use accent color for menu highlight (fix #135)

7 files changed, 144 insertions, 49 deletions

diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 771475d..c37914f 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -1536,15 +1536,11 @@ menu,
   .menu menuitem {
     min-height: 16px;
     min-width: 40px;
-    padding: 4px;
-    border: solid transparent;
-    border-width: 1px 0 1px 0; }
+    padding: 5px; }
     menu menuitem:hover,
     .menu menuitem:hover {
-      color: #D3DAE3;
-      background-color: rgba(255, 255, 255, 0.05);
-      border: solid rgba(255, 255, 255, 0.07);
-      border-width: 1px 0 1px 0; }
+      color: #ffffff;
+      background-color: #5294E2; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
       color: rgba(211, 218, 227, 0.45); }
@@ -1907,6 +1903,7 @@ treeview.check {
 .osd check, filechooser actionbar check {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); }
 
+menuitem check:hover,
 .view check:selected, iconview check:selected,
 treeview.check:selected,
 row:selected check,
@@ -1921,6 +1918,7 @@ treeview.check:disabled {
 .osd check:disabled, filechooser actionbar check:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); }
 
+menuitem check:disabled:hover,
 .view check:disabled:selected, iconview check:disabled:selected,
 treeview.check:disabled:selected,
 row:selected check:disabled,
@@ -1935,6 +1933,7 @@ treeview.check:indeterminate {
 .osd check:indeterminate, filechooser actionbar check:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); }
 
+menuitem check:indeterminate:hover,
 .view check:indeterminate:selected, iconview check:indeterminate:selected,
 treeview.check:indeterminate:selected,
 row:selected check:indeterminate,
@@ -1949,6 +1948,7 @@ treeview.check:indeterminate:disabled {
 .osd check:indeterminate:disabled, filechooser actionbar check:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); }
 
+menuitem check:indeterminate:disabled:hover,
 .view check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected,
 treeview.check:indeterminate:disabled:selected,
 row:selected check:indeterminate:disabled,
@@ -1963,6 +1963,7 @@ treeview.check:checked {
 .osd check:checked, filechooser actionbar check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); }
 
+menuitem check:checked:hover,
 .view check:checked:selected, iconview check:checked:selected,
 treeview.check:checked:selected,
 row:selected check:checked,
@@ -1977,6 +1978,7 @@ treeview.check:checked:disabled {
 .osd check:checked:disabled, filechooser actionbar check:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); }
 
+menuitem check:checked:disabled:hover,
 .view check:checked:disabled:selected, iconview check:checked:disabled:selected,
 treeview.check:checked:disabled:selected,
 row:selected check:checked:disabled,
@@ -1991,6 +1993,7 @@ treeview.radio {
 .osd radio, filechooser actionbar radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); }
 
+menuitem radio:hover,
 .view radio:selected, iconview radio:selected,
 treeview.radio:selected,
 row:selected radio,
@@ -2005,6 +2008,7 @@ treeview.radio:disabled {
 .osd radio:disabled, filechooser actionbar radio:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); }
 
+menuitem radio:disabled:hover,
 .view radio:disabled:selected, iconview radio:disabled:selected,
 treeview.radio:disabled:selected,
 row:selected radio:disabled,
@@ -2019,6 +2023,7 @@ treeview.radio:indeterminate {
 .osd radio:indeterminate, filechooser actionbar radio:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); }
 
+menuitem radio:indeterminate:hover,
 .view radio:indeterminate:selected, iconview radio:indeterminate:selected,
 treeview.radio:indeterminate:selected,
 row:selected radio:indeterminate,
@@ -2033,6 +2038,7 @@ treeview.radio:indeterminate:disabled {
 .osd radio:indeterminate:disabled, filechooser actionbar radio:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); }
 
+menuitem radio:indeterminate:disabled:hover,
 .view radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected,
 treeview.radio:indeterminate:disabled:selected,
 row:selected radio:indeterminate:disabled,
@@ -2047,6 +2053,7 @@ treeview.radio:checked {
 .osd radio:checked, filechooser actionbar radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); }
 
+menuitem radio:checked:hover,
 .view radio:checked:selected, iconview radio:checked:selected,
 treeview.radio:checked:selected,
 row:selected radio:checked,
@@ -2061,6 +2068,7 @@ treeview.radio:checked:disabled {
 .osd radio:checked:disabled, filechooser actionbar radio:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); }
 
+menuitem radio:checked:disabled:hover,
 .view radio:checked:disabled:selected, iconview radio:checked:disabled:selected,
 treeview.radio:checked:disabled:selected,
 row:selected radio:checked:disabled,
