diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index 2b117373..ce8fbad3 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -1687,9 +1687,10 @@ headerbar {
 
   &.default-decoration {
     min-height: $medium-size;
-    // padding: $space-size;
-    box-shadow: inset 0 1px highlight($titlebar);
+    padding: 0;
+    box-shadow: none;
     border: none;
+    outline: none;
 
     windowcontrols {
       button,
@@ -4791,6 +4792,12 @@ window {
       border-radius: 0;
       transition: none;
     }
+
+    &.maximized,
+    &.fullscreen {
+      box-shadow: none;
+      outline: none;
+    }
   }
 
   &.solid-csd {
@@ -4802,11 +4809,6 @@ window {
 
     &:backdrop { background-color: $titlebar-backdrop; }
   }
-
-  &.ssd {
-    // just doing borders, wm draws actual shadows
-    box-shadow: 0 0 0 1px $border;
-  }
 }
 
 // Windows button