diff --git a/src/sass/gnome-shell/_widgets-3-28.scss b/src/sass/gnome-shell/_widgets-3-28.scss
index 76a69830..5f34d665 100644
--- a/src/sass/gnome-shell/_widgets-3-28.scss
+++ b/src/sass/gnome-shell/_widgets-3-28.scss
@@ -31,11 +31,11 @@
 @import 'common/tiled-previews';
 @import 'common/workspace-switcher';
 @import 'widgets-3-28/app-grid';
+@import 'widgets-3-28/calendar';
 @import 'widgets-3-28/dash';
 @import 'widgets-3-28/login-dialog';
 @import 'widgets-3-28/other';
 @import 'widgets-3-28/overview';
 @import 'widgets-3-28/panel';
-@import 'widgets-3-28/search-results';
 @import 'widgets-3-28/window-picker';
 @import 'widgets-3-28/workspace-thumbnails';
diff --git a/src/sass/gnome-shell/_widgets-40-0.scss b/src/sass/gnome-shell/_widgets-40-0.scss
index 5665d50d..c3741b43 100644
--- a/src/sass/gnome-shell/_widgets-40-0.scss
+++ b/src/sass/gnome-shell/_widgets-40-0.scss
@@ -37,6 +37,5 @@
 @import 'widgets-40-0/panel';
 @import 'widgets-40-0/screen-shield';
 @import 'widgets-40-0/search-entry';
-@import 'widgets-40-0/search-results';
 @import 'widgets-40-0/window-picker';
 @import 'widgets-40-0/workspace-thumbnails';
diff --git a/src/sass/gnome-shell/common/_app-grid.scss b/src/sass/gnome-shell/common/_app-grid.scss
index fbbea1cf..c60253b5 100644
--- a/src/sass/gnome-shell/common/_app-grid.scss
+++ b/src/sass/gnome-shell/common/_app-grid.scss
@@ -5,7 +5,7 @@ $app_grid_fg_color: #fff;
 
 .show-apps,
 .app-well-app,