@@ -2131,15 +2139,19 @@ scale {
       background-color: rgba(69, 74, 89, 0.95); }
       .osd scale trough highlight {
         background-color: #5294E2; }
+    menuitem:hover scale trough,
     row:selected scale trough,
     infobar scale trough {
       background-color: rgba(0, 0, 0, 0.2); }
+      menuitem:hover scale trough highlight,
       row:selected scale trough highlight,
       infobar scale trough highlight {
         background-color: #ffffff; }
+        menuitem:hover scale trough highlight:disabled,
         row:selected scale trough highlight:disabled,
         infobar scale trough highlight:disabled {
           background-color: #b1cff2; }
+      menuitem:hover scale trough:disabled,
       row:selected scale trough:disabled,
       infobar scale trough:disabled {
         background-color: rgba(0, 0, 0, 0.1); }
@@ -2168,19 +2180,23 @@ scale {
     scale slider:disabled {
       background-color: #3c414e;
       border-color: rgba(38, 41, 51, 0.8); }
+    menuitem:hover scale slider,
     row:selected scale slider,
     infobar scale slider {
       background-clip: border-box;
       background-color: #ffffff;
       border-color: #ffffff; }
+      menuitem:hover scale slider:hover,
       row:selected scale slider:hover,
       infobar scale slider:hover {
         background-color: #e5effb;
         border-color: #e5effb; }
+      menuitem:hover scale slider:active,
       row:selected scale slider:active,
       infobar scale slider:active {
         background-color: #a9caf1;
         border-color: #a9caf1; }
+      menuitem:hover scale slider:disabled,
       row:selected scale slider:disabled,
       infobar scale slider:disabled {
         background-color: #b1cff2;
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index 7ccb467..14db475 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -1535,15 +1535,11 @@ menu,
   .menu menuitem {
     min-height: 16px;
     min-width: 40px;
-    padding: 4px;
-    border: solid transparent;
-    border-width: 1px 0 1px 0; }
+    padding: 5px; }
     menu menuitem:hover,
     .menu menuitem:hover {
-      color: #5c616c;
-      background-color: rgba(0, 0, 0, 0.04);
-      border: solid rgba(0, 0, 0, 0.08);
-      border-width: 1px 0 1px 0; }
+      color: #ffffff;
+      background-color: #5294E2; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
       color: rgba(92, 97, 108, 0.55); }
@@ -1906,6 +1902,7 @@ treeview.check {
 .osd check, filechooser actionbar check {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); }
 
+menuitem check:hover,
 .view check:selected, iconview check:selected,
 treeview.check:selected,
 row:selected check,
@@ -1920,6 +1917,7 @@ treeview.check:disabled {
 .osd check:disabled, filechooser actionbar check:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); }
 
+menuitem check:disabled:hover,
 .view check:disabled:selected, iconview check:disabled:selected,
 treeview.check:disabled:selected,
 row:selected check:disabled,
@@ -1934,6 +1932,7 @@ treeview.check:indeterminate {
 .osd check:indeterminate, filechooser actionbar check:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); }
 
+menuitem check:indeterminate:hover,
 .view check:indeterminate:selected, iconview check:indeterminate:selected,
 treeview.check:indeterminate:selected,
 row:selected check:indeterminate,
@@ -1948,6 +1947,7 @@ treeview.check:indeterminate:disabled {
 .osd check:indeterminate:disabled, filechooser actionbar check:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); }
 
+menuitem check:indeterminate:disabled:hover,
 .view check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected,
 treeview.check:indeterminate:disabled:selected,
 row:selected check:indeterminate:disabled,
@@ -1962,6 +1962,7 @@ treeview.check:checked {
 .osd check:checked, filechooser actionbar check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); }
 
+menuitem check:checked:hover,
 .view check:checked:selected, iconview check:checked:selected,
 treeview.check:checked:selected,
 row:selected check:checked,
@@ -1976,6 +1977,7 @@ treeview.check:checked:disabled {
 .osd check:checked:disabled, filechooser actionbar check:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); }
 
+menuitem check:checked:disabled:hover,
 .view check:checked:disabled:selected, iconview check:checked:disabled:selected,
 treeview.check:checked:disabled:selected,
 row:selected check:checked:disabled,
@@ -1990,6 +1992,7 @@ treeview.radio {
 .osd radio, filechooser actionbar radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); }
 
+menuitem radio:hover,
 .view radio:selected, iconview radio:selected,
 treeview.radio:selected,
 row:selected radio,
@@ -2004,6 +2007,7 @@ treeview.radio:disabled {
 .osd radio:disabled, filechooser actionbar radio:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); }
 
+menuitem radio:disabled:hover,
 .view radio:disabled:selected, iconview radio:disabled:selected,
 treeview.radio:disabled:selected,
 row:selected radio:disabled,
@@ -2018,6 +2022,7 @@ treeview.radio:indeterminate {
 .osd radio:indeterminate, filechooser actionbar radio:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); }
 
+menuitem radio:indeterminate:hover,
 .view radio:indeterminate:selected, iconview radio:indeterminate:selected,
 treeview.radio:indeterminate:selected,
 row:selected radio:indeterminate,
@@ -2032,6 +2037,7 @@ treeview.radio:indeterminate:disabled {
 .osd radio:indeterminate:disabled, filechooser actionbar radio:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); }
 
