diff --git a/gtk-3.0/apps/xfce.css b/gtk-3.0/apps/xfce.css
index 854f142..5135936 100644
--- a/gtk-3.0/apps/xfce.css
+++ b/gtk-3.0/apps/xfce.css
@@ -9,6 +9,11 @@ XfceHeading {
     background-color: @panel_bg_color;
 }
 
+.xfce4-panel .button {
+    border-radius: 0;
+    padding: 1;
+}
+
 .xfce4-panel .button:active {
     border-width: 0 1px;
     border-radius: 0;
@@ -18,8 +23,8 @@ XfceHeading {
     color: shade(@panel_fg_color, 1.08);
 }
 
-.xfce4-panel *:hover,
-.xfce4-panel *:active:hover {
+.xfce4-panel .button:hover,
+.xfce4-panel .button:active:hover {
     border-color: mix(@panel_bg_color, @panel_fg_color, 0.31);
     background-color: mix(@panel_bg_color, @panel_fg_color, 0.31);
     background-image: none;
@@ -34,18 +39,15 @@ XfceHeading {
     color: @menu_fg_color;
 }
 
-.xfce4-panel .menu *:hover,
-.xfce4-panel .menu GtkLabel:hover,
-.xfce4-panel .menu GtkImage:hover {
+.xfce4-panel .menu *:hover {
     border-color: shade(@theme_selected_bg_color, 0.9);
     background-color: @theme_selected_bg_color;
     background-image: none;
     color: @theme_selected_fg_color;
 }
 
-/* workaround to fix size of indicator-icons */
-XfceIndicatorBox .button {
-    border: 1px;
-    padding: 0;
-    color: @panel_fg_color;
+.xfce4-panel .menu GtkLabel:hover,
+.xfce4-panel .menu GtkImage:hover {
+    background-image: none;
+    color: @theme_selected_fg_color;
 }
diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
index 4bd8c6d..1671552 100644
--- a/gtk-3.0/gtk-widgets.css
+++ b/gtk-3.0/gtk-widgets.css
@@ -539,8 +539,8 @@ GtkIconView.view.cell:selected:focus {
     border-color: shade(@theme_selected_bg_color, 0.9);
     border-radius: 2px;
     background-image: -gtk-gradient(linear, left top, left bottom,
-                                    from (@theme_selected_bg_color),
-                                    to (@theme_selected_bg_color));
+                                     from (@theme_selected_bg_color),
+                                     to (@theme_selected_bg_color));
 
     color: @theme_selected_fg_color;
 }
@@ -757,7 +757,7 @@ GtkInfoBar {
 
 .view.dim-label,
 .dim-label {
-	color: alpha(currentColor, 0.55);
+	color: alpha(currentColor, 0.5);
 }
 
 .dnd {