diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss
index 449a7dc..18d4830 100644
--- a/src/sass/_colors.scss
+++ b/src/sass/_colors.scss
@@ -180,7 +180,7 @@ $osd_borders_color:                 $dark_borders_color;
 
 // Menu colors
 $menu_bg:                           if($variant == 'light', $base_color, $bg_color);
-$menu_bd:                           if($variant == 'light', rgba(black, 0.05), rgba(white, 0.08));
+$menu_bd:                           if($variant == 'light', rgba(black, 0.1), rgba(white, 0.1));
 
 @if $trans == 'true' {
   $menu_bg:                         if($variant == 'light', rgba($base_color, 0.95), rgba($bg_color, 0.95));
diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss
index 95308a9..9532bcd 100644
--- a/src/sass/gnome-shell/_common.scss
+++ b/src/sass/gnome-shell/_common.scss
@@ -24,75 +24,7 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT";
  */
 
 // Stage
-//stage {
-  //@include font(body-1);
-  //color: $fg_color;
-//}
-
-$popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($base_color, 8%), 0.95));
-
-%popover_bubble {
-  color: $alt_fg_color;
-  background-color: $popover_bubble_bg;
-  border-radius: $mn_radius !important;
-  border: none;
-  box-shadow: 0 1px 2px rgba(black, 0.02) !important;
-  text-shadow: none;
-
-  &:hover, &:focus {
-    color: $fg_color;
-    background-color: if($variant == 'light', rgba($popover_bubble_bg, 1), rgba(lighten($popover_bubble_bg, 5%), 1));
-    box-shadow: 0 1px 3px rgba(black, 0.05) !important;
-  }
-
-  &:active {
-    color: $fg_color;
-    background-color: if($variant == 'light', darken($popover_bubble_bg, 1%), lighten($popover_bubble_bg, 3%));
-    box-shadow: none !important;
-  }
-}
-
-%show_apps_bigsur {
-  .show-apps-icon {
-    color: transparent !important;
-    background-image: url("assets/view-app-grid.svg");
-    background-size: contain;
-  }
-
-  &,
-  &:hover,
-  &:active,
-  &:checked,
-  &:focus {
-    .overview-icon, .show-apps-icon { color: transparent !important; }
-  }
-}
-
-%osd_panel {
-  color: $fg_color;
-  background-color: $base_color;
-  border-radius: $wm_radius;
-  border: solid rgba(black, 0.75);
-  border-width: if($variant=='light', 0, 1px);
-  box-shadow: 0 3px 8px 0 rgba(black, 0.25);
-  padding: $base_padding * 2;
-}
-
-%search-section-content-item {
-  border-radius: $bt_radius;
-  padding: $base_padding;
-  transition-duration: 100ms;
-  text-align: center;
-
-  &:focus,
-  &:hover,
-  &:selected {
-    background-color: $light_divider_color;
-    transition-duration: 200ms;
-  }
-
-  &:active,
-  &:checked {
-    background-color: $light_track_color;
-  }
-}
+// stage {
+//   @include font(body-1);
+//   color: $fg_color;
+// }
diff --git a/src/sass/gnome-shell/common/_app-grid.scss b/src/sass/gnome-shell/common/_app-grid.scss
index 33059f9..c54eef6 100644
--- a/src/sass/gnome-shell/common/_app-grid.scss
+++ b/src/sass/gnome-shell/common/_app-grid.scss
@@ -1,6 +1,5 @@
 
 /* App Icons */
