diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css
index fdb3a2f..44ef080 100644
--- a/src/gtk-3.0/gtk-dark.css
+++ b/src/gtk-3.0/gtk-dark.css
@@ -77,8 +77,6 @@ popover.background label.separator {
 label selection {
   color: #ffffff;
   background-color: #0062FF; }
-label:disabled {
-  color: rgba(222, 222, 222, 0.45); }
 
 .dim-label, label.separator, popover label.separator,
 popover.background label.separator, headerbar .subtitle,
@@ -1337,10 +1335,11 @@ headerbar button.suggested-action, .nemo-window .primary-toolbar button.suggeste
     background-image: none;
     box-shadow: none; }
   headerbar button.suggested-action.flat:disabled, .nemo-window .primary-toolbar button.suggested-action.flat:disabled, headerbar button.suggested-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.suggested-action.sidebar-button:disabled, headerbar button.suggested-action:disabled, .nemo-window .primary-toolbar button.suggested-action:disabled {
-    background-color: rgba(119, 119, 119, 0.55);
+    border-color: rgba(255, 255, 255, 0.12);
+    background-color: rgba(72, 72, 72, 0.55);
     box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); }
     headerbar button.suggested-action.flat:disabled label, .nemo-window .primary-toolbar button.suggested-action.flat:disabled label, headerbar button.suggested-action.sidebar-button:disabled label, .nemo-window .primary-toolbar button.suggested-action.sidebar-button:disabled label, headerbar button.suggested-action.flat:disabled, .nemo-window .primary-toolbar button.suggested-action.flat:disabled, headerbar button.suggested-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.suggested-action.sidebar-button:disabled, headerbar button.suggested-action:disabled label, .nemo-window .primary-toolbar button.suggested-action:disabled label, headerbar button.suggested-action:disabled, .nemo-window .primary-toolbar button.suggested-action:disabled {
-      color: rgba(225, 219, 219, 0.35); }
+      color: rgba(222, 222, 222, 0.45); }
 headerbar button.suggested-action:backdrop, .nemo-window .primary-toolbar button.suggested-action:backdrop,
 headerbar button.suggested-action:backdrop,
 .nemo-window .primary-toolbar button.suggested-action:backdrop {
@@ -1371,10 +1370,11 @@ headerbar button.destructive-action, .nemo-window .primary-toolbar button.destru
     background-image: none;
     box-shadow: none; }
   headerbar button.destructive-action.flat:disabled, .nemo-window .primary-toolbar button.destructive-action.flat:disabled, headerbar button.destructive-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.destructive-action.sidebar-button:disabled, headerbar button.destructive-action:disabled, .nemo-window .primary-toolbar button.destructive-action:disabled {
-    background-color: rgba(119, 119, 119, 0.55);
+    border-color: rgba(255, 255, 255, 0.12);
+    background-color: rgba(72, 72, 72, 0.55);
     box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); }
     headerbar button.destructive-action.flat:disabled label, .nemo-window .primary-toolbar button.destructive-action.flat:disabled label, headerbar button.destructive-action.sidebar-button:disabled label, .nemo-window .primary-toolbar button.destructive-action.sidebar-button:disabled label, headerbar button.destructive-action.flat:disabled, .nemo-window .primary-toolbar button.destructive-action.flat:disabled, headerbar button.destructive-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.destructive-action.sidebar-button:disabled, headerbar button.destructive-action:disabled label, .nemo-window .primary-toolbar button.destructive-action:disabled label, headerbar button.destructive-action:disabled, .nemo-window .primary-toolbar button.destructive-action:disabled {
-      color: rgba(225, 219, 219, 0.35); }
+      color: rgba(222, 222, 222, 0.45); }
 headerbar button.destructive-action:backdrop, .nemo-window .primary-toolbar button.destructive-action:backdrop,
 headerbar button.destructive-action:backdrop,
 .nemo-window .primary-toolbar button.destructive-action:backdrop {
@@ -1627,9 +1627,6 @@ menubar,
     .menubar > menuitem:disabled {
       color: rgba(225, 219, 219, 0.2);
       border-color: transparent; }
-    menubar > menuitem label:disabled,
-    .menubar > menuitem label:disabled {
-      color: rgba(225, 219, 219, 0.2); }
 
 menu,
 .menu {
@@ -2233,6 +2230,10 @@ infobar radio:checked:disabled {
 checkbutton.text-button, radiobutton.text-button {
   padding: 2px 0;
   outline-offset: 0; }
+  checkbutton.text-button:hover, radiobutton.text-button:hover {
+    color: #b8b8b8; }
+  checkbutton.text-button:disabled, radiobutton.text-button:disabled {
+    color: rgba(222, 222, 222, 0.45); }
 checkbutton label:not(:only-child):first-child, radiobutton label:not(:only-child):first-child {
   margin-left: 4px; }
 checkbutton label:not(:only-child):last-child, radiobutton label:not(:only-child):last-child {
diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css
index 6b3cf23..b509c6c 100644
--- a/src/gtk-3.0/gtk-light.css
+++ b/src/gtk-3.0/gtk-light.css
@@ -77,8 +77,6 @@ popover.background label.separator {
 label selection {
   color: #ffffff;
   background-color: #0e6bff; }
-label:disabled {
-  color: rgba(36, 36, 36, 0.55); }
 
 .dim-label, label.separator, popover label.separator,
 popover.background label.separator, headerbar .subtitle,
@@ -1337,10 +1335,11 @@ headerbar button.suggested-action, .nemo-window .primary-toolbar button.suggeste
     background-image: none;
     box-shadow: none; }
   headerbar button.suggested-action.flat:disabled, .nemo-window .primary-toolbar button.suggested-action.flat:disabled, headerbar button.suggested-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.suggested-action.sidebar-button:disabled, headerbar button.suggested-action:disabled, .nemo-window .primary-toolbar button.suggested-action:disabled {
-    background-color: white;
+    border-color: rgba(0, 0, 0, 0.11);
+    background-color: rgba(255, 255, 255, 0.55);
     box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); }
     headerbar button.suggested-action.flat:disabled label, .nemo-window .primary-toolbar button.suggested-action.flat:disabled label, headerbar button.suggested-action.sidebar-button:disabled label, .nemo-window .primary-toolbar button.suggested-action.sidebar-button:disabled label, headerbar button.suggested-action.flat:disabled, .nemo-window .primary-toolbar button.suggested-action.flat:disabled, headerbar button.suggested-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.suggested-action.sidebar-button:disabled, headerbar button.suggested-action:disabled label, .nemo-window .primary-toolbar button.suggested-action:disabled label, headerbar button.suggested-action:disabled, .nemo-window .primary-toolbar button.suggested-action:disabled {
-      color: rgba(40, 32, 32, 0.35); }
+      color: rgba(36, 36, 36, 0.55); }
 headerbar button.suggested-action:backdrop, .nemo-window .primary-toolbar button.suggested-action:backdrop,
 headerbar button.suggested-action:backdrop,
 .nemo-window .primary-toolbar button.suggested-action:backdrop {
@@ -1371,10 +1370,11 @@ headerbar button.destructive-action, .nemo-window .primary-toolbar button.destru
     background-image: none;
     box-shadow: none; }
   headerbar button.destructive-action.flat:disabled, .nemo-window .primary-toolbar button.destructive-action.flat:disabled, headerbar button.destructive-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.destructive-action.sidebar-button:disabled, headerbar button.destructive-action:disabled, .nemo-window .primary-toolbar button.destructive-action:disabled {
-    background-color: white;
+    border-color: rgba(0, 0, 0, 0.11);
+    background-color: rgba(255, 255, 255, 0.55);
     box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); }
     headerbar button.destructive-action.flat:disabled label, .nemo-window .primary-toolbar button.destructive-action.flat:disabled label, headerbar button.destructive-action.sidebar-button:disabled label, .nemo-window .primary-toolbar button.destructive-action.sidebar-button:disabled label, headerbar button.destructive-action.flat:disabled, .nemo-window .primary-toolbar button.destructive-action.flat:disabled, headerbar button.destructive-action.sidebar-button:disabled, .nemo-window .primary-toolbar button.destructive-action.sidebar-button:disabled, headerbar button.destructive-action:disabled label, .nemo-window .primary-toolbar button.destructive-action:disabled label, headerbar button.destructive-action:disabled, .nemo-window .primary-toolbar button.destructive-action:disabled {
-      color: rgba(40, 32, 32, 0.35); }
+      color: rgba(36, 36, 36, 0.55); }
 headerbar button.destructive-action:backdrop, .nemo-window .primary-toolbar button.destructive-action:backdrop,
 headerbar button.destructive-action:backdrop,
 .nemo-window .primary-toolbar button.destructive-action:backdrop {
@@ -1625,9 +1625,6 @@ menubar,
     .menubar > menuitem:disabled {
       color: rgba(40, 32, 32, 0.2);
       border-color: transparent; }
-    menubar > menuitem label:disabled,
-    .menubar > menuitem label:disabled {
-      color: rgba(40, 32, 32, 0.2); }
 
 menu,
 .menu {
@@ -2231,6 +2228,10 @@ infobar radio:checked:disabled {
 checkbutton.text-button, radiobutton.text-button {
   padding: 2px 0;
   outline-offset: 0; }
+  checkbutton.text-button:hover, radiobutton.text-button:hover {
+    color: black; }
+  checkbutton.text-button:disabled, radiobutton.text-button:disabled {
+    color: rgba(36, 36, 36, 0.55); }
 checkbutton label:not(:only-child):first-child, radiobutton label:not(:only-child):first-child {
   margin-left: 4px; }
 checkbutton label:not(:only-child):last-child, radiobutton label:not(:only-child):last-child {
diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss
index eb84c88..e73f6c6 100644
--- a/src/gtk-3.0/sass/_common.scss
+++ b/src/gtk-3.0/sass/_common.scss
@@ -126,7 +126,7 @@ label {
   }
 
   &:disabled {
-    color: $insensitive_fg_color;
+//    color: $insensitive_fg_color;
     selection { @extend %selected_items:disabled; }
   }
 }
@@ -1431,7 +1431,7 @@ headerbar {
         box-shadow: none;
       }
       &.flat:disabled,
-      &:disabled { @include button(header-insensitive); }
+      &:disabled { @include button(insensitive); }
     }
     button.#{$b_type}:backdrop,
     button.#{$b_type}:backdrop {
@@ -1763,9 +1763,6 @@ menubar,
       color: transparentize($header_fg, 0.6);
       border-color: transparent;
     }
-
-    label { &:disabled { color: transparentize($header_fg, 0.6); } }
-
   }
 }
 
@@ -2305,6 +2302,8 @@ checkbutton, radiobutton {
     &.text-button {
       padding: 2px 0;
       outline-offset: 0;
+      &:hover { color: darken($fg_color, 15%); }
+      &:disabled { color: $insensitive_fg_color; }
     }
 
   label:not(:only-child) {