osd and titlebutton fixes

21 files changed, 104 insertions, 52 deletions

diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css
index 2373f8b..7d99f70 100644
--- a/common/gtk-3.0/3.14/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-dark.css
@@ -372,6 +372,8 @@ GtkSearchEntry.entry {
       outline-color: rgba(186, 195, 207, 0.3);
       border-color: rgba(26, 28, 34, 0.35);
       background-color: rgba(119, 127, 151, 0.45); }
+      .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child {
+        box-shadow: none; }
     .osd .button:active, .osd .button:checked {
       background-clip: padding-box;
       color: #ffffff;
@@ -392,6 +394,8 @@ GtkSearchEntry.entry {
         outline-color: rgba(186, 195, 207, 0.3);
         border-color: rgba(26, 28, 34, 0.35);
         background-color: rgba(119, 127, 151, 0.45); }
+        .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child {
+          box-shadow: none; }
       .osd .button.flat:insensitive {
         color: #5d626e;
         border-color: rgba(26, 28, 34, 0.35);
diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css
index dfb6844..c531d15 100644
--- a/common/gtk-3.0/3.14/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-darker.css
@@ -371,6 +371,8 @@ GtkSearchEntry.entry {
       outline-color: rgba(186, 195, 207, 0.3);
       border-color: rgba(26, 28, 34, 0.35);
       background-color: rgba(119, 127, 151, 0.45); }
+      .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child {
+        box-shadow: none; }
     .osd .button:active, .osd .button:checked {
       background-clip: padding-box;
       color: #ffffff;
@@ -391,6 +393,8 @@ GtkSearchEntry.entry {
         outline-color: rgba(186, 195, 207, 0.3);
         border-color: rgba(26, 28, 34, 0.35);
         background-color: rgba(119, 127, 151, 0.45); }
+        .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child {
+          box-shadow: none; }
       .osd .button.flat:insensitive {
         color: #5d626e;
         border-color: rgba(26, 28, 34, 0.35);
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
index a8e0867..655cd13 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
@@ -372,6 +372,8 @@ GtkSearchEntry.entry {
       outline-color: rgba(186, 195, 207, 0.3);
       border-color: rgba(26, 28, 34, 0.4);
       background-color: rgba(119, 127, 151, 0.5); }
+      .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child {
+        box-shadow: none; }
     .osd .button:active, .osd .button:checked {
       background-clip: padding-box;
       color: #ffffff;
@@ -392,6 +394,8 @@ GtkSearchEntry.entry {
         outline-color: rgba(186, 195, 207, 0.3);
         border-color: rgba(26, 28, 34, 0.4);
         background-color: rgba(119, 127, 151, 0.5); }
+        .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child {
+          box-shadow: none; }
       .osd .button.flat:insensitive {
         color: #5d626e;
         border-color: rgba(26, 28, 34, 0.4);
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
index c48d25c..7e222d7 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
@@ -371,6 +371,8 @@ GtkSearchEntry.entry {
       outline-color: rgba(186, 195, 207, 0.3);
       border-color: rgba(26, 28, 34, 0.4);
       background-color: rgba(119, 127, 151, 0.5); }
+      .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child {
+        box-shadow: none; }
     .osd .button:active, .osd .button:checked {
       background-clip: padding-box;
       color: #ffffff;
@@ -391,6 +393,8 @@ GtkSearchEntry.entry {
         outline-color: rgba(186, 195, 207, 0.3);
         border-color: rgba(26, 28, 34, 0.4);
         background-color: rgba(119, 127, 151, 0.5); }
+        .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child {
+          box-shadow: none; }
       .osd .button.flat:insensitive {
         color: #5d626e;
         border-color: rgba(26, 28, 34, 0.4);
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css
index baa379f..dfe6878 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.css
@@ -371,6 +371,8 @@ GtkSearchEntry.entry {
       outline-color: rgba(186, 195, 207, 0.3);
       border-color: rgba(26, 28, 34, 0.4);
       background-color: rgba(119, 127, 151, 0.5); }
+      .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child {
+        box-shadow: none; }
     .osd .button:active, .osd .button:checked {
       background-clip: padding-box;
       color: #ffffff;
@@ -391,6 +393,8 @@ GtkSearchEntry.entry {
         outline-color: rgba(186, 195, 207, 0.3);
         border-color: rgba(26, 28, 34, 0.4);
         background-color: rgba(119, 127, 151, 0.5); }
+        .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child {
+          box-shadow: none; }
       .osd .button.flat:insensitive {
         color: #5d626e;
         border-color: rgba(26, 28, 34, 0.4);
diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css
index 4017245..a378b08 100644
--- a/common/gtk-3.0/3.14/gtk-contained.css
+++ b/common/gtk-3.0/3.14/gtk-contained.css
@@ -371,6 +371,8 @@ GtkSearchEntry.entry {
       outline-color: rgba(186, 195, 207, 0.3);
       border-color: rgba(26, 28, 34, 0.35);
       background-color: rgba(119, 127, 151, 0.45); }
+      .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child {
+        box-shadow: none; }
     .osd .button:active, .osd .button:checked {
       background-clip: padding-box;
       color: #ffffff;
@@ -391,6 +393,8 @@ GtkSearchEntry.entry {
         outline-color: rgba(186, 195, 207, 0.3);
         border-color: rgba(26, 28, 34, 0.35);
         background-color: rgba(119, 127, 151, 0.45); }
+        .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child {
+          box-shadow: none; }
       .osd .button.flat:insensitive {
         color: #5d626e;
         border-color: rgba(26, 28, 34, 0.35);
diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss
index 0b83114..482d3c7 100644
--- a/common/gtk-3.0/3.14/sass/_common.scss
+++ b/common/gtk-3.0/3.14/sass/_common.scss
@@ -473,6 +473,7 @@ $_dot_color: $selected_bg_color;
     &:hover {
       @include button(osd-hover);
       @extend %linked;
+      &, &:first-child, &:last-child { box-shadow: none; }
     }
     &:active, &:checked {
       background-clip: padding-box;
@@ -489,6 +490,7 @@ $_dot_color: $selected_bg_color;
       box-shadow: none;
       &:hover {
         @include button(osd-hover);
+        &, &:first-child, &:last-child { box-shadow: none; }
       }
       &:insensitive {
         @include button(osd-insensitive);
diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css
index 2674cef..d083279 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -372,6 +372,8 @@ GtkSearchEntry.entry {
       outline-color: rgba(186, 195, 207, 0.3);
       border-color: rgba(26, 28, 34, 0.35);
       background-color: rgba(119, 127, 151, 0.45); }
+      .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child {
+        box-shadow: none; }
     .osd .button:active, .osd .button:checked {
       background-clip: padding-box;
       color: #ffffff;
@@ -392,6 +394,8 @@ GtkSearchEntry.entry {
         outline-color: rgba(186, 195, 207, 0.3);
         border-color: rgba(26, 28, 34, 0.35);
         background-color: rgba(119, 127, 151, 0.45); }
+        .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child {
+          box-shadow: none; }
       .osd .button.flat:insensitive {
         color: #5d626e;
         border-color: rgba(26, 28, 34, 0.35);
@@ -2557,12 +2561,11 @@ GtkVolumeButton.button {
 
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
-  padding: 7px 4px;
+  padding: 6px 4px;
   border-color: transparent;
   background-color: transparent;
   background-image: none;
-  background-color: rgba(47, 52, 63, 0);
-  border-width: 0; }
+  background-color: rgba(47, 52, 63, 0); }
   .header-bar .button.titlebutton:hover,
   .titlebar .button.titlebutton:hover {
     color: rgba(207, 218, 231, 0.8);
@@ -2583,7 +2586,8 @@ GtkVolumeButton.button {
     color: transparent;
     background-color: transparent;
     background-position: center;
-    background-repeat: no-repeat; }
+    background-repeat: no-repeat;
+    border-width: 0; }
     .header-bar .button.titlebutton.close:backdrop,
     .header-bar .button.titlebutton.maximize:backdrop,
     .header-bar .button.titlebutton.minimize:backdrop,
diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css
index b0b08cb..4de7a2e 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -371,6 +371,8 @@ GtkSearchEntry.entry {
       outline-color: rgba(186, 195, 207, 0.3);
       border-color: rgba(26, 28, 34, 0.35);
       background-color: rgba(119, 127, 151, 0.45); }
+      .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child {
+        box-shadow: none; }
     .osd .button:active, .osd .button:checked {
       background-clip: padding-box;
       color: #ffffff;
@@ -391,6 +393,8 @@ GtkSearchEntry.entry {
         outline-color: rgba(186, 195, 207, 0.3);
         border-color: rgba(26, 28, 34, 0.35);
         background-color: rgba(119, 127, 151, 0.45); }
+        .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child {
+          box-shadow: none; }
       .osd .button.flat:insensitive {
         color: #5d626e;
         border-color: rgba(26, 28, 34, 0.35);
@@ -2560,12 +2564,11 @@ GtkVolumeButton.button {
 
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
-  padding: 7px 4px;
+  padding: 6px 4px;
   border-color: transparent;
   background-color: transparent;
   background-image: none;
-  background-color: rgba(47, 52, 63, 0);
-  border-width: 0; }
+  background-color: rgba(47, 52, 63, 0); }
   .header-bar .button.titlebutton:hover,
   .titlebar .button.titlebutton:hover {
     color: rgba(207, 218, 231, 0.8);
@@ -2586,7 +2589,8 @@ GtkVolumeButton.button {
     color: transparent;
     background-color: transparent;
     background-position: center;
-    background-repeat: no-repeat; }
+    background-repeat: no-repeat;
+    border-width: 0; }
     .header-bar .button.titlebutton.close:backdrop,
     .header-bar .button.titlebutton.maximize:backdrop,
     .header-bar .button.titlebutton.minimize:backdrop,
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
index 9b21e44..4adad11 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
@@ -372,6 +372,8 @@ GtkSearchEntry.entry {
       outline-color: rgba(186, 195, 207, 0.3);
       border-color: rgba(26, 28, 34, 0.4);
       background-color: rgba(119, 127, 151, 0.5); }
+      .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child {
+        box-shadow: none; }
     .osd .button:active, .osd .button:checked {
       background-clip: padding-box;
       color: #ffffff;
@@ -392,6 +394,8 @@ GtkSearchEntry.entry {
         outline-color: rgba(186, 195, 207, 0.3);
         border-color: rgba(26, 28, 34, 0.4);
         background-color: rgba(119, 127, 151, 0.5); }
+        .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child {
+          box-shadow: none; }
       .osd .button.flat:insensitive {
         color: #5d626e;
         border-color: rgba(26, 28, 34, 0.4);
@@ -2557,12 +2561,11 @@ GtkVolumeButton.button {
 
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
-  padding: 7px 4px;
+  padding: 6px 4px;
   border-color: transparent;
   background-color: transparent;
   background-image: none;
-  background-color: rgba(47, 52, 63, 0);
-  border-width: 0; }
+  background-color: rgba(47, 52, 63, 0); }
   .header-bar .button.titlebutton:hover,
   .titlebar .button.titlebutton:hover {
     color: rgba(207, 218, 231, 0.8);
@@ -2583,7 +2586,8 @@ GtkVolumeButton.button {
     color: transparent;
     background-color: transparent;
     background-position: center;
-    background-repeat: no-repeat; }
+    background-repeat: no-repeat;
+    border-width: 0; }
     .header-bar .button.titlebutton.close:backdrop,
     .header-bar .button.titlebutton.maximize:backdrop,
     .header-bar .button.titlebutton.minimize:backdrop,
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
index 3e141e9..d2e4ac6 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
@@ -371,6 +371,8 @@ GtkSearchEntry.entry {
       outline-color: rgba(186, 195, 207, 0.3);
       border-color: rgba(26, 28, 34, 0.4);
       background-color: rgba(119, 127, 151, 0.5); }
+      .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child {
+        box-shadow: none; }
     .osd .button:active, .osd .button:checked {
       background-clip: padding-box;
       color: #ffffff;
@@ -391,6 +393,8 @@ GtkSearchEntry.entry {
         outline-color: rgba(186, 195, 207, 0.3);
         border-color: rgba(26, 28, 34, 0.4);
         background-color: rgba(119, 127, 151, 0.5); }
+        .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child {
+          box-shadow: none; }
       .osd .button.flat:insensitive {
         color: #5d626e;
         border-color: rgba(26, 28, 34, 0.4);
@@ -2560,12 +2564,11 @@ GtkVolumeButton.button {
 
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
-  padding: 7px 4px;
+  padding: 6px 4px;
   border-color: transparent;
   background-color: transparent;
   background-image: none;
-  background-color: rgba(47, 52, 63, 0);
-  border-width: 0; }
+  background-color: rgba(47, 52, 63, 0); }
   .header-bar .button.titlebutton:hover,
   .titlebar .button.titlebutton:hover {
     color: rgba(207, 218, 231, 0.8);
@@ -2586,7 +2589,8 @@ GtkVolumeButton.button {
     color: transparent;
     background-color: transparent;
     background-position: center;
-    background-repeat: no-repeat; }
+    background-repeat: no-repeat;
+    border-width: 0; }
     .header-bar .button.titlebutton.close:backdrop,
     .header-bar .button.titlebutton.maximize:backdrop,
     .header-bar .button.titlebutton.minimize:backdrop,
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css
index 0c303a5..f47276b 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.css
@@ -371,6 +371,8 @@ GtkSearchEntry.entry {
       outline-color: rgba(186, 195, 207, 0.3);
       border-color: rgba(26, 28, 34, 0.4);
       background-color: rgba(119, 127, 151, 0.5); }
+      .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child {
+        box-shadow: none; }
     .osd .button:active, .osd .button:checked {
       background-clip: padding-box;
       color: #ffffff;
@@ -391,6 +393,8 @@ GtkSearchEntry.entry {
         outline-color: rgba(186, 195, 207, 0.3);
         border-color: rgba(26, 28, 34, 0.4);
         background-color: rgba(119, 127, 151, 0.5); }
+        .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child {
+          box-shadow: none; }
       .osd .button.flat:insensitive {
         color: #5d626e;
         border-color: rgba(26, 28, 34, 0.4);
@@ -2560,12 +2564,11 @@ GtkVolumeButton.button {
 
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
-  padding: 7px 4px;
+  padding: 6px 4px;
   border-color: transparent;
   background-color: transparent;
   background-image: none;
-  background-color: rgba(231, 232, 235, 0);
-  border-width: 0; }
+  background-color: rgba(231, 232, 235, 0); }
   .header-bar .button.titlebutton:hover,
   .titlebar .button.titlebutton:hover {
     color: rgba(82, 93, 118, 0.8);
@@ -2586,7 +2589,8 @@ GtkVolumeButton.button {
     color: transparent;
     background-color: transparent;
     background-position: center;
-    background-repeat: no-repeat; }
+    background-repeat: no-repeat;
+    border-width: 0; }
     .header-bar .button.titlebutton.close:backdrop,
     .header-bar .button.titlebutton.maximize:backdrop,
     .header-bar .button.titlebutton.minimize:backdrop,
diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index 73e399d..83b64a9 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -371,6 +371,8 @@ GtkSearchEntry.entry {
       outline-color: rgba(186, 195, 207, 0.3);
       border-color: rgba(26, 28, 34, 0.35);
       background-color: rgba(119, 127, 151, 0.45); }
+      .osd .button:hover, .osd .button:hover:first-child, .osd .button:hover:last-child {
+        box-shadow: none; }
     .osd .button:active, .osd .button:checked {
       background-clip: padding-box;
       color: #ffffff;
@@ -391,6 +393,8 @@ GtkSearchEntry.entry {
         outline-color: rgba(186, 195, 207, 0.3);
         border-color: rgba(26, 28, 34, 0.35);
         background-color: rgba(119, 127, 151, 0.45); }
+        .osd .button.flat:hover, .osd .button.flat:hover:first-child, .osd .button.flat:hover:last-child {
+          box-shadow: none; }
       .osd .button.flat:insensitive {
         color: #5d626e;
         border-color: rgba(26, 28, 34, 0.35);
@@ -2560,12 +2564,11 @@ GtkVolumeButton.button {
 
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
-  padding: 7px 4px;
+  padding: 6px 4px;
   border-color: transparent;
   background-color: transparent;
   background-image: none;
-  background-color: rgba(231, 232, 235, 0);
-  border-width: 0; }
+  background-color: rgba(231, 232, 235, 0); }
   .header-bar .button.titlebutton:hover,
   .titlebar .button.titlebutton:hover {
     color: rgba(82, 93, 118, 0.8);
@@ -2586,7 +2589,8 @@ GtkVolumeButton.button {
     color: transparent;
     background-color: transparent;
     background-position: center;
-    background-repeat: no-repeat; }
+    background-repeat: no-repeat;
+    border-width: 0; }
     .header-bar .button.titlebutton.close:backdrop,
     .header-bar .button.titlebutton.maximize:backdrop,
     .header-bar .button.titlebutton.minimize:backdrop,
diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss
index 1ee78e4..92856f5 100644
--- a/common/gtk-3.0/3.16/sass/_common.scss
+++ b/common/gtk-3.0/3.16/sass/_common.scss
@@ -473,6 +473,7 @@ $_dot_color: $selected_bg_color;
     &:hover {
       @include button(osd-hover);
       @extend %linked;
+      &, &:first-child, &:last-child { box-shadow: none; }
     }
     &:active, &:checked {
       background-clip: padding-box;
@@ -489,6 +490,7 @@ $_dot_color: $selected_bg_color;
       box-shadow: none;
       &:hover {
         @include button(osd-hover);
+        &, &:first-child, &:last-child { box-shadow: none; }
       }
       &:insensitive {
         @include button(osd-insensitive);
@@ -2844,11 +2846,10 @@ GtkVolumeButton.button { padding: 8px; }
   }
 
   .button.titlebutton {
-    padding: 7px 4px;
+    padding: 6px 4px;
 
     @include button(undecorated);
     background-color: transparentize($header_bg, 1);
-    border-width: 0;
 
     &:hover {
       @include button(header-hover);
@@ -2863,6 +2864,7 @@ GtkVolumeButton.button { padding: 8px; }
       background-color: transparent;
       background-position: center;
       background-repeat: no-repeat;
+      border-width: 0;
 
       &:backdrop { opacity: 1; }
     }
diff --git a/common/gtk-3.0/3.18/gtk-contained-dark.css b/common/gtk-3.0/3.18/gtk-contained-dark.css
index 8675069..0381e1d 100644
--- a/common/gtk-3.0/3.18/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-dark.css
@@ -2741,12 +2741,11 @@ GtkVolumeButton.button {
 
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
-  padding: 7px 4px;
+  padding: 6px 4px;
   border-color: transparent;
   background-color: transparent;
   background-image: none;
-  background-color: rgba(47, 52, 63, 0);
-  border-width: 0; }
+  background-color: rgba(47, 52, 63, 0); }
   .header-bar .button.titlebutton:hover,
   .titlebar .button.titlebutton:hover {
     color: rgba(207, 218, 231, 0.8);
@@ -2767,7 +2766,8 @@ GtkVolumeButton.button {
     color: transparent;
     background-color: transparent;
     background-position: center;
-    background-repeat: no-repeat; }
+    background-repeat: no-repeat;
+    border-width: 0; }
     .header-bar .button.titlebutton.close:backdrop,
     .header-bar .button.titlebutton.maximize:backdrop,
     .header-bar .button.titlebutton.minimize:backdrop,
diff --git a/common/gtk-3.0/3.18/gtk-contained-darker.css b/common/gtk-3.0/3.18/gtk-contained-darker.css
index 22c8f5d..d3a2965 100644
--- a/common/gtk-3.0/3.18/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-darker.css
@@ -2744,12 +2744,11 @@ GtkVolumeButton.button {
 
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
-  padding: 7px 4px;
+  padding: 6px 4px;
   border-color: transparent;
   background-color: transparent;
   background-image: none;
-  background-color: rgba(47, 52, 63, 0);
-  border-width: 0; }
+  background-color: rgba(47, 52, 63, 0); }
   .header-bar .button.titlebutton:hover,
   .titlebar .button.titlebutton:hover {
     color: rgba(207, 218, 231, 0.8);
@@ -2770,7 +2769,8 @@ GtkVolumeButton.button {
     color: transparent;
     background-color: transparent;
     background-position: center;
-    background-repeat: no-repeat; }
+    background-repeat: no-repeat;
+    border-width: 0; }
     .header-bar .button.titlebutton.close:backdrop,
     .header-bar .button.titlebutton.maximize:backdrop,
     .header-bar .button.titlebutton.minimize:backdrop,
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
index 9ca1b51..f0ba3d5 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
@@ -2741,12 +2741,11 @@ GtkVolumeButton.button {
 
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
-  padding: 7px 4px;
+  padding: 6px 4px;
   border-color: transparent;
   background-color: transparent;
   background-image: none;
-  background-color: rgba(47, 52, 63, 0);
-  border-width: 0; }
+  background-color: rgba(47, 52, 63, 0); }
   .header-bar .button.titlebutton:hover,
   .titlebar .button.titlebutton:hover {
     color: rgba(207, 218, 231, 0.8);
@@ -2767,7 +2766,8 @@ GtkVolumeButton.button {
     color: transparent;
     background-color: transparent;
     background-position: center;
-    background-repeat: no-repeat; }
+    background-repeat: no-repeat;
+    border-width: 0; }
     .header-bar .button.titlebutton.close:backdrop,
     .header-bar .button.titlebutton.maximize:backdrop,
     .header-bar .button.titlebutton.minimize:backdrop,
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
index 5f79a85..e46b2c0 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
@@ -2744,12 +2744,11 @@ GtkVolumeButton.button {
 
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
-  padding: 7px 4px;
+  padding: 6px 4px;
   border-color: transparent;
   background-color: transparent;
   background-image: none;
-  background-color: rgba(47, 52, 63, 0);
-  border-width: 0; }
+  background-color: rgba(47, 52, 63, 0); }
   .header-bar .button.titlebutton:hover,
   .titlebar .button.titlebutton:hover {
     color: rgba(207, 218, 231, 0.8);
@@ -2770,7 +2769,8 @@ GtkVolumeButton.button {
     color: transparent;
     background-color: transparent;
     background-position: center;
-    background-repeat: no-repeat; }
+    background-repeat: no-repeat;
+    border-width: 0; }
     .header-bar .button.titlebutton.close:backdrop,
     .header-bar .button.titlebutton.maximize:backdrop,
     .header-bar .button.titlebutton.minimize:backdrop,
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid.css b/common/gtk-3.0/3.18/gtk-contained-solid.css
index d0091a0..69ae9d5 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid.css
@@ -2748,12 +2748,11 @@ GtkVolumeButton.button {
 
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
-  padding: 7px 4px;
+  padding: 6px 4px;
   border-color: transparent;
   background-color: transparent;
   background-image: none;
-  background-color: rgba(231, 232, 235, 0);
-  border-width: 0; }
+  background-color: rgba(231, 232, 235, 0); }
   .header-bar .button.titlebutton:hover,
   .titlebar .button.titlebutton:hover {
     color: rgba(82, 93, 118, 0.8);
@@ -2774,7 +2773,8 @@ GtkVolumeButton.button {
     color: transparent;
     background-color: transparent;
     background-position: center;
-    background-repeat: no-repeat; }
+    background-repeat: no-repeat;
+    border-width: 0; }
     .header-bar .button.titlebutton.close:backdrop,
     .header-bar .button.titlebutton.maximize:backdrop,
     .header-bar .button.titlebutton.minimize:backdrop,
diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css
index 5b15558..ea02115 100644
--- a/common/gtk-3.0/3.18/gtk-contained.css
+++ b/common/gtk-3.0/3.18/gtk-contained.css
@@ -2748,12 +2748,11 @@ GtkVolumeButton.button {
 
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
-  padding: 7px 4px;
+  padding: 6px 4px;
   border-color: transparent;
   background-color: transparent;
   background-image: none;
-  background-color: rgba(231, 232, 235, 0);
-  border-width: 0; }
+  background-color: rgba(231, 232, 235, 0); }
   .header-bar .button.titlebutton:hover,
   .titlebar .button.titlebutton:hover {
     color: rgba(82, 93, 118, 0.8);
@@ -2774,7 +2773,8 @@ GtkVolumeButton.button {
     color: transparent;
     background-color: transparent;
     background-position: center;
-    background-repeat: no-repeat; }
+    background-repeat: no-repeat;
+    border-width: 0; }
     .header-bar .button.titlebutton.close:backdrop,
     .header-bar .button.titlebutton.maximize:backdrop,
     .header-bar .button.titlebutton.minimize:backdrop,
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index e5cca7f..5c216f6 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -3008,11 +3008,10 @@ GtkVolumeButton.button { padding: 8px; }
   }
 
   .button.titlebutton {
-    padding: 7px 4px;
+    padding: 6px 4px;
 
     @include button(undecorated);
     background-color: transparentize($header_bg, 1);
-    border-width: 0;
 
     &:hover {
       @include button(header-hover);
@@ -3027,6 +3026,7 @@ GtkVolumeButton.button { padding: 8px; }
       background-color: transparent;
       background-position: center;
       background-repeat: no-repeat;
+      border-width: 0;
 
       &:backdrop { opacity: 1; }
     }