simplify button styling

7 files changed, 519 insertions, 513 deletions

diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 6af13d5..44dbcdc 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -918,35 +918,6 @@ headerbar,
     .selection-mode.titlebar:backdrop:not(headerbar) {
       background-color: rgba(82, 148, 226, 0.95);
       color: rgba(255, 255, 255, 0.6); }
-    headerbar.selection-mode button, .selection-mode.titlebar:not(headerbar) button {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      background-color: rgba(255, 255, 255, 0);
-      border-color: rgba(255, 255, 255, 0); }
-      headerbar.selection-mode button.flat, headerbar.selection-mode button.sidebar-button, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.sidebar-button {
-        border-color: transparent;
-        background-color: transparent;
-        background-image: none;
-        color: #ffffff;
-        background-color: rgba(255, 255, 255, 0); }
-      headerbar.selection-mode button:hover, .selection-mode.titlebar:not(headerbar) button:hover {
-        color: #ffffff;
-        outline-color: rgba(255, 255, 255, 0.3);
-        background-color: rgba(255, 255, 255, 0.05);
-        border-color: rgba(255, 255, 255, 0.5); }
-      headerbar.selection-mode button:active, headerbar.selection-mode button:checked, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked {
-        color: rgba(82, 148, 226, 0.95);
-        outline-color: rgba(82, 148, 226, 0.25);
-        background-color: #ffffff;
-        border-color: #ffffff; }
-      headerbar.selection-mode button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled {
-        color: rgba(255, 255, 255, 0.4);
-        background-color: rgba(255, 255, 255, 0);
-        border-color: rgba(255, 255, 255, 0); }
-        headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked {
-          color: rgba(82, 148, 226, 0.35);
-          background-color: rgba(255, 255, 255, 0.15);
-          border-color: rgba(255, 255, 255, 0.15); }
     headerbar.selection-mode .selection-menu, .selection-mode.titlebar:not(headerbar) .selection-menu {
       box-shadow: none;
       padding-left: 10px;
@@ -1115,6 +1086,13 @@ window.csd > .titlebar:not(headerbar):backdrop {
     border-color: rgba(82, 148, 226, 0.65);
     background-color: rgba(82, 148, 226, 0.65); }
 
+.selection-mode.primary-toolbar button, headerbar.selection-mode button, .selection-mode.titlebar:not(headerbar) button, .selection-mode.primary-toolbar button.flat, headerbar.selection-mode button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode.primary-toolbar button.sidebar-button, headerbar.selection-mode button.sidebar-button, .selection-mode.titlebar:not(headerbar) button.sidebar-button {
+  border-color: transparent;
+  background-color: transparent;
+  background-image: none;
+  color: #ffffff;
+  background-color: rgba(255, 255, 255, 0); }
+
 .primary-toolbar .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child), headerbar .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child), .titlebar:not(headerbar) .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child) {
   margin-right: 1px; }
 
