diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss
index f580f04c..c6771ade 100644
--- a/src/sass/gtk/_common-4.0.scss
+++ b/src/sass/gtk/_common-4.0.scss
@@ -46,9 +46,8 @@ $list_shadow: if($variant == 'light',
   color: $text_color;
 
   > separator {
-    min-height: 1px;
-    background-color: $borders_color;
-    margin: $container_padding / 2 $container_padding * 2;
+    min-height: 0;
+    background-color: transparent;
   }
 }
 
@@ -114,11 +113,13 @@ $list_shadow: if($variant == 'light',
     border-top-left-radius: $bt_radius;
     border-bottom-left-radius: $bt_radius;
   }
+
   &:last-child {
     border-top-right-radius: $bt_radius;
     border-bottom-right-radius: $bt_radius;
     border-right-style: solid;
   }
+
   &:only-child {
     border-radius: $bt_radius;
     border-style: solid;
@@ -133,15 +134,18 @@ $list_shadow: if($variant == 'light',
 %linked_vertical{
   border-radius: 0;
   border-bottom-style: none;
+
   &:first-child {
     border-top-left-radius: $bt_radius;
     border-top-right-radius: $bt_radius;
   }
+
   &:last-child {
     border-bottom-left-radius: $bt_radius;
     border-bottom-right-radius: $bt_radius;
     border-bottom-style: solid;
   }
+
   &:only-child {
     border-radius: $bt_radius;
     border-style: solid;
diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss
index 9f2855c2..2a1d432c 100644
--- a/src/sass/gtk/apps/_gnome-40.0.scss
+++ b/src/sass/gtk/apps/_gnome-40.0.scss
@@ -262,52 +262,52 @@ window.background.csd {
 
       > stack.background { background-color: $base_color; }
     }
+  }
+}
 
-    preferencesgroup > box {
-      button.background-preview-button {
-        padding: $container_padding / 2;
-        outline: 2px solid transparent;
-        outline-offset: 0;
-        border-radius: $bt_radius + $container_padding / 2;
+preferencesgroup > box {
+  button.background-preview-button {
+    padding: $container_padding / 2;
+    outline: 2px solid transparent;
+    outline-offset: 0;
+    border-radius: $bt_radius + $container_padding / 2;
 
-        &, &:hover, &:active, &:checked {
-          background: none;
-          border: none;
-          box-shadow: none;
-        }
+    &, &:hover, &:active, &:checked {
+      background: none;
+      border: none;
+      box-shadow: none;
+    }
 
-        &:hover {
-          outline-color: $alt_disabled_fg_color;
-        }
+    &:hover {
+      outline-color: $alt_disabled_fg_color;
+    }
 
-        &:active {
-          outline-color: $alt_fg_color;
-        }
+    &:active {
+      outline-color: $alt_fg_color;
+    }
 
-        &:checked {
-          outline-color: $selected_bg_color;
-        }
-      }
+    &:checked {
+      outline-color: $selected_bg_color;
+    }
+  }
 
-      flowbox.background-flowbox > flowboxchild {
-        outline: 2px solid transparent;
-        outline-offset: 0;
-        border-radius: $bt_radius + 3px;
-        padding: 3px;
+  flowbox.background-flowbox > flowboxchild {
+    outline: 2px solid transparent;
+    outline-offset: 0;
+    border-radius: $bt_radius + 3px;
+    padding: 3px;
 
-        &:hover {
-          outline-color: $alt_disabled_fg_color;
-        }
+    &:hover {
+      outline-color: $alt_disabled_fg_color;
+    }
 
-        &:active {
-          outline-color: $alt_fg_color;
-        }
+    &:active {
+      outline-color: $alt_fg_color;
+    }
 
-        &:selected {
-          outline-color: $selected_bg_color;
-          background-color: transparent;
-        }
-      }
+    &:selected {
+      outline-color: $selected_bg_color;
+      background-color: transparent;
     }
   }
 }
@@ -350,22 +350,6 @@ window.background {
         }
       }
     }
-
-    .current-week {
-      background-color: $fill_color;
-    }
-
-    button.circular.day {
-      border: none;
-      box-shadow: none;
-      @extend %flat_button;
-    }
-
-    datechooser navigator > button.flat.pill {
-      padding: 0 $container_padding * 2;
-      min-height: $menuitem_size;
-      min-width: $menuitem_size;
-    }
   }
 
   &.maximized, &.tiled {
@@ -382,6 +366,33 @@ window.background {
   }
 }
 
+datechooser {
+  .current-week {
+    background-color: $fill_color;
+  }
+  
+  button.circular.day {
+    border: none;
+    box-shadow: none;
+    @extend %flat_button;
+
+    &:selected {
+      background-color: $selected_bg_color;
+      color: $selected_fg_color;
+    }
+  }
+
+  navigator > button.flat {
+    padding: 0;
+    min-height: $menuitem_size;
+    min-width: $menuitem_size;
+  }
+}
+
+agenda-view list.background {
+  background-color: transparent;
+}
+
 menubutton.flat.popup.sources-button {
   margin: 0;