diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index 2ed0fd11f..4644e84c1 100644
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -736,7 +736,7 @@ StScrollBar {
     #panel.solid .panel-button {
       color: #ccc;
       text-shadow: none; }
-      #panel.solid .panel-button:hover {
+      #panel.solid .panel-button:hover, #panel.solid .panel-button:active, #panel.solid .panel-button:overview, #panel.solid .panel-button:focus, #panel.solid .panel-button:checked {
         color: white; }
     #panel.solid .system-status-icon,
     #panel.solid .app-menu-icon > StIcon,
diff --git a/data/theme/gnome-shell-sass b/data/theme/gnome-shell-sass
index 043f03aca..d509706ff 160000
--- a/data/theme/gnome-shell-sass
+++ b/data/theme/gnome-shell-sass
@@ -1 +1 @@
-Subproject commit 043f03aca1684d9eca5df4aac43646c8f379f174
+Subproject commit d509706ff45800e1c15166d8f803577abfe9f240
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 97e9a4eda..31467b7e7 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -736,7 +736,7 @@ StScrollBar {
     #panel.solid .panel-button {
       color: #ccc;
       text-shadow: none; }
-      #panel.solid .panel-button:hover {
+      #panel.solid .panel-button:hover, #panel.solid .panel-button:active, #panel.solid .panel-button:overview, #panel.solid .panel-button:focus, #panel.solid .panel-button:checked {
         color: white; }
     #panel.solid .system-status-icon,
     #panel.solid .app-menu-icon > StIcon,