diff --git a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
index 231dc88e..5ffb20f4 100644
--- a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
@@ -37,6 +37,7 @@ stage {
 .app-well-app.app-folder .overview-icon, .app-folder.grid-search-result .overview-icon, .app-well-app .overview-icon, .grid-search-result .overview-icon, .dash-item-container .show-apps .overview-icon, .list-search-result, .search-provider-icon, .switcher-list .item-box {
   border-radius: 16px;
   padding: 6px;
+  spacing: 6px;
   border: 2px solid transparent;
   transition-duration: 100ms;
   text-align: center; }
@@ -47,7 +48,7 @@ stage {
   border-radius: 11px;
   border: 1px solid rgba(238, 238, 236, 0.07); }
 
-#LookingGlassDialog > #Toolbar .lg-toolbar-button, .button {
+#LookingGlassDialog > #Toolbar .lg-toolbar-button, .app-folder-dialog .folder-name-container .edit-folder-button, .button {
   border-radius: 6px;
   border-style: solid;
   border-width: 1px;
@@ -55,39 +56,42 @@ stage {
   padding: 3px 24px;
   color: #eeeeec;
   background-color: #2d2f38; }
-  #LookingGlassDialog > #Toolbar .lg-toolbar-button:focus, .button:focus {
+  #LookingGlassDialog > #Toolbar .lg-toolbar-button:focus, .app-folder-dialog .folder-name-container .edit-folder-button:focus, .button:focus {
     color: #eeeeec;
     background-color: #2c364c;
     box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.6); }
-    #LookingGlassDialog > #Toolbar .lg-toolbar-button:focus:hover, .button:focus:hover {
+    #LookingGlassDialog > #Toolbar .lg-toolbar-button:focus:hover, .app-folder-dialog .folder-name-container .edit-folder-button:focus:hover, .button:focus:hover {
       background-color: #333d54;
       box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.7); }
-    #LookingGlassDialog > #Toolbar .lg-toolbar-button:focus:active, .button:focus:active {
+    #LookingGlassDialog > #Toolbar .lg-toolbar-button:focus:active, .app-folder-dialog .folder-name-container .edit-folder-button:focus:active, .button:focus:active {
       background-color: #39435b;
       box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.7); }
-  #LookingGlassDialog > #Toolbar .lg-toolbar-button:hover, .button:hover {
+  #LookingGlassDialog > #Toolbar .lg-toolbar-button:hover, .app-folder-dialog .folder-name-container .edit-folder-button:hover, .button:hover {
     color: #eeeeec;
     background-color: #343640; }
-  #LookingGlassDialog > #Toolbar .lg-toolbar-button:insensitive, .button:insensitive {
+  #LookingGlassDialog > #Toolbar .lg-toolbar-button:insensitive, .app-folder-dialog .folder-name-container .edit-folder-button:insensitive, .button:insensitive {
     color: rgba(238, 238, 236, 0.5);
     background-color: rgba(238, 238, 236, 0.05); }
-  #LookingGlassDialog > #Toolbar .lg-toolbar-button:active, .button:active {
+  #LookingGlassDialog > #Toolbar .lg-toolbar-button:active, .app-folder-dialog .folder-name-container .edit-folder-button:active, .button:active {
     color: #eeeeec;
     background-color: #3b3d49; }
-  #LookingGlassDialog > #Toolbar .lg-toolbar-button:checked, .button:checked {
+  #LookingGlassDialog > #Toolbar .lg-toolbar-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:checked, .button:checked {
     color: #eeeeec;
     background-color: #414451; }
-    #LookingGlassDialog > #Toolbar .lg-toolbar-button:checked:hover, .button:checked:hover {
+    #LookingGlassDialog > #Toolbar .lg-toolbar-button:checked:hover, .app-folder-dialog .folder-name-container .edit-folder-button:checked:hover, .button:checked:hover {
       background-color: #484b5a; }
