diff --git a/src/sass/gnome-shell/common/_app-grid.scss b/src/sass/gnome-shell/common/_app-grid.scss
index 710f1a6b..410853e2 100644
--- a/src/sass/gnome-shell/common/_app-grid.scss
+++ b/src/sass/gnome-shell/common/_app-grid.scss
@@ -9,7 +9,7 @@
   & .overview-icon {
     color: $light_fg_color;
     border-radius: $wm_radius;
-    padding: 8px;
+    padding: $container_padding;
     border: none;
     transition-duration: 100ms;
     text-align: center;
@@ -54,7 +54,7 @@
 .app-folder-dialog {
   border-radius: $bd_radius * 4;
   border: 0 solid rgba(white, 0.15);
-  padding: 12px;
+  padding: $container_padding * 2;
 
   & .folder-name-container {
     padding: $container_padding * 3 $container_padding * 4 0;
diff --git a/src/sass/gnome-shell/common/_calendar.scss b/src/sass/gnome-shell/common/_calendar.scss
index 4885e19e..71389a66 100644
--- a/src/sass/gnome-shell/common/_calendar.scss
+++ b/src/sass/gnome-shell/common/_calendar.scss
@@ -11,7 +11,7 @@
 
 // overall menu
 #calendarArea {
-  padding: 12px 0;
+  padding: $base_padding * 2 0;
 }
 
 // Calendar menu side column
@@ -82,7 +82,7 @@
   box-shadow: none;
   background-color: $popover_bubble_bg;
   padding: $base_padding !important;
-  margin: 0 $base_padding * 2 !important;
+  margin: 0 12px !important;
   text-shadow: none;
   border-radius: $mn_radius;
 
@@ -240,7 +240,7 @@
 .events-button {
   @extend %popover_bubble;
   padding: $base_padding * 2 !important;
-  margin: 2px $base_margin !important;
+  margin: 2px 4px !important;
 }
 
 // Events
@@ -321,8 +321,8 @@
   }
 
   .weather-grid {
-    spacing-rows: 6px;
-    spacing-columns: 12px;
+    spacing-rows: $base_spacing;
+    spacing-columns: $base_spacing * 2;
   }
 
   .weather-forecast-time {
diff --git a/src/sass/gnome-shell/common/_dash.scss b/src/sass/gnome-shell/common/_dash.scss
index fe894576..2a5a910f 100644
--- a/src/sass/gnome-shell/common/_dash.scss
+++ b/src/sass/gnome-shell/common/_dash.scss
@@ -13,8 +13,8 @@ $dash_placeholder_size: 32px;
 
 // OSD Tooltip
 .dash-label {
-  color: rgba(white, 0.9);
-  background-color: rgba(#222, 0.95);
+  color: $light_alt_fg_color;
+  background-color: rgba(black, 0.75);
   border-radius: $bt_radius;
   padding: $base_padding $base_padding * 2;
   box-shadow: none;
diff --git a/src/sass/gnome-shell/common/_entries.scss b/src/sass/gnome-shell/common/_entries.scss
index 5c532212..fb9cfc83 100644
--- a/src/sass/gnome-shell/common/_entries.scss
+++ b/src/sass/gnome-shell/common/_entries.scss
@@ -6,8 +6,8 @@ StEntry, %entry {
   // margin: 2px;
   color: $fg_color;
   caret-color: $fg_color;
-  selection-background-color: $primary_color;
-  selected-color: $light_alt_fg_color;
+  selection-background-color: $primary_color !important;
+  selected-color: $light_fg_color !important;
   // @include font(subheading);
   @include entry(normal);
   &:hover { @include entry(hover); }
@@ -24,6 +24,6 @@ StEntry, %entry {
   }
   StLabel.hint-text {
     margin-left: 2px;
-    color: transparentize($fg_color, 0.3);
+    color: $alt_fg_color;
   }
 }
diff --git a/src/sass/gnome-shell/common/_panel.scss b/src/sass/gnome-shell/common/_panel.scss
index 89323531..47956601 100644
--- a/src/sass/gnome-shell/common/_panel.scss
+++ b/src/sass/gnome-shell/common/_panel.scss
@@ -127,12 +127,12 @@
     .system-status-icon {
       icon-size: $base_icon_size;
       padding: $base_padding;
-      margin: 0 $base_margin;
+      margin: 0 $base_padding;
     }
 
     // .panel-status-indicators-box .system-status-icon,
     .panel-status-menu-box .system-status-icon { margin: 0 0; }
-    .panel-status-menu-box StLabel { padding: 0 0 0 2px; }
+    .panel-status-menu-box StLabel { padding: 0 0 0 $base_padding / 2; }
 
     // app menu icon
     .app-menu-icon {
@@ -148,7 +148,7 @@
   Gjs_AggregateMenu.panel-button,
   Gjs_ui_panel_AggregateMenu.panel-button {
     .system-status-icon {
-      margin: 0 $base_margin / 2;
+      margin: 0 0 !important;
     }
   }
 
diff --git a/src/sass/gnome-shell/common/_popovers.scss b/src/sass/gnome-shell/common/_popovers.scss
index a04e688b..95bc1c8a 100644
--- a/src/sass/gnome-shell/common/_popovers.scss
+++ b/src/sass/gnome-shell/common/_popovers.scss
@@ -127,10 +127,6 @@ $popop_menuitem_radius: $wm_radius - 4px;
       color: transparentize($fg_color, 0.3);
     }
   }
-
-  .search-entry {
-    @extend %entry;
-  }
 }
 // symbolic icons in popover
 .popup-menu-arrow,
@@ -185,8 +181,8 @@ $popop_menuitem_radius: $wm_radius - 4px;
 
   .popup-sub-menu .popup-menu-item > :first-child {
     &:ltr { /* 12px spacing + 2*4px padding */
-            padding-left: $base_spacing * 2 + 4px; margin-left: 1em; }
+            padding-left: $base_padding * 2 + 4px; margin-left: 1em; }
     &:rtl { /* 12px spacing + 2*4px padding */
-            padding-right: $base_spacing * 2 + 4px; margin-right: 1em; }
+            padding-right: $base_padding * 2 + 4px; margin-right: 1em; }
   }
 }
