diff --git a/data/theme/gnome-shell-sass/widgets/_window-picker.scss b/data/theme/gnome-shell-sass/widgets/_window-picker.scss
index d157b91ab..1432a3bf8 100644
--- a/data/theme/gnome-shell-sass/widgets/_window-picker.scss
+++ b/data/theme/gnome-shell-sass/widgets/_window-picker.scss
@@ -3,8 +3,7 @@
 $window_picker_spacing: $base_spacing; // 6px
 $window_picker_padding: $base_padding * 2; // 12px
 
-$window_thumbnail_chrome_color: transparentize($osd_fg_color, 0.4);
-$window_thumbnail_chrome_border: transparentize($osd_bg_color, 0.7);
+$window_thumbnail_label_color: transparentize($osd_bg_color, 0.4);
 
 $window_close_button_size: 30px;
 $window_close_button_padding: 3px;
@@ -17,31 +16,31 @@ $window_close_button_padding: 3px;
 
 // Window titles
 .window-caption {
-  color: $osd_bg_color;
-  background-color: $window_thumbnail_chrome_color;
+  color: $osd_fg_color;
+  background-color: $osd_bg_color;
   border-radius: 99px;
-  border: 1px solid $window_thumbnail_chrome_border;
   padding: $base_padding $base_padding * 2;
 }
 
 // Close button
 .window-close {
-  background-color: $window_thumbnail_chrome_color;
-  color: $osd_bg_color;
-  border: 1px solid $window_thumbnail_chrome_border;
+  background-color: $osd_bg_color;
+  color: $osd_fg_color;
   border-radius: $window_close_button_size * 0.5 + $window_close_button_padding * 2;
   padding: $window_close_button_padding;
   height: $window_close_button_size;
   width: $window_close_button_size;
   box-shadow: -1px 1px 5px 0px rgba(0,0,0,0.5);
+  transition-duration: 300ms;
 
   & StIcon { icon-size: 24px; }
 
   &:hover {
-    background-color: lighten($window_thumbnail_chrome_color, 5%);
+    background-color: lighten($osd_bg_color, 15%);
   }
 
   &:active {
-    background-color: darken($window_thumbnail_chrome_color, 5%);
+    color: transparentize($osd_fg_color, 0.2);
+    background-color: darken($osd_bg_color, 5%);
   }
 }