-    #LookingGlassDialog > #Toolbar .lg-toolbar-button:checked:active, .button:checked:active {
+    #LookingGlassDialog > #Toolbar .lg-toolbar-button:checked:active, .app-folder-dialog .folder-name-container .edit-folder-button:checked:active, .button:checked:active {
       background-color: #4f5362; }
 
 .modal-dialog .modal-dialog-linked-button, .hotplug-notification-item, .notification-banner .notification-button {
   padding: 12px;
   font-weight: bold !important;
-  margin-right: 1px;
   color: #eeeeec;
   background-color: #3b3f4b; }
+  .modal-dialog .modal-dialog-linked-button:ltr, .hotplug-notification-item:ltr, .notification-banner .notification-button:ltr {
+    margin-right: 1px; }
+  .modal-dialog .modal-dialog-linked-button:rtl, .hotplug-notification-item:rtl, .notification-banner .notification-button:rtl {
+    margin-left: 1px; }
   .modal-dialog .modal-dialog-linked-button:insensitive, .hotplug-notification-item:insensitive, .notification-banner .notification-button:insensitive {
     color: rgba(238, 238, 236, 0.5);
     background-color: rgba(238, 238, 236, 0.05); }
@@ -123,9 +127,10 @@ stage {
     border-radius: 0 0 10px 0; }
   .modal-dialog .modal-dialog-linked-button:last-child:rtl, .hotplug-notification-item:last-child:rtl, .notification-banner .notification-button:last-child:rtl {
     border-radius: 0 0 0 10px;
-    margin-right: 0 !important; }
+    margin-left: 0 !important; }
   .modal-dialog .modal-dialog-linked-button:first-child:last-child, .hotplug-notification-item:first-child:last-child, .notification-banner .notification-button:first-child:last-child {
     border-radius: 0 0 10px 10px !important;
+    margin-left: 0 !important;
     margin-right: 0 !important; }
 
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
@@ -167,11 +172,7 @@ stage {
       background-color: #5b6173; }
 
 /* General Typography */
-.search-statustext {
-  font-weight: 300;
-  font-size: 24pt; }
-
-.app-folder-dialog .folder-name-container .folder-name-label, .app-folder-dialog .folder-name-container .folder-name-entry {
+.app-folder-dialog .folder-name-container .folder-name-label, .app-folder-dialog .folder-name-container .folder-name-entry, .search-statustext {
   font-weight: 800;
   font-size: 20pt; }
 
@@ -327,13 +328,12 @@ StScrollBar {
 
 /* Popovers/Menus */
 .popup-menu-boxpointer, .candidate-popup-boxpointer {
-  margin: 4px; }
+  -arrow-rise: 6px; }
 
 .popup-menu {
   min-width: 15em;
   color: #eeeeec; }
   .popup-menu.panel-menu {
-    -boxpointer-gap: 6px;
     margin-bottom: 1.75em; }
 
 .popup-menu-content, .candidate-popup-content {
@@ -346,8 +346,13 @@ StScrollBar {
 .popup-menu-item {
   padding: 9px 12px;
   border-radius: 8px;
+  spacing: 6px;
   transition: 0.2s all ease;
   background-color: transparent; }
+  .popup-menu-item:ltr {
+    padding-left: 6px; }
+  .popup-menu-item:rtl {
+    padding-right: 6px; }
   .popup-menu-item:focus, .popup-menu-item:hover {
     background-color: #2b2f3a !important; }
     .popup-menu-item:focus:active, .popup-menu-item:hover:active {
@@ -367,6 +372,10 @@ StScrollBar {
     color: #fcfcfc; }
   .popup-menu-item:insensitive {
     color: rgba(238, 238, 236, 0.5); }
+  .popup-menu-item .toggle-switch:ltr {
+    margin-left: 4px; }
+  .popup-menu-item .toggle-switch:rtl {
+    margin-right: 4px; }
 
 .popup-inactive-menu-item {
   color: #eeeeec; }
@@ -377,12 +386,6 @@ StScrollBar {
 .popup-menu-icon {
   icon-size: 16px !important; }
 
-.popup-menu-arrow:ltr {
-  margin-right: 4px; }
-
-.popup-menu-arrow:rtl {
-  margin-left: 4px; }
-
 .popup-sub-menu {
   background-color: #363a48;
   border-radius: 0 0 8px 8px; }
@@ -415,22 +418,28 @@ StScrollBar {
     text-align: left; }
 
 .popup-separator-menu-item {
-  padding: 0;
-  margin: 6px 0; }
+  margin: 6px 0;
+  padding: 0 !important; }
+  .popup-separator-menu-item:ltr {
+    margin-right: 4px; }
+  .popup-separator-menu-item:rtl {
+    margin-left: 4px; }
   .popup-separator-menu-item .popup-separator-menu-item-separator {
     height: 1px;
     background-color: #0d0e11; }
   .popup-separator-menu-item .popup-menu-ornament {
     width: 0 !important; }
   .popup-sub-menu .popup-separator-menu-item {
-    padding: 0;
-    margin-right: 2.5em !important;
     background-color: transparent; }
+    .popup-sub-menu .popup-separator-menu-item:ltr {
+      margin-right: 2.5em; }
+    .popup-sub-menu .popup-separator-menu-item:rtl {
+      margin-left: 2.5em; }
     .popup-sub-menu .popup-separator-menu-item .popup-separator-menu-item-separator {
       background-color: #1c1e25; }
 
 .background-menu {
-  -boxpointer-gap: 4px;
+  -boxpointer-gap: 0px;
   -arrow-rise: 0px; }
 
 .aggregate-menu {
@@ -444,16 +453,12 @@ StScrollBar {
     .aggregate-menu .popup-menu-icon:rtl {
       margin-left: 8px; }
   .aggregate-menu .popup-sub-menu .popup-menu-item > :first-child:ltr {
-    margin-left: 8px; }
+    margin-left: 1em; }
   .aggregate-menu .popup-sub-menu .popup-menu-item > :first-child:rtl {
-    margin-right: 8px; }
+    margin-right: 1em; }
 
 .app-menu {
   max-width: 27.25em; }
-  .app-menu .popup-menu-content, .app-menu .candidate-popup-content {
-    margin: 4px; }
-  .app-menu.panel-menu .popup-menu-content, .app-menu.panel-menu .candidate-popup-content {
-    margin: 0; }
   .app-menu .popup-menu-ornament {
     width: 0 !important; }
   .app-menu .popup-inactive-menu-item:first-child > StLabel:ltr {
@@ -722,7 +727,7 @@ StScrollBar {
 
 /* Message List */
 .message-list {
-  width: 32em;
+  width: 29em;
   border: solid #0d0e11; }
   .message-list:ltr {
     margin-left: 0;
@@ -788,10 +793,11 @@ StScrollBar {
     color: #eeeeec;
     background-color: #3b3d49; }
   .message .message-icon-bin {
-    padding: 18px;
-    padding-right: 6px; }
-    .message .message-icon-bin:rtl {
+    padding: 18px; }
+    .message .message-icon-bin:ltr {
       padding-right: 6px; }
+    .message .message-icon-bin:rtl {
+      padding-left: 6px; }
     .message .message-icon-bin > StIcon {
       icon-size: 2.18em;
       -st-icon-style: symbolic; }
@@ -1211,6 +1217,8 @@ StScrollBar {
     .switcher-list .item-box:drop {
       border: 2px solid rgba(39, 119, 255, 0.8);
       background-color: rgba(39, 119, 255, 0.2); }
+    .switcher-list .item-box:hover {
+      background: none; }
   .switcher-list .separator {
     width: 1px;
     background: #0d0e11; }
@@ -1585,12 +1593,14 @@ StScrollBar {
     padding: 0 4px; }
 
 /* Search */
+#searchResults {
+  margin: 0 4px; }
+
 #searchResultsContent {
-  max-width: 1024px;
-  spacing: 8px; }
+  max-width: 1072px; }
 
 .search-section {
-  spacing: 8px; }
+  spacing: 18px; }
   .search-section .search-section-separator {
     height: 8px;
     background-color: transparent; }
@@ -1599,16 +1609,13 @@ StScrollBar {
   background-color: #323643;
   border-radius: 24px;
   border: 1px solid rgba(255, 255, 255, 0.1);
-  box-shadow: none;
-  text-shadow: none;
   color: white;
   padding: 12px;
-  margin: 4px; }
+  margin: 0 12px; }
 
 .list-search-result, .search-provider-icon {
   background-color: transparent;
-  margin: 4px;
-  border-radius: 8px !important; }
+  border-radius: 11px; }
   .list-search-result:hover, .search-provider-icon:hover {
     background-color: rgba(255, 255, 255, 0.1); }
   .list-search-result:selected, .search-provider-icon:selected, .list-search-result:focus, .search-provider-icon:focus {
@@ -1630,7 +1637,14 @@ StScrollBar {
     background-color: rgba(39, 119, 255, 0.2); }
 
 .grid-search-results {
-  spacing: 36px; }
+  spacing: 30px;
+  margin: 0 12px; }
+
+.search-provider-icon:ltr {
+  margin-right: 4px; }
+
+.search-provider-icon:rtl {
+  margin-left: 4px; }
 
 .search-provider-icon .list-search-provider-content {
   spacing: 12px; }
@@ -1652,7 +1666,7 @@ StScrollBar {
 
 /* Dash */
 #dash {
-  margin: 2em; }
+  margin-top: 12px; }
   #dash .placeholder {
     background-image: none;
     background-size: contain;
@@ -1661,16 +1675,25 @@ StScrollBar {
     width: 32px;
     height: 32px; }
   #dash .app-well-app-running-dot {
-    margin-bottom: 15px; }
+    margin-bottom: 14px; }
 
 .dash-background {
   background-color: #323643;
   border-radius: 28px;
   padding: 12px;
-  spacing: 6px; }
+  spacing: 6px;
+  margin-bottom: 12px; }
+
+.dash-item-container > * {
+  margin: 0 2px; }
+
+.dash-item-container:ltr:first-child {
+  margin-left: 0; }
+
+.dash-item-container:rtl:first-child {
+  margin-right: 0; }
 
 .dash-item-container .app-well-app .overview-icon, .dash-item-container .grid-search-result .overview-icon {
-  margin: 0 4px;
   padding: 6px; }
 
 .dash-item-container .show-apps .overview-icon {
@@ -1700,9 +1723,14 @@ StScrollBar {
   border: 2px solid rgba(39, 119, 255, 0.8);
   background-color: rgba(39, 119, 255, 0.2); }
 
+.dash-item-container .show-apps, .dash-item-container .app-well-app, .dash-item-container .grid-search-result {
+  padding-bottom: 12px; }
+
 .dash-separator {
   width: 1px;
-  background-color: #0d0e11; }
+  margin: 0 4px;
+  background-color: #0d0e11;
+  margin-bottom: 12px; }
 
 .dash-label {
   color: white;
@@ -1716,12 +1744,12 @@ StScrollBar {
 .icon-grid {
   row-spacing: 12px;
   column-spacing: 12px;
-  max-row-spacing: 72px;
-  max-column-spacing: 72px;
+  max-row-spacing: 42px;
+  max-column-spacing: 42px;
   page-padding-top: 24px;
   page-padding-bottom: 24px;
-  page-padding-left: 12px;
-  page-padding-right: 12px; }
+  page-padding-left: 18px;
+  page-padding-right: 18px; }
 
 /* App Icons */
 .app-well-app .overview-icon, .grid-search-result .overview-icon {
@@ -1786,8 +1814,7 @@ StScrollBar {
 
 .app-folder-dialog {
   border-radius: 32px;
-  background-color: #323643;
-  padding: 12px 0px 12px 0px; }
+  background-color: #323643; }
   .app-folder-dialog .folder-name-container {
     padding: 24px 36px 0;
     spacing: 12px;
@@ -1798,31 +1825,10 @@ StScrollBar {
       padding: 5px 7px;
       color: white; }
     .app-folder-dialog .folder-name-container .edit-folder-button {
-      background-color: transparent;
-      background-color: none;
+      padding: 0;
       width: 36px;
       height: 36px;
-      border-radius: 18px; }
-      .app-folder-dialog .folder-name-container .edit-folder-button:insensitive {
-        color: rgba(238, 238, 236, 0.5);
-        background-color: rgba(238, 238, 236, 0.05);
-        background-color: transparent; }
-      .app-folder-dialog .folder-name-container .edit-folder-button:focus {
-        color: #eeeeec;
-        background-color: #2c364c;
-        box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.6); }
-        .app-folder-dialog .folder-name-container .edit-folder-button:focus:hover {
-          background-color: #333d54;
-          box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.7); }
-        .app-folder-dialog .folder-name-container .edit-folder-button:focus:active {
-          background-color: #39435b;
-          box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.7); }
-      .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-        color: #eeeeec;
-        background-color: #343640; }
-      .app-folder-dialog .folder-name-container .edit-folder-button:active {
-        color: #eeeeec;
-        background-color: #3b3d49; }
+      border-radius: 99px; }
       .app-folder-dialog .folder-name-container .edit-folder-button > StIcon {
         icon-size: 1.09em; }
   .app-folder-dialog .icon-grid {
@@ -1837,8 +1843,8 @@ StScrollBar {
 
 .app-folder-dialog-container {
   padding: 12px;
-  width: 620px;
-  height: 620px; }
+  width: 640px;
+  height: 640px; }
 
 .app-well-app-running-dot {
   height: 5px;
diff --git a/share/themes/Kali-Light/gnome-shell/gnome-shell.css b/share/themes/Kali-Light/gnome-shell/gnome-shell.css
index 2ea51656..1b995b6e 100644
--- a/share/themes/Kali-Light/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Light/gnome-shell/gnome-shell.css
@@ -37,6 +37,7 @@ stage {
 .app-well-app.app-folder .overview-icon, .app-folder.grid-search-result .overview-icon, .app-well-app .overview-icon, .grid-search-result .overview-icon, .dash-item-container .show-apps .overview-icon, .list-search-result, .search-provider-icon, .switcher-list .item-box {
   border-radius: 16px;
   padding: 6px;
+  spacing: 6px;
   border: 2px solid transparent;
   transition-duration: 100ms;
   text-align: center; }
@@ -47,7 +48,7 @@ stage {
   border-radius: 11px;
   border: 1px solid rgba(255, 255, 255, 0.8); }
 
-#LookingGlassDialog > #Toolbar .lg-toolbar-button, .button {
+#LookingGlassDialog > #Toolbar .lg-toolbar-button, .app-folder-dialog .folder-name-container .edit-folder-button, .button {
   border-radius: 6px;
   border-style: solid;
   border-width: 1px;
@@ -55,39 +56,42 @@ stage {
   padding: 3px 24px;
   color: #5c616c;
   background-color: #f7f7f8; }
-  #LookingGlassDialog > #Toolbar .lg-toolbar-button:focus, .button:focus {
+  #LookingGlassDialog > #Toolbar .lg-toolbar-button:focus, .app-folder-dialog .folder-name-container .edit-folder-button:focus, .button:focus {
     color: #5c616c;
     background-color: #e2eaf9;
     box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.6); }
-    #LookingGlassDialog > #Toolbar .lg-toolbar-button:focus:hover, .button:focus:hover {
+    #LookingGlassDialog > #Toolbar .lg-toolbar-button:focus:hover, .app-folder-dialog .folder-name-container .edit-folder-button:focus:hover, .button:focus:hover {
       background-color: #e9f1ff;
       box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.7); }
-    #LookingGlassDialog > #Toolbar .lg-toolbar-button:focus:active, .button:focus:active {
+    #LookingGlassDialog > #Toolbar .lg-toolbar-button:focus:active, .app-folder-dialog .folder-name-container .edit-folder-button:focus:active, .button:focus:active {
       background-color: #e9f1ff;
       box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.7); }
-  #LookingGlassDialog > #Toolbar .lg-toolbar-button:hover, .button:hover {
+  #LookingGlassDialog > #Toolbar .lg-toolbar-button:hover, .app-folder-dialog .folder-name-container .edit-folder-button:hover, .button:hover {
     color: #5c616c;
     background-color: white; }
-  #LookingGlassDialog > #Toolbar .lg-toolbar-button:insensitive, .button:insensitive {
+  #LookingGlassDialog > #Toolbar .lg-toolbar-button:insensitive, .app-folder-dialog .folder-name-container .edit-folder-button:insensitive, .button:insensitive {
     color: rgba(92, 97, 108, 0.5);
     background-color: rgba(92, 97, 108, 0.05); }
-  #LookingGlassDialog > #Toolbar .lg-toolbar-button:active, .button:active {
+  #LookingGlassDialog > #Toolbar .lg-toolbar-button:active, .app-folder-dialog .folder-name-container .edit-folder-button:active, .button:active {
     color: #5c616c;
     background-color: white; }
-  #LookingGlassDialog > #Toolbar .lg-toolbar-button:checked, .button:checked {
+  #LookingGlassDialog > #Toolbar .lg-toolbar-button:checked, .app-folder-dialog .folder-name-container .edit-folder-button:checked, .button:checked {
     color: #5c616c;
     background-color: white; }
-    #LookingGlassDialog > #Toolbar .lg-toolbar-button:checked:hover, .button:checked:hover {
+    #LookingGlassDialog > #Toolbar .lg-toolbar-button:checked:hover, .app-folder-dialog .folder-name-container .edit-folder-button:checked:hover, .button:checked:hover {
       background-color: white; }
-    #LookingGlassDialog > #Toolbar .lg-toolbar-button:checked:active, .button:checked:active {
+    #LookingGlassDialog > #Toolbar .lg-toolbar-button:checked:active, .app-folder-dialog .folder-name-container .edit-folder-button:checked:active, .button:checked:active {
       background-color: white; }
 
 .modal-dialog .modal-dialog-linked-button, .hotplug-notification-item, .notification-banner .notification-button {
   padding: 12px;
   font-weight: bold !important;
-  margin-right: 1px;
   color: #5c616c;
   background-color: #dadadb; }
+  .modal-dialog .modal-dialog-linked-button:ltr, .hotplug-notification-item:ltr, .notification-banner .notification-button:ltr {
+    margin-right: 1px; }
+  .modal-dialog .modal-dialog-linked-button:rtl, .hotplug-notification-item:rtl, .notification-banner .notification-button:rtl {
+    margin-left: 1px; }
   .modal-dialog .modal-dialog-linked-button:insensitive, .hotplug-notification-item:insensitive, .notification-banner .notification-button:insensitive {
     color: rgba(92, 97, 108, 0.5);
     background-color: rgba(92, 97, 108, 0.05); }
@@ -123,9 +127,10 @@ stage {
     border-radius: 0 0 10px 0; }
   .modal-dialog .modal-dialog-linked-button:last-child:rtl, .hotplug-notification-item:last-child:rtl, .notification-banner .notification-button:last-child:rtl {
     border-radius: 0 0 0 10px;
-    margin-right: 0 !important; }
+    margin-left: 0 !important; }
   .modal-dialog .modal-dialog-linked-button:first-child:last-child, .hotplug-notification-item:first-child:last-child, .notification-banner .notification-button:first-child:last-child {
     border-radius: 0 0 10px 10px !important;
+    margin-left: 0 !important;
     margin-right: 0 !important; }
 
 .screenshot-ui-show-pointer-button, .screenshot-ui-type-button {
@@ -167,11 +172,7 @@ stage {
       background-color: #535a6e; }
 
 /* General Typography */
-.search-statustext {
-  font-weight: 300;
-  font-size: 24pt; }
-
-.app-folder-dialog .folder-name-container .folder-name-label, .app-folder-dialog .folder-name-container .folder-name-entry {
+.app-folder-dialog .folder-name-container .folder-name-label, .app-folder-dialog .folder-name-container .folder-name-entry, .search-statustext {
   font-weight: 800;
   font-size: 20pt; }
 
@@ -327,13 +328,12 @@ StScrollBar {
 
 /* Popovers/Menus */
 .popup-menu-boxpointer, .candidate-popup-boxpointer {
-  margin: 4px; }
+  -arrow-rise: 6px; }
 
 .popup-menu {
   min-width: 15em;
   color: #5c616c; }
   .popup-menu.panel-menu {
-    -boxpointer-gap: 6px;
     margin-bottom: 1.75em; }
 
 .popup-menu-content, .candidate-popup-content {
@@ -346,8 +346,13 @@ StScrollBar {
 .popup-menu-item {
   padding: 9px 12px;
   border-radius: 8px;
+  spacing: 6px;
   transition: 0.2s all ease;
   background-color: transparent; }
+  .popup-menu-item:ltr {
+    padding-left: 6px; }
+  .popup-menu-item:rtl {
+    padding-right: 6px; }
   .popup-menu-item:focus, .popup-menu-item:hover {
     background-color: #f7f7f7 !important; }
     .popup-menu-item:focus:active, .popup-menu-item:hover:active {
@@ -367,6 +372,10 @@ StScrollBar {
     color: #50555e; }
   .popup-menu-item:insensitive {
     color: rgba(92, 97, 108, 0.5); }
+  .popup-menu-item .toggle-switch:ltr {
+    margin-left: 4px; }
+  .popup-menu-item .toggle-switch:rtl {
+    margin-right: 4px; }
 
 .popup-inactive-menu-item {
   color: #5c616c; }
@@ -377,12 +386,6 @@ StScrollBar {
 .popup-menu-icon {
   icon-size: 16px !important; }
 
-.popup-menu-arrow:ltr {
-  margin-right: 4px; }
-
-.popup-menu-arrow:rtl {
-  margin-left: 4px; }
-
 .popup-sub-menu {
   background-color: #ededed;
   border-radius: 0 0 8px 8px; }
@@ -415,22 +418,28 @@ StScrollBar {
     text-align: left; }
 
 .popup-separator-menu-item {
-  padding: 0;
-  margin: 6px 0; }
+  margin: 6px 0;
+  padding: 0 !important; }
+  .popup-separator-menu-item:ltr {
+    margin-right: 4px; }
+  .popup-separator-menu-item:rtl {
+    margin-left: 4px; }
   .popup-separator-menu-item .popup-separator-menu-item-separator {
     height: 1px;
     background-color: #d9d9d9; }
   .popup-separator-menu-item .popup-menu-ornament {
     width: 0 !important; }
   .popup-sub-menu .popup-separator-menu-item {
-    padding: 0;
-    margin-right: 2.5em !important;
     background-color: transparent; }
+    .popup-sub-menu .popup-separator-menu-item:ltr {
+      margin-right: 2.5em; }
+    .popup-sub-menu .popup-separator-menu-item:rtl {
+      margin-left: 2.5em; }
     .popup-sub-menu .popup-separator-menu-item .popup-separator-menu-item-separator {
       background-color: #ebebeb; }
 
 .background-menu {
-  -boxpointer-gap: 4px;
+  -boxpointer-gap: 0px;
   -arrow-rise: 0px; }
 
 .aggregate-menu {
@@ -444,16 +453,12 @@ StScrollBar {
     .aggregate-menu .popup-menu-icon:rtl {
       margin-left: 8px; }
   .aggregate-menu .popup-sub-menu .popup-menu-item > :first-child:ltr {
-    margin-left: 8px; }
+    margin-left: 1em; }
   .aggregate-menu .popup-sub-menu .popup-menu-item > :first-child:rtl {
-    margin-right: 8px; }
+    margin-right: 1em; }
 
 .app-menu {
   max-width: 27.25em; }
-  .app-menu .popup-menu-content, .app-menu .candidate-popup-content {
-    margin: 4px; }
-  .app-menu.panel-menu .popup-menu-content, .app-menu.panel-menu .candidate-popup-content {
-    margin: 0; }
   .app-menu .popup-menu-ornament {
     width: 0 !important; }
   .app-menu .popup-inactive-menu-item:first-child > StLabel:ltr {
@@ -722,7 +727,7 @@ StScrollBar {
 
 /* Message List */
 .message-list {
-  width: 32em;
+  width: 29em;
   border: solid #d9d9d9; }
   .message-list:ltr {
     margin-left: 0;
@@ -788,10 +793,11 @@ StScrollBar {
     color: #5c616c;
     background-color: white; }
   .message .message-icon-bin {
-    padding: 18px;
-    padding-right: 6px; }
-    .message .message-icon-bin:rtl {
+    padding: 18px; }
+    .message .message-icon-bin:ltr {
       padding-right: 6px; }
+    .message .message-icon-bin:rtl {
+      padding-left: 6px; }
     .message .message-icon-bin > StIcon {
       icon-size: 2.18em;
       -st-icon-style: symbolic; }
@@ -1211,6 +1217,8 @@ StScrollBar {
     .switcher-list .item-box:drop {
       border: 2px solid rgba(39, 119, 255, 0.8);
       background-color: rgba(39, 119, 255, 0.2); }
+    .switcher-list .item-box:hover {
+      background: none; }
   .switcher-list .separator {
     width: 1px;
     background: #d9d9d9; }
@@ -1585,12 +1593,14 @@ StScrollBar {
     padding: 0 4px; }
 
 /* Search */
+#searchResults {
+  margin: 0 4px; }
+
 #searchResultsContent {
-  max-width: 1024px;
-  spacing: 8px; }
+  max-width: 1072px; }
 
 .search-section {
-  spacing: 8px; }
+  spacing: 18px; }
   .search-section .search-section-separator {
     height: 8px;
     background-color: transparent; }
@@ -1599,16 +1609,13 @@ StScrollBar {
   background-color: #323643;
   border-radius: 24px;
   border: 1px solid rgba(255, 255, 255, 0.1);
-  box-shadow: none;
-  text-shadow: none;
   color: white;
   padding: 12px;
-  margin: 4px; }
+  margin: 0 12px; }
 
 .list-search-result, .search-provider-icon {
   background-color: transparent;
-  margin: 4px;
-  border-radius: 8px !important; }
+  border-radius: 11px; }
   .list-search-result:hover, .search-provider-icon:hover {
     background-color: rgba(255, 255, 255, 0.1); }
   .list-search-result:selected, .search-provider-icon:selected, .list-search-result:focus, .search-provider-icon:focus {
@@ -1630,7 +1637,14 @@ StScrollBar {
     background-color: rgba(39, 119, 255, 0.2); }
 
 .grid-search-results {
-  spacing: 36px; }
+  spacing: 30px;
+  margin: 0 12px; }
+
+.search-provider-icon:ltr {
+  margin-right: 4px; }
+
+.search-provider-icon:rtl {
+  margin-left: 4px; }
 
 .search-provider-icon .list-search-provider-content {
   spacing: 12px; }
@@ -1652,7 +1666,7 @@ StScrollBar {
 
 /* Dash */
 #dash {
-  margin: 2em; }
+  margin-top: 12px; }
   #dash .placeholder {
     background-image: none;
     background-size: contain;
@@ -1661,16 +1675,25 @@ StScrollBar {
     width: 32px;
     height: 32px; }
   #dash .app-well-app-running-dot {
-    margin-bottom: 15px; }
+    margin-bottom: 14px; }
 
 .dash-background {
   background-color: #323643;
   border-radius: 28px;
   padding: 12px;
-  spacing: 6px; }
+  spacing: 6px;
+  margin-bottom: 12px; }
+
+.dash-item-container > * {
+  margin: 0 2px; }
+
+.dash-item-container:ltr:first-child {
+  margin-left: 0; }
+
+.dash-item-container:rtl:first-child {
+  margin-right: 0; }
 
 .dash-item-container .app-well-app .overview-icon, .dash-item-container .grid-search-result .overview-icon {
-  margin: 0 4px;
   padding: 6px; }
 
 .dash-item-container .show-apps .overview-icon {
@@ -1700,9 +1723,14 @@ StScrollBar {
   border: 2px solid rgba(39, 119, 255, 0.8);
   background-color: rgba(39, 119, 255, 0.2); }
 
+.dash-item-container .show-apps, .dash-item-container .app-well-app, .dash-item-container .grid-search-result {
+  padding-bottom: 12px; }
+
 .dash-separator {
   width: 1px;
-  background-color: #d9d9d9; }
+  margin: 0 4px;
+  background-color: #d9d9d9;
+  margin-bottom: 12px; }
 
 .dash-label {
   color: white;
@@ -1716,12 +1744,12 @@ StScrollBar {
 .icon-grid {
   row-spacing: 12px;
   column-spacing: 12px;
-  max-row-spacing: 72px;
-  max-column-spacing: 72px;
+  max-row-spacing: 42px;
+  max-column-spacing: 42px;
   page-padding-top: 24px;
   page-padding-bottom: 24px;
-  page-padding-left: 12px;
-  page-padding-right: 12px; }
+  page-padding-left: 18px;
+  page-padding-right: 18px; }
 
 /* App Icons */
 .app-well-app .overview-icon, .grid-search-result .overview-icon {
@@ -1786,8 +1814,7 @@ StScrollBar {
 
 .app-folder-dialog {
   border-radius: 32px;
-  background-color: #323643;
-  padding: 12px 0px 12px 0px; }
+  background-color: #323643; }
   .app-folder-dialog .folder-name-container {
     padding: 24px 36px 0;
     spacing: 12px;
@@ -1798,31 +1825,10 @@ StScrollBar {
       padding: 5px 7px;
       color: white; }
     .app-folder-dialog .folder-name-container .edit-folder-button {
-      background-color: transparent;
-      background-color: none;
+      padding: 0;
       width: 36px;
       height: 36px;
-      border-radius: 18px; }
-      .app-folder-dialog .folder-name-container .edit-folder-button:insensitive {
-        color: rgba(92, 97, 108, 0.5);
-        background-color: rgba(92, 97, 108, 0.05);
-        background-color: transparent; }
-      .app-folder-dialog .folder-name-container .edit-folder-button:focus {
-        color: #5c616c;
-        background-color: #e2eaf9;
-        box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.6); }
-        .app-folder-dialog .folder-name-container .edit-folder-button:focus:hover {
-          background-color: #e9f1ff;
-          box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.7); }
-        .app-folder-dialog .folder-name-container .edit-folder-button:focus:active {
-          background-color: #e9f1ff;
-          box-shadow: inset 0 0 0 2px rgba(39, 119, 255, 0.7); }
-      .app-folder-dialog .folder-name-container .edit-folder-button:hover {
-        color: #5c616c;
-        background-color: white; }
-      .app-folder-dialog .folder-name-container .edit-folder-button:active {
-        color: #5c616c;
-        background-color: white; }
+      border-radius: 99px; }
       .app-folder-dialog .folder-name-container .edit-folder-button > StIcon {
         icon-size: 1.09em; }
   .app-folder-dialog .icon-grid {
@@ -1837,8 +1843,8 @@ StScrollBar {
 
 .app-folder-dialog-container {
   padding: 12px;
-  width: 620px;
-  height: 620px; }
+  width: 640px;
+  height: 640px; }
 
 .app-well-app-running-dot {
   height: 5px;
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss
index fa6f4b40..c7c3143a 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/_common.scss
@@ -84,6 +84,7 @@ stage {
 %tile {
   border-radius: $base_border_radius * 2; // 16px
   padding: $base_padding;
+  spacing: $base_padding;
   border: 2px solid transparent;
   transition-duration: 100ms;
   text-align: center;
@@ -122,7 +123,9 @@ $bubble_buttons_color: if($variant == 'light', darken($bg_color, 12%), lighten($
 %bubble_button {
   padding: $base_padding * 2;
   font-weight: bold !important;
-  margin-right: 1px;
+
+  &:ltr {margin-right: 1px;}
+  &:rtl {margin-left: 1px;}
 
   @include button(normal, $c:$bubble_buttons_color);
   &:insensitive { @include button(insensitive, $c:$bubble_buttons_color);}
@@ -146,11 +149,12 @@ $bubble_buttons_color: if($variant == 'light', darken($bg_color, 12%), lighten($
 
   &:last-child:rtl {
     border-radius: 0 0 0 $bubble_button_radius;
-    margin-right: 0 !important;
+    margin-left: 0 !important;
   }
 
   &:first-child:last-child {
     border-radius: 0 0 $bubble_button_radius $bubble_button_radius !important;
+    margin-left: 0 !important;
     margin-right: 0 !important;
   }
 }
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss
index 05a71751..c936e4b6 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_app-grid.scss
@@ -6,12 +6,12 @@ $app_icon_size: 96px;
 .icon-grid {
   row-spacing: $base_padding * 2;
   column-spacing: $base_padding * 2;
-  max-row-spacing: $base_padding * 12;
-  max-column-spacing: $base_padding * 12;
+  max-row-spacing: $base_padding * 7;
+  max-column-spacing: $base_padding * 7;
   page-padding-top: $base_padding * 4;
   page-padding-bottom: $base_padding * 4;
-  page-padding-left: $base_padding * 2;
-  page-padding-right: $base_padding * 2;
+  page-padding-left: $base_padding * 3;
+  page-padding-right: $base_padding * 3;
 }
 
 /* App Icons */
@@ -20,9 +20,7 @@ $app_icon_size: 96px;
 .app-well-app {
   @include overview_icon($osd_fg_color);
 
-  .overview-icon {
-    padding: $base_padding*2;
-  }
+  .overview-icon { padding: $base_padding*2;}
   .overview-icon.overview-icon-with-label {
     > StBoxLayout {
       spacing: $base_padding;
@@ -39,7 +37,6 @@ $app_icon_size: 96px;
 .app-folder-dialog {
   border-radius: $modal_radius*2;
   background-color: $dash_background_color;
-  padding: 12px 0px 12px 0px;
 
   & .folder-name-container {
     padding: 24px 36px 0;
@@ -56,15 +53,11 @@ $app_icon_size: 96px;
     & .folder-name-label { padding: 5px 7px; color: $osd_fg_color; }
 
     & .edit-folder-button {
-      @include button(undecorated);
+      @extend %button;
+      padding: 0;
       width: 36px;
       height: 36px;
-      border-radius: 18px;
-
-      &:focus {@include button(focus);}
-      &:hover {@include button(hover);}
-      &:active {@include button(active);}
-
+      border-radius: 99px;
       & > StIcon { icon-size: $base_icon_size }
     }
   }
@@ -85,8 +78,8 @@ $app_icon_size: 96px;
 
 .app-folder-dialog-container {
   padding: $base_padding*2;
-  width: 620px;
-  height: 620px;
+  width: 640px;
+  height: 640px;
 }
 
 // Running app indicator (also shown in dash)
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dash.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dash.scss
index ac14cff1..94e3257e 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dash.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_dash.scss
@@ -8,7 +8,7 @@ $dash_border_radius: $modal_radius + $dash_padding;
 // container for the dash
 #dash {
   @extend %caption;
-  margin: 2em;
+  margin-top: $dash_padding;
 
   .placeholder {
     // background-image: url("assets/dash-placeholder.svg");
@@ -24,7 +24,7 @@ $dash_border_radius: $modal_radius + $dash_padding;
 
   // Running app indicator (also shown in app grid)
   .app-well-app-running-dot {
-    margin-bottom: 15px; // hardcoded
+    margin-bottom: 14px; // hardcoded
   }
 }
 
@@ -34,24 +34,34 @@ $dash_border_radius: $modal_radius + $dash_padding;
   border-radius: $dash_border_radius;
   padding: $dash_padding;
   spacing: $base_padding;
+  margin-bottom: $dash_padding;
 }
 
 // items on the dash
 .dash-item-container {
+  > * {margin: 0 2px;}
+  &:ltr:first-child {margin-left: 0;}
+  &:rtl:first-child {margin-right: 0;}
+
   // each app item on the dash
   .app-well-app .overview-icon {
-    margin: 0 4px;
     padding: $base_padding;
   }
 
   // show apps button
   .show-apps { @include overview_icon($osd_fg_color);}
+
+  .show-apps, .app-well-app {
+    padding-bottom: $dash_padding;
+  }
 }
 
 // separator between favourites and running apps
 .dash-separator {
   width: 1px;
+  margin: 0 $base_margin;
   background-color: $borders_color;
+  margin-bottom: $dash_padding;
 }
 
 // OSD Tooltip
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss
index ac2e8efe..7f93e817 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_message-list.scss
@@ -3,7 +3,7 @@
 
 // main list
 .message-list {
-  width: 32em;
+  width: 29em;
   border: solid $borders_color;
 
   // padding and margins to account for scrollbar
@@ -67,11 +67,9 @@
   // icon container
   .message-icon-bin {
     padding: ($base_padding * 3);
-    padding-right:$base_padding;
 
-    &:rtl {
-      padding-right:$base_padding;
-    }
+    &:ltr {padding-right:$base_padding;}
+    &:rtl {padding-left:$base_padding;}
 
     // icon size and color
     > StIcon {
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_popovers.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_popovers.scss
index fd5a02d4..08ad3246 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_popovers.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_popovers.scss
@@ -2,7 +2,7 @@
 
 // the popover itself
 .popup-menu-boxpointer {
-  margin: $base_margin; // used as distance from the screen edge
+  -arrow-rise: $base_margin+2px; // distance from the panel & screen edge
 }
 
 // container of the popover menu
@@ -12,7 +12,6 @@
 
   //.popup-status-menu-item {font-weight: normal;  color: pink;} //dunno what that is
   &.panel-menu {
-    -boxpointer-gap: $base_margin+2px; // distance from the panel
     margin-bottom: 1.75em; // so it doesn't touch the bottom of the screen
   }
 }
@@ -20,7 +19,6 @@
 // popover content
 .popup-menu-content {
   padding: $base_padding;
-  // account for margin oddities
   border-radius: $modal_radius - 2px;
   border: 1px solid $borders_edge;
   box-shadow: 0 2px 4px 0 rgba(0,0,0,0.1);
@@ -31,9 +29,13 @@
 .popup-menu-item {
   padding: $base_padding*1.5 $base_padding*2;
   border-radius: $base_border_radius;
+  spacing: $base_padding;
   transition: 0.2s all ease;
   background-color: transparent;
 
+  &:ltr {padding-left: $base_padding;}
+  &:rtl {padding-right: $base_padding;}
+
   &:focus, &:hover {
    background-color: $hover_bg_color !important;
    &:active { background-color: $active_bg_color !important;}
@@ -55,6 +57,12 @@
   }
 
   &:insensitive {color: transparentize($fg_color,0.5);}
+
+  // add margin to switches in menu items
+  .toggle-switch {
+    &:ltr { margin-left: $base_margin;}
+    &:rtl { margin-right: $base_margin;}
+  }
 }
 
 
@@ -71,8 +79,6 @@
 }
 
 .popup-menu-arrow {
-  &:ltr {margin-right: $base_margin;}
-  &:rtl {margin-left: $base_margin;}
 }
 
 
@@ -104,7 +110,7 @@
 
   .popup-menu-section {
     .popup-menu-item:last-child {
-      &:hover,&:focus {border-radius: 0;}
+      &:hover,&:focus { border-radius: 0;}
     }
     &:last-child .popup-menu-item:last-child {
       border-radius: 0 0 $base_border_radius $base_border_radius;
@@ -118,14 +124,16 @@
   width: 1.2em;
   text-align: center !important;
 
-  &:ltr {text-align: right;};
-  &:rtl {text-align: left;};
+  &:ltr { text-align: right;}
+  &:rtl { text-align: left;}
 }
 
 // separator
 .popup-separator-menu-item {
-  padding:0;
   margin: 6px 0;
+  padding:0 !important;
+  &:ltr { margin-right: $base_margin;}
+  &:rtl { margin-left: $base_margin;}
 
   .popup-separator-menu-item-separator {
     height: 1px; //not really the whole box
@@ -136,11 +144,14 @@
     width: 0 !important;
   }
 
+  // separators in submenus
   .popup-sub-menu & {
-    padding: 0;
-    margin-right: 2.5em !important; // account for ornament
     background-color: transparent;
 
+    // account for ornament
+    &:ltr { margin-right: 2.5em;}
+    &:rtl { margin-left: 2.5em;}
+
     .popup-separator-menu-item-separator {
       background-color: lighten($borders_color, 7%);
     }
@@ -149,7 +160,7 @@
 
 // desktop background menu
 .background-menu {
-  -boxpointer-gap: $base_margin;
+  -boxpointer-gap: 0px;
   -arrow-rise: 0px; // hide the beak on the menu
 }
 
@@ -170,19 +181,14 @@
   // account for ornaments in submenus with padding
   .popup-sub-menu .popup-menu-item > :first-child {
     // this value is hardcoded for visual effect
-    &:ltr { margin-left: $base_margin*2;}
-    &:rtl { margin-right: $base_margin*2;}
+    &:ltr { margin-left: 1em;}
+    &:rtl { margin-right: 1em;}
   }
 }
 
 // right-click (and panel) app menu
 .app-menu {
   max-width: 27.25em;
-  .popup-menu-content { margin: $base_margin;}
-
-  &.panel-menu {
-    .popup-menu-content { margin: 0;} // avoid doubling up margin
-  }
 
   // this is unneeded at the top-level in this menu, hide it
   .popup-menu-ornament { width: 0 !important; }
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-results.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-results.scss
index 4ad3f082..644c53db 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-results.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_search-results.scss
@@ -1,15 +1,18 @@
 /* Search */
 
 // search overview container
+#searchResults {
+  margin: 0 $base_margin;
+}
+
 #searchResultsContent {
-  max-width: 1024px;
-  spacing: $base_margin * 2;
+  max-width: 1072px;
 }
 
 // search results sections "the boxes"
 .search-section {
   // This should be equal to #searchResultsContent spacing
-  spacing: $base_margin * 2;
+  spacing: $base_padding*3;
 
   // separator (unstyled)
   .search-section-separator { 
@@ -23,27 +26,24 @@
   background-color: lighten($system_bg_color, 5%);
   border-radius: $modal_radius*1.5;
   border: 1px solid $osd_outer_borders_color;
-  box-shadow: none;
-  text-shadow: none;
   color: $osd_fg_color;
   padding: $base_padding*2;
-  margin: $base_margin;
-  // This is the space between the provider icon and the results container
+  margin:0 $base_margin*3;
 }
 
 %search_section_content_item {
   @include tile_button($osd_fg_color);
-  margin: $base_margin;
-  border-radius: $base_border_radius !important;
+  border-radius: $base_border_radius+3px;
 }
 
 // "no results" text
 .search-statustext {
-  @extend %large_title;
+  @extend %title_1;
 }
 
 .grid-search-results {
-  spacing: $base_padding * 6;
+  spacing: $base_padding*5;
+  margin:0 $base_margin*3;
 }
 
 // Search results with icons
@@ -54,6 +54,8 @@
 // search result provider
 .search-provider-icon {
   @extend %search_section_content_item;
+  &:ltr {margin-right: $base_margin;}
+  &:rtl {margin-left: $base_margin;}
 
   // content
   .list-search-provider-content {
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_switcher-popup.scss b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_switcher-popup.scss
index 892d3351..cec6c9aa 100644
--- a/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_switcher-popup.scss
+++ b/src/themes/Kali/sass/gnome-shell/upstream/gnome-shell-sass/widgets/_switcher-popup.scss
@@ -25,8 +25,9 @@ $switcher_border_radius: $modal_radius + 8px;
 
   // each item in the list
   .item-box {
-
     @include tile_button($osd_fg_color);
+    // override over style so mouse doesn't steal focus
+    &:hover {background: none;}
   }
 
   .separator {
diff --git a/src/themes/Kali/sass/gnome-shell/upstream/sync.sh b/src/themes/Kali/sass/gnome-shell/upstream/sync.sh
index f986628b..2892a1ac 100755
--- a/src/themes/Kali/sass/gnome-shell/upstream/sync.sh
+++ b/src/themes/Kali/sass/gnome-shell/upstream/sync.sh
@@ -4,7 +4,7 @@ GREEN='\033[0;32m'
 YELLOW='\033[0;33m'
 RESET='\033[0m'
 
-VERSION=6b60a189fded722ae37a7d3e94d51a509a7d2df1
+VERSION=42.rc
 
 echo
 printf " $YELLOW[ i ]$RESET Upstream version $VERSION\n"