+menuitem radio:indeterminate:disabled:hover,
 .view radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected,
 treeview.radio:indeterminate:disabled:selected,
 row:selected radio:indeterminate:disabled,
@@ -2046,6 +2052,7 @@ treeview.radio:checked {
 .osd radio:checked, filechooser actionbar radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); }
 
+menuitem radio:checked:hover,
 .view radio:checked:selected, iconview radio:checked:selected,
 treeview.radio:checked:selected,
 row:selected radio:checked,
@@ -2060,6 +2067,7 @@ treeview.radio:checked:disabled {
 .osd radio:checked:disabled, filechooser actionbar radio:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); }
 
+menuitem radio:checked:disabled:hover,
 .view radio:checked:disabled:selected, iconview radio:checked:disabled:selected,
 treeview.radio:checked:disabled:selected,
 row:selected radio:checked:disabled,
@@ -2130,15 +2138,19 @@ scale {
       background-color: rgba(69, 74, 89, 0.95); }
       .osd scale trough highlight {
         background-color: #5294E2; }
+    menuitem:hover scale trough,
     row:selected scale trough,
     infobar scale trough {
       background-color: rgba(0, 0, 0, 0.2); }
+      menuitem:hover scale trough highlight,
       row:selected scale trough highlight,
       infobar scale trough highlight {
         background-color: #ffffff; }
+        menuitem:hover scale trough highlight:disabled,
         row:selected scale trough highlight:disabled,
         infobar scale trough highlight:disabled {
           background-color: #b1cff2; }
+      menuitem:hover scale trough:disabled,
       row:selected scale trough:disabled,
       infobar scale trough:disabled {
         background-color: rgba(0, 0, 0, 0.1); }
@@ -2167,19 +2179,23 @@ scale {
     scale slider:disabled {
       background-color: #fbfbfb;
       border-color: rgba(123, 142, 186, 0.3); }
+    menuitem:hover scale slider,
     row:selected scale slider,
     infobar scale slider {
       background-clip: border-box;
       background-color: #ffffff;
       border-color: #ffffff; }
+      menuitem:hover scale slider:hover,
       row:selected scale slider:hover,
       infobar scale slider:hover {
         background-color: #e5effb;
         border-color: #e5effb; }
+      menuitem:hover scale slider:active,
       row:selected scale slider:active,
       infobar scale slider:active {
         background-color: #a9caf1;
         border-color: #a9caf1; }
+      menuitem:hover scale slider:disabled,
       row:selected scale slider:disabled,
       infobar scale slider:disabled {
         background-color: #b1cff2;
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index cbe313e..8dac95e 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -1536,15 +1536,11 @@ menu,
   .menu menuitem {
     min-height: 16px;
     min-width: 40px;
-    padding: 4px;
-    border: solid transparent;
-    border-width: 1px 0 1px 0; }
+    padding: 5px; }
     menu menuitem:hover,
     .menu menuitem:hover {
-      color: #D3DAE3;
-      background-color: rgba(255, 255, 255, 0.05);
-      border: solid rgba(255, 255, 255, 0.07);
-      border-width: 1px 0 1px 0; }
+      color: #ffffff;
+      background-color: #5294E2; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
       color: rgba(211, 218, 227, 0.45); }
@@ -1907,6 +1903,7 @@ treeview.check {
 .osd check, filechooser actionbar check {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); }
 
+menuitem check:hover,
 .view check:selected, iconview check:selected,
 treeview.check:selected,
 row:selected check,
@@ -1921,6 +1918,7 @@ treeview.check:disabled {
 .osd check:disabled, filechooser actionbar check:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); }
 
+menuitem check:disabled:hover,
 .view check:disabled:selected, iconview check:disabled:selected,
 treeview.check:disabled:selected,
 row:selected check:disabled,
@@ -1935,6 +1933,7 @@ treeview.check:indeterminate {
 .osd check:indeterminate, filechooser actionbar check:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); }
 
+menuitem check:indeterminate:hover,
 .view check:indeterminate:selected, iconview check:indeterminate:selected,
 treeview.check:indeterminate:selected,
 row:selected check:indeterminate,
@@ -1949,6 +1948,7 @@ treeview.check:indeterminate:disabled {
 .osd check:indeterminate:disabled, filechooser actionbar check:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); }
 
+menuitem check:indeterminate:disabled:hover,
 .view check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected,
 treeview.check:indeterminate:disabled:selected,
 row:selected check:indeterminate:disabled,
@@ -1963,6 +1963,7 @@ treeview.check:checked {
 .osd check:checked, filechooser actionbar check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); }
 
+menuitem check:checked:hover,
 .view check:checked:selected, iconview check:checked:selected,
 treeview.check:checked:selected,
 row:selected check:checked,
@@ -1977,6 +1978,7 @@ treeview.check:checked:disabled {
 .osd check:checked:disabled, filechooser actionbar check:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); }
 
+menuitem check:checked:disabled:hover,
 .view check:checked:disabled:selected, iconview check:checked:disabled:selected,
 treeview.check:checked:disabled:selected,
 row:selected check:checked:disabled,
@@ -1991,6 +1993,7 @@ treeview.radio {
 .osd radio, filechooser actionbar radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); }
 
