7 files changed, 34 insertions, 20 deletions
diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 9c4f668..91d7c19 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -897,8 +897,8 @@ headerbar {
   headerbar.default-decoration,
   .csd headerbar.default-decoration, headerbar.default-decoration:backdrop,
   .csd headerbar.default-decoration:backdrop {
-    padding-top: 5px;
-    padding-bottom: 5px;
+    min-height: 28px;
+    padding: 0 3px;
     background-color: #2f343f;
     border-bottom-width: 0; }
     .maximized headerbar.default-decoration, .maximized
@@ -2650,7 +2650,9 @@ decoration {
 headerbar.default-decoration button.titlebutton,
 .titlebar.default-decoration button.titlebutton {
   padding: 0 4px;
-  min-width: 0; }
+  min-width: 0;
+  min-height: 0;
+  margin: 0; }
 
 headerbar button.titlebutton,
 .titlebar button.titlebutton {
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index 4fbc0c3..d066153 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -896,8 +896,8 @@ headerbar {
   headerbar.default-decoration,
   .csd headerbar.default-decoration, headerbar.default-decoration:backdrop,
   .csd headerbar.default-decoration:backdrop {
-    padding-top: 5px;
-    padding-bottom: 5px;
+    min-height: 28px;
+    padding: 0 3px;
     background-color: #2f343f;
     border-bottom-width: 0; }
     .maximized headerbar.default-decoration, .maximized
@@ -2649,7 +2649,9 @@ decoration {
 headerbar.default-decoration button.titlebutton,
 .titlebar.default-decoration button.titlebutton {
   padding: 0 4px;
-  min-width: 0; }
+  min-width: 0;
+  min-height: 0;
+  margin: 0; }
 
 headerbar button.titlebutton,
 .titlebar button.titlebutton {
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 ca9c7f4..3e1e5db 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -897,8 +897,8 @@ headerbar {
   headerbar.default-decoration,
   .csd headerbar.default-decoration, headerbar.default-decoration:backdrop,
   .csd headerbar.default-decoration:backdrop {
-    padding-top: 5px;
-    padding-bottom: 5px;
+    min-height: 28px;
+    padding: 0 3px;
     background-color: #2f343f;
     border-bottom-width: 0; }
     .maximized headerbar.default-decoration, .maximized
@@ -2650,7 +2650,9 @@ decoration {
 headerbar.default-decoration button.titlebutton,
 .titlebar.default-decoration button.titlebutton {
   padding: 0 4px;
-  min-width: 0; }
+  min-width: 0;
+  min-height: 0;
+  margin: 0; }
 
 headerbar button.titlebutton,
 .titlebar button.titlebutton {
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 3b0abcc..f6f4982 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -896,8 +896,8 @@ headerbar {
   headerbar.default-decoration,
   .csd headerbar.default-decoration, headerbar.default-decoration:backdrop,
   .csd headerbar.default-decoration:backdrop {
-    padding-top: 5px;
-    padding-bottom: 5px;
+    min-height: 28px;
+    padding: 0 3px;
     background-color: #2f343f;
     border-bottom-width: 0; }
     .maximized headerbar.default-decoration, .maximized
@@ -2649,7 +2649,9 @@ decoration {
 headerbar.default-decoration button.titlebutton,
 .titlebar.default-decoration button.titlebutton {
   padding: 0 4px;
-  min-width: 0; }
+  min-width: 0;
+  min-height: 0;
+  margin: 0; }
 
 headerbar button.titlebutton,
 .titlebar button.titlebutton {
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index c58c6e6..e353723 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -896,8 +896,8 @@ headerbar {
   headerbar.default-decoration,
   .csd headerbar.default-decoration, headerbar.default-decoration:backdrop,
   .csd headerbar.default-decoration:backdrop {
-    padding-top: 5px;
-    padding-bottom: 5px;
+    min-height: 28px;
+    padding: 0 3px;
     background-color: #e7e8eb;
     border-bottom-width: 0; }
     .maximized headerbar.default-decoration, .maximized
@@ -2653,7 +2653,9 @@ decoration {
 headerbar.default-decoration button.titlebutton,
 .titlebar.default-decoration button.titlebutton {
   padding: 0 4px;
-  min-width: 0; }
+  min-width: 0;
+  min-height: 0;
+  margin: 0; }
 
 headerbar button.titlebutton,
 .titlebar button.titlebutton {
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 9633aa0..d7fc7d0 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -896,8 +896,8 @@ headerbar {
   headerbar.default-decoration,
   .csd headerbar.default-decoration, headerbar.default-decoration:backdrop,
   .csd headerbar.default-decoration:backdrop {
-    padding-top: 5px;
-    padding-bottom: 5px;
+    min-height: 28px;
+    padding: 0 3px;
     background-color: #e7e8eb;
     border-bottom-width: 0; }
     .maximized headerbar.default-decoration, .maximized
@@ -2653,7 +2653,9 @@ decoration {
 headerbar.default-decoration button.titlebutton,
 .titlebar.default-decoration button.titlebutton {
   padding: 0 4px;
-  min-width: 0; }
+  min-width: 0;
+  min-height: 0;
+  margin: 0; }
 
 headerbar button.titlebutton,
 .titlebar button.titlebutton {
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 2b58758..980ccfc 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -975,8 +975,8 @@ headerbar {
   .csd &.default-decoration,             // needed under wayland, since all gtk3 windows are csd windows
   &.default-decoration:backdrop,
   .csd &.default-decoration:backdrop {
-    padding-top: 5px;
-    padding-bottom: 5px;
+    min-height: 28px;
+    padding: 0 3px;
     background-color: opacify($header_bg, 1);
     border-bottom-width: 0;
 
@@ -2885,6 +2885,8 @@ headerbar,
   &.default-decoration button.titlebutton { // no vertical padding for ssd buttons
     padding: 0 4px;                        // already handled by the titlebar-padding
     min-width: 0;
+    min-height: 0;
+    margin: 0;
   }
 
   button.titlebutton {