diff --git a/common/gtk-3.0/3.14/gtk-dark.css b/common/gtk-3.0/3.14/gtk-dark.css
index d08394b..3ac3ad0 100644
--- a/common/gtk-3.0/3.14/gtk-dark.css
+++ b/common/gtk-3.0/3.14/gtk-dark.css
@@ -3057,14 +3057,15 @@ ClockBox {
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
-    border-radius: 0; }
+    border-radius: 0;
+    border: none; }
     .xfce4-panel.panel .button.flat:hover {
       border: none;
       background-color: rgba(65, 70, 84, 0.95); }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked {
-      color: #5294E2;
+      color: #ffffff;
       border: none;
-      background-color: rgba(27, 29, 35, 0.95); }
+      background-color: #5294E2; }
 
 .floating-bar {
   background-color: #5294E2;
diff --git a/common/gtk-3.0/3.14/gtk-darker.css b/common/gtk-3.0/3.14/gtk-darker.css
index 1839cc1..569bef9 100644
--- a/common/gtk-3.0/3.14/gtk-darker.css
+++ b/common/gtk-3.0/3.14/gtk-darker.css
@@ -3060,14 +3060,15 @@ ClockBox {
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
-    border-radius: 0; }
+    border-radius: 0;
+    border: none; }
     .xfce4-panel.panel .button.flat:hover {
       border: none;
       background-color: rgba(65, 70, 84, 0.95); }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked {
-      color: #5294E2;
+      color: #ffffff;
       border: none;
-      background-color: rgba(27, 29, 35, 0.95); }
+      background-color: #5294E2; }
 
 .floating-bar {
   background-color: #5294E2;
diff --git a/common/gtk-3.0/3.14/gtk-solid-dark.css b/common/gtk-3.0/3.14/gtk-solid-dark.css
index 9cbf992..7311f15 100644
--- a/common/gtk-3.0/3.14/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.14/gtk-solid-dark.css
@@ -3057,14 +3057,15 @@ ClockBox {
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
-    border-radius: 0; }
+    border-radius: 0;
+    border: none; }
     .xfce4-panel.panel .button.flat:hover {
       border: none;
       background-color: #414654; }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked {
-      color: #5294E2;
+      color: #ffffff;
       border: none;
-      background-color: #1b1d23; }
+      background-color: #5294E2; }
 
 .floating-bar {
   background-color: #5294E2;
diff --git a/common/gtk-3.0/3.14/gtk-solid-darker.css b/common/gtk-3.0/3.14/gtk-solid-darker.css
index 74fa38e..0674eee 100644
--- a/common/gtk-3.0/3.14/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.14/gtk-solid-darker.css
@@ -3060,14 +3060,15 @@ ClockBox {
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
-    border-radius: 0; }
+    border-radius: 0;
+    border: none; }
     .xfce4-panel.panel .button.flat:hover {
       border: none;
       background-color: #414654; }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked {
-      color: #5294E2;
+      color: #ffffff;
       border: none;
-      background-color: #1b1d23; }
+      background-color: #5294E2; }
 
 .floating-bar {
   background-color: #5294E2;
diff --git a/common/gtk-3.0/3.14/gtk-solid.css b/common/gtk-3.0/3.14/gtk-solid.css
index 0532ab3..6ecb869 100644
--- a/common/gtk-3.0/3.14/gtk-solid.css
+++ b/common/gtk-3.0/3.14/gtk-solid.css
@@ -3060,14 +3060,15 @@ ClockBox {
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
-    border-radius: 0; }
+    border-radius: 0;
+    border: none; }
     .xfce4-panel.panel .button.flat:hover {
       border: none;
       background-color: #414654; }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked {
-      color: #5294E2;
+      color: #ffffff;
       border: none;
-      background-color: #1b1d23; }
+      background-color: #5294E2; }
 
 .floating-bar {
   background-color: #5294E2;
diff --git a/common/gtk-3.0/3.14/gtk.css b/common/gtk-3.0/3.14/gtk.css
index 2c34329..ee8dc74 100644
--- a/common/gtk-3.0/3.14/gtk.css
+++ b/common/gtk-3.0/3.14/gtk.css
@@ -3060,14 +3060,15 @@ ClockBox {
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
-    border-radius: 0; }
+    border-radius: 0;
+    border: none; }
     .xfce4-panel.panel .button.flat:hover {
       border: none;
       background-color: rgba(65, 70, 84, 0.95); }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked {
-      color: #5294E2;
+      color: #ffffff;
       border: none;
-      background-color: rgba(27, 29, 35, 0.95); }
+      background-color: #5294E2; }
 
 .floating-bar {
   background-color: #5294E2;
diff --git a/common/gtk-3.0/3.14/sass/_applications.scss b/common/gtk-3.0/3.14/sass/_applications.scss
index 585f1be..3095a78 100644
--- a/common/gtk-3.0/3.14/sass/_applications.scss
+++ b/common/gtk-3.0/3.14/sass/_applications.scss
@@ -495,15 +495,16 @@ ClockBox {
     color: $panel_fg;
     background-color: transparentize($panel_bg, 1);
     border-radius: 0;
+    border: none;
 
     &:hover {
       border: none;
       background-color: lighten($panel_bg, 10%);
     }
     &:active, &:checked {
-      color: $selected_bg_color;
+      color: $selected_fg_color;
       border: none;
-      background-color: darken($panel_bg, 7%);
+      background-color: $selected_bg_color;
     }
   }
 }
diff --git a/common/gtk-3.0/3.16/gtk-dark.css b/common/gtk-3.0/3.16/gtk-dark.css
index 1368c8e..d7a247e 100644
--- a/common/gtk-3.0/3.16/gtk-dark.css
+++ b/common/gtk-3.0/3.16/gtk-dark.css
@@ -2933,14 +2933,15 @@ ClockBox {
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
-    border-radius: 0; }
+    border-radius: 0;
+    border: none; }
     .xfce4-panel.panel .button.flat:hover {
       border: none;
       background-color: rgba(65, 70, 84, 0.95); }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked {
-      color: #5294E2;
+      color: #ffffff;
       border: none;
-      background-color: rgba(27, 29, 35, 0.95); }
+      background-color: #5294E2; }
 
 .floating-bar {
   background-color: #5294E2;
diff --git a/common/gtk-3.0/3.16/gtk-darker.css b/common/gtk-3.0/3.16/gtk-darker.css
index 934393d..3ff455e 100644
--- a/common/gtk-3.0/3.16/gtk-darker.css
+++ b/common/gtk-3.0/3.16/gtk-darker.css
@@ -2936,14 +2936,15 @@ ClockBox {
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
-    border-radius: 0; }
+    border-radius: 0;
+    border: none; }
     .xfce4-panel.panel .button.flat:hover {
       border: none;
       background-color: rgba(65, 70, 84, 0.95); }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked {
-      color: #5294E2;
+      color: #ffffff;
       border: none;
-      background-color: rgba(27, 29, 35, 0.95); }
+      background-color: #5294E2; }
 
 .floating-bar {
   background-color: #5294E2;
diff --git a/common/gtk-3.0/3.16/gtk-solid-dark.css b/common/gtk-3.0/3.16/gtk-solid-dark.css
index 8886f65..ae8399b 100644
--- a/common/gtk-3.0/3.16/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-solid-dark.css
@@ -2933,14 +2933,15 @@ ClockBox {
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
-    border-radius: 0; }
+    border-radius: 0;
+    border: none; }
     .xfce4-panel.panel .button.flat:hover {
       border: none;
       background-color: #414654; }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked {
-      color: #5294E2;
+      color: #ffffff;
       border: none;
-      background-color: #1b1d23; }
+      background-color: #5294E2; }
 
 .floating-bar {
   background-color: #5294E2;
diff --git a/common/gtk-3.0/3.16/gtk-solid-darker.css b/common/gtk-3.0/3.16/gtk-solid-darker.css
index 2611dee..7144fa4 100644
--- a/common/gtk-3.0/3.16/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.16/gtk-solid-darker.css
@@ -2936,14 +2936,15 @@ ClockBox {
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
-    border-radius: 0; }
+    border-radius: 0;
+    border: none; }
     .xfce4-panel.panel .button.flat:hover {
       border: none;
       background-color: #414654; }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked {
-      color: #5294E2;
+      color: #ffffff;
       border: none;
-      background-color: #1b1d23; }
+      background-color: #5294E2; }
 
 .floating-bar {
   background-color: #5294E2;
diff --git a/common/gtk-3.0/3.16/gtk-solid.css b/common/gtk-3.0/3.16/gtk-solid.css
index 9001fe7..828db13 100644
--- a/common/gtk-3.0/3.16/gtk-solid.css
+++ b/common/gtk-3.0/3.16/gtk-solid.css
@@ -2936,14 +2936,15 @@ ClockBox {
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
-    border-radius: 0; }
+    border-radius: 0;
+    border: none; }
     .xfce4-panel.panel .button.flat:hover {
       border: none;
       background-color: #414654; }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked {
-      color: #5294E2;
+      color: #ffffff;
       border: none;
-      background-color: #1b1d23; }
+      background-color: #5294E2; }
 
 .floating-bar {
   background-color: #5294E2;
diff --git a/common/gtk-3.0/3.16/gtk.css b/common/gtk-3.0/3.16/gtk.css
index 93a3e7a..97b68d5 100644
--- a/common/gtk-3.0/3.16/gtk.css
+++ b/common/gtk-3.0/3.16/gtk.css
@@ -2936,14 +2936,15 @@ ClockBox {
   .xfce4-panel.panel .button.flat {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
-    border-radius: 0; }
+    border-radius: 0;
+    border: none; }
     .xfce4-panel.panel .button.flat:hover {
       border: none;
       background-color: rgba(65, 70, 84, 0.95); }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked {
-      color: #5294E2;
+      color: #ffffff;
       border: none;
-      background-color: rgba(27, 29, 35, 0.95); }
+      background-color: #5294E2; }
 
 .floating-bar {
   background-color: #5294E2;
diff --git a/common/gtk-3.0/3.16/sass/_applications.scss b/common/gtk-3.0/3.16/sass/_applications.scss
index 18a2dfc..abb8cf1 100644
--- a/common/gtk-3.0/3.16/sass/_applications.scss
+++ b/common/gtk-3.0/3.16/sass/_applications.scss
@@ -546,15 +546,16 @@ ClockBox {
     color: $panel_fg;
     background-color: transparentize($panel_bg, 1);
     border-radius: 0;
+    border: none;
 
     &:hover {
       border: none;
       background-color: lighten($panel_bg, 10%);
     }
     &:active, &:checked {
-      color: $selected_bg_color;
+      color: $selected_fg_color;
       border: none;
-      background-color: darken($panel_bg, 7%);
+      background-color: $selected_bg_color;
     }
   }
 }
diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css
index 1cf6d9e..e70198d 100644
--- a/common/gtk-3.0/3.18/gtk-dark.css
+++ b/common/gtk-3.0/3.18/gtk-dark.css
@@ -3077,14 +3077,15 @@ ClockBox {
   .xfce4-panel.panel .button.flat, .xfce4-panel.panel .sidebar-button.button {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
-    border-radius: 0; }
+    border-radius: 0;
+    border: none; }
     .xfce4-panel.panel .button.flat:hover, .xfce4-panel.panel .sidebar-button.button:hover {
       border: none;
       background-color: rgba(65, 70, 84, 0.95); }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .sidebar-button.button:active, .xfce4-panel.panel .button.flat:checked, .xfce4-panel.panel .sidebar-button.button:checked {
-      color: #5294E2;
+      color: #ffffff;
       border: none;
-      background-color: rgba(27, 29, 35, 0.95); }
+      background-color: #5294E2; }
 
 .floating-bar {
   background-color: #5294E2;
diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css
index e488ecd..657cf8d 100644
--- a/common/gtk-3.0/3.18/gtk-darker.css
+++ b/common/gtk-3.0/3.18/gtk-darker.css
@@ -3080,14 +3080,15 @@ ClockBox {
   .xfce4-panel.panel .button.flat, .xfce4-panel.panel .sidebar-button.button {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
-    border-radius: 0; }
+    border-radius: 0;
+    border: none; }
     .xfce4-panel.panel .button.flat:hover, .xfce4-panel.panel .sidebar-button.button:hover {
       border: none;
       background-color: rgba(65, 70, 84, 0.95); }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .sidebar-button.button:active, .xfce4-panel.panel .button.flat:checked, .xfce4-panel.panel .sidebar-button.button:checked {
-      color: #5294E2;
+      color: #ffffff;
       border: none;
-      background-color: rgba(27, 29, 35, 0.95); }
+      background-color: #5294E2; }
 
 .floating-bar {
   background-color: #5294E2;
diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css
index 12e17cf..75b8ad9 100644
--- a/common/gtk-3.0/3.18/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.18/gtk-solid-dark.css
@@ -3077,14 +3077,15 @@ ClockBox {
   .xfce4-panel.panel .button.flat, .xfce4-panel.panel .sidebar-button.button {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
-    border-radius: 0; }
+    border-radius: 0;
+    border: none; }
     .xfce4-panel.panel .button.flat:hover, .xfce4-panel.panel .sidebar-button.button:hover {
       border: none;
       background-color: #414654; }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .sidebar-button.button:active, .xfce4-panel.panel .button.flat:checked, .xfce4-panel.panel .sidebar-button.button:checked {
-      color: #5294E2;
+      color: #ffffff;
       border: none;
-      background-color: #1b1d23; }
+      background-color: #5294E2; }
 
 .floating-bar {
   background-color: #5294E2;
diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css
index 97465d9..87eccaa 100644
--- a/common/gtk-3.0/3.18/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.18/gtk-solid-darker.css
@@ -3080,14 +3080,15 @@ ClockBox {
   .xfce4-panel.panel .button.flat, .xfce4-panel.panel .sidebar-button.button {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
-    border-radius: 0; }
+    border-radius: 0;
+    border: none; }
     .xfce4-panel.panel .button.flat:hover, .xfce4-panel.panel .sidebar-button.button:hover {
       border: none;
       background-color: #414654; }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .sidebar-button.button:active, .xfce4-panel.panel .button.flat:checked, .xfce4-panel.panel .sidebar-button.button:checked {
-      color: #5294E2;
+      color: #ffffff;
       border: none;
-      background-color: #1b1d23; }
+      background-color: #5294E2; }
 
 .floating-bar {
   background-color: #5294E2;
diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css
index 0bf90a5..f84426c 100644
--- a/common/gtk-3.0/3.18/gtk-solid.css
+++ b/common/gtk-3.0/3.18/gtk-solid.css
@@ -3084,14 +3084,15 @@ ClockBox {
   .xfce4-panel.panel .button.flat, .xfce4-panel.panel .sidebar-button.button {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
-    border-radius: 0; }
+    border-radius: 0;
+    border: none; }
     .xfce4-panel.panel .button.flat:hover, .xfce4-panel.panel .sidebar-button.button:hover {
       border: none;
       background-color: #414654; }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .sidebar-button.button:active, .xfce4-panel.panel .button.flat:checked, .xfce4-panel.panel .sidebar-button.button:checked {
-      color: #5294E2;
+      color: #ffffff;
       border: none;
-      background-color: #1b1d23; }
+      background-color: #5294E2; }
 
 .floating-bar {
   background-color: #5294E2;
diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css
index d5e0546..a8beed2 100644
--- a/common/gtk-3.0/3.18/gtk.css
+++ b/common/gtk-3.0/3.18/gtk.css
@@ -3084,14 +3084,15 @@ ClockBox {
   .xfce4-panel.panel .button.flat, .xfce4-panel.panel .sidebar-button.button {
     color: #BAC3CF;
     background-color: rgba(43, 46, 55, 0);
-    border-radius: 0; }
+    border-radius: 0;
+    border: none; }
     .xfce4-panel.panel .button.flat:hover, .xfce4-panel.panel .sidebar-button.button:hover {
       border: none;
       background-color: rgba(65, 70, 84, 0.95); }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .sidebar-button.button:active, .xfce4-panel.panel .button.flat:checked, .xfce4-panel.panel .sidebar-button.button:checked {
-      color: #5294E2;
+      color: #ffffff;
       border: none;
-      background-color: rgba(27, 29, 35, 0.95); }
+      background-color: #5294E2; }
 
 .floating-bar {
   background-color: #5294E2;
diff --git a/common/gtk-3.0/3.18/sass/_applications.scss b/common/gtk-3.0/3.18/sass/_applications.scss
index e241b5a..c3a7fa5 100644
--- a/common/gtk-3.0/3.18/sass/_applications.scss
+++ b/common/gtk-3.0/3.18/sass/_applications.scss
@@ -594,15 +594,16 @@ ClockBox {
     color: $panel_fg;
     background-color: transparentize($panel_bg, 1);
     border-radius: 0;
+    border: none;
 
     &:hover {
       border: none;
       background-color: lighten($panel_bg, 10%);
     }
     &:active, &:checked {
-      color: $selected_bg_color;
+      color: $selected_fg_color;
       border: none;
-      background-color: darken($panel_bg, 7%);
+      background-color: $selected_bg_color;
     }
   }
 }