diff --git a/src/_sass/gtk/_common-4.0.scss b/src/_sass/gtk/_common-4.0.scss
index e72d911..b274761 100644
--- a/src/_sass/gtk/_common-4.0.scss
+++ b/src/_sass/gtk/_common-4.0.scss
@@ -1158,7 +1158,7 @@ headerbar {
   color: $titlebar-text;
   // The sizing factor needs to be defined in the headerbar node for the case of split headerbars
   min-height: $large-size;
-  padding: 0 $container-padding;
+  padding: 0;
   border-radius: $window-radius $window-radius 0 0;
 
   &:disabled { color: $titlebar-text-disabled; }
@@ -1226,7 +1226,7 @@ headerbar {
   }
 
   > windowhandle > box {
-    padding: 0 $container-padding / 2;
+    padding: 0 $container-padding;
 
     &,
     > box.start,
@@ -3324,8 +3324,8 @@ window.dialog.message { // Message Dialog styling
     }
 
     .dialog-action-area {
-      margin-top: -$container-padding;
-      // padding: $container-padding;
+      // margin-top: -$container-padding;
+      padding: $container-padding;
 
       > button {
         @extend %button-flat;
diff --git a/src/gtk/4.0/gtk-Compact.css b/src/gtk/4.0/gtk-Compact.css
index 3569353..e11640b 100644
--- a/src/gtk/4.0/gtk-Compact.css
+++ b/src/gtk/4.0/gtk-Compact.css
@@ -1405,7 +1405,7 @@ headerbar {
   background-color: #2C2C2C;
   color: white;
   min-height: 40px;
-  padding: 0 4px;
+  padding: 0;
   border-radius: 14px 14px 0 0;
 }
 
@@ -1485,7 +1485,7 @@ box.vertical headerbar {
 }
 
 headerbar > windowhandle > box {
-  padding: 0 2px;
+  padding: 0 4px;
 }
 
 headerbar > windowhandle > box,
@@ -3715,7 +3715,7 @@ window.dialog.message.csd.background {
 }
 
 window.dialog.message.csd .dialog-action-area {
-  margin-top: -4px;
+  padding: 4px;
 }
 
 window.dialog.message.csd .dialog-action-area > button, window.dialog.message.csd .dialog-action-area > button:first-child, window.dialog.message.csd .dialog-action-area > button:last-child {
diff --git a/src/gtk/4.0/gtk-Dark-Compact.css b/src/gtk/4.0/gtk-Dark-Compact.css
index efeb8ea..adfaf5c 100644
--- a/src/gtk/4.0/gtk-Dark-Compact.css
+++ b/src/gtk/4.0/gtk-Dark-Compact.css
@@ -1405,7 +1405,7 @@ headerbar {
   background-color: #2C2C2C;
   color: white;
   min-height: 40px;
-  padding: 0 4px;
+  padding: 0;
   border-radius: 14px 14px 0 0;
 }
 
@@ -1485,7 +1485,7 @@ box.vertical headerbar {
 }
 
 headerbar > windowhandle > box {
-  padding: 0 2px;
+  padding: 0 4px;
 }
 
 headerbar > windowhandle > box,
@@ -3715,7 +3715,7 @@ window.dialog.message.csd.background {
 }
 
 window.dialog.message.csd .dialog-action-area {
-  margin-top: -4px;
+  padding: 4px;
 }
 
 window.dialog.message.csd .dialog-action-area > button, window.dialog.message.csd .dialog-action-area > button:first-child, window.dialog.message.csd .dialog-action-area > button:last-child {
diff --git a/src/gtk/4.0/gtk-Dark.css b/src/gtk/4.0/gtk-Dark.css
index 14dc02c..5b6ca19 100644
--- a/src/gtk/4.0/gtk-Dark.css
+++ b/src/gtk/4.0/gtk-Dark.css
@@ -1405,7 +1405,7 @@ headerbar {
   background-color: #2C2C2C;
   color: white;
   min-height: 48px;
-  padding: 0 6px;
+  padding: 0;
   border-radius: 18px 18px 0 0;
 }
 
@@ -1485,7 +1485,7 @@ box.vertical headerbar {
 }
 
 headerbar > windowhandle > box {
-  padding: 0 3px;
+  padding: 0 6px;
 }
 
 headerbar > windowhandle > box,
@@ -3715,7 +3715,7 @@ window.dialog.message.csd.background {
 }
 
 window.dialog.message.csd .dialog-action-area {
-  margin-top: -6px;
+  padding: 6px;
 }
 
 window.dialog.message.csd .dialog-action-area > button, window.dialog.message.csd .dialog-action-area > button:first-child, window.dialog.message.csd .dialog-action-area > button:last-child {
diff --git a/src/gtk/4.0/gtk-Light-Compact.css b/src/gtk/4.0/gtk-Light-Compact.css
index 773b4bb..4fa97af 100644
--- a/src/gtk/4.0/gtk-Light-Compact.css
+++ b/src/gtk/4.0/gtk-Light-Compact.css
@@ -1405,7 +1405,7 @@ headerbar {
   background-color: #FFFFFF;
   color: rgba(0, 0, 0, 0.87);
   min-height: 40px;
-  padding: 0 4px;
+  padding: 0;
   border-radius: 14px 14px 0 0;
 }
 
@@ -1485,7 +1485,7 @@ box.vertical headerbar {
 }
 
 headerbar > windowhandle > box {
-  padding: 0 2px;
+  padding: 0 4px;
 }
 
 headerbar > windowhandle > box,
@@ -3715,7 +3715,7 @@ window.dialog.message.csd.background {
 }
 
 window.dialog.message.csd .dialog-action-area {
-  margin-top: -4px;
+  padding: 4px;
 }
 
 window.dialog.message.csd .dialog-action-area > button, window.dialog.message.csd .dialog-action-area > button:first-child, window.dialog.message.csd .dialog-action-area > button:last-child {
diff --git a/src/gtk/4.0/gtk-Light.css b/src/gtk/4.0/gtk-Light.css
index 7a2f78b..ef610a3 100644
--- a/src/gtk/4.0/gtk-Light.css
+++ b/src/gtk/4.0/gtk-Light.css
@@ -1405,7 +1405,7 @@ headerbar {
   background-color: #FFFFFF;
   color: rgba(0, 0, 0, 0.87);
   min-height: 48px;
-  padding: 0 6px;
+  padding: 0;
   border-radius: 18px 18px 0 0;
 }
 
@@ -1485,7 +1485,7 @@ box.vertical headerbar {
 }
 
 headerbar > windowhandle > box {
-  padding: 0 3px;
+  padding: 0 6px;
 }
 
 headerbar > windowhandle > box,
@@ -3715,7 +3715,7 @@ window.dialog.message.csd.background {
 }
 
 window.dialog.message.csd .dialog-action-area {
-  margin-top: -6px;
+  padding: 6px;
 }
 
 window.dialog.message.csd .dialog-action-area > button, window.dialog.message.csd .dialog-action-area > button:first-child, window.dialog.message.csd .dialog-action-area > button:last-child {
diff --git a/src/gtk/4.0/gtk.css b/src/gtk/4.0/gtk.css
index d5762db..5f6ce62 100644
--- a/src/gtk/4.0/gtk.css
+++ b/src/gtk/4.0/gtk.css
@@ -1405,7 +1405,7 @@ headerbar {
   background-color: #2C2C2C;
   color: white;
   min-height: 48px;
-  padding: 0 6px;
+  padding: 0;
   border-radius: 18px 18px 0 0;
 }
 
@@ -1485,7 +1485,7 @@ box.vertical headerbar {
 }
 
 headerbar > windowhandle > box {
-  padding: 0 3px;
+  padding: 0 6px;
 }
 
 headerbar > windowhandle > box,
@@ -3715,7 +3715,7 @@ window.dialog.message.csd.background {
 }
 
 window.dialog.message.csd .dialog-action-area {
-  margin-top: -6px;
+  padding: 6px;
 }
 
 window.dialog.message.csd .dialog-action-area > button, window.dialog.message.csd .dialog-action-area > button:first-child, window.dialog.message.csd .dialog-action-area > button:last-child {