diff --git a/src/gtk-3.20/scss/widgets/_toolbar.scss b/src/gtk-3.20/scss/widgets/_toolbar.scss
index 5bb8f65..6256220 100644
--- a/src/gtk-3.20/scss/widgets/_toolbar.scss
+++ b/src/gtk-3.20/scss/widgets/_toolbar.scss
@@ -154,10 +154,10 @@
             margin-bottom: $spacing + 1px;
         }
 
-        window:not(.tiled):not(.maximized) separator:first-child + &, // tackles the paned container case
-        window:not(.tiled):not(.maximized) &:first-child { &:backdrop, & { border-top-left-radius: $roundness; } }
+        window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + &, // tackles the paned container case
+        window:not(.tiled):not(.maximized):not(.solid-csd) &:first-child { &:backdrop, & { border-top-left-radius: $roundness; } }
 
-        window:not(.tiled):not(.maximized) &:last-child { &:backdrop, & { border-top-right-radius: $roundness; } }
+        window:not(.tiled):not(.maximized):not(.solid-csd) &:last-child { &:backdrop, & { border-top-right-radius: $roundness; } }
     }
 
     %titlebar { // Default headerbar and titlebar code.
@@ -260,7 +260,7 @@
         @extend %titlebar;
     }
 
-    .background:not(.tiled):not(.maximized) .titlebar {
+    .background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar {
         &:backdrop, & {
             border-top-left-radius: $roundness;
             border-top-right-radius: $roundness;