diff --git a/gtk-3.0/apps/_nemo.scss b/gtk-3.0/apps/_nemo.scss
index 39abdc8..cd59f59 100644
--- a/gtk-3.0/apps/_nemo.scss
+++ b/gtk-3.0/apps/_nemo.scss
@@ -51,7 +51,10 @@
             margin-top: 5px;
             margin-bottom: 5px;
             min-height: 24px;
-            &:hover { color: $selected_bg_color; }
+            &:hover { 
+                background: transparent;
+                color: $selected_bg_color; 
+            }
             &:selected,
             &:active,
             &:checked { @include button(active-header); }
diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
index ec87a84..a3488d4 100755
--- a/gtk-3.0/gtk-dark.css
+++ b/gtk-3.0/gtk-dark.css
@@ -987,8 +987,18 @@ button:backdrop {
   border-width: 1px; }
 
 .primary-toolbar
+button, .primary-toolbar .raised
 button {
   -gtk-icon-shadow: none; }
+  .primary-toolbar
+  button:hover, .primary-toolbar
+  button:focus, .primary-toolbar .raised
+  button:hover, .primary-toolbar .raised
+  button:focus {
+    color: #fefefe;
+    outline-color: rgba(254, 254, 254, 0.3);
+    background-color: #f7b922;
+    text-shadow: none; }
 
 .stack-switcher > button.needs-attention > label,
 .stack-switcher > button.needs-attention > image, stacksidebar row.needs-attention > label {
@@ -6449,6 +6459,7 @@ ConversationListView {
     margin-bottom: 5px;
     min-height: 24px; }
     .nemo-window toolbar.primary-toolbar button:hover {
+      background: transparent;
       color: #f7b922; }
     .nemo-window toolbar.primary-toolbar button:selected, .nemo-window toolbar.primary-toolbar button:active, .nemo-window toolbar.primary-toolbar button:checked {
       border-radius: 23px;
diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 9620cdd..6fcc564 100755
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -990,8 +990,18 @@ button:backdrop {
   border-width: 1px; }
 
 .primary-toolbar
+button, .primary-toolbar .raised
 button {
   -gtk-icon-shadow: none; }
+  .primary-toolbar
+  button:hover, .primary-toolbar
+  button:focus, .primary-toolbar .raised
+  button:hover, .primary-toolbar .raised
+  button:focus {
+    color: #fefefe;
+    outline-color: rgba(254, 254, 254, 0.3);
+    background-color: #f7b922;
+    text-shadow: none; }
 
 .stack-switcher > button.needs-attention > label,
 .stack-switcher > button.needs-attention > image, stacksidebar row.needs-attention > label {
@@ -6474,6 +6484,7 @@ ConversationListView {
     margin-bottom: 5px;
     min-height: 24px; }
     .nemo-window toolbar.primary-toolbar button:hover {
+      background: transparent;
       color: #f7b922; }
     .nemo-window toolbar.primary-toolbar button:selected, .nemo-window toolbar.primary-toolbar button:active, .nemo-window toolbar.primary-toolbar button:checked {
       border-radius: 23px;
diff --git a/gtk-3.0/widgets/_buttons.scss b/gtk-3.0/widgets/_buttons.scss
index 9f6ebf0..2758b50 100644
--- a/gtk-3.0/widgets/_buttons.scss
+++ b/gtk-3.0/widgets/_buttons.scss
@@ -364,7 +364,15 @@ button {
     @extend %linked;
   }
 
-  .primary-toolbar & { -gtk-icon-shadow: none; } // tango icons don't need shadows
+  .primary-toolbar &, .primary-toolbar .raised & { // tango icons don't need shadows
+    -gtk-icon-shadow: none; 
+ 
+    &:hover,
+    &:focus {
+      @include button(hover,$selected_bg_color,$selected_fg_color);
+    }
+
+  } 
 
   .linked > &,
   .linked > &:hover,