diff --git a/src/sass/gnome-shell/common/_app-grid.scss b/src/sass/gnome-shell/common/_app-grid.scss
index dfe337bd..59144936 100644
--- a/src/sass/gnome-shell/common/_app-grid.scss
+++ b/src/sass/gnome-shell/common/_app-grid.scss
@@ -117,6 +117,12 @@ $app_grid_fg_color: #fff;
   }
 }
 
+// right-click app menu
+.app-menu,
+.app-well-menu {
+  max-width: 27.25em;
+}
+
 // Rename popup for app folders
 .rename-folder-popup {
   .rename-folder-popup-item {
diff --git a/src/sass/gnome-shell/common/_popovers.scss b/src/sass/gnome-shell/common/_popovers.scss
index 18daf77e..c6a2952d 100644
--- a/src/sass/gnome-shell/common/_popovers.scss
+++ b/src/sass/gnome-shell/common/_popovers.scss
@@ -19,6 +19,7 @@ $popop_menuitem_radius: $wm_radius - 4px;
   min-width: 12em;
   color: $alt_fg_color;
   padding: 0 0 !important;
+  font-weight: normal;
 
   .popup-menu-content {
     padding: 6px 0 !important;
@@ -26,6 +27,7 @@ $popop_menuitem_radius: $wm_radius - 4px;
     box-shadow: 0 8px 16px 0 rgba(black, 0.25);
     border: 1px solid if($variant=='light', rgba(black, 0), rgba(black, 0.75));
     margin: 4px 8px 4px 12px !important;
+    font-weight: normal;
   }
 
   .popup-menu-item {
@@ -36,6 +38,7 @@ $popop_menuitem_radius: $wm_radius - 4px;
     text-shadow: none;
     border-radius: $popop_menuitem_radius;
     margin: 0 6px;
+    font-weight: normal;
 
     &:ltr { padding-right: 2em !important; padding-left: 0 !important; }
     &:rtl { padding-right: 0 !important; padding-left: 2em !important; }
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 aca98ac6..64e3405f 100644
--- a/src/sass/gnome-shell/widgets-3-28/_app-grid.scss
+++ b/src/sass/gnome-shell/widgets-3-28/_app-grid.scss
@@ -1,10 +1,22 @@
 
+$app_icon_size: 96px;
+$app_icon_padding: 24px;
+
 // app icons
 .icon-grid {
   row-spacing: $base_spacing * 6;
   column-spacing: $base_spacing * 6;
   max-row-spacing: $base_spacing * 12;
   max-column-spacing: $base_spacing * 12;
+
+  // for 3.26
+  -shell-grid-horizontal-item-size: $app_icon_size + $app_icon_padding * 2;
+  -shell-grid-vertical-item-size: $app_icon_size + $app_icon_padding * 2;
+  spacing: $base_spacing * 4;
+
+  .overview-icon {
+    icon-size: $app_icon_size;
+  }
 }
 
 .app-folder-icon {
@@ -62,16 +74,72 @@
   &:checked:active { background-image: none; }
 }
 
-// Some hacks I don't even know
-.all-apps {
+//Some hacks I don't even
+.all-apps,
+.search-display > StBoxLayout,
+.frequent-apps > StBoxLayout {
   // 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;
+//
+// gnome-shell 3.36
+//
+.app-view-controls { //favorties | all toggle container
+  width: 320px;
+  padding-bottom: 32px;
+  margin: 0 0;
+}
+
+.app-view-control { //favorties | all toggle button
+  padding: 0 16px;
+  margin: 0 0;
+  font-weight: bold;
+  color: $light_alt_fg_color;
+  background-color: rgba($light_alt_fg_color, 0.15);
+  &:hover {
+    color: $light_alt_fg_color;
+    background-color: rgba($light_alt_fg_color, 0.22);
+  }
+  &:active {
+    color: $light_alt_fg_color;
+    background-color: darken($primary_color, 3%);
+  }
+  &:checked {
+    color: $light_alt_fg_color;
+    background-color: $primary_color;
+    box-shadow: none;
+  }
+  &:first-child {
+    border-right-width: 0;
+    border-radius: $bt_radius 0 0 $bt_radius;
+  }
+  &:last-child {
+    border-radius: 0 $bt_radius $bt_radius 0;
+  }
+}
+
+// Collections
+.app-folder-popup { //expanded collection
+  -arrow-border-radius: $bd_radius * 2;
+  -arrow-background-color: $light_divider_color;
+  -arrow-base: 0;
+  -arrow-rise: 12px;
+}
+
+.app-folder-popup-bin { padding: 5px; }
+
+.no-frequent-applications-label {
+  @include font(display-2);
+  color: $light_hint_fg_color;
+}
+
+.overview-icon.overview-icon-with-label,
+.grid-search-result .overview-icon.overview-icon-with-label {
+  padding: 10px 8px 5px 8px;
+  spacing: 6px;
+
+  > StBoxLayout {
+    spacing: 6px;
+  }
 }
diff --git a/src/sass/gnome-shell/widgets-3-28/_other.scss b/src/sass/gnome-shell/widgets-3-28/_other.scss
index fa386d25..90ef14a7 100644
--- a/src/sass/gnome-shell/widgets-3-28/_other.scss
+++ b/src/sass/gnome-shell/widgets-3-28/_other.scss
@@ -1,71 +1,4 @@
 
-.app-view-controls { //favorties | all toggle container
-  width: 320px;
-  padding-bottom: 32px;
-  margin: 0 0;
-}
-
-.app-view-control { //favorties | all toggle button
-  padding: 0 16px;
-  margin: 0 0;
-  font-weight: bold;
-  color: $light_alt_fg_color;
-  background-color: rgba($light_alt_fg_color, 0.15);
-  &:hover {
-    color: $light_alt_fg_color;
-    background-color: rgba($light_alt_fg_color, 0.22);
-  }
-  &:active {
-    color: $light_alt_fg_color;
-    background-color: darken($primary_color, 3%);
-  }
-  &:checked {
-    color: $light_alt_fg_color;
-    background-color: $primary_color;
-    box-shadow: none;
-  }
-  &:first-child {
-    border-right-width: 0;
-    border-radius: $bt_radius 0 0 $bt_radius;
-  }
-  &:last-child {
-    border-radius: 0 $bt_radius $bt_radius 0;
-  }
-}
-
-// Collections
-.app-folder-popup { //expanded collection
-  -arrow-border-radius: $bd_radius * 2;
-  -arrow-background-color: $light_divider_color;
-  -arrow-base: 0;
-  -arrow-rise: 12px;
-}
-
-.app-folder-popup-bin { padding: 5px; }
-
-.no-frequent-applications-label {
-  @include font(display-2);
-  color: $light_hint_fg_color;
-}
-
-.overview-icon.overview-icon-with-label,
-.grid-search-result .overview-icon.overview-icon-with-label {
-  padding: 10px 8px 5px 8px;
-  spacing: 6px;
-
-  > StBoxLayout {
-    spacing: 6px;
-  }
-}
-
-//Some hacks I don't even
-.all-apps,
-.search-display > StBoxLayout,
-.frequent-apps > StBoxLayout {
-  // horizontal padding to make sure scrollbars or dash don't overlap content
-  padding: 0px 88px 10px 88px;
-}
-
 // ShellMountOperation Dialogs
 .shell-mount-operation-icon { icon-size: 48px; }
 
diff --git a/src/sass/gnome-shell/widgets-40-0/_app-grid.scss b/src/sass/gnome-shell/widgets-40-0/_app-grid.scss
index 319e8e57..cd2e392a 100644
--- a/src/sass/gnome-shell/widgets-40-0/_app-grid.scss
+++ b/src/sass/gnome-shell/widgets-40-0/_app-grid.scss
@@ -13,12 +13,6 @@ $app_icon_size: 96px;
   page-padding-right: $base_padding * 2;
 }
 
-// right-click app menu
-.app-menu,
-.app-well-menu {
-  max-width: 27.25em;
-}
-
 // App Grid pagination indicators
 .page-indicator {
   padding: $base_padding $base_padding * 2 0;