diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml
index d47349432..0d90fcabe 100644
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@@ -25,8 +25,6 @@
     <file>page-indicator-checked.svg</file>
     <file>page-indicator-hover.svg</file>
     <file>panel-button-border.svg</file>
-    <file>panel-button-highlight-narrow.svg</file>
-    <file>panel-button-highlight-wide.svg</file>
     <file>process-working.svg</file>
     <file>running-indicator.svg</file>
     <file>source-button-border.svg</file>
diff --git a/data/theme/_common.scss b/data/theme/_common.scss
index e0b45d7cf..eff7cb587 100644
--- a/data/theme/_common.scss
+++ b/data/theme/_common.scss
@@ -478,11 +478,6 @@ StScrollBar {
       height: 24px;
     }
     
-    .overview-icon {
-      &:hover {
-        background-color: transparentize($osd_bg_color,0.6);
-      }
-    }
   }
   
   .dash-label { //osd tooltip
@@ -531,14 +526,20 @@ StScrollBar {
     & > .overview-icon { 
       @extend %icon_tile;
     }
+    &.running > .overview-icon {
+      text-shadow: black 0px 2px 2px;
+    }
     &:active > .overview-icon, 
     &:checked > .overview-icon {
       background-color: transparentize($osd_bg_color,.1);
     }
     &:hover > .overview-icon, 
+    &.running:hover > .overview-icon,
     &:focus > .overview-icon, 
     &:selected > .overview-icon { 
-      background-color: transparentize($osd_bg_color,.5); 
+      background-color: transparentize($osd_bg_color,.5);
+      border-image: none;
+      background-image: none;
     }
     
   }
@@ -551,10 +552,6 @@ StScrollBar {
     text-align: center;
   }
   
-  .app-well-app.running > .overview-icon {
-    text-shadow: black 0px 2px 2px;
-    border-image: url("panel-button-border.svg") 6 10 0 2; //fixme needs to not be blurry and a little narrower
-  }
   .app-well-app.app-folder > .overview-icon {
     background-color: transparentize($osd_bg_color,.6);
   }
diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index fef366b4b..674f5f2e9 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -1703,8 +1703,6 @@ StScrollBar {
   #dash .empty-dash-drop-target {
     width: 24px;
     height: 24px; }
-  #dash .overview-icon:hover {
-    background-color: rgba(46, 52, 54, 0.4); }
 
 .dash-label {
   border-radius: 7px;
@@ -1747,20 +1745,28 @@ StScrollBar {
 .list-search-result:hover {
   background-color: rgba(46, 52, 54, 0.5); }
 
+.app-well-app.running > .overview-icon,
+.show-apps.running > .overview-icon,
+.grid-search-result.running > .overview-icon {
+  text-shadow: black 0px 2px 2px; }
 .app-well-app:active > .overview-icon, .app-well-app:checked > .overview-icon,
 .show-apps:active > .overview-icon,
 .show-apps:checked > .overview-icon,
 .grid-search-result:active > .overview-icon,
 .grid-search-result:checked > .overview-icon {
   background-color: rgba(46, 52, 54, 0.9); }
-.app-well-app:hover > .overview-icon, .app-well-app:focus > .overview-icon, .app-well-app:selected > .overview-icon,
+.app-well-app:hover > .overview-icon, .app-well-app.running:hover > .overview-icon, .app-well-app:focus > .overview-icon, .app-well-app:selected > .overview-icon,
 .show-apps:hover > .overview-icon,
+.show-apps.running:hover > .overview-icon,
 .show-apps:focus > .overview-icon,
 .show-apps:selected > .overview-icon,
 .grid-search-result:hover > .overview-icon,
+.grid-search-result.running:hover > .overview-icon,
 .grid-search-result:focus > .overview-icon,
 .grid-search-result:selected > .overview-icon {
-  background-color: rgba(46, 52, 54, 0.5); }
+  background-color: rgba(46, 52, 54, 0.5);
+  border-image: none;
+  background-image: none; }
 
 .search-provider-icon,
 .list-search-result, .app-well-app > .overview-icon,
@@ -1772,10 +1778,6 @@ StScrollBar {
   transition-duration: 100ms;
   text-align: center; }
 
-.app-well-app.running > .overview-icon {
-  text-shadow: black 0px 2px 2px;
-  border-image: url("panel-button-border.svg") 6 10 0 2; }
-
 .app-well-app.app-folder > .overview-icon {
   background-color: rgba(46, 52, 54, 0.4); }