diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index 7bcebaf..5f54949 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -219,6 +219,14 @@ GtkComboBox.combobox-entry .button:prelight,
     color: @internal_element_color;
 }
 
+.spinbutton.entry {
+    padding: 0;
+}
+
+.spinbutton.entry.button {
+    padding: 6;
+}
+
 .spinbutton.button:prelight,
 .spinbutton.button:active {
     color: @internal_element_prelight;
@@ -228,10 +236,6 @@ GtkComboBox.combobox-entry .button:prelight,
     color: @insensitive_border_color;
 }
 
-.spinbutton.entry {
-    padding: 0 6 0 1;
-}
-
 /****************
  * Progress bar *
  ****************/
