diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 04ea9bbd..658ecc51 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -2294,40 +2294,6 @@ headerbar {
     }
   }
 
-  &.default-decoration {
-    min-height: $medium_size;
-    padding: 0;
-    background-color: $header_bg;
-    border: none;
-    box-shadow: none;
-
-    > windowhandle > box {
-      padding: 0 $container_padding / 2;
-    }
-
-    .tiled &,
-    .maximized &,
-    .fullscreen & { box-shadow: none; }
-
-    windowcontrols {
-      button,
-      menubutton {
-        border: none;
-        min-width: 16px;
-        min-height: 16px;
-        margin: 0;
-        padding: 0;
-      }
-
-      menubutton button {
-        min-height: 20px;
-        min-width: 20px;
-        margin: 0;
-        padding: $container_padding - 2px;
-      }
-    }
-  }
-
   separator.titlebutton { @extend %header_separator; }
 
   // Titlebuttons
@@ -2399,6 +2365,47 @@ headerbar {
       }
     }
   }
+
+  &.default-decoration {
+    min-height: $medium_size;
+    padding: 0;
+    background-color: $header_bg;
+    border: none;
+    box-shadow: none;
+
+    > windowhandle > box {
+      padding: 0 $container_padding / 2;
+    }
+
+    .tiled &,
+    .maximized &,
+    .fullscreen & { box-shadow: none; }
+
+    windowcontrols {
+      button,
+      menubutton {
+        border: none;
+        min-width: 16px;
+        min-height: 16px;
+        margin: 0;
+        padding: 0;
+      }
+
+      menubutton button {
+        min-height: 20px;
+        min-width: 20px;
+        margin: 0;
+        padding: $container_padding - 2px;
+      }
+
+      button.close, button.maximize, button.minimize {
+        min-width: 16px;
+        min-height: 16px;
+        margin: 0;
+        padding: 0;
+      }
+    }
+  }
 }
 
 .titlebar {