diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index a30f404ec..f56a712a8 100644
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -196,6 +196,34 @@ StScrollBar {
 
 /* TOP BAR */
 
+#panel {
+  background-color: black;
+  font-weight: bold;
+  height: 1.86em;
+  &.unlock-screen,
+  &.login-screen { background-color: transparent; }
+
+  #panelLeft, #panelCenter { // spacing between activities<>app menu and such
+    spacing: 4px;
+  }
+  
+  .panel-corner {
+    -panel-corner-radius: 6px;
+    -panel-corner-background-color: black;
+    -panel-corner-border-width: 2px;
+    -panel-corner-border-color: transparent; 
+    
+    &:active, &:overview, &:focus { -panel-corner-border-color: transparentize($fg_color, 0.1); }
+    &.lock-screen, &.login-screen, &unlock-screen {
+      -panel-corner-radius: 0;
+      -panel-corner-background-color: transparent;
+      -panel-corner-border-color: transparent;
+    }
+  }
+  
+}
+
+
 // not really top bar only
 .popup-menu-arrow { width: 16px; height: 16px; }
 .popup-menu-icon { icon-size: 1.09em; }
diff --git a/data/theme/_gnome-shell-old.scss b/data/theme/_gnome-shell-old.scss
index 2f9a7602b..e161d496d 100644
--- a/data/theme/_gnome-shell-old.scss
+++ b/data/theme/_gnome-shell-old.scss
@@ -193,57 +193,6 @@
 
 /* Panel */
 
-#panel {
-    background-color: black;
-    font-weight: bold;
-    height: 1.86em;
-}
-
-#panel.unlock-screen,
-#panel.login-screen {
-    background-color: transparent;
-}
-
-#panelLeft, #panelCenter {
-    spacing: 4px;
-}
-
-#panelLeft:ltr {
-    padding-right: 4px;
-}
-
-#panelLeft:rtl {
-    padding-left: 4px;
-}
-
-#panelRight:ltr {
-    padding-left: 4px;
-}
-
-#panelRight:rtl {
-    padding-right: 4px;
-}
-
-.panel-corner {
-    -panel-corner-radius: 6px;
-    -panel-corner-background-color: black;
-    -panel-corner-border-width: 2px;
-    -panel-corner-border-color: transparent;
-}
-
-.panel-corner:active,
-.panel-corner:overview,
-.panel-corner:focus {
-    -panel-corner-border-color: rgba(255,255,255,0.8);
-}
-
-.panel-corner.lock-screen,
-.panel-corner.unlock-screen,
-.panel-corner.login-screen {
-    -panel-corner-background-color: transparent;
-    -panel-corner-border-color: transparent;
-}
-
 #appMenu {
     spinner-image: url("process-working.svg");
     spacing: 4px;
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 014a79252..d174fac40 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -147,47 +147,6 @@
   spacing: 12px; }
 
 /* Panel */
-#panel {
-  background-color: black;
-  font-weight: bold;
-  height: 1.86em; }
-
-#panel.unlock-screen,
-#panel.login-screen {
-  background-color: transparent; }
-
-#panelLeft, #panelCenter {
-  spacing: 4px; }
-
-#panelLeft:ltr {
-  padding-right: 4px; }
-
-#panelLeft:rtl {
-  padding-left: 4px; }
-
-#panelRight:ltr {
-  padding-left: 4px; }
-
-#panelRight:rtl {
-  padding-right: 4px; }
-
-.panel-corner {
-  -panel-corner-radius: 6px;
-  -panel-corner-background-color: black;
-  -panel-corner-border-width: 2px;
-  -panel-corner-border-color: transparent; }
-
-.panel-corner:active,
-.panel-corner:overview,
-.panel-corner:focus {
-  -panel-corner-border-color: rgba(255, 255, 255, 0.8); }
-
-.panel-corner.lock-screen,
-.panel-corner.unlock-screen,
-.panel-corner.login-screen {
-  -panel-corner-background-color: transparent;
-  -panel-corner-border-color: transparent; }
-
 #appMenu {
   spinner-image: url("process-working.svg");
   spacing: 4px; }
@@ -2027,6 +1986,26 @@ StScrollBar {
   app menu inside the main app window itself rather than the top bar
 */
 /* TOP BAR */
+#panel {
+  background-color: black;
+  font-weight: bold;
+  height: 1.86em; }
+  #panel.unlock-screen, #panel.login-screen {
+    background-color: transparent; }
+  #panel #panelLeft, #panel #panelCenter {
+    spacing: 4px; }
+  #panel .panel-corner {
+    -panel-corner-radius: 6px;
+    -panel-corner-background-color: black;
+    -panel-corner-border-width: 2px;
+    -panel-corner-border-color: transparent; }
+    #panel .panel-corner:active, #panel .panel-corner:overview, #panel .panel-corner:focus {
+      -panel-corner-border-color: rgba(238, 238, 236, 0.9); }
+    #panel .panel-corner.lock-screen, #panel .panel-corner.login-screen, #panel .panel-cornerunlock-screen {
+      -panel-corner-radius: 0;
+      -panel-corner-background-color: transparent;
+      -panel-corner-border-color: transparent; }
+
 .popup-menu-arrow {
   width: 16px;
   height: 16px; }