diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index fae642994..e43b9c093 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -1094,13 +1094,11 @@ StScrollBar {
   padding-bottom: 32px; }
 
 .window-picker {
-  -horizontal-spacing: 32px;
-  -vertical-spacing: 32px;
-  padding-left: 32px;
-  padding-right: 32px;
-  padding-bottom: 48px; }
+  -horizontal-spacing: 16px;
+  -vertical-spacing: 16px;
+  padding: 0 16px 16px; }
   .window-picker.external-monitor {
-    padding: 32px; }
+    padding: 16px; }
 
 .window-clone-border {
   border: 4px solid #215d9c;
diff --git a/data/theme/gnome-shell-sass b/data/theme/gnome-shell-sass
index d0f74b58c..b178ba1d9 160000
--- a/data/theme/gnome-shell-sass
+++ b/data/theme/gnome-shell-sass
@@ -1 +1 @@
-Subproject commit d0f74b58c31ef48caa93ae8d378f88903ac0e854
+Subproject commit b178ba1d9d090e269b898952fd5a79c54ddc6f75
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index c2e62b198..c57fae711 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -1094,13 +1094,11 @@ StScrollBar {
   padding-bottom: 32px; }
 
 .window-picker {
-  -horizontal-spacing: 32px;
-  -vertical-spacing: 32px;
-  padding-left: 32px;
-  padding-right: 32px;
-  padding-bottom: 48px; }
+  -horizontal-spacing: 16px;
+  -vertical-spacing: 16px;
+  padding: 0 16px 16px; }
   .window-picker.external-monitor {
-    padding: 32px; }
+    padding: 16px; }
 
 .window-clone-border {
   border: 4px solid #215d9c;