2 files changed, 11 insertions, 5 deletions
diff --git a/common/gtk-3.0/3.20/sass/_applications.scss b/common/gtk-3.0/3.20/sass/_applications.scss
index db2c0ed..decde96 100644
--- a/common/gtk-3.0/3.20/sass/_applications.scss
+++ b/common/gtk-3.0/3.20/sass/_applications.scss
@@ -273,9 +273,17 @@ $disk_space_free: darken($bg_color, 3%);
 //
 .gb-search-entry-occurrences-tag { background: none; }
 
-workbench stack.titlebar {
+workbench.csd > stack.titlebar:not(headerbar) {
   padding: 0;
+  background: none;
   border: none;
+  box-shadow: none;
+
+  headerbar {
+    &,
+    &:first-child,
+    &:last-child { border-radius: $_header_radius $_header_radius 0 0; }
+  }
 }
 
 editortweak .linked > entry.search:focus + .gb-linked-scroller { border-top-color: $selected_bg_color; }
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index d80ee48..7e293b5 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -1072,10 +1072,8 @@ headerbar {
   window.csd > & {
     &, &:backdrop {
       padding: 0;
-      background-color: transparent;
-      background-image: none;
-      border-style: none;
-      border-color: transparent;
+      background: none;
+      border: none;
       box-shadow: none;
     }
   }