diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 595124bd1e..25c59e83c4 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -451,6 +451,12 @@ button {
       &:checked { @include button(insensitive-active); }
     }
 
+    &.image-button {
+      min-width: 32px;
+      padding-left: 0;
+      padding-right: 0;
+    }
+
     &.text-button {
       padding-left: 16px;
       padding-right: 16px;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 5ffd77518d..8b7417ba76 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -490,6 +490,11 @@ notebook > header > tabs > arrow, headerbar button.titlebutton,
       border-color: #1c1f1f;
       background-image: linear-gradient(to bottom, #313434, #333636);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
+  notebook > header > tabs > arrow.image-button, headerbar button.image-button.titlebutton,
+  .titlebar button.image-button.titlebutton, button.image-button {
+    min-width: 32px;
+    padding-left: 0;
+    padding-right: 0; }
   notebook > header > tabs > arrow.text-button, headerbar button.text-button.titlebutton,
   .titlebar button.text-button.titlebutton, button.text-button {
     padding-left: 16px;
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index f82592ba10..c8ff8f3fac 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -490,6 +490,11 @@ notebook > header > tabs > arrow, headerbar button.titlebutton,
       border-color: #9d9d99;
       background-image: linear-gradient(to bottom, #e9e9e8, #f1f1f1);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+  notebook > header > tabs > arrow.image-button, headerbar button.image-button.titlebutton,
+  .titlebar button.image-button.titlebutton, button.image-button {
+    min-width: 32px;
+    padding-left: 0;
+    padding-right: 0; }
   notebook > header > tabs > arrow.text-button, headerbar button.text-button.titlebutton,
   .titlebar button.text-button.titlebutton, button.text-button {
     padding-left: 16px;