diff --git a/src/sass/gnome-shell/common/_search-entry.scss b/src/sass/gnome-shell/common/_search-entry.scss
index c79d137b..1468c289 100644
--- a/src/sass/gnome-shell/common/_search-entry.scss
+++ b/src/sass/gnome-shell/common/_search-entry.scss
@@ -1,5 +1,5 @@
 // Search entry
-%search-entry, .search-entry {
+%search-entry, #overview .search-entry {
   width: 320px;
   min-height: $menuitem_size;
   padding: 0 10px !important;
diff --git a/src/sass/gnome-shell/widgets-40-0/_window-picker.scss b/src/sass/gnome-shell/widgets-40-0/_window-picker.scss
index 112fece2..7ec6f08c 100644
--- a/src/sass/gnome-shell/widgets-40-0/_window-picker.scss
+++ b/src/sass/gnome-shell/widgets-40-0/_window-picker.scss
@@ -6,9 +6,9 @@
 
 // Window titles
 .window-caption {
-  color: $osd_fg_color;
-  background-color: rgba($osd_bg_color, 1);
-  border-radius: 100px;
+  color: $light_alt_fg_color;
+  background-color: rgba(black, 0.75);
+  border-radius: $circular_radius;
   padding: $base_padding $base_padding * 2;
 }
 
@@ -25,11 +25,6 @@ $window_close_button_padding: 3px;
   width: $window_close_button_size;
   box-shadow: -1px 1px 5px 0px rgba(0,0,0,0.5);
   transition-duration: 300ms;
-//  background-image: url("assets/window-close-symbolic.svg");
-
-//  StIcon {
-//    icon-size: 1px; // Can't set to 0
-//  }
 
   &:hover {
     color: white;
diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss
index f23430de..2595019d 100644
--- a/src/sass/gtk/_common-3.0.scss
+++ b/src/sass/gtk/_common-3.0.scss
@@ -22,7 +22,7 @@ $cakeisalie: "This stylesheet is generated, DO NOT EDIT";
   outline-color: gtkalpha(currentColor, 0.15);
   outline-style: solid;
   outline-offset: -4px;
-  outline-width: 2px;
+  outline-width: 0;
   -gtk-outline-radius: $bt_radius;
   -gtk-secondary-caret-color: $selected_bg_color;
 }