diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index b93f6f942..43a50d095 100644
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -263,7 +263,7 @@ StScrollBar {
     -panel-corner-border-width: 2px;
     -panel-corner-border-color: transparent; 
     
-    &:active, &:overview, &:focus { -panel-corner-border-color: transparentize($fg_color, 0.1); }
+    &:active, &:overview, &:focus { -panel-corner-border-color: #729fcf; } //fixed due to SVG image-border
     &.lock-screen, &.login-screen, &unlock-screen {
       -panel-corner-radius: 0;
       -panel-corner-background-color: transparent;
@@ -296,8 +296,7 @@ StScrollBar {
     
     &:active, &:overview, &:focus, &:checked {
       border-image: url("panel-button-border.svg") 6 10 0 2;
-      background-image: url("panel-button-highlight-wide.svg");
-      color: white;
+      color: lighten($fg_color,10%);
       text-shadow: black 0px 2px 2px;
       
       & > .system-status-icon { icon-shadow: black 0 2px 2px; }
@@ -315,7 +314,7 @@ StScrollBar {
   .panel-status-button {
   
     &:active, &:overview, &:focus, &:checked {
-      background-image: url("panel-button-highlight-narrow.svg");
+      border-image: url("panel-button-border.svg") 6 10 0 2;
     }
   }
   
@@ -328,6 +327,8 @@ StScrollBar {
   .screencast-indicator { color: $warning_color; }
 }
 
+  // a little unstructured mess:
+
   .system-switch-user-submenu-icon {
     icon-size: 24px;
     border: 1px solid transparentize($fg_color,0.6);
@@ -336,6 +337,7 @@ StScrollBar {
   #appMenu {
     spinner-image: url("process-working.svg");
     spacing: 4px;
+    
     .label-shadow { color: transparentize(#000,0.5); }
   }
   
@@ -360,9 +362,6 @@ StScrollBar {
     
     & > StIcon { icon-size: 16px; }
   }
-  .system0switch-user0submenu-icon { } //FIXME, what's this?
-  
-
 
 // not really top bar only
 .popup-menu-arrow { width: 16px; height: 16px; }
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 00b897de3..56724110d 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -1861,7 +1861,7 @@ StScrollBar {
     -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-corner-border-color: #729fcf; }
     #panel .panel-corner.lock-screen, #panel .panel-corner.login-screen, #panel .panel-cornerunlock-screen {
       -panel-corner-radius: 0;
       -panel-corner-background-color: transparent;
@@ -1881,7 +1881,6 @@ StScrollBar {
       text-shadow: black 0 2px 2px; }
     #panel .panel-button:active, #panel .panel-button:overview, #panel .panel-button:focus, #panel .panel-button:checked {
       border-image: url("panel-button-border.svg") 6 10 0 2;
-      background-image: url("panel-button-highlight-wide.svg");
       color: white;
       text-shadow: black 0px 2px 2px; }
       #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 {
@@ -1894,7 +1893,7 @@ StScrollBar {
       .unlock-screen #panel .panel-button:focus, .unlock-screen #panel .panel-button:hover, .unlock-screen #panel .panel-button:active, .login-screen #panel .panel-button:focus, .login-screen #panel .panel-button:hover, .login-screen #panel .panel-button:active, .lock-screen #panel .panel-button:focus, .lock-screen #panel .panel-button:hover, .lock-screen #panel .panel-button:active {
         color: white; }
   #panel .panel-status-button:active, #panel .panel-status-button:overview, #panel .panel-status-button:focus, #panel .panel-status-button:checked {
-    background-image: url("panel-button-highlight-narrow.svg"); }
+    border-image: url("panel-button-border.svg") 6 10 0 2; }
   #panel .panel-menu {
     -boxpointer-gap: 4px; }
   #panel .panel-status-indicators-box,
diff --git a/data/theme/panel-button-border.svg b/data/theme/panel-button-border.svg
index 48891d48d..882467345 100644
--- a/data/theme/panel-button-border.svg
+++ b/data/theme/panel-button-border.svg
@@ -13,7 +13,7 @@
    height="10"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="panel-button-border.svg">
   <defs
      id="defs4" />
@@ -25,17 +25,17 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="44.8"
-     inkscape:cx="8.6594891"
+     inkscape:cx="4.7420784"
      inkscape:cy="5.7029946"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:window-width="1440"
-     inkscape:window-height="843"
-     inkscape:window-x="0"
-     inkscape:window-y="26"
+     inkscape:window-width="2560"
+     inkscape:window-height="1402"
+     inkscape:window-x="2560"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      guidetolerance="10000"
      objecttolerance="10000">
@@ -64,7 +64,7 @@
      inkscape:groupmode="layer"
      id="layer1">
     <rect
-       style="opacity:0.8;fill:#ffffff;fill-opacity:1;stroke-width:0.43599999;stroke-miterlimit:4;stroke-dasharray:none"
+       style="opacity:1;fill:#729fcf;fill-opacity:1;stroke-width:0.43599999000000000;stroke-miterlimit:4;stroke-dasharray:none"
        id="rect3796"
        width="7"
        height="2"