diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 184e768..f3c4cc6 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1878,11 +1878,6 @@ headerbar {
       }
     }
   }
-
-  > box.left.horizontal,
-  > box.right.horizontal {
-    padding: 0 $container_padding;
-  }
 }
 
 .background:not(.unified) {
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 5b3229e..37a92e8 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -4916,7 +4916,7 @@ window {
 //
 
 windowcontrols {
-  border-spacing: 2px;
+  border-spacing: 6px;
   padding: 0 10px;
 
   &:not(.empty) {
@@ -4936,11 +4936,18 @@ windowcontrols {
   }
 
   button {
+    > image {
+      padding: 0;
+      margin: 0;
+      background-color: transparent;
+      background-image: none;
+    }
+
     &.close, &.maximize, &.minimize {
       min-width: 16px;
       min-height: 16px;
       margin: 0;
-      padding: 0;
+      padding: ($menuitem_size - 20px) / 2 0;
       background-position: center;
       background-repeat: no-repeat;
       background-size: 16px 16px;