diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index aea00ea..dfb2076 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1485,7 +1485,7 @@ actionbar {
 
 headerbar {
   min-height: $headerbar_size;
-  padding: 0 $container_padding;
+  padding: 0 8px;
   color: $header_fg;
   background-color: $header_bg;
   border-bottom: 1px solid $header_border;
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index f123d63..044e04b 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -1979,7 +1979,7 @@ headerbar {
   }
 
   > windowhandle > box {
-    padding: 0 $container_padding;
+    padding: 0 8px;
 
     &,
     > box.start,