diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index 000cee4..94dfec7 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1739,6 +1739,7 @@ actionbar {
     background-color: $header_bg;
     border-color: opacify($header_border, 1);
     box-shadow: none;
+    padding: 0 $container_padding + 10px;
 
     &:backdrop {
       background-color: $header_bg_backdrop;
@@ -1853,7 +1854,7 @@ actionbar {
     .fullscreen & {
       box-shadow: none;
 
-      &, &.background {
+      &, &.background, &:backdrop {
         border-top-left-radius: $maximized_radius;
         border-top-right-radius: $maximized_radius;
       }
@@ -1879,13 +1880,6 @@ window.background.csd.unified {
     > box > separator { background: none; }
     > button:disabled { @include button(header-insensitive); }
   }
-
-  &.maximized {
-    > deck > box > headerbar.windowhandle {
-      border-top-left-radius: $maximized_radius;
-      border-top-right-radius: $maximized_radius;
-    }
-  }
 }
 
 window.background > box.vertical > headerbar:not(.titlebar) { // reset headerbar style for not CSD window
diff --git a/src/sass/gtk/apps/_gnome-3.22.scss b/src/sass/gtk/apps/_gnome-3.22.scss
index 3d7d630..6f10a99 100644
--- a/src/sass/gtk/apps/_gnome-3.22.scss
+++ b/src/sass/gtk/apps/_gnome-3.22.scss
@@ -416,21 +416,17 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
     &.background.csd {
       border-radius: $maximized_radius_style;
 
-      &.unified { border-radius: $maximized_radius; }
+      notebook { &, > stack { border-radius: 0 0 $maximized_radius $maximized_radius; } }
 
-      &, &.unified {
-        notebook { &, > stack { border-radius: 0 0 $maximized_radius $maximized_radius; } }
-
-        > headerbar.titlebar,
-        > deck > box.vertical > headerbar.titlebar {
-          &, &.windowhandle {
-            border-top-left-radius: $maximized_radius;
-            border-top-right-radius: $maximized_radius;
-          }
+      > headerbar.titlebar,
+      > deck > box.vertical > headerbar.titlebar {
+        &, &.windowhandle {
+          border-top-left-radius: $maximized_radius;
+          border-top-right-radius: $maximized_radius;
         }
-
-        placessidebar { border-bottom-left-radius: $maximized_radius; }
       }
+
+      placessidebar { border-bottom-left-radius: $maximized_radius; }
     }
   }
 
@@ -2014,8 +2010,6 @@ window.background.csd {
 // Gnome Clocks
 //
 window.background.csd.unified {
-  border-radius: $wm_radius;
-
   > deck > deck > deck {
     > box.vertical > headerbar.titlebar.windowhandle {
       > viewswitchertitle > squeezer {
@@ -2030,8 +2024,6 @@ window.background.csd.unified {
   }
 
   &.maximized, &.tiled, &.fullscreen {
-    border-radius: $maximized_radius;
-
     > deck > box.vertical > headerbar.titlebar.windowhandle {
       border-top-left-radius: $maximized_radius;
       border-top-right-radius: $maximized_radius;
@@ -3060,4 +3052,22 @@ window.background.csd.unified {
   > decoration-overlay {
     border-radius: $wm_radius;
   }
+
+  &.tiled,
+  &.tiled-top,
+  &.tiled-right,
+  &.tiled-bottom,
+  &.tiled-left,
+  &.maximized,
+  &.fullscreen {
+    > decoration-overlay {
+      box-shadow: none;
+    }
+
+    &,
+    > decoration,
+    > decoration-overlay {
+      border-radius: $maximized_radius;
+    }
+  }
 }