diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 451a8596..e8791ea7 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -3100,7 +3100,11 @@ calendar {
  ***********/
 messagedialog { // Message Dialog styling
   &.background {
-    background-color: $surface;
+    @if $variant == 'dark' {
+      background-color: transparent;
+    } @else {
+      background-color: $surface;
+    }
 
     &.csd { // rounded bottom border styling for csd version
       border-bottom-left-radius: $window-radius;
@@ -3108,16 +3112,14 @@ messagedialog { // Message Dialog styling
     }
   }
 
-  .titlebar {
-    min-height: $small-size;
-    border-style: none;
-    box-shadow: none;
-    background-color: $surface;
-    color: $text;
+  &, &.background.csd {
+    .titlebar {
+      border: none;
+      box-shadow: none;
 
-    &:backdrop {
-      background-color: $surface;
-      color: $text-secondary;
+      &, &:backdrop {
+        background-color: transparent;
+      }
     }
   }
 
@@ -3753,7 +3755,7 @@ decoration {
     border: none;
   }
 
-  messagedialog.csd & {
+  messagedialog.background.csd & {
     border-radius: $window-radius;
 
     @if $variant == 'dark' {
diff --git a/src/sass/gtk/apps/_gnome-3.0.scss b/src/sass/gtk/apps/_gnome-3.0.scss
index d8b899fc..ddaecb89 100644
--- a/src/sass/gtk/apps/_gnome-3.0.scss
+++ b/src/sass/gtk/apps/_gnome-3.0.scss
@@ -821,6 +821,8 @@ window.background.csd.unified {
 }
 
 .sidebar-paned .inline-toolbar.horizontal.sidebar-toolbar {
+  box-shadow: inset 0 1px $border;
+
   button.image-button {
     border-radius: $circular-radius;
 
@@ -852,8 +854,9 @@ window.csd > box.vertical > box.vertical,
 window.solid-csd > box.vertical > box.vertical {
   > toolbar.horizontal {
     padding: $space-size;
-    // margin: -1px 0;
+    margin: -1px 0;
     border-bottom: none;
+    border-top: 1px solid $border;
     box-shadow: none;
     background-color: transparent;
 
@@ -861,6 +864,7 @@ window.solid-csd > box.vertical > box.vertical {
     > toolitem > box.horizontal > button {
       @extend %circular-button;
       @extend %rhythmbox-image-button;
+      margin: $space-size 0;
     }
   }
 
@@ -875,6 +879,8 @@ window.solid-csd > box.vertical > box.vertical {
 // hard-coded spacing depends on non-scalable unit,
 // seems cover-art widget is the most biggest thing?
 window.background > box.vertical > toolbar.primary-toolbar {
+  padding: 0 $space-size * 2 0 $space-size;
+
   > toolitem {
     > .linked > button.image-button.raised { // 'shuffle/repeat'
       // @extend %circular-button;
@@ -905,6 +911,61 @@ window.background > box.vertical > toolbar.primary-toolbar {
   }
 }
 
+window.background > box > .sidebar-paned {
+  > paned > box > notebook > stack > box {
+    > grid > grid > grid,
+    > box > grid > grid > grid,
+    > notebook > stack > grid > grid > grid { // Button box part
+      border-bottom: 1px solid $border;
+      padding: $space-size;
+      margin: -6px;
+    }
+
+    > grid > grid > box,
+    > box > grid > grid > box,
+    > notebook > stack > grid > grid > box { // Search box part
+      border-bottom: 1px solid $border;
+      padding: 0 $space-size $space-size;
+      margin: 0 -6px -6px 0;
+    }
+
+    > grid > paned > box,
+    > notebook > stack > grid > paned > box {
+      > scrolledwindow {
+        &:not(:last-child) {
+          border-right: 1px solid $border;
+          margin-right: -1px;
+        }
+      }
+    }
+  }
+
+  > paned > box > notebook > stack > box > box {
+    > grid > grid > grid,
+    > box > grid > grid > grid,
+    > notebook > stack > grid > grid > grid {
+      border-bottom: 1px solid $border;
+      padding: $space-size / 2;
+      margin: -1px -6px -6px;
+    }
+
+    > grid > paned > box,
+    > notebook > stack > grid > paned > box {
+      > scrolledwindow {
+        &:not(:last-child) {
+          border-right: 1px solid $border;
+          margin-right: -1px;
+        }
+      }
+    }
+
+    > paned > box:first-child > box {
+      padding: 0 $space-size $space-size;
+      border-bottom: 1px solid $border;
+    }
+  }
+}
+
 
 /**********
  * Polari *
diff --git a/src/sass/gtk/apps/_nemo.scss b/src/sass/gtk/apps/_nemo.scss
index 007e3e02..b23ac481 100644
--- a/src/sass/gtk/apps/_nemo.scss
+++ b/src/sass/gtk/apps/_nemo.scss
@@ -91,7 +91,8 @@
   }
 
   .toolbar {
-    padding: 0;
+    padding: 2px;
+    margin: -2px;
 
     button {
       @extend %button-flat;