diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 5309a1d6c0..51f5f270ad 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -319,8 +319,10 @@ GtkLabel {
   }
 
   // buttons in header bars and action bars
-  &.image-button { padding: 8px; }
-  &.text-button { padding: 6px 8px 5px; } // due to font metrics
+  .header-bar &.image-button,
+  .action-bar &.image-button { padding: 8px; }
+  .header-bar &.text-button,
+  .action-bar &.text-button { padding: 6px 8px 5px; } // due to font metrics
 
   //inline-toolbar buttons
   .inline-toolbar &, .inline-toolbar &:backdrop {
@@ -569,10 +571,9 @@ GtkColorButton.button { padding: 4px; } // Uniform padding on the
  * ComboBoxes *
  **************/
 GtkComboBox {
-
-  //FIXME padding issue
-  padding: 0;
-
+  > .button { padding-top: 2px; padding-bottom: 2px; } // Otherwise combos
+                                                       // are bigger then
+                                                       // buttons
   -GtkComboBox-arrow-scaling: 0.5;
   -GtkComboBox-shadow-type: none;
 
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 8f46554c92..fcc66157ca 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -452,9 +452,9 @@
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
-  .button.image-button {
+  .header-bar .button.image-button, .action-bar .button.image-button {
     padding: 8px; }
-  .button.text-button {
+  .header-bar .button.text-button, .action-bar .button.text-button {
     padding: 6px 8px 5px; }
   .inline-toolbar .button, .inline-toolbar .button:backdrop {
     border-radius: 2px;
@@ -753,12 +753,14 @@ GtkColorButton.button {
  * ComboBoxes *
  **************/
 GtkComboBox {
-  padding: 0;
   -GtkComboBox-arrow-scaling: 0.5;
   -GtkComboBox-shadow-type: none;
   box-shadow: 0 1px rgba(238, 238, 236, 0.1);
   text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
   icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176); }
+  GtkComboBox > .button {
+    padding-top: 2px;
+    padding-bottom: 2px; }
   GtkComboBox:insensitive {
     color: #939695;
     text-shadow: none;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 36e2c0485a..b686728ef2 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -444,9 +444,9 @@
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
-  .button.image-button {
+  .header-bar .button.image-button, .action-bar .button.image-button {
     padding: 8px; }
-  .button.text-button {
+  .header-bar .button.text-button, .action-bar .button.text-button {
     padding: 6px 8px 5px; }
   .inline-toolbar .button, .inline-toolbar .button:backdrop {
     border-radius: 2px;
@@ -745,12 +745,14 @@ GtkColorButton.button {
  * ComboBoxes *
  **************/
 GtkComboBox {
-  padding: 0;
   -GtkComboBox-arrow-scaling: 0.5;
   -GtkComboBox-shadow-type: none;
   box-shadow: 0 1px white;
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923); }
+  GtkComboBox > .button {
+    padding-top: 2px;
+    padding-bottom: 2px; }
   GtkComboBox:insensitive {
     color: #8d9091;
     text-shadow: none;