Improved menu theming

20 files changed, 138 insertions, 75 deletions

diff --git a/themes/b5/gtk-3.0/gtk.css b/themes/b5/gtk-3.0/gtk.css
index 6b386e7..e3984ac 100644
--- a/themes/b5/gtk-3.0/gtk.css
+++ b/themes/b5/gtk-3.0/gtk.css
@@ -34,7 +34,6 @@
     -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 15;
     -GtkMenuBar-shadow-type          : out;
-    -GtkMenuItem-selected-shadow-type: out;
     -GtkRange-slider-width           : 11;
     -GtkRange-stepper-size           : 11;
     -GtkRange-stepper-spacing        : 0;
@@ -295,6 +294,14 @@ GtkCalendar:selected {
     border-color: @fg_selected;
 }
 
+.menuitem {
+    border-width: 2 2;
+}
+
+.menuitem:hover {
+    border-style: outset;
+}
+
 .slider {
     color: #525051;
 
diff --git a/themes/basic/gtk-3.0/gtk.css b/themes/basic/gtk-3.0/gtk.css
index a9850ae..9c8ed0d 100644
--- a/themes/basic/gtk-3.0/gtk.css
+++ b/themes/basic/gtk-3.0/gtk.css
@@ -43,6 +43,10 @@
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#4B6983, 1.0)), to(shade(#4B6983, 1.1)));
 }
 
+.menuitem {
+    border-width: 0 0;
+}
+
 .scrollbar, .scale {
     border-width: 2 2;
 }
diff --git a/themes/cadmium/gtk-3.0/gtk.css b/themes/cadmium/gtk-3.0/gtk.css
index eed815c..e1aa2d3 100644
--- a/themes/cadmium/gtk-3.0/gtk.css
+++ b/themes/cadmium/gtk-3.0/gtk.css
@@ -318,7 +318,7 @@ GtkCalendar:selected {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.05)), to(shade(@bg_insensitive, 0.95)));
 }
 
-.dock:hover, .menubar:hover, .toolbar:hover {
+.dock:hover, .toolbar:hover {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_prelight, 1.05)), to(shade(@bg_prelight, 0.95)));
 }
 
