diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 3446fa1807..5cf56c1dab 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3254,33 +3254,31 @@ decoration {
     box-shadow: 0 2px 6px 2px transparentize(black, 0.8),
                 0 0 0 1px $_wm_border_backdrop;
   }
-  &.tiled {
+  .tiled & {
     border-radius: 0;
   }
-  &.popup {
+  .popup & {
     box-shadow: none;
   }
   // server-side decorations as used by mutter
   &.ssd {
     box-shadow: 0 0 0 1px $_wm_border; //just doing borders, wm draws actual shadows
   }
-  &.csd {
-    &.popup {
-      border-radius: 0;
-      box-shadow: 0 1px 2px transparentize(black, 0.8),
-                  0 0 0 1px transparentize($_wm_border,0.1);
-    }
-    &.tooltip {
-      border-radius: 5px;
-      box-shadow: none;
-    }
-    messagedialog & {
-      border-radius: 7px;
-      box-shadow: 0 1px 2px transparentize(black, 0.8),
-                  0 0 0 1px transparentize($_wm_border,0.1);
-    }
+  .csd.popup & {
+    border-radius: 0;
+    box-shadow: 0 1px 2px transparentize(black, 0.8),
+                0 0 0 1px transparentize($_wm_border,0.1);
   }
-  &.solid-csd {
+  .csd.tooltip & {
+    border-radius: 5px;
+    box-shadow: none;
+  }
+  messagedialog.csd & {
+    border-radius: 7px;
+    box-shadow: 0 1px 2px transparentize(black, 0.8),
+                  0 0 0 1px transparentize($_wm_border,0.1);
+  }
+  .solid-csd & {
     border-radius: 0;
     margin: 4px;
     background-color: $backdrop_bg_color;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 7ed9f4ebc0..8ff97854af 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -4442,22 +4442,22 @@ decoration {
   margin: 10px; }
   decoration:backdrop {
     box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.9); }
-  decoration.tiled {
+  .tiled decoration {
     border-radius: 0; }
-  decoration.popup {
+  .popup decoration {
     box-shadow: none; }
   decoration.ssd {
     box-shadow: 0 0 0 1px rgba(28, 31, 31, 0.9); }
-  decoration.csd.popup {
+  .csd.popup decoration {
     border-radius: 0;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); }
-  decoration.csd.tooltip {
+  .csd.tooltip decoration {
     border-radius: 5px;
     box-shadow: none; }
-  messagedialog decoration.csd {
+  messagedialog.csd decoration {
     border-radius: 7px;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(28, 31, 31, 0.8); }
-  decoration.solid-csd {
+  .solid-csd decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #393f3f;
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index b606f9c2ec..88e26fed4c 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -4614,22 +4614,22 @@ decoration {
   margin: 10px; }
   decoration:backdrop {
     box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.18); }
-  decoration.tiled {
+  .tiled decoration {
     border-radius: 0; }
-  decoration.popup {
+  .popup decoration {
     box-shadow: none; }
   decoration.ssd {
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23); }
-  decoration.csd.popup {
+  .csd.popup decoration {
     border-radius: 0;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
-  decoration.csd.tooltip {
+  .csd.tooltip decoration {
     border-radius: 5px;
     box-shadow: none; }
-  messagedialog decoration.csd {
+  messagedialog.csd decoration {
     border-radius: 7px;
     box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }
-  decoration.solid-csd {
+  .solid-csd decoration {
     border-radius: 0;
     margin: 4px;
     background-color: #ededed;