+menuitem radio:hover,
 .view radio:selected, iconview radio:selected,
 treeview.radio:selected,
 row:selected radio,
@@ -2005,6 +2008,7 @@ treeview.radio:disabled {
 .osd radio:disabled, filechooser actionbar radio:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); }
 
+menuitem radio:disabled:hover,
 .view radio:disabled:selected, iconview radio:disabled:selected,
 treeview.radio:disabled:selected,
 row:selected radio:disabled,
@@ -2019,6 +2023,7 @@ treeview.radio:indeterminate {
 .osd radio:indeterminate, filechooser actionbar radio:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); }
 
+menuitem radio:indeterminate:hover,
 .view radio:indeterminate:selected, iconview radio:indeterminate:selected,
 treeview.radio:indeterminate:selected,
 row:selected radio:indeterminate,
@@ -2033,6 +2038,7 @@ treeview.radio:indeterminate:disabled {
 .osd radio:indeterminate:disabled, filechooser actionbar radio:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); }
 
+menuitem radio:indeterminate:disabled:hover,
 .view radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected,
 treeview.radio:indeterminate:disabled:selected,
 row:selected radio:indeterminate:disabled,
@@ -2047,6 +2053,7 @@ treeview.radio:checked {
 .osd radio:checked, filechooser actionbar radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); }
 
+menuitem radio:checked:hover,
 .view radio:checked:selected, iconview radio:checked:selected,
 treeview.radio:checked:selected,
 row:selected radio:checked,
@@ -2061,6 +2068,7 @@ treeview.radio:checked:disabled {
 .osd radio:checked:disabled, filechooser actionbar radio:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); }
 
+menuitem radio:checked:disabled:hover,
 .view radio:checked:disabled:selected, iconview radio:checked:disabled:selected,
 treeview.radio:checked:disabled:selected,
 row:selected radio:checked:disabled,
@@ -2131,15 +2139,19 @@ scale {
       background-color: #454a59; }
       .osd scale trough highlight {
         background-color: #5294E2; }
+    menuitem:hover scale trough,
     row:selected scale trough,
     infobar scale trough {
       background-color: rgba(0, 0, 0, 0.2); }
+      menuitem:hover scale trough highlight,
       row:selected scale trough highlight,
       infobar scale trough highlight {
         background-color: #ffffff; }
+        menuitem:hover scale trough highlight:disabled,
         row:selected scale trough highlight:disabled,
         infobar scale trough highlight:disabled {
           background-color: #b1cff2; }
+      menuitem:hover scale trough:disabled,
       row:selected scale trough:disabled,
       infobar scale trough:disabled {
         background-color: rgba(0, 0, 0, 0.1); }
@@ -2168,19 +2180,23 @@ scale {
     scale slider:disabled {
       background-color: #3c414e;
       border-color: rgba(38, 41, 51, 0.8); }
+    menuitem:hover scale slider,
     row:selected scale slider,
     infobar scale slider {
       background-clip: border-box;
       background-color: #ffffff;
       border-color: #ffffff; }
+      menuitem:hover scale slider:hover,
       row:selected scale slider:hover,
       infobar scale slider:hover {
         background-color: #e5effb;
         border-color: #e5effb; }
+      menuitem:hover scale slider:active,
       row:selected scale slider:active,
       infobar scale slider:active {
         background-color: #a9caf1;
         border-color: #a9caf1; }
+      menuitem:hover scale slider:disabled,
       row:selected scale slider:disabled,
       infobar scale slider:disabled {
         background-color: #b1cff2;
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index 02dc153..d184701 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -1535,15 +1535,11 @@ menu,
   .menu menuitem {
     min-height: 16px;
     min-width: 40px;
-    padding: 4px;
-    border: solid transparent;
-    border-width: 1px 0 1px 0; }
+    padding: 5px; }
     menu menuitem:hover,
     .menu menuitem:hover {
-      color: #5c616c;
-      background-color: rgba(0, 0, 0, 0.04);
-      border: solid rgba(0, 0, 0, 0.08);
-      border-width: 1px 0 1px 0; }
+      color: #ffffff;
+      background-color: #5294E2; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
       color: rgba(92, 97, 108, 0.55); }
@@ -1906,6 +1902,7 @@ treeview.check {
 .osd check, filechooser actionbar check {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); }
 
+menuitem check:hover,
 .view check:selected, iconview check:selected,
 treeview.check:selected,
 row:selected check,
@@ -1920,6 +1917,7 @@ treeview.check:disabled {
 .osd check:disabled, filechooser actionbar check:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); }
 
+menuitem check:disabled:hover,
 .view check:disabled:selected, iconview check:disabled:selected,
 treeview.check:disabled:selected,
 row:selected check:disabled,
@@ -1934,6 +1932,7 @@ treeview.check:indeterminate {
 .osd check:indeterminate, filechooser actionbar check:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); }
 
+menuitem check:indeterminate:hover,
 .view check:indeterminate:selected, iconview check:indeterminate:selected,
 treeview.check:indeterminate:selected,
 row:selected check:indeterminate,
@@ -1948,6 +1947,7 @@ treeview.check:indeterminate:disabled {
 .osd check:indeterminate:disabled, filechooser actionbar check:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); }
 
+menuitem check:indeterminate:disabled:hover,
 .view check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected,
 treeview.check:indeterminate:disabled:selected,
 row:selected check:indeterminate:disabled,
@@ -1962,6 +1962,7 @@ treeview.check:checked {
 .osd check:checked, filechooser actionbar check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); }
 
+menuitem check:checked:hover,
 .view check:checked:selected, iconview check:checked:selected,
 treeview.check:checked:selected,
 row:selected check:checked,
@@ -1976,6 +1977,7 @@ treeview.check:checked:disabled {
 .osd check:checked:disabled, filechooser actionbar check:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); }
 
+menuitem check:checked:disabled:hover,
 .view check:checked:disabled:selected, iconview check:checked:disabled:selected,
 treeview.check:checked:disabled:selected,
 row:selected check:checked:disabled,
@@ -1990,6 +1992,7 @@ treeview.radio {
 .osd radio, filechooser actionbar radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); }
 
+menuitem radio:hover,
 .view radio:selected, iconview radio:selected,
 treeview.radio:selected,
 row:selected radio,
@@ -2004,6 +2007,7 @@ treeview.radio:disabled {
 .osd radio:disabled, filechooser actionbar radio:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); }
 
