diff --git a/src/assets/metacity-1/assets-normal/button.svg b/src/assets/metacity-1/assets-Normal/button.svg
similarity index 100%
rename from src/assets/metacity-1/assets-normal/button.svg
rename to src/assets/metacity-1/assets-Normal/button.svg
diff --git a/src/assets/metacity-1/assets-normal/close.svg b/src/assets/metacity-1/assets-Normal/close.svg
similarity index 100%
rename from src/assets/metacity-1/assets-normal/close.svg
rename to src/assets/metacity-1/assets-Normal/close.svg
diff --git a/src/assets/metacity-1/assets-normal/maximize.svg b/src/assets/metacity-1/assets-Normal/maximize.svg
similarity index 100%
rename from src/assets/metacity-1/assets-normal/maximize.svg
rename to src/assets/metacity-1/assets-Normal/maximize.svg
diff --git a/src/assets/metacity-1/assets-normal/menu.svg b/src/assets/metacity-1/assets-Normal/menu.svg
similarity index 100%
rename from src/assets/metacity-1/assets-normal/menu.svg
rename to src/assets/metacity-1/assets-Normal/menu.svg
diff --git a/src/assets/metacity-1/assets-normal/minimize.svg b/src/assets/metacity-1/assets-Normal/minimize.svg
similarity index 100%
rename from src/assets/metacity-1/assets-normal/minimize.svg
rename to src/assets/metacity-1/assets-Normal/minimize.svg
diff --git a/src/assets/metacity-1/assets-normal/shade.svg b/src/assets/metacity-1/assets-Normal/shade.svg
similarity index 100%
rename from src/assets/metacity-1/assets-normal/shade.svg
rename to src/assets/metacity-1/assets-Normal/shade.svg
diff --git a/src/assets/metacity-1/assets-normal/unmaximize.svg b/src/assets/metacity-1/assets-Normal/unmaximize.svg
similarity index 100%
rename from src/assets/metacity-1/assets-normal/unmaximize.svg
rename to src/assets/metacity-1/assets-Normal/unmaximize.svg
diff --git a/src/assets/metacity-1/assets-normal/unshade.svg b/src/assets/metacity-1/assets-Normal/unshade.svg
similarity index 100%
rename from src/assets/metacity-1/assets-normal/unshade.svg
rename to src/assets/metacity-1/assets-Normal/unshade.svg
diff --git a/src/main/gnome-shell/gnome-shell-Dark.css b/src/main/gnome-shell/gnome-shell-Dark.css
index 64eba4d1..cce37afd 100644
--- a/src/main/gnome-shell/gnome-shell-Dark.css
+++ b/src/main/gnome-shell/gnome-shell-Dark.css
@@ -765,9 +765,9 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .modal-dialog-linked-button {
-  min-height: 32px;
-  padding: 6px;
-  margin: 3px;
+  min-height: 32px !important;
+  padding: 6px !important;
+  margin: 3px !important;
   border: none !important;
   border-radius: 6px;
 }
@@ -1685,12 +1685,32 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 0;
 }
 
+.message-list:ltr {
+  margin-left: 0;
+  margin-right: 0;
+  padding-right: 0;
+  border-right-width: 0;
+}
+
+.message-list:rtl {
+  margin-right: 0;
+  margin-left: 0;
+  padding-left: 0;
+  border-left-width: 0;
+}
+
 .message-list .message-list-placeholder {
   spacing: 12px;
 }
 
+.message-list .message-list-placeholder > StIcon {
+  icon-size: 48px;
+  margin-bottom: 12px;
+  -st-icon-style: symbolic;
+}
+
 .message-list-sections {
-  margin: 0 16px;
+  margin: 0 8px 0 16px;
 }
 
 .message-list-section,
@@ -1733,7 +1753,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   color: rgba(255, 255, 255, 0.5);
   font-size: 9pt;
   text-align: right;
