diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index b17013f..b0be4c5 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -1681,19 +1681,6 @@ combobox {
    margin-top: $container_padding / 2;
    padding: 0;
 
-   listview {
-     margin: $container_padding 0;
-
-     & > row {
-       padding: $container_padding;
-
-       &:selected {
-         color: $selected_fg_color;
-         background-color: $selected_bg_color;
-       }
-     }
-   }
-
     // drodowns with searchboxes on top
     .dropdown-searchbar {
       padding: $container_padding;
@@ -2514,13 +2501,18 @@ popover {
       background-color: $base_color;
     }
 
-    listview.view {
-      padding: 0;
+    listview {
+      padding: $container_padding;
       margin: 0;
 
       > row {
+        padding: $container_padding $container_padding * 2;
         margin: 0;
-        padding: $container_padding / 2 $container_padding;
+
+        &:selected {
+          color: $selected_fg_color;
+          background-color: $selected_bg_color;
+        }
       }
     }
   }
diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss
index 1c1f4ab..7f242c9 100644
--- a/src/sass/gtk/apps/_gnome-40.0.scss
+++ b/src/sass/gtk/apps/_gnome-40.0.scss
@@ -357,21 +357,25 @@ menubutton.flat.popup.sources-button {
 .card {
   &.display-container {
     border: 1px solid $borders_color;
+
+    .small & {
+      border-radius: 0;
+
+      &.display-container {
+        border-width: 0 0 1px 0;
+      }
+    }
   }
 
   #displayitem {
     border-top: 1px solid $borders_color;
   }
-
-  .small & {
-    border-radius: 0;
-
-    &.forecast-card {
-      border-width: 1px 0;
-    }
-
-    &.display-container {
-      border-width: 0 0 1px 0;
-    }
-  }
+}
+
+//
+// Weather
+//
+
+.small .forecast-card {
+  border-width: 1px 0;
 }