+menuitem radio:disabled:hover,
 .view radio:disabled:selected, iconview radio:disabled:selected,
 treeview.radio:disabled:selected,
 row:selected radio:disabled,
@@ -2018,6 +2022,7 @@ treeview.radio:indeterminate {
 .osd radio:indeterminate, filechooser actionbar radio:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); }
 
+menuitem radio:indeterminate:hover,
 .view radio:indeterminate:selected, iconview radio:indeterminate:selected,
 treeview.radio:indeterminate:selected,
 row:selected radio:indeterminate,
@@ -2032,6 +2037,7 @@ treeview.radio:indeterminate:disabled {
 .osd radio:indeterminate:disabled, filechooser actionbar radio:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); }
 
+menuitem radio:indeterminate:disabled:hover,
 .view radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected,
 treeview.radio:indeterminate:disabled:selected,
 row:selected radio:indeterminate:disabled,
@@ -2046,6 +2052,7 @@ treeview.radio:checked {
 .osd radio:checked, filechooser actionbar radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); }
 
+menuitem radio:checked:hover,
 .view radio:checked:selected, iconview radio:checked:selected,
 treeview.radio:checked:selected,
 row:selected radio:checked,
@@ -2060,6 +2067,7 @@ treeview.radio:checked:disabled {
 .osd radio:checked:disabled, filechooser actionbar radio:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); }
 
+menuitem radio:checked:disabled:hover,
 .view radio:checked:disabled:selected, iconview radio:checked:disabled:selected,
 treeview.radio:checked:disabled:selected,
 row:selected radio:checked:disabled,