-  padding-bottom: 0.13em;
+  padding-bottom: 0.12em;
 }
 
 .message .message-secondary-bin > .event-time:ltr {
@@ -1750,7 +1770,8 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .message .message-content {
-  padding: 14px;
+  padding: 9px;
+  margin-bottom: 8px;
   spacing: 4px;
   color: rgba(255, 255, 255, 0.5);
 }
@@ -1811,7 +1832,8 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .media-message-cover-icon {
-  icon-size: 32px !important;
+  icon-size: 48px;
+  border-radius: 6px;
 }
 
 .media-message-cover-icon.fallback {
diff --git a/src/main/gnome-shell/gnome-shell-Light.css b/src/main/gnome-shell/gnome-shell-Light.css
index 834fb680..0cff1082 100644
--- a/src/main/gnome-shell/gnome-shell-Light.css
+++ b/src/main/gnome-shell/gnome-shell-Light.css
@@ -765,9 +765,9 @@ StWidget.focused .app-well-app-running-dot {
 }
 
 .modal-dialog-linked-button {
-  min-height: 32px;
-  padding: 6px;
-  margin: 3px;
+  min-height: 32px !important;
+  padding: 6px !important;
+  margin: 3px !important;
   border: none !important;
   border-radius: 6px;
 }
@@ -1685,12 +1685,32 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   padding: 0;
 }
 
+.message-list:ltr {
+  margin-left: 0;
+  margin-right: 0;
+  padding-right: 0;
+  border-right-width: 0;
+}
+
+.message-list:rtl {
+  margin-right: 0;
+  margin-left: 0;
+  padding-left: 0;
+  border-left-width: 0;
+}
+
 .message-list .message-list-placeholder {
   spacing: 12px;
 }
 
+.message-list .message-list-placeholder > StIcon {
+  icon-size: 48px;
+  margin-bottom: 12px;
+  -st-icon-style: symbolic;
+}
+
 .message-list-sections {
-  margin: 0 16px;
+  margin: 0 8px 0 16px;
 }
 
 .message-list-section,
@@ -1733,7 +1753,7 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
   color: rgba(0, 0, 0, 0.38);
   font-size: 9pt;
   text-align: right;
-  padding-bottom: 0.13em;
+  padding-bottom: 0.12em;
 }
 
 .message .message-secondary-bin > .event-time:ltr {
@@ -1750,7 +1770,8 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .message .message-content {
-  padding: 14px;
+  padding: 9px;
+  margin-bottom: 8px;
   spacing: 4px;
   color: rgba(0, 0, 0, 0.38);
 }
@@ -1811,7 +1832,8 @@ StEntry StLabel.hint-text, .popup-menu .search-entry StLabel.hint-text {
 }
 
 .media-message-cover-icon {
-  icon-size: 32px !important;
+  icon-size: 48px;
+  border-radius: 6px;
 }
 
 .media-message-cover-icon.fallback {
diff --git a/src/main/gtk-4.0/gtk-Dark.css b/src/main/gtk-4.0/gtk-Dark.css
index 536563eb..2965d3f0 100644
--- a/src/main/gtk-4.0/gtk-Dark.css
+++ b/src/main/gtk-4.0/gtk-Dark.css
@@ -1556,6 +1556,10 @@ searchbar > revealer > box {
   box-shadow: none;
 }
 
+searchbar > revealer > box entry {
+  margin: 0;
+}
+
 /***************
  * Header bars *
  ***************/
@@ -2803,7 +2807,7 @@ switch > slider {
   transition: all 75ms cubic-bezier(0, 0, 0.2, 1);
   min-width: 20px;
   min-height: 20px;
-  margin: 1px;
+  margin: 0;
   border-radius: 9999px;
   outline: none;
   box-shadow: none;
diff --git a/src/main/gtk-4.0/gtk-Light.css b/src/main/gtk-4.0/gtk-Light.css
index 52cc5de1..49f69955 100644
--- a/src/main/gtk-4.0/gtk-Light.css
+++ b/src/main/gtk-4.0/gtk-Light.css
@@ -1556,6 +1556,10 @@ searchbar > revealer > box {
   box-shadow: none;
 }
 
+searchbar > revealer > box entry {
+  margin: 0;
+}
+
 /***************
  * Header bars *
  ***************/
diff --git a/src/sass/gnome-shell/common/_dialogs.scss b/src/sass/gnome-shell/common/_dialogs.scss
index b5512573..7b947c92 100644
--- a/src/sass/gnome-shell/common/_dialogs.scss
+++ b/src/sass/gnome-shell/common/_dialogs.scss
@@ -44,9 +44,9 @@
   @extend %theme_dialogs;
 
   &-linked-button {
-    min-height: $item_size;
-    padding: $base_padding;
-    margin: $base_padding / 2;
+    min-height: $item_size !important;
+    padding: $base_padding !important;
+    margin: $base_padding / 2 !important;
     border: none !important;
     border-radius: $base_radius;
     @extend %flat_button;
diff --git a/src/sass/gnome-shell/common/_message-list.scss b/src/sass/gnome-shell/common/_message-list.scss
index b3f1d992..43662dd6 100644
--- a/src/sass/gnome-shell/common/_message-list.scss
+++ b/src/sass/gnome-shell/common/_message-list.scss
@@ -7,11 +7,24 @@
   border: none;
   padding: 0;
 
-  .message-list-placeholder { spacing: $base_spacing * 2; }
+  // padding and margins to account for scrollbar
+  &:ltr { margin-left: 0; margin-right: 0; padding-right: 0; border-right-width: 0; }
+  &:rtl { margin-right: 0; margin-left: 0; padding-left: 0; border-left-width: 0; }
+
+  .message-list-placeholder {
+    spacing: $base_spacing * 2;
+
+    // icon size and color
+    > StIcon {
+      icon-size: 48px; // 48px
+      margin-bottom: $base_margin * 3;
+      -st-icon-style: symbolic;
+    }
+  }
 }
 
 .message-list-sections {
-  margin: 0 $base_margin * 4; // to account for scrollbar
+  margin: 0 $base_margin * 2 0 $base_margin * 4; // to account for scrollbar
 }
 
 .message-list-section,
@@ -55,10 +68,10 @@
       color: $text-disabled;
       @include fontsize($font_size - 2);
       text-align: right;
-      padding-bottom: 0.13em;
+      padding-bottom: 0.12em;
 
-      &:ltr { text-align: right };
-      &:rtl { text-align: left };
+      &:ltr { text-align: right; }
+      &:rtl { text-align: left; }
     }
   }
 
@@ -68,7 +81,8 @@
   }
 
   .message-content {
-    padding: $base_padding + $base_margin * 2;
+    padding: $base_padding * 1.5;
+    margin-bottom: $base_margin * 2;
     spacing: 4px;
     color: $text-disabled;
   }
@@ -111,7 +125,8 @@
 
 // album-art
 .media-message-cover-icon {
-  icon-size: 32px !important;
+  icon-size: 48px;
+  border-radius: $base_radius;
 
   &.fallback {
     icon-size: 32px !important;
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 5b06d201..dd8a373e 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1070,7 +1070,7 @@ searchbar > revealer > box,
 
 searchbar > revealer > box {
   // workaround: undo the GtkContainer:border-width and use CSS padding instead
-  margin: -6px;
+  margin: -$space-size;
 }
 
 
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 2626e87e..a648efba 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -2700,7 +2700,7 @@ switch {
     transition: all $duration $ease-out;
     min-width: $small-size - 4px;
     min-height: $small-size - 4px;
-    margin: 1px;
+    margin: if($variant == 'light', 1px, 0);
     border-radius: $circular-radius;
     outline: none;
     box-shadow: none;