1 files changed, 22 insertions, 9 deletions
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index a31eea5..5f23dd9 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -1066,6 +1066,10 @@ headerbar,
 
     .maximized & { background-color: opacify($header_bg, 1); }
   }
+
+  separator.titlebutton { @extend %header_separator; }
+
+  @extend %header_widgets;
 }
 
 .titlebar {
@@ -1078,16 +1082,31 @@ headerbar {
     margin-bottom: 6px;
   }
 
+  // Fixes split headerbars
   separator:first-child + &,
-  &:first-child { &, &:backdrop { border-top-left-radius: $_header_radius; }}
+  &:first-child {
+    &, &:backdrop {
+      border-top-left-radius: $_header_radius;
+
+      .maximized &,
+      .tiled & { border-radius: 0; }
+    }
+  }
+
+  &:last-child {
+    &, &:backdrop {
+      border-top-right-radius: $_header_radius;
 
-  &:last-child { &, &:backdrop { border-top-right-radius: $_header_radius; }}
+      .maximized &,
+      .tiled & { border-radius: 0; }
+    }
+  }
 }
 
+// Fixes split headerbars too
 .titlebar:not(headerbar) {
   window.csd > &,
   window.csd > &:backdrop {
-    // in csd we assume every titlebar is a headerbar so reset anything, this is needed for split toolbars cases
     padding: 0;
     background-color: transparent;
     background-image: none;
@@ -1101,12 +1120,6 @@ headerbar {
   @extend %titlebar;
 }
 
-headerbar {
-  separator.titlebutton { @extend %header_separator; }
-
-  @extend %header_widgets;
-}
-
 %header_separator {
   min-width: 1px;
   min-height: 1px;