diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss
index 118b2af..bc2ea41 100644
--- a/src/sass/_colors.scss
+++ b/src/sass/_colors.scss
@@ -271,6 +271,7 @@ $button_borders:                    if($variant == 'light', $button_border, $dar
 $wm_outline_light:                  0 0 0 2px rgba(black, 0.03), 0 0 0 1px rgba(black, 0.12);
 $wm_outline_dark:                   0 0 0 2px rgba(black, 0.1), 0 0 0 1px rgba(black, 0.75);
 $wm_shadow:                         if($variant=='light', rgba(black, 0.15), rgba(black, 0.35));
+$wm_shadow_backdrop:                if($variant=='light', rgba(black, 0.08), rgba(black, 0.15));
 $wm_outline:                        if($variant=='light', $wm_outline_light, $wm_outline_dark);
 
 // WM Buttons
diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 719218e..f123d63 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -4845,29 +4845,28 @@ window {
   border: none;
 
   &.csd {
-    transition: $shadow_transition;
+    transition: none;
     border-radius: $wm_radius;
     outline: 1px solid $highlight_color;
     outline-offset: -1px;
     box-shadow: 0 3px 3px 0 $wm_shadow,
                 0 8px 8px 0 $wm_shadow,
                 0 16px 16px 0 $wm_shadow,
+                0 0 0 36px transparent,
                 $wm_outline;
     margin: 0;
 
     &:backdrop {
+      transition: $shadow_transition;
       // the transparent shadow here is to enforce that the shadow extents don't
       // change when we go to backdrop, to prevent jumping windows
-      box-shadow: 0 3px 3px 0 $wm_shadow,
-                  0 8px 8px 0 transparent,
-                  0 16px 16px 0 transparent,
+      box-shadow: 0 3px 3px 0 $wm_shadow_backdrop,
+                  0 3px 5px 0 $wm_shadow_backdrop,
+                  0 6px 8px 0 $wm_shadow_backdrop,
+                  0 0 0 36px transparent,
                   $wm_outline;
     }
 
-    &.dialog.message {
-      border-radius: $wm_radius;
-    }
-
     &.tiled,
     &.tiled-top,
     &.tiled-left,
diff --git a/src/sass/gtk/apps/_misc.scss b/src/sass/gtk/apps/_misc.scss
index 09c7adc..2b64f91 100644
--- a/src/sass/gtk/apps/_misc.scss
+++ b/src/sass/gtk/apps/_misc.scss
@@ -195,6 +195,8 @@ window.background.chromium {
   color: $text_color;
 
   headerbar.titlebar {
+    padding: 0 $container_padding * 2;
+
     button.toggle { // account-button (> 64.0.3282?)
       border: none;
       background-color: transparent;