-
 .show-apps,
 .app-well-app,
 %app-well-app {
diff --git a/src/sass/gnome-shell/common/_calendar.scss b/src/sass/gnome-shell/common/_calendar.scss
index 111c591..5b164b8 100644
--- a/src/sass/gnome-shell/common/_calendar.scss
+++ b/src/sass/gnome-shell/common/_calendar.scss
@@ -1,5 +1,44 @@
 /* Date/Time Menu */
 
+$popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($base_color, 8%), 0.95));
+
+%popover_bubble {
+  color: $alt_fg_color;
+  background-color: $popover_bubble_bg;
+  border-radius: $mn_radius !important;
+  border: none;
+  box-shadow: 0 1px 2px rgba(black, 0.02) !important;
+  text-shadow: none;
+
+  &:hover, &:focus {
+    color: $fg_color;
+    background-color: if($variant == 'light', rgba($popover_bubble_bg, 1), rgba(lighten($popover_bubble_bg, 5%), 1));
+    box-shadow: 0 1px 3px rgba(black, 0.05) !important;
+  }
+
+  &:active {
+    color: $fg_color;
+    background-color: if($variant == 'light', darken($popover_bubble_bg, 1%), lighten($popover_bubble_bg, 3%));
+    box-shadow: none !important;
+  }
+}
+
+%show_apps_bigsur {
+  .show-apps-icon {
+    color: transparent !important;
+    background-image: url("assets/view-app-grid.svg");
+    background-size: contain;
+  }
+
+  &,
+  &:hover,
+  &:active,
+  &:checked,
+  &:focus {
+    .overview-icon, .show-apps-icon { color: transparent !important; }
+  }
+}
+
 .clock-display-box {
   spacing: 2px;
 
diff --git a/src/sass/gnome-shell/common/_osd.scss b/src/sass/gnome-shell/common/_osd.scss
index ed01111..2ffa288 100644
--- a/src/sass/gnome-shell/common/_osd.scss
+++ b/src/sass/gnome-shell/common/_osd.scss
@@ -1,5 +1,15 @@
 /* OSD */
 
+%osd_panel {
+  color: $fg_color;
+  background-color: $base_color;
+  border-radius: $wm_radius;
+  border: solid rgba(black, 0.75);
+  border-width: if($variant=='light', 0, 1px);
+  box-shadow: 0 3px 8px 0 rgba(black, 0.25);
+  padding: $base_padding * 2;
+}
+
 .osd-window {
   @extend %osd_panel;
   text-align: center;
diff --git a/src/sass/gnome-shell/common/_search-results.scss b/src/sass/gnome-shell/common/_search-results.scss
index 3ce9687..81ad5bc 100644
--- a/src/sass/gnome-shell/common/_search-results.scss
+++ b/src/sass/gnome-shell/common/_search-results.scss
@@ -1,5 +1,24 @@
 /* Search */
 
+%search-section-content-item {
+  border-radius: $bt_radius;
+  padding: $base_padding;
+  transition-duration: 100ms;
+  text-align: center;
+
+  &:focus,
+  &:hover,
+  &:selected {
+    background-color: $light_divider_color;
+    transition-duration: 200ms;
+  }
+
+  &:active,
+  &:checked {
+    background-color: $light_track_color;
+  }
+}
+
 // search overview container
 #searchResultsContent {
   max-width: 1024px;
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index ba7b7e0..76e406a 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -1769,7 +1769,6 @@ headerbar {
     background-color: $header_bg;
     border-color: opacify($header_border, 1);
     box-shadow: none;
-    padding: 0 $container_padding + 10px;
 
     &:backdrop {
       background-color: $header_bg_backdrop;
@@ -2218,12 +2217,11 @@ menu {
     @if $variant == 'dark' { border: 1px solid lighten($menu_bg, 6%); }
   }
 
-  separator,
-  .csd & separator {
+  separator {
     margin: 2px 4px;
-    min-height: 0;
-    border-bottom: 2px solid $menu_bd;
-    background-color: transparent;
+    min-height: 1px;
+    background-color: $borders_color;
+    border: none;
   }
 
   > menuitem {
diff --git a/src/sass/gtk/apps/_gnome-3.22.scss b/src/sass/gtk/apps/_gnome-3.22.scss
index cbeb9cb..b0d8a08 100644
--- a/src/sass/gtk/apps/_gnome-3.22.scss
+++ b/src/sass/gtk/apps/_gnome-3.22.scss
@@ -131,8 +131,9 @@ $nautilus_sidebar_image: image($dark_sidebar_bg);
 
       @if $nautilus_style == 'normal' or $nautilus_style == 'stable' {
         @if $placement == 'left' {
-          > .linked.raised > button:first-child { margin-left: $nautilus_sidebar_size - (48px + $container_padding * 6); }
+          > .linked.raised > button:first-child { margin-left: $nautilus_sidebar_size - (32px + $container_padding * 6); }
         }
+
         @else {
           .path-bar-box { margin-left: $nautilus_sidebar_size - (68px + $container_padding * 2); }
           entry.search { margin-left: if($placement == 'left', $container_padding * 1.5, $nautilus_sidebar_size - 74px); }