7 files changed, 42 insertions, 7 deletions
diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css
index 8015a12..5d36bf1 100644
--- a/common/gtk-3.0/3.18/gtk-dark.css
+++ b/common/gtk-3.0/3.18/gtk-dark.css
@@ -2519,11 +2519,16 @@ GtkVolumeButton.button {
 
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
-  padding: 8px 4px;
+  padding-left: 4px;
+  padding-right: 4px;
   border-color: transparent;
   background-color: transparent;
   background-image: none;
   background-color: rgba(47, 52, 63, 0); }
+  .header-bar .button.titlebutton:not(GtkMenuButton),
+  .titlebar .button.titlebutton:not(GtkMenuButton) {
+    padding-top: 8px;
+    padding-bottom: 8px; }
   .header-bar .button.titlebutton:hover,
   .titlebar .button.titlebutton:hover {
     color: rgba(207, 218, 231, 0.8);
diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css
index e8bd476..ec7a025 100644
--- a/common/gtk-3.0/3.18/gtk-darker.css
+++ b/common/gtk-3.0/3.18/gtk-darker.css
@@ -2522,11 +2522,16 @@ GtkVolumeButton.button {
 
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
-  padding: 8px 4px;
+  padding-left: 4px;
+  padding-right: 4px;
   border-color: transparent;
   background-color: transparent;
   background-image: none;
   background-color: rgba(47, 52, 63, 0); }
+  .header-bar .button.titlebutton:not(GtkMenuButton),
+  .titlebar .button.titlebutton:not(GtkMenuButton) {
+    padding-top: 8px;
+    padding-bottom: 8px; }
   .header-bar .button.titlebutton:hover,
   .titlebar .button.titlebutton:hover {
     color: rgba(207, 218, 231, 0.8);
diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css
index 6f3bd8d..11fd0c5 100644
--- a/common/gtk-3.0/3.18/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.18/gtk-solid-dark.css
@@ -2519,11 +2519,16 @@ GtkVolumeButton.button {
 
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
-  padding: 8px 4px;
+  padding-left: 4px;
+  padding-right: 4px;
   border-color: transparent;
   background-color: transparent;
   background-image: none;
   background-color: rgba(47, 52, 63, 0); }
+  .header-bar .button.titlebutton:not(GtkMenuButton),
+  .titlebar .button.titlebutton:not(GtkMenuButton) {
+    padding-top: 8px;
+    padding-bottom: 8px; }
   .header-bar .button.titlebutton:hover,
   .titlebar .button.titlebutton:hover {
     color: rgba(207, 218, 231, 0.8);
diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css
index 89cb073..18ee29d 100644
--- a/common/gtk-3.0/3.18/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.18/gtk-solid-darker.css
@@ -2522,11 +2522,16 @@ GtkVolumeButton.button {
 
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
-  padding: 8px 4px;
+  padding-left: 4px;
+  padding-right: 4px;
   border-color: transparent;
   background-color: transparent;
   background-image: none;
   background-color: rgba(47, 52, 63, 0); }
+  .header-bar .button.titlebutton:not(GtkMenuButton),
+  .titlebar .button.titlebutton:not(GtkMenuButton) {
+    padding-top: 8px;
+    padding-bottom: 8px; }
   .header-bar .button.titlebutton:hover,
   .titlebar .button.titlebutton:hover {
     color: rgba(207, 218, 231, 0.8);
diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css
index e7b2c5e..fddb2f5 100644
--- a/common/gtk-3.0/3.18/gtk-solid.css
+++ b/common/gtk-3.0/3.18/gtk-solid.css
@@ -2526,11 +2526,16 @@ GtkVolumeButton.button {
 
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
-  padding: 8px 4px;
+  padding-left: 4px;
+  padding-right: 4px;
   border-color: transparent;
   background-color: transparent;
   background-image: none;
   background-color: rgba(231, 232, 235, 0); }
+  .header-bar .button.titlebutton:not(GtkMenuButton),
+  .titlebar .button.titlebutton:not(GtkMenuButton) {
+    padding-top: 8px;
+    padding-bottom: 8px; }
   .header-bar .button.titlebutton:hover,
   .titlebar .button.titlebutton:hover {
     color: rgba(82, 93, 118, 0.8);
diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css
index 89ab1f7..9b8ab26 100644
--- a/common/gtk-3.0/3.18/gtk.css
+++ b/common/gtk-3.0/3.18/gtk.css
@@ -2526,11 +2526,16 @@ GtkVolumeButton.button {
 
 .header-bar .button.titlebutton,
 .titlebar .button.titlebutton {
-  padding: 8px 4px;
+  padding-left: 4px;
+  padding-right: 4px;
   border-color: transparent;
   background-color: transparent;
   background-image: none;
   background-color: rgba(231, 232, 235, 0); }
+  .header-bar .button.titlebutton:not(GtkMenuButton),
+  .titlebar .button.titlebutton:not(GtkMenuButton) {
+    padding-top: 8px;
+    padding-bottom: 8px; }
   .header-bar .button.titlebutton:hover,
   .titlebar .button.titlebutton:hover {
     color: rgba(82, 93, 118, 0.8);
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index ec870bc..0428cf9 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -2807,7 +2807,12 @@ GtkVolumeButton.button { padding: 8px; }
   .button.titlebutton {
     @extend .image-button;
 
-    padding: 8px 4px;
+    &:not(GtkMenuButton) {
+      padding-top: 8px;
+      padding-bottom: 8px;
+    }
+    padding-left: 4px;
+    padding-right: 4px;
 
     @include button(undecorated);
     background-color: transparentize($header_bg, 1);