diff --git a/gtk-3.20/scss/apps/_nemo.scss b/gtk-3.20/scss/apps/_nemo.scss
index f4e4921..d291be3 100644
--- a/gtk-3.20/scss/apps/_nemo.scss
+++ b/gtk-3.20/scss/apps/_nemo.scss
@@ -69,6 +69,7 @@
                 button {
                     min-height: 16px;
                     min-width: 16px;
+                    padding: ($spacing - 1px);
                 }
 
                 button:first-child {
diff --git a/gtk-3.20/scss/widgets/_button.scss b/gtk-3.20/scss/widgets/_button.scss
index a00a450..d4358e1 100644
--- a/gtk-3.20/scss/widgets/_button.scss
+++ b/gtk-3.20/scss/widgets/_button.scss
@@ -381,7 +381,11 @@
 
         .linked.vertical > & { @include linked_vertical_button(shade($bg_color, 1.2)); }
 
-        &.circular { // FIXME: aggregate to buttons
+        &.circular,
+        &.circular-button { // FIXME: aggregate to buttons
+            padding: 0;
+            min-width: 28px;
+            min-height: 28px;
             border-radius: 9999px; // Fixed: https://github.com/GNOME/gtk/commit/a6409458f0d50d673a4dc370b9251993b7835b6b
             -gtk-outline-radius: 9999px;
 
@@ -453,6 +457,12 @@
         }
 
         &.vertical {
+            button, entry {
+                min-width: 0;
+                padding-left: $spacing - 2px;
+                padding-right: $spacing - 2px;
+            }
+
             entry {
                 // reset all the other props since the spinbutton node is styled here
                 border-radius: 0;
@@ -482,8 +492,8 @@
         button.combo {
             // otherwise the arrow placement is not symmetric
             min-width: 0;
-            padding-left: 8px;
-            padding-right: 8px;
+            padding-left: $spacing + 2px;
+            padding-right: $spacing + 2px;
         }
 
         arrow {
diff --git a/gtk-3.20/scss/widgets/_notebook.scss b/gtk-3.20/scss/widgets/_notebook.scss
index 0752ef7..ccbea6c 100644
--- a/gtk-3.20/scss/widgets/_notebook.scss
+++ b/gtk-3.20/scss/widgets/_notebook.scss
@@ -198,6 +198,8 @@
                 button.flat {
                     min-height: 16px;
                     min-width: 16px;
+                    padding: 0;
+
                     @extend %close_button;
                 }
             }
diff --git a/gtk-3.20/scss/widgets/_osd.scss b/gtk-3.20/scss/widgets/_osd.scss
index e71a1fb..331f160 100644
--- a/gtk-3.20/scss/widgets/_osd.scss
+++ b/gtk-3.20/scss/widgets/_osd.scss
@@ -8,6 +8,16 @@
 @include exports("osd") {
     overlay.osd { background-color: transparent; }
 
+    button.osd {
+        @include button($osd_bg, $osd_fg);
+
+        &.image-button {
+            padding: 0;
+            min-height: 36px;
+            min-width: 36px;
+        }
+    }
+
     .osd {
         background-color: $osd_bg;
         color: $osd_fg;
diff --git a/gtk-3.20/scss/widgets/_view.scss b/gtk-3.20/scss/widgets/_view.scss
index e2358b2..41abe9a 100644
--- a/gtk-3.20/scss/widgets/_view.scss
+++ b/gtk-3.20/scss/widgets/_view.scss
@@ -59,7 +59,7 @@
     }
 
     %column_header_button {
-        padding: 0 6px;
+        padding: ($spacing - 2px) ($spacing + 1px);
         border-radius: 0;
         background-image: none;
         text-shadow: none;