diff --git a/src/sass/gnome-shell/common/_slider.scss b/src/sass/gnome-shell/common/_slider.scss
index 4e0cde20..274f9771 100644
--- a/src/sass/gnome-shell/common/_slider.scss
+++ b/src/sass/gnome-shell/common/_slider.scss
@@ -6,29 +6,29 @@ $barlevel_active_bg_color: if($variant == 'light', white, rgba(white, 0.35));
 $barlevel_boder_color: if($variant == 'light', rgba(black, 0.15), transparent);
 
 .slider {
-  height: 20px;
+  height: 22px;
   color: $slider_color;
   border-radius: 16px;
 
-  -slider-height: 19px;
+  -slider-height: 22px;
   -slider-background-color: $barlevel_bg_color; //background of the trough
   -slider-border-color: $barlevel_boder_color; //trough border color
   -slider-active-background-color: $barlevel_active_bg_color; //active trough fill
   -slider-active-border-color: $barlevel_boder_color; //active trough border
   -slider-border-width: 1px;
-  -slider-handle-radius: 10px;
+  -slider-handle-radius: 11px;
   -slider-handle-border-width: 1px;
   -slider-handle-border-color: $barlevel_boder_color;
 
   // barlevels are for >= 3.29.90
-  -barlevel-height: 19px;
+  -barlevel-height: 20px;
   -barlevel-background-color: $barlevel_bg_color;
   -barlevel-border-color: $barlevel_boder_color;
   -barlevel-active-background-color: $barlevel_active_bg_color;
   -barlevel-active-border-color: $barlevel_boder_color;
   -barlevel-overdrive-color: $destructive_color;
   -barlevel-overdrive-border-color: $barlevel_boder_color;
-  -barlevel-overdrive-separator-width: 0;
+  -barlevel-overdrive-separator-width: 1px;
   -barlevel-border-width: 1px;
   -barlevel-border-color: $barlevel_boder_color;
 }
diff --git a/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss b/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss
index 0b304df0..d8d5baaa 100644
--- a/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss
+++ b/src/sass/gnome-shell/widgets-44-0/_quick-settings.scss
@@ -17,8 +17,8 @@
 
 .quick-toggle, .quick-menu-toggle {
   border-radius: $circular_radius;
-  min-width: 13em;
-  max-width: 13em;
+  min-width: 12em;
+  max-width: 12em;
   min-height: $scalable_icon_size * 3;
   border: none;
 }
@@ -49,20 +49,20 @@
     }
   }
 
-  & > StBoxLayout { spacing: $base_padding * 2; }
+  & > StBoxLayout { spacing: $base_padding * 1.5; }
 
   /* Move padding into the box; this is to allow menu arrows
      to extend to the border */
   &.button { padding: 0; }
-  & > StBoxLayout { padding: 0 $base_padding * 2.5; }
-  &:ltr > StBoxLayout { padding-left: $base_padding * 3; }
-  &:rtl > StBoxLayout { padding-right: $base_padding * 3; }
+  & > StBoxLayout { padding: 0 $base_padding * 2; }
+  &:ltr > StBoxLayout { padding-left: $base_padding * 4; }
+  &:rtl > StBoxLayout { padding-right: $base_padding * 4; }
 
   .quick-toggle-title { font-weight: bold; }
 
   & StBoxLayout > .quick-toggle-subtitle {
+    @extend %caption;
     font-weight: normal;
-    font-size: 12px;
   }
 
   .quick-toggle-icon { icon-size: $base_icon_size !important; }
@@ -83,7 +83,7 @@
   }
 
   & .quick-toggle-arrow {
-    padding: $base_padding $base_padding * 2.5;
+    padding: $scaled_padding $scaled_padding * 2;
     border: none;
     background-color: $fill_color !important;
 
diff --git a/src/sass/gtk/apps/_gnome-40.0.scss b/src/sass/gtk/apps/_gnome-40.0.scss
index c31a533f..a768d81f 100644
--- a/src/sass/gtk/apps/_gnome-40.0.scss
+++ b/src/sass/gtk/apps/_gnome-40.0.scss
@@ -86,19 +86,6 @@ $flap_sidebar_size: 240px;
 
   headerbar > windowhandle > box { padding: 0 10px; }
 
-  placessidebar {
-    .navigation-sidebar > row {
-      &:selected {
-        background-color: if($variant == 'light', rgba(black, 0.15), rgba(white, 0.15));
-        color: $fg_color;
-      }
-
-      &.sidebar-row {
-        .sidebar-icon { color: if($variant == 'light', $selected_bg_color, lighten($selected_bg_color, 20%)); }
-      }
-    }
-  }
-
   flap.unfolded,
   .sidebar-pane {
     &, &:backdrop {
@@ -107,6 +94,19 @@ $flap_sidebar_size: 240px;
 
     placessidebar {
       background: none;
+
+      .navigation-sidebar:not(.view) {
+        > row {
+          &:selected {
+            background-color: if($variant == 'light', rgba(black, 0.15), rgba(white, 0.15));
+            color: $fg_color;
+          }
+
+          &.sidebar-row {
+            .sidebar-icon { color: if($variant == 'light', $selected_bg_color, lighten($selected_bg_color, 20%)); }
+          }
+        }
+      }
     }
 
     > separator.horizontal {
diff --git a/src/sass/gtk/apps/_libadwaita.scss b/src/sass/gtk/apps/_libadwaita.scss
index ad3caff9..f0502792 100644
--- a/src/sass/gtk/apps/_libadwaita.scss
+++ b/src/sass/gtk/apps/_libadwaita.scss
@@ -599,7 +599,7 @@ toolbarview.undershoot-bottom scrolledwindow {
     padding: $container_padding $container_padding * 2;
   }
 
-  list.navigation-sidebar:not(.view) {
+  .navigation-sidebar:not(.view) {
     padding: $container_padding * 2;
 
     > row {