diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index d91e9eb5fa..2bce268a17 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -910,12 +910,14 @@ spinbutton {
     padding: 0;
 
     entry {
+      margin: 0;
       background: none;
       border: none;
       box-shadow: none;
     }
 
     button {
+      margin: 0;
       background-image: none;
       border-style: none none none solid;
       border-color: transparentize($borders_color, 0.7);
@@ -1351,6 +1353,7 @@ headerbar {
 
   // add vertical margins to headerbar entries, buttons and separators to avoid them spanning the whole height
   entry,
+  spinbutton,
   separator,
   button {
     margin-top: 6px;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 46af313587..6919c03148 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1351,12 +1351,14 @@ headerbar button.titlebutton:visited,
 spinbutton:not(.vertical) {
   padding: 0; }
   spinbutton:not(.vertical) entry, spinbutton:not(.vertical) spinbutton:not(.vertical) {
+    margin: 0;
     background: none;
     border: none;
     box-shadow: none; }
   spinbutton:not(.vertical) button,
   spinbutton:not(.vertical) .titlebar button.titlebutton,
   .titlebar spinbutton:not(.vertical) button.titlebutton {
+    margin: 0;
     background-image: none;
     border-style: none none none solid;
     border-color: rgba(28, 31, 31, 0.3);
@@ -1952,11 +1954,13 @@ headerbar {
       min-height: 26px;
       padding: 0 5px; }
   .titlebar:not(headerbar) entry, .titlebar:not(headerbar) spinbutton:not(.vertical),
+  .titlebar:not(headerbar) spinbutton,
   .titlebar:not(headerbar) separator,
   .titlebar:not(headerbar) button,
   .titlebar:not(headerbar) button.titlebutton,
   headerbar entry,
   headerbar spinbutton:not(.vertical),
+  headerbar spinbutton,
   headerbar separator,
   headerbar button,
   headerbar button.titlebutton,
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index a7ff60d78f..8bc47f8b36 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1355,12 +1355,14 @@ headerbar button.titlebutton:visited,
 spinbutton:not(.vertical) {
   padding: 0; }
   spinbutton:not(.vertical) entry, spinbutton:not(.vertical) spinbutton:not(.vertical) {
+    margin: 0;
     background: none;
     border: none;
     box-shadow: none; }
   spinbutton:not(.vertical) button,
   spinbutton:not(.vertical) .titlebar button.titlebutton,
   .titlebar spinbutton:not(.vertical) button.titlebutton {
+    margin: 0;
     background-image: none;
     border-style: none none none solid;
     border-color: rgba(157, 157, 153, 0.3);
@@ -1956,11 +1958,13 @@ headerbar {
       min-height: 26px;
       padding: 0 5px; }
   .titlebar:not(headerbar) entry, .titlebar:not(headerbar) spinbutton:not(.vertical),
+  .titlebar:not(headerbar) spinbutton,
   .titlebar:not(headerbar) separator,
   .titlebar:not(headerbar) button,
   .titlebar:not(headerbar) button.titlebutton,
   headerbar entry,
   headerbar spinbutton:not(.vertical),
+  headerbar spinbutton,
   headerbar separator,
   headerbar button,
   headerbar button.titlebutton,