-.grid-search-result {
+%app-well-app {
   & .overview-icon {
     color: $light_alt_fg_color;
     border-radius: $bd_radius * 1.5;
diff --git a/src/sass/gnome-shell/common/_calendar.scss b/src/sass/gnome-shell/common/_calendar.scss
index 6c492d09..ba199e57 100644
--- a/src/sass/gnome-shell/common/_calendar.scss
+++ b/src/sass/gnome-shell/common/_calendar.scss
@@ -100,11 +100,11 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
 
 /* Calendar */
 .calendar {
-  margin: 2px 12px;
   border: none;
   box-shadow: none;
   background-color: $popover_bubble_bg;
-  padding: 4px 8px;
+  padding: $base_padding;
+  margin: 0 $base_padding * 2;
   text-shadow: none;
   border-radius: $mn_radius;
 
@@ -254,31 +254,31 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
 .weather-button,
 .events-button {
   @extend %popover_bubble;
-  padding: 12px;
-  margin: 2px 4px;
+  padding: $base_padding * 2;
+  margin: 2px $base_padding;
 }
 
 // Events
 .events-button {
   .events-box {
-    spacing: 6px;
+    spacing: $base_spacing;
   }
 
   .events-list {
-    spacing: 12px;
+    spacing: 2 * $base_spacing;
     text-shadow: none;
   }
 
   .events-title {
     color: $hint_fg_color;
     font-weight: bold;
-    margin-bottom: 4px;
     text-shadow: none;
   }
 
   .event-time {
     color: $hint_fg_color;
     font-feature-settings: "tnum";
+    @include fontsize($base_font_size - 2);
   }
 }
 
@@ -287,13 +287,13 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
   .world-clocks-city {
     color: $hint_fg_color;
     font-weight: bold;
-    font-size: 0.9em;
+    @include fontsize($base_font_size - 1);
   }
 
   .world-clocks-time {
     color: $hint_fg_color;
     font-feature-settings: "tnum";
-    font-size: 1.2em;
+    @include fontsize($base_font_size - 1);
 
     &:ltr { text-align: right; }
     &:rtl { text-align: left; }
@@ -302,7 +302,7 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
   .world-clocks-timezone {
     color: $hint_fg_color;
     font-feature-settings: "tnum";
-    font-size: 0.9em;
+    @include fontsize($base_font_size - 2);
   }
 }
 
@@ -317,11 +317,11 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
   margin-bottom: 6px;
 
   .weather-box {
-    spacing: 12px;
+    spacing: $base_spacing + $base_margin;
   }
 
   .weather-header-box {
-    spacing: 6px;
+    spacing: $base_spacing;
   }
 
   .weather-header {
@@ -331,6 +331,7 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
     &.location {
       font-weight: normal;
       color: $hint_fg_color;
+      @include fontsize($base_font_size - 2);
     }
   }
 
@@ -342,7 +343,7 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
   .weather-forecast-time {
     color: $alt_fg_color;
     font-feature-settings: "tnum";
-    font-size: 9pt;
+    @include fontsize($base_font_size - 3);
     font-weight: normal;
     padding-top: 0.2em;
     padding-bottom: 0.4em;
diff --git a/src/sass/gnome-shell/common/_ibus-popup.scss b/src/sass/gnome-shell/common/_ibus-popup.scss
index fe33c0a1..9c471d51 100644
--- a/src/sass/gnome-shell/common/_ibus-popup.scss
+++ b/src/sass/gnome-shell/common/_ibus-popup.scss
@@ -7,10 +7,12 @@
   -arrow-base: 64px;
   -arrow-rise: 12px;
   background-color: transparent;
+  color: $hint_fg_color;
 }
 
 .candidate-popup-content {
   @extend %theme_dialogs;
+  color: $hint_fg_color;
   box-shadow: 0 8px 16px 0 rgba(black, 0.25);
   border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
   margin: ($container_padding / 2) 8px;
@@ -29,6 +31,7 @@
   padding: 0.3em 0.5em 0.3em 0.5em;
   margin-right: 2px;
   border-radius: $bt_radius;
+  color: $hint_fg_color;
   &:hover { background-color: $divider_color; color: $fg_color; }
   &:active { background-color: $track_color; color: $fg_color; }
   &:selected { background-color: $primary_color; color: $light_alt_fg_color; }
diff --git a/src/sass/gnome-shell/common/_search-entry.scss b/src/sass/gnome-shell/common/_search-entry.scss
index dd9cc148..3e7a84ee 100644
--- a/src/sass/gnome-shell/common/_search-entry.scss
+++ b/src/sass/gnome-shell/common/_search-entry.scss
@@ -1,7 +1,8 @@
 // Search entry
 %search-entry, .search-entry {
   width: 320px;
-  padding: $base_padding+1 $base_padding+3;
+  min-height: $menuitem_size;
+  padding: 2px 10px;
   border: none;
   color: $light_hint_fg_color;
   caret-color: $light_alt_fg_color;
diff --git a/src/sass/gnome-shell/common/_search-results.scss b/src/sass/gnome-shell/common/_search-results.scss
index 3cde24fe..d65e3bb9 100644
--- a/src/sass/gnome-shell/common/_search-results.scss
+++ b/src/sass/gnome-shell/common/_search-results.scss
@@ -19,6 +19,12 @@
   }
 }
 
+// search overview container
+#searchResultsContent {
+  max-width: 1024px;
+  spacing: $base_margin * 2;
+}
+
 // search results sections "the boxes"
 .search-section {
   // This should be equal to #searchResultsContent spacing
@@ -54,15 +60,9 @@
   spacing: $base_spacing * 6;
 }
 
-//Icon tile
-.list-search-result {
-  &:focus, &:selected, &:hover {
-    background-color: $light_divider_color;
-    transition-duration: 200ms;
-  }
-  &:active, &:checked {
-    background-color: $light_track_color;
-  }
+// Search results with icons
+.grid-search-result {
+  @extend %app-well-app;
 }
 
 // search result provider
@@ -81,3 +81,26 @@
     }
   }
 }
+
+// search results list
+.list-search-results {
+  spacing: $base_spacing;
+}
+
+// search result listitem
+.list-search-result {
+  @extend %search-section-content-item;
+  // content
+  .list-search-result-content {
+    spacing: $base_padding;
+  }
+
+  // list item title (with leading icon)
+  .list-search-result-title {
+    spacing: $base_spacing * 2;
+    // font-weight: bold;
+  }
+
+  // list item description
+  .list-search-result-description { color: $light_alt_fg_color; }
+}
diff --git a/src/sass/gnome-shell/widgets-3-28/_app-grid.scss b/src/sass/gnome-shell/widgets-3-28/_app-grid.scss
index d1e5af05..aca98ac6 100644
--- a/src/sass/gnome-shell/widgets-3-28/_app-grid.scss
+++ b/src/sass/gnome-shell/widgets-3-28/_app-grid.scss
@@ -1,23 +1,16 @@
-$app_icon_size: 96px;
 
-// App Vault/Grid
+// app icons
 .icon-grid {
-  spacing: 30px;
-  -shell-grid-horizontal-item-size: 136px;
-  -shell-grid-vertical-item-size: 136px;
-
-  row-spacing: $container_padding * 6;
-  column-spacing: $container_padding * 6;
-  max-row-spacing: $container_padding * 12;
-  max-column-spacing: $container_padding * 12;
-
-  .overview-icon { icon-size: $app_icon_size; }
+  row-spacing: $base_spacing * 6;
+  column-spacing: $base_spacing * 6;
+  max-row-spacing: $base_spacing * 12;
+  max-column-spacing: $base_spacing * 12;
 }
 
 .app-folder-icon {
-  padding: $container_padding;
-  spacing-rows: $container_padding;
-  spacing-columns: $container_padding;
+  padding: $base_padding;
+  spacing-rows: $base_spacing;
+  spacing-columns: $base_spacing;
 }
 
 // expanded folder
@@ -68,3 +61,17 @@ $app_icon_size: 96px;
   }
   &:checked:active { background-image: none; }
 }