@@ -2644,7 +2622,7 @@ infobar {
     color: #5294E2;
     background-color: #ffffff; }
 
-row:selected button, .info button,
+.selection-mode.primary-toolbar button:hover, headerbar.selection-mode button:hover, .selection-mode.titlebar:not(headerbar) button:hover, row:selected button, .info button,
 .question button,
 .warning button,
 .error button, .nautilus-window .floating-bar button {
@@ -2652,57 +2630,82 @@ row:selected button, .info button,
   outline-color: rgba(255, 255, 255, 0.3);
   background-color: rgba(255, 255, 255, 0);
   border-color: rgba(255, 255, 255, 0.5); }
-  row:selected button.flat, row:selected button.sidebar-button, .info button.flat, .info button.sidebar-button,
-  .question button.flat,
-  .question button.sidebar-button,
-  .warning button.flat,
-  .warning button.sidebar-button,
-  .error button.flat,
-  .error button.sidebar-button, .nautilus-window .floating-bar button.flat, .nautilus-window .floating-bar button.sidebar-button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: #ffffff;
-    background-color: rgba(255, 255, 255, 0); }
-  row:selected button:hover, .info button:hover,
-  .question button:hover,
-  .warning button:hover,
-  .error button:hover, .nautilus-window .floating-bar button:hover {
-    color: #ffffff;
-    outline-color: rgba(255, 255, 255, 0.3);
-    background-color: rgba(255, 255, 255, 0.2);
-    border-color: rgba(255, 255, 255, 0.8); }
-  row:selected button:active, .info button:active,
-  .question button:active,
-  .warning button:active,
-  .error button:active, .nautilus-window .floating-bar button:active, row:selected button:active:hover, .info button:active:hover,
-  .question button:active:hover,
-  .warning button:active:hover,
-  .error button:active:hover, .nautilus-window .floating-bar button:active:hover, row:selected button:checked, .info button:checked,
-  .question button:checked,
-  .warning button:checked,
-  .error button:checked, .nautilus-window .floating-bar button:checked {
-    color: #5294E2;
-    outline-color: rgba(82, 148, 226, 0.3);
-    background-color: #ffffff;
-    border-color: #ffffff; }
+
+row:selected button.flat, row:selected button.sidebar-button, .info button.flat, .info button.sidebar-button,
+.question button.flat,
+.question button.sidebar-button,
+.warning button.flat,
+.warning button.sidebar-button,
+.error button.flat,
+.error button.sidebar-button, .nautilus-window .floating-bar button.flat, .nautilus-window .floating-bar button.sidebar-button {
+  border-color: transparent;
+  background-color: transparent;
+  background-image: none;
+  color: #ffffff;
+  background-color: rgba(255, 255, 255, 0); }
+  .selection-mode.primary-toolbar button:disabled, headerbar.selection-mode button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled, row:selected button.flat:disabled, row:selected button.sidebar-button:disabled, .info button.flat:disabled, .info button.sidebar-button:disabled,
+  .question button.flat:disabled,
+  .question button.sidebar-button:disabled,
+  .warning button.flat:disabled,
+  .warning button.sidebar-button:disabled,
+  .error button.flat:disabled,
+  .error button.sidebar-button:disabled, .nautilus-window .floating-bar button.flat:disabled, .nautilus-window .floating-bar button.sidebar-button:disabled, .selection-mode.primary-toolbar button:disabled label, headerbar.selection-mode button:disabled label, .selection-mode.titlebar:not(headerbar) button:disabled label, row:selected button.flat:disabled label, row:selected button.sidebar-button:disabled label, .info button.flat:disabled label, .info button.sidebar-button:disabled label,
+  .question button.flat:disabled label,
+  .question button.sidebar-button:disabled label,
+  .warning button.flat:disabled label,
+  .warning button.sidebar-button:disabled label,
+  .error button.flat:disabled label,
+  .error button.sidebar-button:disabled label, .nautilus-window .floating-bar button.flat:disabled label, .nautilus-window .floating-bar button.sidebar-button:disabled label {
+    color: rgba(255, 255, 255, 0.4); }
+
+row:selected button:hover, .info button:hover,
+.question button:hover,
+.warning button:hover,
+.error button:hover, .nautilus-window .floating-bar button:hover {
+  color: #ffffff;
+  outline-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: rgba(255, 255, 255, 0.8); }
+
+.selection-mode.primary-toolbar button:active, headerbar.selection-mode button:active, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.primary-toolbar button:checked, headerbar.selection-mode button:checked, .selection-mode.titlebar:not(headerbar) button:checked, row:selected button:active, .info button:active,
+.question button:active,
+.warning button:active,
+.error button:active, .nautilus-window .floating-bar button:active, .selection-mode.primary-toolbar button:hover:active, headerbar.selection-mode button:hover:active, .selection-mode.titlebar:not(headerbar) button:hover:active, .selection-mode.primary-toolbar button:hover:checked, headerbar.selection-mode button:hover:checked, .selection-mode.titlebar:not(headerbar) button:hover:checked, row:selected button:active:hover, .info button:active:hover,
+.question button:active:hover,
+.warning button:active:hover,
+.error button:active:hover, .nautilus-window .floating-bar button:active:hover, row:selected button:checked, .info button:checked,
+.question button:checked,
+.warning button:checked,
+.error button:checked, .nautilus-window .floating-bar button:checked {
+  color: #5294E2;
+  outline-color: rgba(82, 148, 226, 0.3);
+  background-color: #ffffff;
+  border-color: #ffffff; }
+
+row:selected button:disabled, .info button:disabled,
+.question button:disabled,
+.warning button:disabled,
+.error button:disabled, .nautilus-window .floating-bar button:disabled {
+  background-color: rgba(255, 255, 255, 0);
+  border-color: rgba(255, 255, 255, 0.4); }
   row:selected button:disabled, .info button:disabled,
   .question button:disabled,
   .warning button:disabled,
-  .error button:disabled, .nautilus-window .floating-bar button:disabled {
-    color: rgba(255, 255, 255, 0.4);
-    background-color: rgba(255, 255, 255, 0);
-    border-color: rgba(255, 255, 255, 0.2); }
-    row:selected button:disabled:active, .info button:disabled:active,
-    .question button:disabled:active,
-    .warning button:disabled:active,
-    .error button:disabled:active, .nautilus-window .floating-bar button:disabled:active, row:selected button:disabled:checked, .info button:disabled:checked,
-    .question button:disabled:checked,
-    .warning button:disabled:checked,
-    .error button:disabled:checked, .nautilus-window .floating-bar button:disabled:checked {
-      color: rgba(82, 148, 226, 0.4);
-      background-color: rgba(255, 255, 255, 0.2);
-      border-color: rgba(255, 255, 255, 0.2); }
+  .error button:disabled, .nautilus-window .floating-bar button:disabled, row:selected button:disabled label, .info button:disabled label,
+  .question button:disabled label,
+  .warning button:disabled label,
+  .error button:disabled label, .nautilus-window .floating-bar button:disabled label {
+    color: rgba(255, 255, 255, 0.5); }
+  .selection-mode.primary-toolbar button:disabled:active, headerbar.selection-mode button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.primary-toolbar button:disabled:checked, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:checked, row:selected button:disabled:active, .info button:disabled:active,
+  .question button:disabled:active,
+  .warning button:disabled:active,
+  .error button:disabled:active, .nautilus-window .floating-bar button:disabled:active, .selection-mode.primary-toolbar button:disabled:checked, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:checked, .selection-mode.primary-toolbar button:disabled:active, headerbar.selection-mode button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:active, row:selected button:disabled:checked, .info button:disabled:checked,
+  .question button:disabled:checked,
+  .warning button:disabled:checked,
+  .error button:disabled:checked, .nautilus-window .floating-bar button:disabled:checked {
+    color: #5294E2;
+    background-color: rgba(255, 255, 255, 0.5);
+    border-color: rgba(255, 255, 255, 0.4); }
 
 tooltip {
   border-radius: 2px;
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index d1931ed..328af5d 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -917,35 +917,6 @@ headerbar,
     .selection-mode.titlebar:backdrop:not(headerbar) {
       background-color: rgba(82, 148, 226, 0.95);
       color: rgba(255, 255, 255, 0.6); }
-    headerbar.selection-mode button, .selection-mode.titlebar:not(headerbar) button {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      background-color: rgba(255, 255, 255, 0);
-      border-color: rgba(255, 255, 255, 0); }
-      headerbar.selection-mode button.flat, headerbar.selection-mode button.sidebar-button, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.sidebar-button {
-        border-color: transparent;
-        background-color: transparent;
-        background-image: none;
-        color: #ffffff;
-        background-color: rgba(255, 255, 255, 0); }
-      headerbar.selection-mode button:hover, .selection-mode.titlebar:not(headerbar) button:hover {
-        color: #ffffff;
-        outline-color: rgba(255, 255, 255, 0.3);
-        background-color: rgba(255, 255, 255, 0.05);
-        border-color: rgba(255, 255, 255, 0.5); }
-      headerbar.selection-mode button:active, headerbar.selection-mode button:checked, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked {
-        color: rgba(82, 148, 226, 0.95);
-        outline-color: rgba(82, 148, 226, 0.25);
-        background-color: #ffffff;
-        border-color: #ffffff; }
-      headerbar.selection-mode button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled {
-        color: rgba(255, 255, 255, 0.4);
-        background-color: rgba(255, 255, 255, 0);
-        border-color: rgba(255, 255, 255, 0); }
-        headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked {
-          color: rgba(82, 148, 226, 0.35);
-          background-color: rgba(255, 255, 255, 0.15);
-          border-color: rgba(255, 255, 255, 0.15); }
     headerbar.selection-mode .selection-menu, .selection-mode.titlebar:not(headerbar) .selection-menu {
       box-shadow: none;
       padding-left: 10px;
@@ -1114,6 +1085,13 @@ window.csd > .titlebar:not(headerbar):backdrop {
     border-color: rgba(82, 148, 226, 0.65);
     background-color: rgba(82, 148, 226, 0.65); }
 
+.selection-mode.primary-toolbar button, headerbar.selection-mode button, .selection-mode.titlebar:not(headerbar) button, .selection-mode.primary-toolbar button.flat, headerbar.selection-mode button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode.primary-toolbar button.sidebar-button, headerbar.selection-mode button.sidebar-button, .selection-mode.titlebar:not(headerbar) button.sidebar-button {
+  border-color: transparent;
+  background-color: transparent;
+  background-image: none;
+  color: #ffffff;
+  background-color: rgba(255, 255, 255, 0); }
+
 .primary-toolbar .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child), headerbar .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child), .titlebar:not(headerbar) .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child) {
   margin-right: 1px; }
 
@@ -2643,7 +2621,7 @@ infobar {
     color: #5294E2;
     background-color: #ffffff; }
 
-row:selected button, .info button,
+.selection-mode.primary-toolbar button:hover, headerbar.selection-mode button:hover, .selection-mode.titlebar:not(headerbar) button:hover, row:selected button, .info button,
 .question button,
 .warning button,
 .error button, .nautilus-window .floating-bar button {
@@ -2651,57 +2629,82 @@ row:selected button, .info button,
   outline-color: rgba(255, 255, 255, 0.3);
   background-color: rgba(255, 255, 255, 0);
   border-color: rgba(255, 255, 255, 0.5); }
-  row:selected button.flat, row:selected button.sidebar-button, .info button.flat, .info button.sidebar-button,
-  .question button.flat,
-  .question button.sidebar-button,
-  .warning button.flat,
-  .warning button.sidebar-button,
-  .error button.flat,
-  .error button.sidebar-button, .nautilus-window .floating-bar button.flat, .nautilus-window .floating-bar button.sidebar-button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: #ffffff;
-    background-color: rgba(255, 255, 255, 0); }
-  row:selected button:hover, .info button:hover,
-  .question button:hover,
-  .warning button:hover,
-  .error button:hover, .nautilus-window .floating-bar button:hover {
-    color: #ffffff;
-    outline-color: rgba(255, 255, 255, 0.3);
-    background-color: rgba(255, 255, 255, 0.2);
-    border-color: rgba(255, 255, 255, 0.8); }
-  row:selected button:active, .info button:active,
-  .question button:active,
-  .warning button:active,
-  .error button:active, .nautilus-window .floating-bar button:active, row:selected button:active:hover, .info button:active:hover,
-  .question button:active:hover,
-  .warning button:active:hover,
-  .error button:active:hover, .nautilus-window .floating-bar button:active:hover, row:selected button:checked, .info button:checked,
-  .question button:checked,
-  .warning button:checked,
-  .error button:checked, .nautilus-window .floating-bar button:checked {
-    color: #5294E2;
-    outline-color: rgba(82, 148, 226, 0.3);
-    background-color: #ffffff;
-    border-color: #ffffff; }
+
+row:selected button.flat, row:selected button.sidebar-button, .info button.flat, .info button.sidebar-button,
+.question button.flat,
+.question button.sidebar-button,
+.warning button.flat,
+.warning button.sidebar-button,
+.error button.flat,
+.error button.sidebar-button, .nautilus-window .floating-bar button.flat, .nautilus-window .floating-bar button.sidebar-button {
+  border-color: transparent;
+  background-color: transparent;
+  background-image: none;
+  color: #ffffff;
+  background-color: rgba(255, 255, 255, 0); }
+  .selection-mode.primary-toolbar button:disabled, headerbar.selection-mode button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled, row:selected button.flat:disabled, row:selected button.sidebar-button:disabled, .info button.flat:disabled, .info button.sidebar-button:disabled,
+  .question button.flat:disabled,
+  .question button.sidebar-button:disabled,
+  .warning button.flat:disabled,
+  .warning button.sidebar-button:disabled,
+  .error button.flat:disabled,
+  .error button.sidebar-button:disabled, .nautilus-window .floating-bar button.flat:disabled, .nautilus-window .floating-bar button.sidebar-button:disabled, .selection-mode.primary-toolbar button:disabled label, headerbar.selection-mode button:disabled label, .selection-mode.titlebar:not(headerbar) button:disabled label, row:selected button.flat:disabled label, row:selected button.sidebar-button:disabled label, .info button.flat:disabled label, .info button.sidebar-button:disabled label,
+  .question button.flat:disabled label,
+  .question button.sidebar-button:disabled label,
+  .warning button.flat:disabled label,
+  .warning button.sidebar-button:disabled label,
+  .error button.flat:disabled label,
+  .error button.sidebar-button:disabled label, .nautilus-window .floating-bar button.flat:disabled label, .nautilus-window .floating-bar button.sidebar-button:disabled label {
+    color: rgba(255, 255, 255, 0.4); }
+
+row:selected button:hover, .info button:hover,
+.question button:hover,
+.warning button:hover,
+.error button:hover, .nautilus-window .floating-bar button:hover {
+  color: #ffffff;
+  outline-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: rgba(255, 255, 255, 0.8); }
+
+.selection-mode.primary-toolbar button:active, headerbar.selection-mode button:active, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.primary-toolbar button:checked, headerbar.selection-mode button:checked, .selection-mode.titlebar:not(headerbar) button:checked, row:selected button:active, .info button:active,
+.question button:active,
+.warning button:active,
+.error button:active, .nautilus-window .floating-bar button:active, .selection-mode.primary-toolbar button:hover:active, headerbar.selection-mode button:hover:active, .selection-mode.titlebar:not(headerbar) button:hover:active, .selection-mode.primary-toolbar button:hover:checked, headerbar.selection-mode button:hover:checked, .selection-mode.titlebar:not(headerbar) button:hover:checked, row:selected button:active:hover, .info button:active:hover,
+.question button:active:hover,
+.warning button:active:hover,
+.error button:active:hover, .nautilus-window .floating-bar button:active:hover, row:selected button:checked, .info button:checked,
+.question button:checked,
+.warning button:checked,
+.error button:checked, .nautilus-window .floating-bar button:checked {
+  color: #5294E2;
+  outline-color: rgba(82, 148, 226, 0.3);
+  background-color: #ffffff;
+  border-color: #ffffff; }
+
+row:selected button:disabled, .info button:disabled,
+.question button:disabled,
+.warning button:disabled,
+.error button:disabled, .nautilus-window .floating-bar button:disabled {
+  background-color: rgba(255, 255, 255, 0);
+  border-color: rgba(255, 255, 255, 0.4); }
   row:selected button:disabled, .info button:disabled,
   .question button:disabled,
   .warning button:disabled,
-  .error button:disabled, .nautilus-window .floating-bar button:disabled {
-    color: rgba(255, 255, 255, 0.4);
-    background-color: rgba(255, 255, 255, 0);
-    border-color: rgba(255, 255, 255, 0.2); }
-    row:selected button:disabled:active, .info button:disabled:active,
-    .question button:disabled:active,
-    .warning button:disabled:active,
-    .error button:disabled:active, .nautilus-window .floating-bar button:disabled:active, row:selected button:disabled:checked, .info button:disabled:checked,
-    .question button:disabled:checked,
-    .warning button:disabled:checked,
-    .error button:disabled:checked, .nautilus-window .floating-bar button:disabled:checked {
-      color: rgba(82, 148, 226, 0.4);
-      background-color: rgba(255, 255, 255, 0.2);
-      border-color: rgba(255, 255, 255, 0.2); }
+  .error button:disabled, .nautilus-window .floating-bar button:disabled, row:selected button:disabled label, .info button:disabled label,
+  .question button:disabled label,
+  .warning button:disabled label,
+  .error button:disabled label, .nautilus-window .floating-bar button:disabled label {
+    color: rgba(255, 255, 255, 0.5); }
+  .selection-mode.primary-toolbar button:disabled:active, headerbar.selection-mode button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.primary-toolbar button:disabled:checked, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:checked, row:selected button:disabled:active, .info button:disabled:active,
+  .question button:disabled:active,
+  .warning button:disabled:active,
+  .error button:disabled:active, .nautilus-window .floating-bar button:disabled:active, .selection-mode.primary-toolbar button:disabled:checked, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:checked, .selection-mode.primary-toolbar button:disabled:active, headerbar.selection-mode button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:active, row:selected button:disabled:checked, .info button:disabled:checked,
+  .question button:disabled:checked,
+  .warning button:disabled:checked,
+  .error button:disabled:checked, .nautilus-window .floating-bar button:disabled:checked {
+    color: #5294E2;
+    background-color: rgba(255, 255, 255, 0.5);
+    border-color: rgba(255, 255, 255, 0.4); }
 
 tooltip {
   border-radius: 2px;
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index b5e4c5d..7cc5408 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -918,35 +918,6 @@ headerbar,
     .selection-mode.titlebar:backdrop:not(headerbar) {
       background-color: #5294E2;
       color: rgba(255, 255, 255, 0.6); }
-    headerbar.selection-mode button, .selection-mode.titlebar:not(headerbar) button {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      background-color: rgba(255, 255, 255, 0);
-      border-color: rgba(255, 255, 255, 0); }
-      headerbar.selection-mode button.flat, headerbar.selection-mode button.sidebar-button, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.sidebar-button {
-        border-color: transparent;
-        background-color: transparent;
-        background-image: none;
-        color: #ffffff;
-        background-color: rgba(255, 255, 255, 0); }
-      headerbar.selection-mode button:hover, .selection-mode.titlebar:not(headerbar) button:hover {
-        color: #ffffff;
-        outline-color: rgba(255, 255, 255, 0.3);
-        background-color: rgba(255, 255, 255, 0.05);
-        border-color: rgba(255, 255, 255, 0.5); }
-      headerbar.selection-mode button:active, headerbar.selection-mode button:checked, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked {
-        color: #5294E2;
-        outline-color: rgba(82, 148, 226, 0.3);
-        background-color: #ffffff;
-        border-color: #ffffff; }
-      headerbar.selection-mode button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled {
-        color: rgba(255, 255, 255, 0.4);
-        background-color: rgba(255, 255, 255, 0);
-        border-color: rgba(255, 255, 255, 0); }
-        headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked {
-          color: rgba(82, 148, 226, 0.4);
-          background-color: rgba(255, 255, 255, 0.15);
-          border-color: rgba(255, 255, 255, 0.15); }
     headerbar.selection-mode .selection-menu, .selection-mode.titlebar:not(headerbar) .selection-menu {
       box-shadow: none;
       padding-left: 10px;
@@ -1115,6 +1086,13 @@ window.csd > .titlebar:not(headerbar):backdrop {
     border-color: rgba(82, 148, 226, 0.65);
     background-color: rgba(82, 148, 226, 0.65); }
 
+.selection-mode.primary-toolbar button, headerbar.selection-mode button, .selection-mode.titlebar:not(headerbar) button, .selection-mode.primary-toolbar button.flat, headerbar.selection-mode button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode.primary-toolbar button.sidebar-button, headerbar.selection-mode button.sidebar-button, .selection-mode.titlebar:not(headerbar) button.sidebar-button {
+  border-color: transparent;
+  background-color: transparent;
+  background-image: none;
+  color: #ffffff;
+  background-color: rgba(255, 255, 255, 0); }
+
 .primary-toolbar .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child), headerbar .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child), .titlebar:not(headerbar) .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child) {
   margin-right: 1px; }
 
@@ -2644,7 +2622,7 @@ infobar {
     color: #5294E2;
     background-color: #ffffff; }
 
-row:selected button, .info button,
+.selection-mode.primary-toolbar button:hover, headerbar.selection-mode button:hover, .selection-mode.titlebar:not(headerbar) button:hover, row:selected button, .info button,
 .question button,
 .warning button,
 .error button, .nautilus-window .floating-bar button {
@@ -2652,57 +2630,82 @@ row:selected button, .info button,
   outline-color: rgba(255, 255, 255, 0.3);
   background-color: rgba(255, 255, 255, 0);
   border-color: rgba(255, 255, 255, 0.5); }
-  row:selected button.flat, row:selected button.sidebar-button, .info button.flat, .info button.sidebar-button,
-  .question button.flat,
-  .question button.sidebar-button,
-  .warning button.flat,
-  .warning button.sidebar-button,
-  .error button.flat,
-  .error button.sidebar-button, .nautilus-window .floating-bar button.flat, .nautilus-window .floating-bar button.sidebar-button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: #ffffff;
-    background-color: rgba(255, 255, 255, 0); }
-  row:selected button:hover, .info button:hover,
-  .question button:hover,
-  .warning button:hover,
-  .error button:hover, .nautilus-window .floating-bar button:hover {
-    color: #ffffff;
-    outline-color: rgba(255, 255, 255, 0.3);
-    background-color: rgba(255, 255, 255, 0.2);
-    border-color: rgba(255, 255, 255, 0.8); }
-  row:selected button:active, .info button:active,
-  .question button:active,
-  .warning button:active,
-  .error button:active, .nautilus-window .floating-bar button:active, row:selected button:active:hover, .info button:active:hover,
-  .question button:active:hover,
-  .warning button:active:hover,
-  .error button:active:hover, .nautilus-window .floating-bar button:active:hover, row:selected button:checked, .info button:checked,
-  .question button:checked,
-  .warning button:checked,
-  .error button:checked, .nautilus-window .floating-bar button:checked {
-    color: #5294E2;
-    outline-color: rgba(82, 148, 226, 0.3);
-    background-color: #ffffff;
-    border-color: #ffffff; }
+
+row:selected button.flat, row:selected button.sidebar-button, .info button.flat, .info button.sidebar-button,
+.question button.flat,
+.question button.sidebar-button,
+.warning button.flat,
+.warning button.sidebar-button,
+.error button.flat,
+.error button.sidebar-button, .nautilus-window .floating-bar button.flat, .nautilus-window .floating-bar button.sidebar-button {
+  border-color: transparent;
+  background-color: transparent;
+  background-image: none;
+  color: #ffffff;
+  background-color: rgba(255, 255, 255, 0); }
+  .selection-mode.primary-toolbar button:disabled, headerbar.selection-mode button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled, row:selected button.flat:disabled, row:selected button.sidebar-button:disabled, .info button.flat:disabled, .info button.sidebar-button:disabled,
+  .question button.flat:disabled,
+  .question button.sidebar-button:disabled,
+  .warning button.flat:disabled,
+  .warning button.sidebar-button:disabled,
+  .error button.flat:disabled,
+  .error button.sidebar-button:disabled, .nautilus-window .floating-bar button.flat:disabled, .nautilus-window .floating-bar button.sidebar-button:disabled, .selection-mode.primary-toolbar button:disabled label, headerbar.selection-mode button:disabled label, .selection-mode.titlebar:not(headerbar) button:disabled label, row:selected button.flat:disabled label, row:selected button.sidebar-button:disabled label, .info button.flat:disabled label, .info button.sidebar-button:disabled label,
+  .question button.flat:disabled label,
+  .question button.sidebar-button:disabled label,
+  .warning button.flat:disabled label,
+  .warning button.sidebar-button:disabled label,
+  .error button.flat:disabled label,
+  .error button.sidebar-button:disabled label, .nautilus-window .floating-bar button.flat:disabled label, .nautilus-window .floating-bar button.sidebar-button:disabled label {
+    color: rgba(255, 255, 255, 0.4); }
+
+row:selected button:hover, .info button:hover,
+.question button:hover,
+.warning button:hover,
+.error button:hover, .nautilus-window .floating-bar button:hover {
+  color: #ffffff;
+  outline-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: rgba(255, 255, 255, 0.8); }
+
+.selection-mode.primary-toolbar button:active, headerbar.selection-mode button:active, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.primary-toolbar button:checked, headerbar.selection-mode button:checked, .selection-mode.titlebar:not(headerbar) button:checked, row:selected button:active, .info button:active,
+.question button:active,
+.warning button:active,
+.error button:active, .nautilus-window .floating-bar button:active, .selection-mode.primary-toolbar button:hover:active, headerbar.selection-mode button:hover:active, .selection-mode.titlebar:not(headerbar) button:hover:active, .selection-mode.primary-toolbar button:hover:checked, headerbar.selection-mode button:hover:checked, .selection-mode.titlebar:not(headerbar) button:hover:checked, row:selected button:active:hover, .info button:active:hover,
+.question button:active:hover,
+.warning button:active:hover,
+.error button:active:hover, .nautilus-window .floating-bar button:active:hover, row:selected button:checked, .info button:checked,
+.question button:checked,
+.warning button:checked,
+.error button:checked, .nautilus-window .floating-bar button:checked {
+  color: #5294E2;
+  outline-color: rgba(82, 148, 226, 0.3);
+  background-color: #ffffff;
+  border-color: #ffffff; }
+
+row:selected button:disabled, .info button:disabled,
+.question button:disabled,
+.warning button:disabled,
+.error button:disabled, .nautilus-window .floating-bar button:disabled {
+  background-color: rgba(255, 255, 255, 0);
+  border-color: rgba(255, 255, 255, 0.4); }
   row:selected button:disabled, .info button:disabled,
   .question button:disabled,
   .warning button:disabled,
-  .error button:disabled, .nautilus-window .floating-bar button:disabled {
-    color: rgba(255, 255, 255, 0.4);
-    background-color: rgba(255, 255, 255, 0);
-    border-color: rgba(255, 255, 255, 0.2); }
-    row:selected button:disabled:active, .info button:disabled:active,
-    .question button:disabled:active,
-    .warning button:disabled:active,
-    .error button:disabled:active, .nautilus-window .floating-bar button:disabled:active, row:selected button:disabled:checked, .info button:disabled:checked,
-    .question button:disabled:checked,
-    .warning button:disabled:checked,
-    .error button:disabled:checked, .nautilus-window .floating-bar button:disabled:checked {
-      color: rgba(82, 148, 226, 0.4);
-      background-color: rgba(255, 255, 255, 0.2);
-      border-color: rgba(255, 255, 255, 0.2); }
+  .error button:disabled, .nautilus-window .floating-bar button:disabled, row:selected button:disabled label, .info button:disabled label,
+  .question button:disabled label,
+  .warning button:disabled label,
+  .error button:disabled label, .nautilus-window .floating-bar button:disabled label {
+    color: rgba(255, 255, 255, 0.5); }
+  .selection-mode.primary-toolbar button:disabled:active, headerbar.selection-mode button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.primary-toolbar button:disabled:checked, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:checked, row:selected button:disabled:active, .info button:disabled:active,
+  .question button:disabled:active,
+  .warning button:disabled:active,
+  .error button:disabled:active, .nautilus-window .floating-bar button:disabled:active, .selection-mode.primary-toolbar button:disabled:checked, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:checked, .selection-mode.primary-toolbar button:disabled:active, headerbar.selection-mode button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:active, row:selected button:disabled:checked, .info button:disabled:checked,
+  .question button:disabled:checked,
+  .warning button:disabled:checked,
+  .error button:disabled:checked, .nautilus-window .floating-bar button:disabled:checked {
+    color: #5294E2;
+    background-color: rgba(255, 255, 255, 0.5);
+    border-color: rgba(255, 255, 255, 0.4); }
 
 tooltip {
   border-radius: 2px;
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index caaa5db..8d23f0e 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -917,35 +917,6 @@ headerbar,
     .selection-mode.titlebar:backdrop:not(headerbar) {
       background-color: #5294E2;
       color: rgba(255, 255, 255, 0.6); }
-    headerbar.selection-mode button, .selection-mode.titlebar:not(headerbar) button {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      background-color: rgba(255, 255, 255, 0);
-      border-color: rgba(255, 255, 255, 0); }
-      headerbar.selection-mode button.flat, headerbar.selection-mode button.sidebar-button, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.sidebar-button {
-        border-color: transparent;
-        background-color: transparent;
-        background-image: none;
-        color: #ffffff;
-        background-color: rgba(255, 255, 255, 0); }
-      headerbar.selection-mode button:hover, .selection-mode.titlebar:not(headerbar) button:hover {
-        color: #ffffff;
-        outline-color: rgba(255, 255, 255, 0.3);
-        background-color: rgba(255, 255, 255, 0.05);
-        border-color: rgba(255, 255, 255, 0.5); }
-      headerbar.selection-mode button:active, headerbar.selection-mode button:checked, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked {
-        color: #5294E2;
-        outline-color: rgba(82, 148, 226, 0.3);
-        background-color: #ffffff;
-        border-color: #ffffff; }
-      headerbar.selection-mode button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled {
-        color: rgba(255, 255, 255, 0.4);
-        background-color: rgba(255, 255, 255, 0);
-        border-color: rgba(255, 255, 255, 0); }
-        headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked {
-          color: rgba(82, 148, 226, 0.4);
-          background-color: rgba(255, 255, 255, 0.15);
-          border-color: rgba(255, 255, 255, 0.15); }
     headerbar.selection-mode .selection-menu, .selection-mode.titlebar:not(headerbar) .selection-menu {
       box-shadow: none;
       padding-left: 10px;
@@ -1114,6 +1085,13 @@ window.csd > .titlebar:not(headerbar):backdrop {
     border-color: rgba(82, 148, 226, 0.65);
     background-color: rgba(82, 148, 226, 0.65); }
 
+.selection-mode.primary-toolbar button, headerbar.selection-mode button, .selection-mode.titlebar:not(headerbar) button, .selection-mode.primary-toolbar button.flat, headerbar.selection-mode button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode.primary-toolbar button.sidebar-button, headerbar.selection-mode button.sidebar-button, .selection-mode.titlebar:not(headerbar) button.sidebar-button {
+  border-color: transparent;
+  background-color: transparent;
+  background-image: none;
+  color: #ffffff;
+  background-color: rgba(255, 255, 255, 0); }
+
 .primary-toolbar .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child), headerbar .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child), .titlebar:not(headerbar) .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child) {
   margin-right: 1px; }
 
@@ -2643,7 +2621,7 @@ infobar {
     color: #5294E2;
     background-color: #ffffff; }
 
-row:selected button, .info button,
+.selection-mode.primary-toolbar button:hover, headerbar.selection-mode button:hover, .selection-mode.titlebar:not(headerbar) button:hover, row:selected button, .info button,
 .question button,
 .warning button,
 .error button, .nautilus-window .floating-bar button {
@@ -2651,57 +2629,82 @@ row:selected button, .info button,
   outline-color: rgba(255, 255, 255, 0.3);
   background-color: rgba(255, 255, 255, 0);
   border-color: rgba(255, 255, 255, 0.5); }
-  row:selected button.flat, row:selected button.sidebar-button, .info button.flat, .info button.sidebar-button,
-  .question button.flat,
-  .question button.sidebar-button,
-  .warning button.flat,
-  .warning button.sidebar-button,
-  .error button.flat,
-  .error button.sidebar-button, .nautilus-window .floating-bar button.flat, .nautilus-window .floating-bar button.sidebar-button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: #ffffff;
-    background-color: rgba(255, 255, 255, 0); }
-  row:selected button:hover, .info button:hover,
-  .question button:hover,
-  .warning button:hover,
-  .error button:hover, .nautilus-window .floating-bar button:hover {
-    color: #ffffff;
-    outline-color: rgba(255, 255, 255, 0.3);
-    background-color: rgba(255, 255, 255, 0.2);
-    border-color: rgba(255, 255, 255, 0.8); }
-  row:selected button:active, .info button:active,
-  .question button:active,
-  .warning button:active,
-  .error button:active, .nautilus-window .floating-bar button:active, row:selected button:active:hover, .info button:active:hover,
-  .question button:active:hover,
-  .warning button:active:hover,
-  .error button:active:hover, .nautilus-window .floating-bar button:active:hover, row:selected button:checked, .info button:checked,
-  .question button:checked,
-  .warning button:checked,
-  .error button:checked, .nautilus-window .floating-bar button:checked {
-    color: #5294E2;
-    outline-color: rgba(82, 148, 226, 0.3);
-    background-color: #ffffff;
-    border-color: #ffffff; }
+
+row:selected button.flat, row:selected button.sidebar-button, .info button.flat, .info button.sidebar-button,
+.question button.flat,
+.question button.sidebar-button,
+.warning button.flat,
+.warning button.sidebar-button,
+.error button.flat,
+.error button.sidebar-button, .nautilus-window .floating-bar button.flat, .nautilus-window .floating-bar button.sidebar-button {
+  border-color: transparent;
+  background-color: transparent;
+  background-image: none;
+  color: #ffffff;
+  background-color: rgba(255, 255, 255, 0); }
+  .selection-mode.primary-toolbar button:disabled, headerbar.selection-mode button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled, row:selected button.flat:disabled, row:selected button.sidebar-button:disabled, .info button.flat:disabled, .info button.sidebar-button:disabled,
+  .question button.flat:disabled,
+  .question button.sidebar-button:disabled,
+  .warning button.flat:disabled,
+  .warning button.sidebar-button:disabled,
+  .error button.flat:disabled,
+  .error button.sidebar-button:disabled, .nautilus-window .floating-bar button.flat:disabled, .nautilus-window .floating-bar button.sidebar-button:disabled, .selection-mode.primary-toolbar button:disabled label, headerbar.selection-mode button:disabled label, .selection-mode.titlebar:not(headerbar) button:disabled label, row:selected button.flat:disabled label, row:selected button.sidebar-button:disabled label, .info button.flat:disabled label, .info button.sidebar-button:disabled label,
+  .question button.flat:disabled label,
+  .question button.sidebar-button:disabled label,
+  .warning button.flat:disabled label,
+  .warning button.sidebar-button:disabled label,
+  .error button.flat:disabled label,
+  .error button.sidebar-button:disabled label, .nautilus-window .floating-bar button.flat:disabled label, .nautilus-window .floating-bar button.sidebar-button:disabled label {
+    color: rgba(255, 255, 255, 0.4); }
+
+row:selected button:hover, .info button:hover,
+.question button:hover,
+.warning button:hover,
+.error button:hover, .nautilus-window .floating-bar button:hover {
+  color: #ffffff;
+  outline-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: rgba(255, 255, 255, 0.8); }
+
+.selection-mode.primary-toolbar button:active, headerbar.selection-mode button:active, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.primary-toolbar button:checked, headerbar.selection-mode button:checked, .selection-mode.titlebar:not(headerbar) button:checked, row:selected button:active, .info button:active,
+.question button:active,
+.warning button:active,
+.error button:active, .nautilus-window .floating-bar button:active, .selection-mode.primary-toolbar button:hover:active, headerbar.selection-mode button:hover:active, .selection-mode.titlebar:not(headerbar) button:hover:active, .selection-mode.primary-toolbar button:hover:checked, headerbar.selection-mode button:hover:checked, .selection-mode.titlebar:not(headerbar) button:hover:checked, row:selected button:active:hover, .info button:active:hover,
+.question button:active:hover,
+.warning button:active:hover,
+.error button:active:hover, .nautilus-window .floating-bar button:active:hover, row:selected button:checked, .info button:checked,
+.question button:checked,
+.warning button:checked,
+.error button:checked, .nautilus-window .floating-bar button:checked {
+  color: #5294E2;
+  outline-color: rgba(82, 148, 226, 0.3);
+  background-color: #ffffff;
+  border-color: #ffffff; }
+
+row:selected button:disabled, .info button:disabled,
+.question button:disabled,
+.warning button:disabled,
+.error button:disabled, .nautilus-window .floating-bar button:disabled {
+  background-color: rgba(255, 255, 255, 0);
+  border-color: rgba(255, 255, 255, 0.4); }
   row:selected button:disabled, .info button:disabled,
   .question button:disabled,
   .warning button:disabled,
-  .error button:disabled, .nautilus-window .floating-bar button:disabled {
-    color: rgba(255, 255, 255, 0.4);
-    background-color: rgba(255, 255, 255, 0);
-    border-color: rgba(255, 255, 255, 0.2); }
-    row:selected button:disabled:active, .info button:disabled:active,
-    .question button:disabled:active,
-    .warning button:disabled:active,
-    .error button:disabled:active, .nautilus-window .floating-bar button:disabled:active, row:selected button:disabled:checked, .info button:disabled:checked,
-    .question button:disabled:checked,
-    .warning button:disabled:checked,
-    .error button:disabled:checked, .nautilus-window .floating-bar button:disabled:checked {
-      color: rgba(82, 148, 226, 0.4);
-      background-color: rgba(255, 255, 255, 0.2);
-      border-color: rgba(255, 255, 255, 0.2); }
+  .error button:disabled, .nautilus-window .floating-bar button:disabled, row:selected button:disabled label, .info button:disabled label,
+  .question button:disabled label,
+  .warning button:disabled label,
+  .error button:disabled label, .nautilus-window .floating-bar button:disabled label {
+    color: rgba(255, 255, 255, 0.5); }
+  .selection-mode.primary-toolbar button:disabled:active, headerbar.selection-mode button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.primary-toolbar button:disabled:checked, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:checked, row:selected button:disabled:active, .info button:disabled:active,
+  .question button:disabled:active,
+  .warning button:disabled:active,
+  .error button:disabled:active, .nautilus-window .floating-bar button:disabled:active, .selection-mode.primary-toolbar button:disabled:checked, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:checked, .selection-mode.primary-toolbar button:disabled:active, headerbar.selection-mode button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:active, row:selected button:disabled:checked, .info button:disabled:checked,
+  .question button:disabled:checked,
+  .warning button:disabled:checked,
+  .error button:disabled:checked, .nautilus-window .floating-bar button:disabled:checked {
+    color: #5294E2;
+    background-color: rgba(255, 255, 255, 0.5);
+    border-color: rgba(255, 255, 255, 0.4); }
 
 tooltip {
   border-radius: 2px;
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 432160f..c045239 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -917,35 +917,6 @@ headerbar,
     .selection-mode.titlebar:backdrop:not(headerbar) {
       background-color: #5294E2;
       color: rgba(255, 255, 255, 0.6); }
-    headerbar.selection-mode button, .selection-mode.titlebar:not(headerbar) button {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      background-color: rgba(255, 255, 255, 0);
-      border-color: rgba(255, 255, 255, 0); }
-      headerbar.selection-mode button.flat, headerbar.selection-mode button.sidebar-button, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.sidebar-button {
-        border-color: transparent;
-        background-color: transparent;
-        background-image: none;
-        color: #ffffff;
-        background-color: rgba(255, 255, 255, 0); }
-      headerbar.selection-mode button:hover, .selection-mode.titlebar:not(headerbar) button:hover {
-        color: #ffffff;
-        outline-color: rgba(255, 255, 255, 0.3);
-        background-color: rgba(255, 255, 255, 0.05);
-        border-color: rgba(255, 255, 255, 0.5); }
-      headerbar.selection-mode button:active, headerbar.selection-mode button:checked, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked {
-        color: #5294E2;
-        outline-color: rgba(82, 148, 226, 0.3);
-        background-color: #ffffff;
-        border-color: #ffffff; }
-      headerbar.selection-mode button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled {
-        color: rgba(255, 255, 255, 0.4);
-        background-color: rgba(255, 255, 255, 0);
-        border-color: rgba(255, 255, 255, 0); }
-        headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked {
-          color: rgba(82, 148, 226, 0.4);
-          background-color: rgba(255, 255, 255, 0.15);
-          border-color: rgba(255, 255, 255, 0.15); }
     headerbar.selection-mode .selection-menu, .selection-mode.titlebar:not(headerbar) .selection-menu {
       box-shadow: none;
       padding-left: 10px;
@@ -1114,6 +1085,13 @@ window.csd > .titlebar:not(headerbar):backdrop {
     border-color: rgba(82, 148, 226, 0.65);
     background-color: rgba(82, 148, 226, 0.65); }
 
+.selection-mode.primary-toolbar button, headerbar.selection-mode button, .selection-mode.titlebar:not(headerbar) button, .selection-mode.primary-toolbar button.flat, headerbar.selection-mode button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode.primary-toolbar button.sidebar-button, headerbar.selection-mode button.sidebar-button, .selection-mode.titlebar:not(headerbar) button.sidebar-button {
+  border-color: transparent;
+  background-color: transparent;
+  background-image: none;
+  color: #ffffff;
+  background-color: rgba(255, 255, 255, 0); }
+
 .primary-toolbar .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child), headerbar .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child), .titlebar:not(headerbar) .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child) {
   margin-right: 1px; }
 
@@ -2647,7 +2625,7 @@ infobar {
     color: #5294E2;
     background-color: #ffffff; }
 
-row:selected button, .info button,
+.selection-mode.primary-toolbar button:hover, headerbar.selection-mode button:hover, .selection-mode.titlebar:not(headerbar) button:hover, row:selected button, .info button,
 .question button,
 .warning button,
 .error button, .nautilus-window .floating-bar button {
@@ -2655,57 +2633,82 @@ row:selected button, .info button,
   outline-color: rgba(255, 255, 255, 0.3);
   background-color: rgba(255, 255, 255, 0);
   border-color: rgba(255, 255, 255, 0.5); }
-  row:selected button.flat, row:selected button.sidebar-button, .info button.flat, .info button.sidebar-button,
-  .question button.flat,
-  .question button.sidebar-button,
-  .warning button.flat,
-  .warning button.sidebar-button,
-  .error button.flat,
-  .error button.sidebar-button, .nautilus-window .floating-bar button.flat, .nautilus-window .floating-bar button.sidebar-button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: #ffffff;
-    background-color: rgba(255, 255, 255, 0); }
-  row:selected button:hover, .info button:hover,
-  .question button:hover,
-  .warning button:hover,
-  .error button:hover, .nautilus-window .floating-bar button:hover {
-    color: #ffffff;
-    outline-color: rgba(255, 255, 255, 0.3);
-    background-color: rgba(255, 255, 255, 0.2);
-    border-color: rgba(255, 255, 255, 0.8); }
-  row:selected button:active, .info button:active,
-  .question button:active,
-  .warning button:active,
-  .error button:active, .nautilus-window .floating-bar button:active, row:selected button:active:hover, .info button:active:hover,
-  .question button:active:hover,
-  .warning button:active:hover,
-  .error button:active:hover, .nautilus-window .floating-bar button:active:hover, row:selected button:checked, .info button:checked,
-  .question button:checked,
-  .warning button:checked,
-  .error button:checked, .nautilus-window .floating-bar button:checked {
-    color: #5294E2;
-    outline-color: rgba(82, 148, 226, 0.3);
-    background-color: #ffffff;
-    border-color: #ffffff; }
+
+row:selected button.flat, row:selected button.sidebar-button, .info button.flat, .info button.sidebar-button,
+.question button.flat,
+.question button.sidebar-button,
+.warning button.flat,
+.warning button.sidebar-button,
+.error button.flat,
+.error button.sidebar-button, .nautilus-window .floating-bar button.flat, .nautilus-window .floating-bar button.sidebar-button {
+  border-color: transparent;
+  background-color: transparent;
+  background-image: none;
+  color: #ffffff;
+  background-color: rgba(255, 255, 255, 0); }
+  .selection-mode.primary-toolbar button:disabled, headerbar.selection-mode button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled, row:selected button.flat:disabled, row:selected button.sidebar-button:disabled, .info button.flat:disabled, .info button.sidebar-button:disabled,
+  .question button.flat:disabled,
+  .question button.sidebar-button:disabled,
+  .warning button.flat:disabled,
+  .warning button.sidebar-button:disabled,
+  .error button.flat:disabled,
+  .error button.sidebar-button:disabled, .nautilus-window .floating-bar button.flat:disabled, .nautilus-window .floating-bar button.sidebar-button:disabled, .selection-mode.primary-toolbar button:disabled label, headerbar.selection-mode button:disabled label, .selection-mode.titlebar:not(headerbar) button:disabled label, row:selected button.flat:disabled label, row:selected button.sidebar-button:disabled label, .info button.flat:disabled label, .info button.sidebar-button:disabled label,
+  .question button.flat:disabled label,
+  .question button.sidebar-button:disabled label,
+  .warning button.flat:disabled label,
+  .warning button.sidebar-button:disabled label,
+  .error button.flat:disabled label,
+  .error button.sidebar-button:disabled label, .nautilus-window .floating-bar button.flat:disabled label, .nautilus-window .floating-bar button.sidebar-button:disabled label {
+    color: rgba(255, 255, 255, 0.4); }
+
+row:selected button:hover, .info button:hover,
+.question button:hover,
+.warning button:hover,
+.error button:hover, .nautilus-window .floating-bar button:hover {
+  color: #ffffff;
+  outline-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: rgba(255, 255, 255, 0.8); }
+
+.selection-mode.primary-toolbar button:active, headerbar.selection-mode button:active, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.primary-toolbar button:checked, headerbar.selection-mode button:checked, .selection-mode.titlebar:not(headerbar) button:checked, row:selected button:active, .info button:active,
+.question button:active,
+.warning button:active,
+.error button:active, .nautilus-window .floating-bar button:active, .selection-mode.primary-toolbar button:hover:active, headerbar.selection-mode button:hover:active, .selection-mode.titlebar:not(headerbar) button:hover:active, .selection-mode.primary-toolbar button:hover:checked, headerbar.selection-mode button:hover:checked, .selection-mode.titlebar:not(headerbar) button:hover:checked, row:selected button:active:hover, .info button:active:hover,
+.question button:active:hover,
+.warning button:active:hover,
+.error button:active:hover, .nautilus-window .floating-bar button:active:hover, row:selected button:checked, .info button:checked,
+.question button:checked,
+.warning button:checked,
+.error button:checked, .nautilus-window .floating-bar button:checked {
+  color: #5294E2;
+  outline-color: rgba(82, 148, 226, 0.3);
+  background-color: #ffffff;
+  border-color: #ffffff; }
+
+row:selected button:disabled, .info button:disabled,
+.question button:disabled,
+.warning button:disabled,
+.error button:disabled, .nautilus-window .floating-bar button:disabled {
+  background-color: rgba(255, 255, 255, 0);
+  border-color: rgba(255, 255, 255, 0.4); }
   row:selected button:disabled, .info button:disabled,
   .question button:disabled,
   .warning button:disabled,
-  .error button:disabled, .nautilus-window .floating-bar button:disabled {
-    color: rgba(255, 255, 255, 0.4);
-    background-color: rgba(255, 255, 255, 0);
-    border-color: rgba(255, 255, 255, 0.2); }
-    row:selected button:disabled:active, .info button:disabled:active,
-    .question button:disabled:active,
-    .warning button:disabled:active,
-    .error button:disabled:active, .nautilus-window .floating-bar button:disabled:active, row:selected button:disabled:checked, .info button:disabled:checked,
-    .question button:disabled:checked,
-    .warning button:disabled:checked,
-    .error button:disabled:checked, .nautilus-window .floating-bar button:disabled:checked {
-      color: rgba(82, 148, 226, 0.4);
-      background-color: rgba(255, 255, 255, 0.2);
-      border-color: rgba(255, 255, 255, 0.2); }
+  .error button:disabled, .nautilus-window .floating-bar button:disabled, row:selected button:disabled label, .info button:disabled label,
+  .question button:disabled label,
+  .warning button:disabled label,
+  .error button:disabled label, .nautilus-window .floating-bar button:disabled label {
+    color: rgba(255, 255, 255, 0.5); }
+  .selection-mode.primary-toolbar button:disabled:active, headerbar.selection-mode button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.primary-toolbar button:disabled:checked, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:checked, row:selected button:disabled:active, .info button:disabled:active,
+  .question button:disabled:active,
+  .warning button:disabled:active,
+  .error button:disabled:active, .nautilus-window .floating-bar button:disabled:active, .selection-mode.primary-toolbar button:disabled:checked, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:checked, .selection-mode.primary-toolbar button:disabled:active, headerbar.selection-mode button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:active, row:selected button:disabled:checked, .info button:disabled:checked,
+  .question button:disabled:checked,
+  .warning button:disabled:checked,
+  .error button:disabled:checked, .nautilus-window .floating-bar button:disabled:checked {
+    color: #5294E2;
+    background-color: rgba(255, 255, 255, 0.5);
+    border-color: rgba(255, 255, 255, 0.4); }
 
 tooltip {
   border-radius: 2px;
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 06282ba..4617453 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -917,35 +917,6 @@ headerbar,
     .selection-mode.titlebar:backdrop:not(headerbar) {
       background-color: rgba(82, 148, 226, 0.95);
       color: rgba(255, 255, 255, 0.6); }
-    headerbar.selection-mode button, .selection-mode.titlebar:not(headerbar) button {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      background-color: rgba(255, 255, 255, 0);
-      border-color: rgba(255, 255, 255, 0); }
-      headerbar.selection-mode button.flat, headerbar.selection-mode button.sidebar-button, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode.titlebar:not(headerbar) button.sidebar-button {
-        border-color: transparent;
-        background-color: transparent;
-        background-image: none;
-        color: #ffffff;
-        background-color: rgba(255, 255, 255, 0); }
-      headerbar.selection-mode button:hover, .selection-mode.titlebar:not(headerbar) button:hover {
-        color: #ffffff;
-        outline-color: rgba(255, 255, 255, 0.3);
-        background-color: rgba(255, 255, 255, 0.05);
-        border-color: rgba(255, 255, 255, 0.5); }
-      headerbar.selection-mode button:active, headerbar.selection-mode button:checked, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.titlebar:not(headerbar) button:checked {
-        color: rgba(82, 148, 226, 0.95);
-        outline-color: rgba(82, 148, 226, 0.25);
-        background-color: #ffffff;
-        border-color: #ffffff; }
-      headerbar.selection-mode button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled {
-        color: rgba(255, 255, 255, 0.4);
-        background-color: rgba(255, 255, 255, 0);
-        border-color: rgba(255, 255, 255, 0); }
-        headerbar.selection-mode button:disabled:active, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:checked {
-          color: rgba(82, 148, 226, 0.35);
-          background-color: rgba(255, 255, 255, 0.15);
-          border-color: rgba(255, 255, 255, 0.15); }
     headerbar.selection-mode .selection-menu, .selection-mode.titlebar:not(headerbar) .selection-menu {
       box-shadow: none;
       padding-left: 10px;
@@ -1114,6 +1085,13 @@ window.csd > .titlebar:not(headerbar):backdrop {
     border-color: rgba(82, 148, 226, 0.65);
     background-color: rgba(82, 148, 226, 0.65); }
 
+.selection-mode.primary-toolbar button, headerbar.selection-mode button, .selection-mode.titlebar:not(headerbar) button, .selection-mode.primary-toolbar button.flat, headerbar.selection-mode button.flat, .selection-mode.titlebar:not(headerbar) button.flat, .selection-mode.primary-toolbar button.sidebar-button, headerbar.selection-mode button.sidebar-button, .selection-mode.titlebar:not(headerbar) button.sidebar-button {
+  border-color: transparent;
+  background-color: transparent;
+  background-image: none;
+  color: #ffffff;
+  background-color: rgba(255, 255, 255, 0); }
+
 .primary-toolbar .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child), headerbar .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child), .titlebar:not(headerbar) .linked:not(.vertical):not(.path-bar):not(.stack-switcher) button:not(:last-child):not(:only-child) {
   margin-right: 1px; }
 
@@ -2647,7 +2625,7 @@ infobar {
     color: #5294E2;
     background-color: #ffffff; }
 
-row:selected button, .info button,
+.selection-mode.primary-toolbar button:hover, headerbar.selection-mode button:hover, .selection-mode.titlebar:not(headerbar) button:hover, row:selected button, .info button,
 .question button,
 .warning button,
 .error button, .nautilus-window .floating-bar button {
@@ -2655,57 +2633,82 @@ row:selected button, .info button,
   outline-color: rgba(255, 255, 255, 0.3);
   background-color: rgba(255, 255, 255, 0);
   border-color: rgba(255, 255, 255, 0.5); }
-  row:selected button.flat, row:selected button.sidebar-button, .info button.flat, .info button.sidebar-button,
-  .question button.flat,
-  .question button.sidebar-button,
-  .warning button.flat,
-  .warning button.sidebar-button,
-  .error button.flat,
-  .error button.sidebar-button, .nautilus-window .floating-bar button.flat, .nautilus-window .floating-bar button.sidebar-button {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: #ffffff;
-    background-color: rgba(255, 255, 255, 0); }
-  row:selected button:hover, .info button:hover,
-  .question button:hover,
-  .warning button:hover,
-  .error button:hover, .nautilus-window .floating-bar button:hover {
-    color: #ffffff;
-    outline-color: rgba(255, 255, 255, 0.3);
-    background-color: rgba(255, 255, 255, 0.2);
-    border-color: rgba(255, 255, 255, 0.8); }
-  row:selected button:active, .info button:active,
-  .question button:active,
-  .warning button:active,
-  .error button:active, .nautilus-window .floating-bar button:active, row:selected button:active:hover, .info button:active:hover,
-  .question button:active:hover,
-  .warning button:active:hover,
-  .error button:active:hover, .nautilus-window .floating-bar button:active:hover, row:selected button:checked, .info button:checked,
-  .question button:checked,
-  .warning button:checked,
-  .error button:checked, .nautilus-window .floating-bar button:checked {
-    color: #5294E2;
-    outline-color: rgba(82, 148, 226, 0.3);
-    background-color: #ffffff;
-    border-color: #ffffff; }
+
+row:selected button.flat, row:selected button.sidebar-button, .info button.flat, .info button.sidebar-button,
+.question button.flat,
+.question button.sidebar-button,
+.warning button.flat,
+.warning button.sidebar-button,
+.error button.flat,
+.error button.sidebar-button, .nautilus-window .floating-bar button.flat, .nautilus-window .floating-bar button.sidebar-button {
+  border-color: transparent;
+  background-color: transparent;
+  background-image: none;
+  color: #ffffff;
+  background-color: rgba(255, 255, 255, 0); }
+  .selection-mode.primary-toolbar button:disabled, headerbar.selection-mode button:disabled, .selection-mode.titlebar:not(headerbar) button:disabled, row:selected button.flat:disabled, row:selected button.sidebar-button:disabled, .info button.flat:disabled, .info button.sidebar-button:disabled,
+  .question button.flat:disabled,
+  .question button.sidebar-button:disabled,
+  .warning button.flat:disabled,
+  .warning button.sidebar-button:disabled,
+  .error button.flat:disabled,
+  .error button.sidebar-button:disabled, .nautilus-window .floating-bar button.flat:disabled, .nautilus-window .floating-bar button.sidebar-button:disabled, .selection-mode.primary-toolbar button:disabled label, headerbar.selection-mode button:disabled label, .selection-mode.titlebar:not(headerbar) button:disabled label, row:selected button.flat:disabled label, row:selected button.sidebar-button:disabled label, .info button.flat:disabled label, .info button.sidebar-button:disabled label,
+  .question button.flat:disabled label,
+  .question button.sidebar-button:disabled label,
+  .warning button.flat:disabled label,
+  .warning button.sidebar-button:disabled label,
+  .error button.flat:disabled label,
+  .error button.sidebar-button:disabled label, .nautilus-window .floating-bar button.flat:disabled label, .nautilus-window .floating-bar button.sidebar-button:disabled label {
+    color: rgba(255, 255, 255, 0.4); }
+
+row:selected button:hover, .info button:hover,
+.question button:hover,
+.warning button:hover,
+.error button:hover, .nautilus-window .floating-bar button:hover {
+  color: #ffffff;
+  outline-color: rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.2);
+  border-color: rgba(255, 255, 255, 0.8); }
+
+.selection-mode.primary-toolbar button:active, headerbar.selection-mode button:active, .selection-mode.titlebar:not(headerbar) button:active, .selection-mode.primary-toolbar button:checked, headerbar.selection-mode button:checked, .selection-mode.titlebar:not(headerbar) button:checked, row:selected button:active, .info button:active,
+.question button:active,
+.warning button:active,
+.error button:active, .nautilus-window .floating-bar button:active, .selection-mode.primary-toolbar button:hover:active, headerbar.selection-mode button:hover:active, .selection-mode.titlebar:not(headerbar) button:hover:active, .selection-mode.primary-toolbar button:hover:checked, headerbar.selection-mode button:hover:checked, .selection-mode.titlebar:not(headerbar) button:hover:checked, row:selected button:active:hover, .info button:active:hover,
+.question button:active:hover,
+.warning button:active:hover,
+.error button:active:hover, .nautilus-window .floating-bar button:active:hover, row:selected button:checked, .info button:checked,
+.question button:checked,
+.warning button:checked,
+.error button:checked, .nautilus-window .floating-bar button:checked {
+  color: #5294E2;
+  outline-color: rgba(82, 148, 226, 0.3);
+  background-color: #ffffff;
+  border-color: #ffffff; }
+
+row:selected button:disabled, .info button:disabled,
+.question button:disabled,
+.warning button:disabled,
+.error button:disabled, .nautilus-window .floating-bar button:disabled {
+  background-color: rgba(255, 255, 255, 0);
+  border-color: rgba(255, 255, 255, 0.4); }
   row:selected button:disabled, .info button:disabled,
   .question button:disabled,
   .warning button:disabled,
-  .error button:disabled, .nautilus-window .floating-bar button:disabled {
-    color: rgba(255, 255, 255, 0.4);
-    background-color: rgba(255, 255, 255, 0);
-    border-color: rgba(255, 255, 255, 0.2); }
-    row:selected button:disabled:active, .info button:disabled:active,
-    .question button:disabled:active,
-    .warning button:disabled:active,
-    .error button:disabled:active, .nautilus-window .floating-bar button:disabled:active, row:selected button:disabled:checked, .info button:disabled:checked,
-    .question button:disabled:checked,
-    .warning button:disabled:checked,
-    .error button:disabled:checked, .nautilus-window .floating-bar button:disabled:checked {
-      color: rgba(82, 148, 226, 0.4);
-      background-color: rgba(255, 255, 255, 0.2);
-      border-color: rgba(255, 255, 255, 0.2); }
+  .error button:disabled, .nautilus-window .floating-bar button:disabled, row:selected button:disabled label, .info button:disabled label,
+  .question button:disabled label,
+  .warning button:disabled label,
+  .error button:disabled label, .nautilus-window .floating-bar button:disabled label {
+    color: rgba(255, 255, 255, 0.5); }
+  .selection-mode.primary-toolbar button:disabled:active, headerbar.selection-mode button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:active, .selection-mode.primary-toolbar button:disabled:checked, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:checked, row:selected button:disabled:active, .info button:disabled:active,
+  .question button:disabled:active,
+  .warning button:disabled:active,
+  .error button:disabled:active, .nautilus-window .floating-bar button:disabled:active, .selection-mode.primary-toolbar button:disabled:checked, headerbar.selection-mode button:disabled:checked, .selection-mode.titlebar:not(headerbar) button:disabled:checked, .selection-mode.primary-toolbar button:disabled:active, headerbar.selection-mode button:disabled:active, .selection-mode.titlebar:not(headerbar) button:disabled:active, row:selected button:disabled:checked, .info button:disabled:checked,
+  .question button:disabled:checked,
+  .warning button:disabled:checked,
+  .error button:disabled:checked, .nautilus-window .floating-bar button:disabled:checked {
+    color: #5294E2;
+    background-color: rgba(255, 255, 255, 0.5);
+    border-color: rgba(255, 255, 255, 0.4); }
 
 tooltip {
   border-radius: 2px;
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 33805a9..2d9003d 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -994,42 +994,6 @@ headerbar,
 
     .subtitle:link { @extend *:link:selected;  }
 
-    button {
-      color: $selected_fg_color;
-      outline-color: transparentize($selected_fg_color, 0.7);
-      background-color: transparentize($selected_fg_color, 1);
-      border-color: transparentize($selected_fg_color, 1);
-
-      &.flat {
-        @include button(undecorated);
-        color: $selected_fg_color;
-        background-color: transparentize($selected_fg_color, 1);
-      }
-      &:hover {
-        color: $selected_fg_color;
-        outline-color: transparentize($selected_fg_color, 0.7);
-        background-color: transparentize($selected_fg_color, 0.95);
-        border-color: transparentize($selected_fg_color, 0.5);
-      }
-      &:active, &:checked {
-        color: $selection_mode_bg;
-        outline-color: transparentize($selection_mode_bg, 0.7);
-        background-color: $selected_fg_color;
-        border-color: $selected_fg_color;
-      }
-      &:disabled {
-        color: transparentize($selected_fg_color, 0.6);
-        background-color: transparentize($selected_fg_color, 1);
-        border-color: transparentize($selected_fg_color, 1);
-
-        &:active, &:checked {
-          color: transparentize($selection_mode_bg, 0.6);
-          background-color: transparentize($selected_fg_color, 0.85);
-          border-color: transparentize($selected_fg_color, 0.85);
-        }
-      }
-    }
-
     .selection-menu {
       box-shadow: none;
       padding-left: 10px;
@@ -1197,6 +1161,23 @@ headerbar {
     &:disabled:active, &:disabled:checked { @include button(header-insensitive-active); }
   }
 
+  &.selection-mode button {
+
+    &, &.flat {
+      @include button(undecorated);
+      color: $selected_fg_color;
+      background-color: transparentize($selected_fg_color, 1);
+    }
+    &:hover { @extend %normal_selected_button; }
+    &:active, &:checked { @extend %selected-button:active; }
+
+    &:disabled {
+      @extend %selected-button.flat:disabled;
+
+      &:checked, &:active { @extend %selected-button:disabled:checked; }
+    }
+  }
+
   // Linking stuff
   .linked:not(.vertical):not(.path-bar):not(.stack-switcher) {
     button:not(:last-child):not(:only-child) { margin-right: 1px; }
@@ -2765,15 +2746,22 @@ infobar { border-style: none; }
 // Buttons on selected backgrounds
 //
 %selected-button {
-  color: $selected_fg_color;
-  outline-color: transparentize($selected_fg_color, 0.7);
-  background-color: transparentize($selected_fg_color, 1);
-  border-color: transparentize($selected_fg_color, 0.5);
+
+  @at-root %normal_selected_button, & {
+    color: $selected_fg_color;
+    outline-color: transparentize($selected_fg_color, 0.7);
+    background-color: transparentize($selected_fg_color, 1);
+    border-color: transparentize($selected_fg_color, 0.5);
+  }
 
   &.flat {
     @include button(undecorated);
     color: $selected_fg_color;
     background-color: transparentize($selected_fg_color, 1);
+
+    &:disabled {
+      &, label { color: transparentize($selected_fg_color, 0.6); }
+    }
   }
   &:hover {
     color: $selected_fg_color;
@@ -2788,14 +2776,14 @@ infobar { border-style: none; }
     border-color: $selected_fg_color;
   }
   &:disabled {
-    color: transparentize($selected_fg_color, 0.6);
+    &, label { color: transparentize($selected_fg_color, 0.5); }
     background-color: transparentize($selected_fg_color, 1);
-    border-color: transparentize($selected_fg_color, 0.8);
+    border-color: transparentize($selected_fg_color, 0.6);
 
     &:active, &:checked {
-      color: transparentize($selected_bg_color, 0.6);
-      background-color: transparentize($selected_fg_color, 0.8);
-      border-color: transparentize($selected_fg_color, 0.8);
+      color: $selected_bg_color;
+      background-color: transparentize($selected_fg_color, 0.5);
+      border-color: transparentize($selected_fg_color, 0.6);
     }
   }
 }