diff --git a/gtk-3.20/gtk-widgets.css b/gtk-3.20/gtk-widgets.css
index d405bce..85da2f9 100644
--- a/gtk-3.20/gtk-widgets.css
+++ b/gtk-3.20/gtk-widgets.css
@@ -1748,7 +1748,7 @@ switch {
   switch:checked {
     background-color: shade(@theme_selected_bg_color, 0.7); }
     switch:checked:backdrop {
-      background-color: @theme_unfocused_selected_bg_color; }
+      background-color: shade(@theme_unfocused_selected_bg_color, 0.7); }
   switch:disabled {
     background-color: @theme_disabled_bg_color; }
     switch:disabled:backdrop {
@@ -2599,7 +2599,9 @@ messagedialog.csd .dialog-action-area button {
     padding-right: 12px;
     color: alpha(currentColor, 0.7); }
   .titlebar .titlebutton.close, .titlebar .titlebutton.maximize, .titlebar .titlebutton.minimize, .titlebar .titlebutton:not(separator) {
-    padding: 3px 5px;
+    padding: 0;
+    min-height: 20px;
+    min-width: 26px;
     border: none;
     color: transparent;
     background-color: transparent;
@@ -2607,7 +2609,8 @@ messagedialog.csd .dialog-action-area button {
     background-position: center;
     background-repeat: no-repeat; }
   .titlebar .titlebutton.close {
-    padding: 3px 14px;
+    min-height: 20px;
+    min-width: 45px;
     background: url("assets/close-normal.png") center center; }
     .titlebar .titlebutton.close:hover {
       background: url("assets/close-hover.png") center center; }