@@ -2130,15 +2138,19 @@ scale {
       background-color: #454a59; }
       .osd scale trough highlight {
         background-color: #5294E2; }
+    menuitem:hover scale trough,
     row:selected scale trough,
     infobar scale trough {
       background-color: rgba(0, 0, 0, 0.2); }
+      menuitem:hover scale trough highlight,
       row:selected scale trough highlight,
       infobar scale trough highlight {
         background-color: #ffffff; }
+        menuitem:hover scale trough highlight:disabled,
         row:selected scale trough highlight:disabled,
         infobar scale trough highlight:disabled {
           background-color: #b1cff2; }
+      menuitem:hover scale trough:disabled,
       row:selected scale trough:disabled,
       infobar scale trough:disabled {
         background-color: rgba(0, 0, 0, 0.1); }
@@ -2167,19 +2179,23 @@ scale {
     scale slider:disabled {
       background-color: #fbfbfb;
       border-color: rgba(123, 142, 186, 0.3); }
+    menuitem:hover scale slider,
     row:selected scale slider,
     infobar scale slider {
       background-clip: border-box;
       background-color: #ffffff;
       border-color: #ffffff; }
+      menuitem:hover scale slider:hover,
       row:selected scale slider:hover,
       infobar scale slider:hover {
         background-color: #e5effb;
         border-color: #e5effb; }
+      menuitem:hover scale slider:active,
       row:selected scale slider:active,
       infobar scale slider:active {
         background-color: #a9caf1;
         border-color: #a9caf1; }
+      menuitem:hover scale slider:disabled,
       row:selected scale slider:disabled,
       infobar scale slider:disabled {
         background-color: #b1cff2;
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 949a367..fe5a598 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -1539,15 +1539,11 @@ menu,
   .menu menuitem {
     min-height: 16px;
     min-width: 40px;
-    padding: 4px;
-    border: solid transparent;
-    border-width: 1px 0 1px 0; }
+    padding: 5px; }
     menu menuitem:hover,
     .menu menuitem:hover {
-      color: #5c616c;
-      background-color: rgba(0, 0, 0, 0.04);
-      border: solid rgba(0, 0, 0, 0.08);
-      border-width: 1px 0 1px 0; }
+      color: #ffffff;
+      background-color: #5294E2; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
       color: rgba(92, 97, 108, 0.55); }
@@ -1910,6 +1906,7 @@ treeview.check {
 .osd check, filechooser actionbar check {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); }
 
+menuitem check:hover,
 .view check:selected, iconview check:selected,
 treeview.check:selected,
 row:selected check,
@@ -1924,6 +1921,7 @@ treeview.check:disabled {
 .osd check:disabled, filechooser actionbar check:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); }
 
+menuitem check:disabled:hover,
 .view check:disabled:selected, iconview check:disabled:selected,
 treeview.check:disabled:selected,
 row:selected check:disabled,
@@ -1938,6 +1936,7 @@ treeview.check:indeterminate {
 .osd check:indeterminate, filechooser actionbar check:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); }
 
+menuitem check:indeterminate:hover,
 .view check:indeterminate:selected, iconview check:indeterminate:selected,
 treeview.check:indeterminate:selected,
 row:selected check:indeterminate,
@@ -1952,6 +1951,7 @@ treeview.check:indeterminate:disabled {
 .osd check:indeterminate:disabled, filechooser actionbar check:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); }
 
+menuitem check:indeterminate:disabled:hover,
 .view check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected,
 treeview.check:indeterminate:disabled:selected,
 row:selected check:indeterminate:disabled,
@@ -1966,6 +1966,7 @@ treeview.check:checked {
 .osd check:checked, filechooser actionbar check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); }
 
+menuitem check:checked:hover,
 .view check:checked:selected, iconview check:checked:selected,
 treeview.check:checked:selected,
 row:selected check:checked,
@@ -1980,6 +1981,7 @@ treeview.check:checked:disabled {
 .osd check:checked:disabled, filechooser actionbar check:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); }
 
+menuitem check:checked:disabled:hover,
 .view check:checked:disabled:selected, iconview check:checked:disabled:selected,
 treeview.check:checked:disabled:selected,
 row:selected check:checked:disabled,
@@ -1994,6 +1996,7 @@ treeview.radio {
 .osd radio, filechooser actionbar radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); }
 
+menuitem radio:hover,
 .view radio:selected, iconview radio:selected,
 treeview.radio:selected,
 row:selected radio,
@@ -2008,6 +2011,7 @@ treeview.radio:disabled {
 .osd radio:disabled, filechooser actionbar radio:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); }
 
+menuitem radio:disabled:hover,
 .view radio:disabled:selected, iconview radio:disabled:selected,
 treeview.radio:disabled:selected,
 row:selected radio:disabled,
@@ -2022,6 +2026,7 @@ treeview.radio:indeterminate {
 .osd radio:indeterminate, filechooser actionbar radio:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); }
 
+menuitem radio:indeterminate:hover,
 .view radio:indeterminate:selected, iconview radio:indeterminate:selected,
 treeview.radio:indeterminate:selected,
 row:selected radio:indeterminate,
@@ -2036,6 +2041,7 @@ treeview.radio:indeterminate:disabled {
 .osd radio:indeterminate:disabled, filechooser actionbar radio:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); }
 
+menuitem radio:indeterminate:disabled:hover,
 .view radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected,
 treeview.radio:indeterminate:disabled:selected,
 row:selected radio:indeterminate:disabled,
@@ -2050,6 +2056,7 @@ treeview.radio:checked {
 .osd radio:checked, filechooser actionbar radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); }
 
+menuitem radio:checked:hover,
 .view radio:checked:selected, iconview radio:checked:selected,
 treeview.radio:checked:selected,
 row:selected radio:checked,
@@ -2064,6 +2071,7 @@ treeview.radio:checked:disabled {
 .osd radio:checked:disabled, filechooser actionbar radio:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); }
 
+menuitem radio:checked:disabled:hover,
 .view radio:checked:disabled:selected, iconview radio:checked:disabled:selected,
 treeview.radio:checked:disabled:selected,
 row:selected radio:checked:disabled,
