diff --git a/data/gnome-classic.css b/data/gnome-classic.css
index 7e000bc5..184eee67 100644
--- a/data/gnome-classic.css
+++ b/data/gnome-classic.css
@@ -1755,6 +1755,21 @@ StScrollBar {
     background-gradient-end: #000;
     border-top-color: #000;
     border-bottom: 1px solid #000; }
+    #panel:overview .panel-button {
+      color: #fff; }
+  #panel .panel-button {
+    color: #2e3436; }
+    #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
+      background-color: #4a90d9 !important;
+      color: #ffffff !important;
+      box-shadow: none; }
+      #panel .panel-button:active > .system-status-icon, #panel .panel-button:overview > .system-status-icon, #panel .panel-button:focus > .system-status-icon, #panel .panel-button:checked > .system-status-icon {
+        icon-shadow: none; }
+  #panel .panel-corner,
+  #panel .panel-corner:active,
+  #panel .panel-corner:overview,
+  #panel .panel-corner:focus {
+    -panel-corner-radius: 0; }
 
 .tile-preview-left.on-primary,
 .tile-preview-right.on-primary,
@@ -1762,21 +1777,6 @@ StScrollBar {
   /* keep in sync with -panel-corner-radius */
   border-radius: 0; }
 
-.panel-corner,
-.panel-corner:active,
-.panel-corner:overview,
-.panel-corner:focus {
-  -panel-corner-radius: 0 !important; }
-
-.panel-button {
-  color: #2e3436 !important; }
-  .panel-button:active, .panel-button:overview, .panel-button:focus, .panel-button:checked {
-    background-color: #4a90d9 !important;
-    color: #ffffff !important;
-    box-shadow: none; }
-    .panel-button:active > .system-status-icon, .panel-button:overview > .system-status-icon, .panel-button:focus > .system-status-icon, .panel-button:checked > .system-status-icon {
-      icon-shadow: none; }
-
 .toggle-switch-us {
   background-image: url("classic-toggle-off-us.svg"); }
   .toggle-switch-us:checked {
diff --git a/data/gnome-classic.scss b/data/gnome-classic.scss
index 78de8207..d7d065b4 100644
--- a/data/gnome-classic.scss
+++ b/data/gnome-classic.scss
@@ -22,6 +22,26 @@ $variant: 'light';
     background-gradient-end: #000;
     border-top-color: #000;
     border-bottom: 1px solid #000;
+    .panel-button { color: #fff; }
+  }
+
+  .panel-button {
+    color: $fg_color;
+    &:active, &:overview, &:focus, &:checked {
+      // Trick due to St limitations. It needs a background to draw
+      // a box-shadow
+      background-color: $selected_bg_color !important;
+      color: $selected_fg_color !important;
+      box-shadow: none;
+      & > .system-status-icon { icon-shadow: none; }
+    }
+  }
+  
+  .panel-corner,
+  .panel-corner:active,
+  .panel-corner:overview,
+  .panel-corner:focus {
+      -panel-corner-radius: 0;
   }
 }
 
@@ -32,24 +52,7 @@ $variant: 'light';
     border-radius: 0;
 }
 
-.panel-corner,
-.panel-corner:active,
-.panel-corner:overview,
-.panel-corner:focus {
-    -panel-corner-radius: 0 !important;
-}
 
-.panel-button {
-  color: $fg_color !important;
-  &:active, &:overview, &:focus, &:checked {
-    // Trick due to St limitations. It needs a background to draw
-    // a box-shadow
-    background-color: $selected_bg_color !important;
-    color: $selected_fg_color !important;
-    box-shadow: none;
-    & > .system-status-icon { icon-shadow: none; }
-  }
-}
 
 @each $v in us, intl {
   .toggle-switch-#{$v} {