@@ -348,7 +348,12 @@ GtkCalendar:selected {
 }
 
 .menuitem {
-    border-width: 1 2;
+    border-width: 1 1;
+    background-image: none;
+}
+
+.menuitem:hover {
+    border-style: solid;
 }
 
 .slider.vertical, .progressbar.vertical {
diff --git a/themes/curve/gtk-3.0/gtk.css b/themes/curve/gtk-3.0/gtk.css
index c80e03e..26b1679 100644
--- a/themes/curve/gtk-3.0/gtk.css
+++ b/themes/curve/gtk-3.0/gtk.css
@@ -33,7 +33,6 @@
     -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 15;
     -GtkMenuBar-shadow-type          : out;
-    -GtkMenuItem-selected-shadow-type: out;
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
     -GtkRange-stepper-spacing        : 0;
@@ -319,7 +318,7 @@ GtkCalendar:selected {
     border-color: @fg_selected;
 }
 
-.dock:hover, .menubar:hover, .toolbar:hover {
+.dock:hover .toolbar:hover {
     color: #ffffff;
     background-color: #4464ac;
     border-color: darker(#4464ac);
@@ -341,8 +340,13 @@ GtkCalendar:selected {
 
 .menuitem:hover {
     color: #ffffff;
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#4464ac, 0.8)), to(shade(#4464ac, 1.0)));
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#4464ac, 0.8)), to(shade(#4464ac, 1.8)));
     border-color: darker(#4464ac);
+    border-style: outset;
+}
+
+.menuitem *:hover {
+    color: #ffffff;
 }
 
 .menuitem:selected {
diff --git a/themes/dawn/gtk-3.0/gtk.css b/themes/dawn/gtk-3.0/gtk.css
index 980f24c..9b40227 100644
--- a/themes/dawn/gtk-3.0/gtk.css
+++ b/themes/dawn/gtk-3.0/gtk.css
@@ -36,7 +36,6 @@
     -GtkCheckButton-indicator-size   : 12;
     -GtkMenuBar-internal-padding     : 4;
     -GtkMenuBar-shadow-type          : out;
-    -GtkMenuItem-selected-shadow-type: etched-in;
     -GtkPaned-handle-size     	     : 7;
     -GtkRange-slider-width           : 16;
     -GtkRange-stepper-size           : 16;
@@ -366,7 +365,11 @@ GtkCalendar:selected {
 }
 
 .menuitem {
-    border-width: 1 2;
+    border-width: 1 1;
+}
+
+.menuitem:hover {
+    border-style: solid;
 }
 
 .radio {
diff --git a/themes/dusk/gtk-3.0/gtk.css b/themes/dusk/gtk-3.0/gtk.css
index c2cd051..2891f3d 100644
--- a/themes/dusk/gtk-3.0/gtk.css
+++ b/themes/dusk/gtk-3.0/gtk.css
@@ -36,7 +36,6 @@
     -GtkCheckButton-indicator-size   : 8;
     -GtkMenuBar-internal-padding     : 1;
     -GtkMenuBar-shadow-type          : out;
-    -GtkMenuItem-selected-shadow-type: etched-in;
     -GtkPaned-handle-size     	     : 4;
     -GtkRange-slider-width           : 12;
     -GtkRange-stepper-size           : 10;
@@ -345,7 +344,11 @@ GtkCalendar:selected {
 }
 
 .menuitem {
-    border-width: 1 2;
+    border-width: 1 1;
+}
+
+.menuitem:hover {
+    border-style: solid;
 }
 
 .slider.vertical {
diff --git a/themes/kde2/gtk-3.0/gtk.css b/themes/kde2/gtk-3.0/gtk.css
index 6a1d7a3..6605da0 100644
--- a/themes/kde2/gtk-3.0/gtk.css
+++ b/themes/kde2/gtk-3.0/gtk.css
@@ -32,7 +32,6 @@
     -GtkButton-default-outside-border: 0;
     -GtkWidget-focus-line-width      : 1;
     -GtkCheckButton-indicator-size   : 15;
-    -GtkMenuItem-selected-shadow-type: in;
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
     -GtkRange-trough-border          : 0;
@@ -327,3 +326,7 @@ GtkCalendar:selected {
 .button:selected {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.9)), to(shade(@bg_selected, 1.1)));
 }
+
+.menuitem:hover {
+    border-style: inset;
+}
diff --git a/themes/kolors/gtk-3.0/gtk.css b/themes/kolors/gtk-3.0/gtk.css
index 4f8f371..e0fe63c 100644
--- a/themes/kolors/gtk-3.0/gtk.css
+++ b/themes/kolors/gtk-3.0/gtk.css
@@ -34,7 +34,6 @@
     -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 15;
     -GtkMenuBar-shadow-type          : out;
-    -GtkMenuItem-selected-shadow-type: none;
     -GtkRange-slider-width           : 11;
     -GtkRange-stepper-size           : 13;
     -GtkRange-stepper-spacing        : 0;
@@ -378,3 +377,11 @@ GtkCalendar:selected {
 .button.vertical:selected, .slider.vertical:selected {
     background-image: -gtk-gradient(linear, left top, right top, from(shade(@bg_selected, 0.9)), to(shade(@bg_selected, 1.1)));
 }
+
+.menuitem {
+    border-width: 0 0;
+}
+
+.menuitem:hover {
+    border-style: none;
+}
diff --git a/themes/light/gtk-3.0/gtk.css b/themes/light/gtk-3.0/gtk.css
index 7ce6f0c..aef787f 100644
--- a/themes/light/gtk-3.0/gtk.css
+++ b/themes/light/gtk-3.0/gtk.css
@@ -34,7 +34,6 @@
     -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 15;
     -GtkMenuBar-shadow-type          : out;
-    -GtkMenuItem-selected-shadow-type: in;
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
     -GtkRange-stepper-spacing        : 0;
@@ -318,3 +317,10 @@ GtkCalendar:selected {
     border-color: darker(#f5f5dd);
 }
 
+.menuitem {
+    border-width: 2 2;
+}
+
+.menuitem:hover {
+    border-style: inset;
+}
diff --git a/themes/orange/gtk-3.0/gtk.css b/themes/orange/gtk-3.0/gtk.css
index ae01db4..161f108 100644
--- a/themes/orange/gtk-3.0/gtk.css
+++ b/themes/orange/gtk-3.0/gtk.css
@@ -39,7 +39,6 @@
     -GtkButton-child-displacement-x  : 0;
     -GtkButton-child-displacement-y  : 1;
     -GtkCheckButton-indicator-size   : 12;
-    -GtkMenuItem-selected-shadow-type: none;
     -GtkPaned-handle-size            : 7;
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
@@ -339,7 +338,7 @@ GtkCalendar:selected {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#f8f7f5, 1.05)), to(shade(#f8f7f5, 0.95)));
     border-color: darker(#f8f7f5);
 
-    border-width: 1 2;
+    border-width: 0 0;
 }
 
 .menuitem:active, .menu:active {
@@ -353,10 +352,17 @@ GtkCalendar:selected {
     border-color: darker(#f8f7f5);
 }
 
-.menuitem:hover, .menu:hover {
+.menu:hover {
+    color: #000000;
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#ffe371, 1.05)), to(shade(#ffe371, 0.95)));
+    border-color: darker(#ffe371);
+}
+
+.menuitem:hover {
     color: #000000;
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#ffe371, 1.05)), to(shade(#ffe371, 0.95)));
     border-color: darker(#ffe371);
+    border-style: none;
 }
 
 .menuitem:selected, .menu:selected {
@@ -378,7 +384,7 @@ GtkCalendar:selected {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 1.05)), to(shade(@bg_insensitive, 0.95)));
 }
 
-.menubar:hover, .toolbar:hover {
+.toolbar:hover {
     color: #000000;
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#fff0b3, 1.05)), to(shade(#fff0b3, 0.95)));
     border-color: darker(#fff0b3);
diff --git a/themes/redmondxp/gtk-3.0/gtk.css b/themes/redmondxp/gtk-3.0/gtk.css
index 26afbcb..af1217c 100644
--- a/themes/redmondxp/gtk-3.0/gtk.css
+++ b/themes/redmondxp/gtk-3.0/gtk.css
@@ -34,7 +34,6 @@
     -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 15;
     -GtkMenuBar-shadow-type          : out;
-    -GtkMenuItem-selected-shadow-type: none;
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
     -GtkRange-stepper-spacing        : 0;
@@ -348,31 +347,15 @@ GtkCalendar:selected {
 }
 
 .menubar {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_normal, 0.9)), to(shade(@bg_normal, 1.1)));
-
     border-width: 2 2;
 }
 
 .menubar:active {
     color: #ffffff;
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#0055ef, 1.1)), to(shade(#0055ef, 0.9)));
-    border-color: darker(#0055ef);
-}
-
-.menubar:insensitive {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 0.9)), to(shade(@bg_insensitive, 1.1)));
-}
-
-.menubar:hover {
-    color: #ffffff;
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#0055ef, 0.9)), to(shade(#0055ef, 1.1)));
+    background-color: #0055ef;
     border-color: darker(#0055ef);
 }
 
-.menubar:selected {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 1.1)), to(shade(@bg_selected, 0.9)));
-}
-
 .button {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#fafaf2, 1.1)), to(shade(#fafaf2, 0.9)));
     border-color: darker(#fafaf2);
@@ -449,6 +432,21 @@ GtkCalendar:selected {
     border-color: darker(#efebdf);
 }
 
+.menuitem {
+    border-width: 0 0;
+}
+
+.menuitem:hover {
+    color: #ffffff;
+    background-color: #0055ef;
+    border-color: darker(#0055ef);
+    border-style: none;
+}
+
+.menuitem *:hover {
+    color: #ffffff;
+}
+
 .scale.slider.horizontal {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#efebdf, 1.1)), to(shade(#efebdf, 0.9)));
     border-color: darker(#efebdf);
diff --git a/themes/saltlake/gtk-3.0/gtk.css b/themes/saltlake/gtk-3.0/gtk.css
index 96d8e96..ccd28b0 100644
--- a/themes/saltlake/gtk-3.0/gtk.css
+++ b/themes/saltlake/gtk-3.0/gtk.css
@@ -300,3 +300,6 @@ GtkCalendar:selected {
     border-width: 1 1;
 }
 
+.menuitem:hover {
+    border-style: solid;
+}
diff --git a/themes/smooth/gtk-3.0/gtk.css b/themes/smooth/gtk-3.0/gtk.css
index 6f0a541..163e838 100644
--- a/themes/smooth/gtk-3.0/gtk.css
+++ b/themes/smooth/gtk-3.0/gtk.css
@@ -33,7 +33,6 @@
     -GtkWidget-focus-line-width      : 1;
     -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 15;
-    -GtkMenuItem-selected-shadow-type: out;
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
     -GtkRange-stepper-spacing        : 0;
@@ -295,3 +294,10 @@ GtkCalendar:selected {
     border-color: @fg_selected;
 }
 
+.menuitem {
+    border-width: 2 2;
+}
+
+.menuitem:hover {
+    border-style: outset;
+}
diff --git a/themes/stellar/gtk-3.0/gtk.css b/themes/stellar/gtk-3.0/gtk.css
index 8a23661..d9fdea2 100644
--- a/themes/stellar/gtk-3.0/gtk.css
+++ b/themes/stellar/gtk-3.0/gtk.css
@@ -33,7 +33,6 @@
     -GtkButton-default-outside-border: 6;
     -GtkWidget-focus-padding         : 0;
     -GtkCheckButton-indicator-size   : 15;
-    -GtkMenuItem-selected-shadow-type: in;
     -GtkRange-slider-width           : 12;
     -GtkRange-stepper-size           : 12;
     -GtkRange-stepper-spacing        : 0;
@@ -298,9 +297,9 @@ GtkCalendar:selected {
     border-color: @fg_selected;
 }
 
-.menu:hover {
+.menuitem:hover {
     color: #FFFFFF;
     background-color: #9BA0B0;
     border-color: darker(#9BA0B0);
+    border-style: inset;
 }
-
diff --git a/themes/winter/gtk-3.0/gtk.css b/themes/winter/gtk-3.0/gtk.css
index 5ad62aa..45dbcba 100644
--- a/themes/winter/gtk-3.0/gtk.css
+++ b/themes/winter/gtk-3.0/gtk.css
@@ -33,7 +33,6 @@
     -GtkButton-default-outside-border: 0;
     -GtkCheckButton-indicator-size   : 15;
     -GtkMenuBar-shadow-type          : out;
-    -GtkMenuItem-selected-shadow-type: out;
     -GtkPaned-handle-size            : 8;
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
@@ -330,7 +329,7 @@ GtkCalendar:selected {
     border-color: darker(#A4B8CB);
 }
 
-.dock:hover, .menubar:hover, .toolbar:hover {
+.dock:hover .toolbar:hover {
     color: #224466;
     background-color: #B3C8DD;
     border-color: darker(#B3C8DD);
@@ -360,12 +359,19 @@ GtkCalendar:selected {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_insensitive, 0.8)), to(shade(@bg_insensitive, 1.8)));
 }
 
-.button:hover, .menuitem:hover {
+.button:hover {
     color: #224466;
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#B3C8DD, 0.8)), to(shade(#B3C8DD, 1.8)));
     border-color: darker(#B3C8DD);
 }
 
+.menuitem:hover {
+    color: #224466;
+    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#B3C8DD, 0.8)), to(shade(#B3C8DD, 1.8)));
+    border-color: darker(#B3C8DD);
+    border-style: outset;
+}
+
 .button:selected, .menuitem:selected {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.8)), to(shade(@bg_selected, 1.8)));
 }
diff --git a/themes/xfce-4.0/gtk-3.0/gtk.css b/themes/xfce-4.0/gtk-3.0/gtk.css
index cb95aba..abba4ac 100644
--- a/themes/xfce-4.0/gtk-3.0/gtk.css
+++ b/themes/xfce-4.0/gtk-3.0/gtk.css
@@ -36,7 +36,6 @@
     -GtkButton-default-outside-border: 0;
     -GtkCheckButton-indicator-size   : 15;
     -GtkMenuBar-shadow-type          : out;
-    -GtkMenuItem-selected-shadow-type: out;
     -GtkPaned-handle-size            : 8;
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
@@ -336,7 +335,7 @@ GtkCalendar:selected {
     border-color: darker(#bfbdbb);
 }
 
-.menubar:hover, .dock:hover, .toolbar:hover {
+.dock:hover, .toolbar:hover {
     color: #ffffff;
     background-color: #606080;
     border-color: darker(#606080);
@@ -362,6 +361,11 @@ GtkCalendar:selected {
     color: #ffffff;
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#606080, 0.8)), to(shade(#606080, 1.8)));
     border-color: darker(#606080);
+    border-style: outset;
+}
+
+.menuitem *:hover {
+    color: #ffffff;
 }
 
 .menuitem:selected {
diff --git a/themes/xfce-4.2/gtk-3.0/gtk.css b/themes/xfce-4.2/gtk-3.0/gtk.css
index c05e88e..8e88f4a 100644
--- a/themes/xfce-4.2/gtk-3.0/gtk.css
+++ b/themes/xfce-4.2/gtk-3.0/gtk.css
@@ -40,7 +40,6 @@
     -GtkCheckButton-indicator-size   : 12;
     -GtkMenuBar-internal-padding     : 2;
     -GtkMenuBar-shadow-type          : out;
-    -GtkMenuItem-selected-shadow-type: etched-in;
     -GtkPaned-handle-size            : 7;
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
@@ -355,7 +354,7 @@ GtkCalendar:selected {
     background-color: #ffffff;
     border-color: darker(#ffffff);
 
-    border-width: 1 2;
+    border-width: 1;
 }
 
 .menuitem:active {
@@ -373,6 +372,11 @@ GtkCalendar:selected {
     color: #ffffff;
     background-color: #5582c2;
     border-color: darker(#5582c2);
+    border-style: solid;
+}
+
+.menuitem *:hover {
+    color: #ffffff;
 }
 
 .menuitem:selected {
@@ -380,14 +384,14 @@ GtkCalendar:selected {
     border-color: darker(@bg_selected);
 }
 
-.menubar:active .toolbar:active {
+.menubar:active, .toolbar:active {
     color: #ffffff;
     background-color: #d3d7e0;
     border-color: darker(#d3d7e0);
 }
 
 
-.menubar:hover .toolbar:hover {
+.toolbar:hover {
     color: #ffffff;
     background-color: #5582c2;
     border-color: darker(#5582c2);
diff --git a/themes/xfce-4.4/gtk-3.0/gtk.css b/themes/xfce-4.4/gtk-3.0/gtk.css
index d0babc0..3dd8c32 100644
--- a/themes/xfce-4.4/gtk-3.0/gtk.css
+++ b/themes/xfce-4.4/gtk-3.0/gtk.css
@@ -45,7 +45,6 @@
     -GtkButton-child-displacement-x  : 0;
     -GtkButton-child-displacement-y  : 1;
     -GtkCheckButton-indicator-size   : 12;
-    -GtkMenuItem-selected-shadow-type: etched-in;
     -GtkPaned-handle-size            : 7;
     -GtkRange-slider-width           : 15;
     -GtkRange-stepper-size           : 15;
@@ -355,7 +354,7 @@ GtkCalendar:selected {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#ffffff, 1.1)), to(shade(#ffffff, 0.95)));
     border-color: darker(#ffffff);
 
-    border-width: 1 2;
+    border-width: 1 1;
 }
 
 .menuitem:active {
@@ -371,6 +370,7 @@ GtkCalendar:selected {
 .menuitem:hover {
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#d3d7cf, 1.1)), to(shade(#d3d7cf, 0.95)));
     border-color: darker(#d3d7cf);
+    border-style: solid;
 }
 
 .menuitem:selected {
@@ -396,11 +396,6 @@ GtkCalendar:selected {
     border-color: darker(#eeeeec);
 }
 
-.menubar:hover {
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#d3d7cf, 1.2)), to(shade(#d3d7cf, 0.9)));
-    border-color: darker(#d3d7cf);
-}
-
 .menubar:selected {
     color: #000000;
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.9)), to(shade(@bg_selected, 1.2)));
diff --git a/themes/xfce-4.6/gtk-3.0/gtk.css b/themes/xfce-4.6/gtk-3.0/gtk.css
index 69088e5..22416df 100644
--- a/themes/xfce-4.6/gtk-3.0/gtk.css
+++ b/themes/xfce-4.6/gtk-3.0/gtk.css
@@ -62,8 +62,6 @@
     -GtkMenu-horizontal-padding      : 0;
     -GtkMenu-vertical-padding        : 0;
 
-    -GtkMenuItem-selected-shadow-type: etched-in;
-
     -GtkPaned-handle-size            : 3;
 
     -GtkRange-slider-width           : 15;
@@ -369,7 +367,7 @@ GtkCalendar:selected {
     background-color: #fafaf7;
     border-color: darker(#fafaf7);
 
-    border-width: 1 2;
+    border-width: 1 1;
 }
 
 .menu:active, .memuitem:active {
@@ -383,10 +381,18 @@ GtkCalendar:selected {
     border-color: darker(#fafaf7);
 }
 
-.menu:hover, .menuitem:hover {
+.menu:hover {
+    color: #101010;
+    background-color: #cce2ff;
+    border-color: darker(#cce2ff);
+}
+
+.menuitem:hover {
     color: #101010;
+    background-image: none;
     background-color: #cce2ff;
     border-color: darker(#cce2ff);
+    border-style: solid;
 }
 
 .menu:selected, .menuitem:selected {
@@ -413,12 +419,6 @@ GtkCalendar:selected {
     border-color: darker(#eeeeec);
 }
 
-.menubar:hover {
-    color: #101010;
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#cce2ff, 1.0)), to(shade(#cce2ff, 0.9)));
-    border-color: darker(#cce2ff);
-}
-
 .menubar:selected {
     color: #101010;
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.9)), to(shade(@bg_selected, 1.0)));
diff --git a/themes/xfce/gtk-3.0/gtk.css b/themes/xfce/gtk-3.0/gtk.css
index 69088e5..22416df 100644
--- a/themes/xfce/gtk-3.0/gtk.css
+++ b/themes/xfce/gtk-3.0/gtk.css
@@ -62,8 +62,6 @@
     -GtkMenu-horizontal-padding      : 0;
     -GtkMenu-vertical-padding        : 0;
 
-    -GtkMenuItem-selected-shadow-type: etched-in;
-
     -GtkPaned-handle-size            : 3;
 
     -GtkRange-slider-width           : 15;
@@ -369,7 +367,7 @@ GtkCalendar:selected {
     background-color: #fafaf7;
     border-color: darker(#fafaf7);
 
-    border-width: 1 2;
+    border-width: 1 1;
 }
 
 .menu:active, .memuitem:active {
@@ -383,10 +381,18 @@ GtkCalendar:selected {
     border-color: darker(#fafaf7);
 }
 
-.menu:hover, .menuitem:hover {
+.menu:hover {
+    color: #101010;
+    background-color: #cce2ff;
+    border-color: darker(#cce2ff);
+}
+
+.menuitem:hover {
     color: #101010;
+    background-image: none;
     background-color: #cce2ff;
     border-color: darker(#cce2ff);
+    border-style: solid;
 }
 
 .menu:selected, .menuitem:selected {
@@ -413,12 +419,6 @@ GtkCalendar:selected {
     border-color: darker(#eeeeec);
 }
 
-.menubar:hover {
-    color: #101010;
-    background-image: -gtk-gradient(linear, left top, left bottom, from(shade(#cce2ff, 1.0)), to(shade(#cce2ff, 0.9)));
-    border-color: darker(#cce2ff);
-}
-
 .menubar:selected {
     color: #101010;
     background-image: -gtk-gradient(linear, left top, left bottom, from(shade(@bg_selected, 0.9)), to(shade(@bg_selected, 1.0)));