diff --git a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
index 8f0d72d3..bf9ae41b 100644
--- a/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Dark/gnome-shell/gnome-shell.css
@@ -309,8 +309,11 @@ StScrollBar {
   border-bottom: 1px solid rgba(13, 14, 17, 0.8); }
 
 .popup-menu-ornament {
-  text-align: right;
   width: 1.2em; }
+  .popup-menu-ornament:ltr {
+    text-align: right; }
+  .popup-menu-ornament:rtl {
+    text-align: left; }
 
 .popup-separator-menu-item {
   padding: 0; }
@@ -588,8 +591,11 @@ StScrollBar {
     font-weight: bold;
     color: #eeeeec;
     font-feature-settings: "tnum";
-    font-size: 11pt;
-    text-align: right; }
+    font-size: 11pt; }
+    .world-clocks-button .world-clocks-time:ltr {
+      text-align: right; }
+    .world-clocks-button .world-clocks-time:rtl {
+      text-align: left; }
   .world-clocks-button .world-clocks-timezone {
     color: #bebeb6;
     font-feature-settings: "tnum";
@@ -722,9 +728,12 @@ StScrollBar {
     .message .message-secondary-bin > .event-time {
       color: rgba(238, 238, 236, 0.5);
       font-size: 9pt;
-      text-align: right;
       /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
       padding-bottom: 0.13em; }
+      .message .message-secondary-bin > .event-time:ltr {
+        text-align: right; }
+      .message .message-secondary-bin > .event-time:rtl {
+        text-align: left; }
   .message .message-close-button {
     color: white; }
     .message .message-close-button:hover {
@@ -1340,7 +1349,7 @@ StScrollBar {
 .icon-grid {
   -shell-grid-horizontal-item-size: 144px;
   -shell-grid-vertical-item-size: 144px;
-  spacing: 36px; }
+  spacing: 24px; }
   .icon-grid .overview-icon {
     icon-size: 96px; }
 
@@ -2014,12 +2023,13 @@ StScrollBar {
 .user-widget.horizontal .user-widget-label {
   font-size: 13pt;
   font-weight: bold;
-  text-align: left;
   padding-left: 15px; }
   .user-widget.horizontal .user-widget-label:ltr {
-    padding-left: 14px; }
+    padding-left: 14px;
+    text-align: left; }
   .user-widget.horizontal .user-widget-label:rtl {
-    padding-right: 14px; }
+    padding-right: 14px;
+    text-align: right; }
 
 .user-widget.vertical .user-widget-label {
   font-size: 16pt;
diff --git a/share/themes/Kali-Light/gnome-shell/gnome-shell.css b/share/themes/Kali-Light/gnome-shell/gnome-shell.css
index d2ed3fcf..6e5645f8 100644
--- a/share/themes/Kali-Light/gnome-shell/gnome-shell.css
+++ b/share/themes/Kali-Light/gnome-shell/gnome-shell.css
@@ -309,8 +309,11 @@ StScrollBar {
   border-bottom: 1px solid rgba(217, 217, 217, 0.8); }
 
 .popup-menu-ornament {
-  text-align: right;
   width: 1.2em; }
+  .popup-menu-ornament:ltr {
+    text-align: right; }
+  .popup-menu-ornament:rtl {
+    text-align: left; }
 
 .popup-separator-menu-item {
   padding: 0; }
@@ -587,8 +590,11 @@ StScrollBar {
     font-weight: bold;
     color: #5c616c;
     font-feature-settings: "tnum";
-    font-size: 11pt;
-    text-align: right; }
+    font-size: 11pt; }
+    .world-clocks-button .world-clocks-time:ltr {
+      text-align: right; }
+    .world-clocks-button .world-clocks-time:rtl {
+      text-align: left; }
   .world-clocks-button .world-clocks-timezone {
     color: #2d3035;
     font-feature-settings: "tnum";
@@ -721,9 +727,12 @@ StScrollBar {
     .message .message-secondary-bin > .event-time {
       color: rgba(92, 97, 108, 0.5);
       font-size: 9pt;
-      text-align: right;
       /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
       padding-bottom: 0.13em; }
+      .message .message-secondary-bin > .event-time:ltr {
+        text-align: right; }
+      .message .message-secondary-bin > .event-time:rtl {
+        text-align: left; }
   .message .message-close-button {
     color: #818794; }
     .message .message-close-button:hover {
@@ -1339,7 +1348,7 @@ StScrollBar {
 .icon-grid {
   -shell-grid-horizontal-item-size: 144px;
   -shell-grid-vertical-item-size: 144px;
-  spacing: 36px; }
+  spacing: 24px; }
   .icon-grid .overview-icon {
     icon-size: 96px; }
 
@@ -2010,12 +2019,13 @@ StScrollBar {
 .user-widget.horizontal .user-widget-label {
   font-size: 13pt;
   font-weight: bold;
-  text-align: left;
   padding-left: 15px; }
   .user-widget.horizontal .user-widget-label:ltr {
-    padding-left: 14px; }
+    padding-left: 14px;
+    text-align: left; }
   .user-widget.horizontal .user-widget-label:rtl {
-    padding-right: 14px; }
+    padding-right: 14px;
+    text-align: right; }
 
 .user-widget.vertical .user-widget-label {
   font-size: 16pt;
diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_app-grid.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_app-grid.scss
index 1d2e135b..3a040369 100644
--- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_app-grid.scss
+++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_app-grid.scss
@@ -7,7 +7,7 @@ $app_icon_padding: 24px;
 .icon-grid {
   -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 * 6;
+  spacing: $base_spacing * 4;
 
   .overview-icon {
     icon-size: $app_icon_size;
diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_calendar.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_calendar.scss
index 1c2cb2fb..950d25e2 100644
--- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_calendar.scss
+++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_calendar.scss
@@ -206,7 +206,9 @@
     color: $fg_color;
     font-feature-settings: "tnum";
     @include fontsize($base_font_size);
-    text-align: right;
+
+    &:ltr { text-align: right; }
+    &:rtl { text-align: left; }
   }
 
   // timezone offset label
diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_login-dialog.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_login-dialog.scss
index 0b148bea..06fdcf25 100644
--- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_login-dialog.scss
+++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_login-dialog.scss
@@ -138,11 +138,10 @@
 .user-widget.horizontal .user-widget-label {
   @include fontsize($base_font_size + 2);
   font-weight: bold;
-  text-align: left;
   padding-left: 15px;
 
-  &:ltr { padding-left: 14px; }
-  &:rtl { padding-right: 14px; }
+  &:ltr { padding-left: 14px; text-align: left; }
+  &:rtl { padding-right: 14px; text-align: right; }
 }
 
 .user-widget.vertical .user-widget-label {
diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_message-list.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_message-list.scss
index e6a4d92b..45edb26b 100644
--- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_message-list.scss
+++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_message-list.scss
@@ -71,9 +71,11 @@
     > .event-time {
       color: transparentize($fg_color, 0.5);
       @include fontsize($base_font_size - 2);
-      text-align: right;
       /* HACK: the label should be baseline-aligned with a 1em label, fake this with some bottom padding */
       padding-bottom: 0.13em;
+
+      &:ltr { text-align: right };
+      &:rtl { text-align: left };
     }
   }
 
diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_popovers.scss b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_popovers.scss
index a693f150..db9df9aa 100644
--- a/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_popovers.scss
+++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/gnome-shell-sass/widgets/_popovers.scss
@@ -76,8 +76,10 @@ $popover_arrow_height: 12px;
 
 // container for radio and check boxes
 .popup-menu-ornament {
-  text-align: right;
   width: 1.2em;
+
+  &:ltr { text-align: right };
+  &:rtl { text-align: left };
 }
 
 // separator
diff --git a/src/themes/Kali/sass/gnome-shell-sass/upstream/sync.sh b/src/themes/Kali/sass/gnome-shell-sass/upstream/sync.sh
index 0df9c54d..deef4a99 100755
--- a/src/themes/Kali/sass/gnome-shell-sass/upstream/sync.sh
+++ b/src/themes/Kali/sass/gnome-shell-sass/upstream/sync.sh
@@ -4,7 +4,7 @@ GREEN='\033[0;32m'
 YELLOW='\033[0;33m'
 RESET='\033[0m'
 
-VERSION=3.36.4
+VERSION=3.36.5
 
 echo
 echo -e " $YELLOW[ i ]$RESET Upstream version $VERSION"