diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index bcd8392c..2c41c758 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -2060,11 +2060,13 @@ popover.menu {
 /************
  * Popovers *
  ************/
-popover.background {
-  font: initial;
+popover {
+  &.background {
+    font: initial;
 
-  &, &:backdrop {
-    background-color: transparent;
+    &, &:backdrop {
+      background-color: transparent;
+    }
   }
 
   > arrow,
@@ -2083,14 +2085,6 @@ popover.background {
       background-clip: border-box;
       box-shadow: 0 0 0 1px $window-border, $shadow-z5;
     }
-
-    &:backdrop {
-      @if $rimless == 'true' {
-        box-shadow: $shadow-z3;
-      } @else {
-        box-shadow: $shadow-z3, 0 0 0 1px $window-border;
-      }
-    }
   }
 
   @if $rimless == 'false' and $variant == 'light' {
@@ -4753,12 +4747,32 @@ colorchooser .popover.osd {
  **********************/
 window {
   border: none;
-  transition: $transition-shadow;
 
   &.csd {
     border-radius: $window-radius;
     outline-offset: -1px;
     outline: 1px solid highlight($background);
+    margin: 0;
+
+    @if $rimless == 'true' {
+      box-shadow: $shadow-z16, 0 0 36px transparent;
+    } @else {
+      box-shadow: $shadow-z16, 0 0 0 1px $window-border, 0 0 36px transparent;
+    }
+
+    &:backdrop {
+      // the transparent shadow here is to enforce that the shadow extents don't
+      // change when we go to backdrop, to prevent jumping windows.
+      // The biggest shadow should be in the same order then in the active state
+      // or the jumping will happen during the transition.
+      transition: $transition-shadow;
+
+      @if $rimless == 'true' {
+        box-shadow: $shadow-z4, 0 0 36px transparent;
+      } @else {
+        box-shadow: $shadow-z4, 0 0 0 1px $window-border, 0 0 36px transparent;
+      }
+    }
 
     &.maximized,
     &.fullscreen,
@@ -4766,24 +4780,9 @@ window {
     &.tiled-top,
     &.tiled-right,
     &.tiled-bottom,
-    &.tiled-left { border-radius: 0; }
-  }
-
-  @if $rimless == 'true' {
-    box-shadow: $shadow-z16, 0 0 36px transparent;
-  } @else {
-    box-shadow: $shadow-z16, 0 0 0 1px $window-border, 0 0 36px transparent;
-  }
-
-  &:backdrop {
-    // the transparent shadow here is to enforce that the shadow extents don't
-    // change when we go to backdrop, to prevent jumping windows.
-    // The biggest shadow should be in the same order then in the active state
-    // or the jumping will happen during the transition.
-    @if $rimless == 'true' {
-      box-shadow: $shadow-z4, 0 0 36px transparent;
-    } @else {
-      box-shadow: $shadow-z4, 0 0 0 1px $window-border, 0 0 36px transparent;
+    &.tiled-left {
+      border-radius: 0;
+      transition: none;
     }
   }
 
diff --git a/src/sass/gtk/apps/_gnome-4.0.scss b/src/sass/gtk/apps/_gnome-4.0.scss
index 3010b021..5d7ec66a 100644
--- a/src/sass/gtk/apps/_gnome-4.0.scss
+++ b/src/sass/gtk/apps/_gnome-4.0.scss
@@ -99,6 +99,12 @@ window.dialog {
 //
 
 .display-container {
+  &.card {
+    border-radius: 0;
+    box-shadow: none;
+    border-width: 0 0 1px 0;
+  }
+
   .history-view { background-color: $base; }
 
   #displayitem {
@@ -118,19 +124,6 @@ window.dialog {
   }
 }
 
-.small .card {
-  border-radius: 0;
-  box-shadow: none;
-
-  &.forecast-card {
-    border-width: 1px 0;
-  }
-
-  &.display-container {
-    border-width: 0 0 1px 0;
-  }
-}
-
 leaflet {
   button.number-button {
     background-color: rgba($text, 0.1);
@@ -1167,6 +1160,7 @@ $weather_forecast_color: #ae7b03;
 .forecast-card {
   transition: border-radius 100ms ease-out;
   border-radius: $corner-radius;
+  border-width: 1px 0;
 }
 
 .forecast-card separator {