diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 7f77189..235b49e 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -992,10 +992,8 @@ window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop,
 window.csd > .titlebar:not(headerbar),
 window.csd > .titlebar:not(headerbar):backdrop {
   padding: 0;
-  background-color: transparent;
-  background-image: none;
-  border-style: none;
-  border-color: transparent;
+  background: none;
+  border: none;
   box-shadow: none; }
 
 .titlebar:not(headerbar) > separator {
@@ -3137,9 +3135,13 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 .gb-search-entry-occurrences-tag {
   background: none; }
 
-workbench stack.titlebar {
+workbench.csd > stack.titlebar:not(headerbar) {
   padding: 0;
-  border: none; }
+  background: none;
+  border: none;
+  box-shadow: none; }
+  workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.titlebar:not(headerbar) headerbar:first-child, workbench.csd > stack.titlebar:not(headerbar) headerbar:last-child {
+    border-radius: 3px 3px 0 0; }
 
 editortweak .linked > entry.search:focus + .gb-linked-scroller {
   border-top-color: #5294E2; }
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index 9c3d6f1..d9b98c1 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -991,10 +991,8 @@ window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop,
 window.csd > .titlebar:not(headerbar),
 window.csd > .titlebar:not(headerbar):backdrop {
   padding: 0;
-  background-color: transparent;
-  background-image: none;
-  border-style: none;
-  border-color: transparent;
+  background: none;
+  border: none;
   box-shadow: none; }
 
 .titlebar:not(headerbar) > separator {
@@ -3136,9 +3134,13 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 .gb-search-entry-occurrences-tag {
   background: none; }
 
-workbench stack.titlebar {
+workbench.csd > stack.titlebar:not(headerbar) {
   padding: 0;
-  border: none; }
+  background: none;
+  border: none;
+  box-shadow: none; }
+  workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.titlebar:not(headerbar) headerbar:first-child, workbench.csd > stack.titlebar:not(headerbar) headerbar:last-child {
+    border-radius: 3px 3px 0 0; }
 
 editortweak .linked > entry.search:focus + .gb-linked-scroller {
   border-top-color: #5294E2; }
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index 33f8b9f..d7f1282 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -992,10 +992,8 @@ window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop,
 window.csd > .titlebar:not(headerbar),
 window.csd > .titlebar:not(headerbar):backdrop {
   padding: 0;
-  background-color: transparent;
-  background-image: none;
-  border-style: none;
-  border-color: transparent;
+  background: none;
+  border: none;
   box-shadow: none; }
 
 .titlebar:not(headerbar) > separator {
@@ -3137,9 +3135,13 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 .gb-search-entry-occurrences-tag {
   background: none; }
 
-workbench stack.titlebar {
+workbench.csd > stack.titlebar:not(headerbar) {
   padding: 0;
-  border: none; }
+  background: none;
+  border: none;
+  box-shadow: none; }
+  workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.titlebar:not(headerbar) headerbar:first-child, workbench.csd > stack.titlebar:not(headerbar) headerbar:last-child {
+    border-radius: 3px 3px 0 0; }
 
 editortweak .linked > entry.search:focus + .gb-linked-scroller {
   border-top-color: #5294E2; }
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index ee0701d..9fc0b32 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -991,10 +991,8 @@ window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop,
 window.csd > .titlebar:not(headerbar),
 window.csd > .titlebar:not(headerbar):backdrop {
   padding: 0;
-  background-color: transparent;
-  background-image: none;
-  border-style: none;
-  border-color: transparent;
+  background: none;
+  border: none;
   box-shadow: none; }
 
 .titlebar:not(headerbar) > separator {
@@ -3136,9 +3134,13 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 .gb-search-entry-occurrences-tag {
   background: none; }
 
-workbench stack.titlebar {
+workbench.csd > stack.titlebar:not(headerbar) {
   padding: 0;
-  border: none; }
+  background: none;
+  border: none;
+  box-shadow: none; }
+  workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.titlebar:not(headerbar) headerbar:first-child, workbench.csd > stack.titlebar:not(headerbar) headerbar:last-child {
+    border-radius: 3px 3px 0 0; }
 
 editortweak .linked > entry.search:focus + .gb-linked-scroller {
   border-top-color: #5294E2; }
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 23369e8..2c4c41f 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -991,10 +991,8 @@ window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop,
 window.csd > .titlebar:not(headerbar),
 window.csd > .titlebar:not(headerbar):backdrop {
   padding: 0;
-  background-color: transparent;
-  background-image: none;
-  border-style: none;
-  border-color: transparent;
+  background: none;
+  border: none;
   box-shadow: none; }
 
 .titlebar:not(headerbar) > separator {
@@ -3140,9 +3138,13 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 .gb-search-entry-occurrences-tag {
   background: none; }
 
-workbench stack.titlebar {
+workbench.csd > stack.titlebar:not(headerbar) {
   padding: 0;
-  border: none; }
+  background: none;
+  border: none;
+  box-shadow: none; }
+  workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.titlebar:not(headerbar) headerbar:first-child, workbench.csd > stack.titlebar:not(headerbar) headerbar:last-child {
+    border-radius: 4px 4px 0 0; }
 
 editortweak .linked > entry.search:focus + .gb-linked-scroller {
   border-top-color: #5294E2; }
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 39f25b4..a6fd06c 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -991,10 +991,8 @@ window > .titlebar:not(headerbar), window > .titlebar:not(headerbar):backdrop,
 window.csd > .titlebar:not(headerbar),
 window.csd > .titlebar:not(headerbar):backdrop {
   padding: 0;
-  background-color: transparent;
-  background-image: none;
-  border-style: none;
-  border-color: transparent;
+  background: none;
+  border: none;
   box-shadow: none; }
 
 .titlebar:not(headerbar) > separator {
@@ -3140,9 +3138,13 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can
 .gb-search-entry-occurrences-tag {
   background: none; }
 
-workbench stack.titlebar {
+workbench.csd > stack.titlebar:not(headerbar) {
   padding: 0;
-  border: none; }
+  background: none;
+  border: none;
+  box-shadow: none; }
+  workbench.csd > stack.titlebar:not(headerbar) headerbar, workbench.csd > stack.titlebar:not(headerbar) headerbar:first-child, workbench.csd > stack.titlebar:not(headerbar) headerbar:last-child {
+    border-radius: 4px 4px 0 0; }
 
 editortweak .linked > entry.search:focus + .gb-linked-scroller {
   border-top-color: #5294E2; }
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;
     }
   }