+
+// Some hacks I don't even know
+.all-apps {
+  // horizontal padding to make sure scrollbars or dash don't overlap content
+  padding: 0px 88px 10px 88px;
+}
+
+// shutdown and other actions in the grid
+.system-action-icon {
+  background-color: rgba(0,0,0,0.8);
+  color: #fff;
+  border-radius: 99px;
+  icon-size: 48px;
+}
diff --git a/src/sass/gnome-shell/widgets-3-28/_calendar.scss b/src/sass/gnome-shell/widgets-3-28/_calendar.scss
new file mode 100644
index 00000000..cd543363
--- /dev/null
+++ b/src/sass/gnome-shell/widgets-3-28/_calendar.scss
@@ -0,0 +1,8 @@
+
+.calendar {
+  // prev/next month icons
+  .calendar-change-month-back,
+  .calendar-change-month-forward {
+    padding: 0 2px;
+  }
+}
diff --git a/src/sass/gnome-shell/widgets-3-28/_search-results.scss b/src/sass/gnome-shell/widgets-3-28/_search-results.scss
index f7774b01..8b137891 100644
--- a/src/sass/gnome-shell/widgets-3-28/_search-results.scss
+++ b/src/sass/gnome-shell/widgets-3-28/_search-results.scss
@@ -1,12 +1 @@
-#searchResultsContent {
-  max-width: 1024px;
-  spacing: 8px;
-}
 
-.list-search-results { spacing: 3px; }
-.list-search-result-content { spacing: 30px; }
-.list-search-result-title { @include font(subheading); color: $light_alt_fg_color; spacing: 12px; }
-.list-search-result-description { color: $light_alt_fg_color; }
-.list-search-provider-details { width: 150px; color: $light_alt_fg_color; margin-top: 0.24em; }
-.list-search-provider-content { spacing: 20px; }
-.search-provider-icon { padding: 15px; }
diff --git a/src/sass/gnome-shell/widgets-40-0/_search-results.scss b/src/sass/gnome-shell/widgets-40-0/_search-results.scss
index 92f99d5e..e69de29b 100644
--- a/src/sass/gnome-shell/widgets-40-0/_search-results.scss
+++ b/src/sass/gnome-shell/widgets-40-0/_search-results.scss
@@ -1,28 +0,0 @@
-// search overview container
-#searchResultsContent {
-  max-width: 1024px;
-  spacing: $base_margin * 2;
-}
-
-// search results list
-.list-search-results {
-  spacing: $base_spacing;
-}
-
-// search result listitem
-.list-search-result {
-  @extend %search-section-content-item;
-  // content
-  .list-search-result-content {
-    spacing: $base_padding;
-  }
-
-  // list item title (with leading icon)
-  .list-search-result-title {
-    spacing: $base_spacing * 2;
-    // font-weight: bold;
-  }
-
-  // list item description
-  .list-search-result-description { color: $light_alt_fg_color; }
-}