@@ -2134,15 +2142,19 @@ scale {
       background-color: #454a59; }
       .osd scale trough highlight {
         background-color: #5294E2; }
+    menuitem:hover scale trough,
     row:selected scale trough,
     infobar scale trough {
       background-color: rgba(0, 0, 0, 0.2); }
+      menuitem:hover scale trough highlight,
       row:selected scale trough highlight,
       infobar scale trough highlight {
         background-color: #ffffff; }
+        menuitem:hover scale trough highlight:disabled,
         row:selected scale trough highlight:disabled,
         infobar scale trough highlight:disabled {
           background-color: #b1cff2; }
+      menuitem:hover scale trough:disabled,
       row:selected scale trough:disabled,
       infobar scale trough:disabled {
         background-color: rgba(0, 0, 0, 0.1); }
@@ -2171,19 +2183,23 @@ scale {
     scale slider:disabled {
       background-color: #fbfbfb;
       border-color: rgba(123, 142, 186, 0.3); }
+    menuitem:hover scale slider,
     row:selected scale slider,
     infobar scale slider {
       background-clip: border-box;
       background-color: #ffffff;
       border-color: #ffffff; }
+      menuitem:hover scale slider:hover,
       row:selected scale slider:hover,
       infobar scale slider:hover {
         background-color: #e5effb;
         border-color: #e5effb; }
+      menuitem:hover scale slider:active,
       row:selected scale slider:active,
       infobar scale slider:active {
         background-color: #a9caf1;
         border-color: #a9caf1; }
+      menuitem:hover scale slider:disabled,
       row:selected scale slider:disabled,
       infobar scale slider:disabled {
         background-color: #b1cff2;
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 40e3f0b..1ebb175 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -1539,15 +1539,11 @@ menu,
   .menu menuitem {
     min-height: 16px;
     min-width: 40px;
-    padding: 4px;
-    border: solid transparent;
-    border-width: 1px 0 1px 0; }
+    padding: 5px; }
     menu menuitem:hover,
     .menu menuitem:hover {
-      color: #5c616c;
-      background-color: rgba(0, 0, 0, 0.04);
-      border: solid rgba(0, 0, 0, 0.08);
-      border-width: 1px 0 1px 0; }
+      color: #ffffff;
+      background-color: #5294E2; }
     menu menuitem:disabled,
     .menu menuitem:disabled {
       color: rgba(92, 97, 108, 0.55); }
@@ -1910,6 +1906,7 @@ treeview.check {
 .osd check, filechooser actionbar check {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-dark.png"), url("assets/checkbox-unchecked-dark@2.png")); }
 
+menuitem check:hover,
 .view check:selected, iconview check:selected,
 treeview.check:selected,
 row:selected check,
@@ -1924,6 +1921,7 @@ treeview.check:disabled {
 .osd check:disabled, filechooser actionbar check:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-unchecked-insensitive-dark.png"), url("assets/checkbox-unchecked-insensitive-dark@2.png")); }
 
+menuitem check:disabled:hover,
 .view check:disabled:selected, iconview check:disabled:selected,
 treeview.check:disabled:selected,
 row:selected check:disabled,
@@ -1938,6 +1936,7 @@ treeview.check:indeterminate {
 .osd check:indeterminate, filechooser actionbar check:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-dark.png"), url("assets/checkbox-mixed-dark@2.png")); }
 
+menuitem check:indeterminate:hover,
 .view check:indeterminate:selected, iconview check:indeterminate:selected,
 treeview.check:indeterminate:selected,
 row:selected check:indeterminate,
@@ -1952,6 +1951,7 @@ treeview.check:indeterminate:disabled {
 .osd check:indeterminate:disabled, filechooser actionbar check:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-mixed-insensitive-dark.png"), url("assets/checkbox-mixed-insensitive-dark@2.png")); }
 
+menuitem check:indeterminate:disabled:hover,
 .view check:indeterminate:disabled:selected, iconview check:indeterminate:disabled:selected,
 treeview.check:indeterminate:disabled:selected,
 row:selected check:indeterminate:disabled,
@@ -1966,6 +1966,7 @@ treeview.check:checked {
 .osd check:checked, filechooser actionbar check:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-dark.png"), url("assets/checkbox-checked-dark@2.png")); }
 
+menuitem check:checked:hover,
 .view check:checked:selected, iconview check:checked:selected,
 treeview.check:checked:selected,
 row:selected check:checked,
@@ -1980,6 +1981,7 @@ treeview.check:checked:disabled {
 .osd check:checked:disabled, filechooser actionbar check:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/checkbox-checked-insensitive-dark.png"), url("assets/checkbox-checked-insensitive-dark@2.png")); }
 
+menuitem check:checked:disabled:hover,
 .view check:checked:disabled:selected, iconview check:checked:disabled:selected,
 treeview.check:checked:disabled:selected,
 row:selected check:checked:disabled,
@@ -1994,6 +1996,7 @@ treeview.radio {
 .osd radio, filechooser actionbar radio {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-dark.png"), url("assets/radio-unchecked-dark@2.png")); }
 
+menuitem radio:hover,
 .view radio:selected, iconview radio:selected,
 treeview.radio:selected,
 row:selected radio,
@@ -2008,6 +2011,7 @@ treeview.radio:disabled {
 .osd radio:disabled, filechooser actionbar radio:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-unchecked-insensitive-dark.png"), url("assets/radio-unchecked-insensitive-dark@2.png")); }
 
+menuitem radio:disabled:hover,
 .view radio:disabled:selected, iconview radio:disabled:selected,
 treeview.radio:disabled:selected,
 row:selected radio:disabled,
@@ -2022,6 +2026,7 @@ treeview.radio:indeterminate {
 .osd radio:indeterminate, filechooser actionbar radio:indeterminate {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-dark.png"), url("assets/radio-mixed-dark@2.png")); }
 
+menuitem radio:indeterminate:hover,
 .view radio:indeterminate:selected, iconview radio:indeterminate:selected,
 treeview.radio:indeterminate:selected,
 row:selected radio:indeterminate,
@@ -2036,6 +2041,7 @@ treeview.radio:indeterminate:disabled {
 .osd radio:indeterminate:disabled, filechooser actionbar radio:indeterminate:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-mixed-insensitive-dark.png"), url("assets/radio-mixed-insensitive-dark@2.png")); }
 
+menuitem radio:indeterminate:disabled:hover,
 .view radio:indeterminate:disabled:selected, iconview radio:indeterminate:disabled:selected,
 treeview.radio:indeterminate:disabled:selected,
 row:selected radio:indeterminate:disabled,
@@ -2050,6 +2056,7 @@ treeview.radio:checked {
 .osd radio:checked, filechooser actionbar radio:checked {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-dark.png"), url("assets/radio-checked-dark@2.png")); }
 
+menuitem radio:checked:hover,
 .view radio:checked:selected, iconview radio:checked:selected,
 treeview.radio:checked:selected,
 row:selected radio:checked,
@@ -2064,6 +2071,7 @@ treeview.radio:checked:disabled {
 .osd radio:checked:disabled, filechooser actionbar radio:checked:disabled {
   -gtk-icon-source: -gtk-scaled(url("assets/radio-checked-insensitive-dark.png"), url("assets/radio-checked-insensitive-dark@2.png")); }
 
+menuitem radio:checked:disabled:hover,
 .view radio:checked:disabled:selected, iconview radio:checked:disabled:selected,
 treeview.radio:checked:disabled:selected,
 row:selected radio:checked:disabled,
@@ -2134,15 +2142,19 @@ scale {
       background-color: rgba(69, 74, 89, 0.95); }
       .osd scale trough highlight {
         background-color: #5294E2; }
+    menuitem:hover scale trough,
     row:selected scale trough,
     infobar scale trough {
       background-color: rgba(0, 0, 0, 0.2); }
+      menuitem:hover scale trough highlight,
       row:selected scale trough highlight,
       infobar scale trough highlight {
         background-color: #ffffff; }
+        menuitem:hover scale trough highlight:disabled,
         row:selected scale trough highlight:disabled,
         infobar scale trough highlight:disabled {
           background-color: #b1cff2; }
+      menuitem:hover scale trough:disabled,
       row:selected scale trough:disabled,
       infobar scale trough:disabled {
         background-color: rgba(0, 0, 0, 0.1); }
@@ -2171,19 +2183,23 @@ scale {
     scale slider:disabled {
       background-color: #fbfbfb;
       border-color: rgba(123, 142, 186, 0.3); }
+    menuitem:hover scale slider,
     row:selected scale slider,
     infobar scale slider {
       background-clip: border-box;
       background-color: #ffffff;
       border-color: #ffffff; }
+      menuitem:hover scale slider:hover,
       row:selected scale slider:hover,
       infobar scale slider:hover {
         background-color: #e5effb;
         border-color: #e5effb; }
+      menuitem:hover scale slider:active,
       row:selected scale slider:active,
       infobar scale slider:active {
         background-color: #a9caf1;
         border-color: #a9caf1; }
+      menuitem:hover scale slider:disabled,
       row:selected scale slider:disabled,
       infobar scale slider:disabled {
         background-color: #b1cff2;
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 279c598..ed35b4c 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -1599,14 +1599,10 @@ menu,
   menuitem {
     min-height: 16px;
     min-width: 40px;
-    padding: 4px;
-    border: solid transparent;
-    border-width: 1px 0 1px 0;
+    padding: 5px;
     &:hover {
-      color: $fg_color;
-      background-color: if($variant == 'light', transparentize(black, 0.96), transparentize(white, 0.95));
-      border: solid if($variant == 'light', transparentize(black, 0.92), transparentize(white, 0.93));
-      border-width: 1px 0 1px 0;
+      color: $selected_fg_color;
+      background-color: $selected_bg_color;
     }
     &:disabled {
       color: $insensitive_fg_color;
@@ -2015,6 +2011,7 @@ switch {
     // the borders of checks and radios are
     // too similar in luminosity to the selected background color, hence
     // we need special casing.
+    menuitem #{$w}#{$s}:hover,
     .view #{$w}#{$s}:selected,
     treeview.#{$w}#{$s}:selected,
     row:selected #{$w}#{$s},
@@ -2125,6 +2122,7 @@ scale {
     }
 
     // Troughs in selected list-rows and infobars
+    menuitem:hover &,
     row:selected &,
     infobar & {
       background-color: transparentize(black, 0.8);
@@ -2180,6 +2178,7 @@ scale {
     }
 
     // Selected list-row and infobar sliders
+    menuitem:hover &,
     row:selected &,
     infobar & {
       background-clip: border-box;