diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index 44072c354..36835d9f3 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -74,6 +74,10 @@ StEntry {
     color: #7f7f7f;
     border-color: #0d0d0d;
     box-shadow: none; }
+  StEntry StIcon.capslock-warning {
+    icon-size: 16px;
+    warning-color: #f57900;
+    padding: 0 4px; }
 
 /* Scrollbars */
 StScrollBar {
@@ -115,11 +119,11 @@ StScrollBar {
   width: 24px;
   height: 22px;
   background-image: url("resource:///org/gnome/shell/theme/checkbox-off.svg"); }
-.check-box:focus Stbin {
+.check-box:focus StBin {
   background-image: url("resource:///org/gnome/shell/theme/checkbox-off-focused.svg"); }
-.check-box:checked Stbin {
+.check-box:checked StBin {
   background-image: url("resource:///org/gnome/shell/theme/checkbox.svg"); }
-.check-box:focus:checked Stbin {
+.check-box:focus:checked StBin {
   background-image: url("resource:///org/gnome/shell/theme/checkbox-focused.svg"); }
 
 /* Switches */
diff --git a/data/theme/gnome-shell-sass b/data/theme/gnome-shell-sass
index 943f849e3..099f3d318 160000
--- a/data/theme/gnome-shell-sass
+++ b/data/theme/gnome-shell-sass
@@ -1 +1 @@
-Subproject commit 943f849e3da047bc7b8b8cd24eded1bede35199d
+Subproject commit 099f3d31813ce1f30c30c14f168a8af2e6cd4904
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 113d265da..04055a717 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -74,6 +74,10 @@ StEntry {
     color: #939695;
     border-color: #323636;
     box-shadow: none; }
+  StEntry StIcon.capslock-warning {
+    icon-size: 16px;
+    warning-color: #f57900;
+    padding: 0 4px; }
 
 /* Scrollbars */
 StScrollBar {
@@ -115,11 +119,11 @@ StScrollBar {
   width: 24px;
   height: 22px;
   background-image: url("resource:///org/gnome/shell/theme/checkbox-off.svg"); }
-.check-box:focus Stbin {
+.check-box:focus StBin {
   background-image: url("resource:///org/gnome/shell/theme/checkbox-off-focused.svg"); }
-.check-box:checked Stbin {
+.check-box:checked StBin {
   background-image: url("resource:///org/gnome/shell/theme/checkbox.svg"); }
-.check-box:focus:checked Stbin {
+.check-box:focus:checked StBin {
   background-image: url("resource:///org/gnome/shell/theme/checkbox-focused.svg"); }
 
 /* Switches */