diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css
index e97d073..c2e1dd6 100644
--- a/common/gtk-3.0/3.14/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-dark.css
@@ -430,9 +430,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(77, 173, 212, 0.65); }
+      color: rgba(211, 218, 227, 0.45); }
     .button.suggested-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(211, 218, 227, 0.45);
+      border-color: rgba(43, 46, 57, 0.55);
+      background-color: rgba(68, 74, 88, 0.55); }
+      .button.suggested-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.destructive-action {
     background-clip: border-box;
     color: #ffffff;
@@ -461,9 +465,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(240, 74, 80, 0.65); }
+      color: rgba(211, 218, 227, 0.45); }
     .button.destructive-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(211, 218, 227, 0.45);
+      border-color: rgba(43, 46, 57, 0.55);
+      background-color: rgba(68, 74, 88, 0.55); }
+      .button.destructive-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.image-button {
     padding: 8px; }
   .header-bar .button.image-button {
@@ -1194,13 +1202,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #2e96c0;
     border-color: #2e96c0; }
-  .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(77, 173, 212, 0.65); }
+  .primary-toolbar .button.suggested-action.flat:insensitive,
+  .header-bar .button.suggested-action.flat:insensitive,
   .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.suggested-action.flat:insensitive > GtkLabel,
+    .header-bar .button.suggested-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.suggested-action:insensitive > GtkLabel, .header-bar .button.suggested-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.suggested-action:backdrop,
 .header-bar .button.suggested-action:backdrop,
@@ -1231,13 +1242,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ec1b22;
     border-color: #ec1b22; }
-  .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(240, 74, 80, 0.65); }
+  .primary-toolbar .button.destructive-action.flat:insensitive,
+  .header-bar .button.destructive-action.flat:insensitive,
   .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.destructive-action.flat:insensitive > GtkLabel,
+    .header-bar .button.destructive-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.destructive-action:insensitive > GtkLabel, .header-bar .button.destructive-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.destructive-action:backdrop,
 .header-bar .button.destructive-action:backdrop,
diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css
index f7e0cd0..e4382cc 100644
--- a/common/gtk-3.0/3.14/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-darker.css
@@ -429,9 +429,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(77, 173, 212, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.suggested-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.suggested-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.destructive-action {
     background-clip: border-box;
     color: #ffffff;
@@ -460,9 +464,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(240, 74, 80, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.destructive-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.destructive-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.image-button {
     padding: 8px; }
   .header-bar .button.image-button {
@@ -1197,13 +1205,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #2e96c0;
     border-color: #2e96c0; }
-  .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(77, 173, 212, 0.65); }
+  .primary-toolbar .button.suggested-action.flat:insensitive,
+  .header-bar .button.suggested-action.flat:insensitive,
   .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.suggested-action.flat:insensitive > GtkLabel,
+    .header-bar .button.suggested-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.suggested-action:insensitive > GtkLabel, .header-bar .button.suggested-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.suggested-action:backdrop,
 .header-bar .button.suggested-action:backdrop,
@@ -1234,13 +1245,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ec1b22;
     border-color: #ec1b22; }
-  .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(240, 74, 80, 0.65); }
+  .primary-toolbar .button.destructive-action.flat:insensitive,
+  .header-bar .button.destructive-action.flat:insensitive,
   .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.destructive-action.flat:insensitive > GtkLabel,
+    .header-bar .button.destructive-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.destructive-action:insensitive > GtkLabel, .header-bar .button.destructive-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.destructive-action:backdrop,
 .header-bar .button.destructive-action:backdrop,
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
index 0b1f6c1..6f791d3 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css
@@ -430,9 +430,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(77, 173, 212, 0.65); }
+      color: rgba(211, 218, 227, 0.45); }
     .button.suggested-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(211, 218, 227, 0.45);
+      border-color: rgba(43, 46, 57, 0.55);
+      background-color: rgba(68, 74, 88, 0.55); }
+      .button.suggested-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.destructive-action {
     background-clip: border-box;
     color: #ffffff;
@@ -461,9 +465,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(240, 74, 80, 0.65); }
+      color: rgba(211, 218, 227, 0.45); }
     .button.destructive-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(211, 218, 227, 0.45);
+      border-color: rgba(43, 46, 57, 0.55);
+      background-color: rgba(68, 74, 88, 0.55); }
+      .button.destructive-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.image-button {
     padding: 8px; }
   .header-bar .button.image-button {
@@ -1194,13 +1202,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #2e96c0;
     border-color: #2e96c0; }
-  .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(77, 173, 212, 0.65); }
+  .primary-toolbar .button.suggested-action.flat:insensitive,
+  .header-bar .button.suggested-action.flat:insensitive,
   .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.suggested-action.flat:insensitive > GtkLabel,
+    .header-bar .button.suggested-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.suggested-action:insensitive > GtkLabel, .header-bar .button.suggested-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.suggested-action:backdrop,
 .header-bar .button.suggested-action:backdrop,
@@ -1231,13 +1242,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ec1b22;
     border-color: #ec1b22; }
-  .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(240, 74, 80, 0.65); }
+  .primary-toolbar .button.destructive-action.flat:insensitive,
+  .header-bar .button.destructive-action.flat:insensitive,
   .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.destructive-action.flat:insensitive > GtkLabel,
+    .header-bar .button.destructive-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.destructive-action:insensitive > GtkLabel, .header-bar .button.destructive-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.destructive-action:backdrop,
 .header-bar .button.destructive-action:backdrop,
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
index a3a3791..1b9f403 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css
@@ -429,9 +429,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(77, 173, 212, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.suggested-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.suggested-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.destructive-action {
     background-clip: border-box;
     color: #ffffff;
@@ -460,9 +464,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(240, 74, 80, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.destructive-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.destructive-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.image-button {
     padding: 8px; }
   .header-bar .button.image-button {
@@ -1197,13 +1205,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #2e96c0;
     border-color: #2e96c0; }
-  .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(77, 173, 212, 0.65); }
+  .primary-toolbar .button.suggested-action.flat:insensitive,
+  .header-bar .button.suggested-action.flat:insensitive,
   .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.suggested-action.flat:insensitive > GtkLabel,
+    .header-bar .button.suggested-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.suggested-action:insensitive > GtkLabel, .header-bar .button.suggested-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.suggested-action:backdrop,
 .header-bar .button.suggested-action:backdrop,
@@ -1234,13 +1245,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ec1b22;
     border-color: #ec1b22; }
-  .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(240, 74, 80, 0.65); }
+  .primary-toolbar .button.destructive-action.flat:insensitive,
+  .header-bar .button.destructive-action.flat:insensitive,
   .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.destructive-action.flat:insensitive > GtkLabel,
+    .header-bar .button.destructive-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.destructive-action:insensitive > GtkLabel, .header-bar .button.destructive-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.destructive-action:backdrop,
 .header-bar .button.destructive-action:backdrop,
diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css
index fd5e4cb..8593c42 100644
--- a/common/gtk-3.0/3.14/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.14/gtk-contained-solid.css
@@ -429,9 +429,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(77, 173, 212, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.suggested-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.suggested-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.destructive-action {
     background-clip: border-box;
     color: #ffffff;
@@ -460,9 +464,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(240, 74, 80, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.destructive-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.destructive-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.image-button {
     padding: 8px; }
   .header-bar .button.image-button {
@@ -1197,13 +1205,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #2e96c0;
     border-color: #2e96c0; }
-  .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(77, 173, 212, 0.65); }
+  .primary-toolbar .button.suggested-action.flat:insensitive,
+  .header-bar .button.suggested-action.flat:insensitive,
   .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(82, 93, 118, 0.35);
+    background-color: rgba(231, 232, 235, 0);
+    border-color: rgba(231, 232, 235, 0); }
+    .primary-toolbar .button.suggested-action.flat:insensitive > GtkLabel,
+    .header-bar .button.suggested-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.suggested-action:insensitive > GtkLabel, .header-bar .button.suggested-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.suggested-action:backdrop,
 .header-bar .button.suggested-action:backdrop,
@@ -1234,13 +1245,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ec1b22;
     border-color: #ec1b22; }
-  .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(240, 74, 80, 0.65); }
+  .primary-toolbar .button.destructive-action.flat:insensitive,
+  .header-bar .button.destructive-action.flat:insensitive,
   .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(82, 93, 118, 0.35);
+    background-color: rgba(231, 232, 235, 0);
+    border-color: rgba(231, 232, 235, 0); }
+    .primary-toolbar .button.destructive-action.flat:insensitive > GtkLabel,
+    .header-bar .button.destructive-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.destructive-action:insensitive > GtkLabel, .header-bar .button.destructive-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.destructive-action:backdrop,
 .header-bar .button.destructive-action:backdrop,
diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css
index 4ef7c32..3e99e77 100644
--- a/common/gtk-3.0/3.14/gtk-contained.css
+++ b/common/gtk-3.0/3.14/gtk-contained.css
@@ -429,9 +429,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(77, 173, 212, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.suggested-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.suggested-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.destructive-action {
     background-clip: border-box;
     color: #ffffff;
@@ -460,9 +464,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(240, 74, 80, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.destructive-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.destructive-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.image-button {
     padding: 8px; }
   .header-bar .button.image-button {
@@ -1197,13 +1205,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #2e96c0;
     border-color: #2e96c0; }
-  .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(77, 173, 212, 0.65); }
+  .primary-toolbar .button.suggested-action.flat:insensitive,
+  .header-bar .button.suggested-action.flat:insensitive,
   .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(82, 93, 118, 0.35);
+    background-color: rgba(231, 232, 235, 0);
+    border-color: rgba(231, 232, 235, 0); }
+    .primary-toolbar .button.suggested-action.flat:insensitive > GtkLabel,
+    .header-bar .button.suggested-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.suggested-action:insensitive > GtkLabel, .header-bar .button.suggested-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.suggested-action:backdrop,
 .header-bar .button.suggested-action:backdrop,
@@ -1234,13 +1245,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ec1b22;
     border-color: #ec1b22; }
-  .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(240, 74, 80, 0.65); }
+  .primary-toolbar .button.destructive-action.flat:insensitive,
+  .header-bar .button.destructive-action.flat:insensitive,
   .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(82, 93, 118, 0.35);
+    background-color: rgba(231, 232, 235, 0);
+    border-color: rgba(231, 232, 235, 0); }
+    .primary-toolbar .button.destructive-action.flat:insensitive > GtkLabel,
+    .header-bar .button.destructive-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.destructive-action:insensitive > GtkLabel, .header-bar .button.destructive-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.destructive-action:backdrop,
 .header-bar .button.destructive-action:backdrop,
diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss
index 8eeb0eb..1c70163 100644
--- a/common/gtk-3.0/3.14/sass/_common.scss
+++ b/common/gtk-3.0/3.14/sass/_common.scss
@@ -518,9 +518,9 @@ $_dot_color: $selected_bg_color;
       }
       &.flat:insensitive {
         @include button(undecorated);
-        color: transparentize($b_color, 0.35);
+        color: $insensitive_fg_color;
       }
-      &:insensitive { opacity: 0.75; }
+      &:insensitive { @include button(insensitive); }
     }
   }
 
@@ -1307,11 +1307,8 @@ GtkComboBox {
       &:active, &:checked {
         @include button(suggested_destructive, darken($b_color, 10%));
       }
-      &.flat:insensitive {
-        @include button(undecorated);
-        color: transparentize($b_color, 0.35);
-      }
-      &:insensitive { opacity: 0.75; }
+      &.flat:insensitive,
+      &:insensitive { @include button(header-insensitive); }
     }
     .button.#{$b_type}:backdrop,
     .button.#{$b_type}:backdrop {
diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css
index 676129a..2227d42 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -430,9 +430,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(77, 173, 212, 0.65); }
+      color: rgba(211, 218, 227, 0.45); }
     .button.suggested-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(211, 218, 227, 0.45);
+      border-color: rgba(43, 46, 57, 0.55);
+      background-color: rgba(68, 74, 88, 0.55); }
+      .button.suggested-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.destructive-action {
     background-clip: border-box;
     color: #ffffff;
@@ -461,9 +465,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(240, 74, 80, 0.65); }
+      color: rgba(211, 218, 227, 0.45); }
     .button.destructive-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(211, 218, 227, 0.45);
+      border-color: rgba(43, 46, 57, 0.55);
+      background-color: rgba(68, 74, 88, 0.55); }
+      .button.destructive-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.image-button {
     padding: 8px; }
   .header-bar .button.image-button {
@@ -1200,13 +1208,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #2e96c0;
     border-color: #2e96c0; }
-  .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(77, 173, 212, 0.65); }
+  .primary-toolbar .button.suggested-action.flat:insensitive,
+  .header-bar .button.suggested-action.flat:insensitive,
   .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.suggested-action.flat:insensitive > GtkLabel,
+    .header-bar .button.suggested-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.suggested-action:insensitive > GtkLabel, .header-bar .button.suggested-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.suggested-action:backdrop,
 .header-bar .button.suggested-action:backdrop,
@@ -1237,13 +1248,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ec1b22;
     border-color: #ec1b22; }
-  .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(240, 74, 80, 0.65); }
+  .primary-toolbar .button.destructive-action.flat:insensitive,
+  .header-bar .button.destructive-action.flat:insensitive,
   .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.destructive-action.flat:insensitive > GtkLabel,
+    .header-bar .button.destructive-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.destructive-action:insensitive > GtkLabel, .header-bar .button.destructive-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.destructive-action:backdrop,
 .header-bar .button.destructive-action:backdrop,
diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css
index 970a781..b970f4c 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -429,9 +429,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(77, 173, 212, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.suggested-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.suggested-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.destructive-action {
     background-clip: border-box;
     color: #ffffff;
@@ -460,9 +464,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(240, 74, 80, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.destructive-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.destructive-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.image-button {
     padding: 8px; }
   .header-bar .button.image-button {
@@ -1203,13 +1211,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #2e96c0;
     border-color: #2e96c0; }
-  .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(77, 173, 212, 0.65); }
+  .primary-toolbar .button.suggested-action.flat:insensitive,
+  .header-bar .button.suggested-action.flat:insensitive,
   .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.suggested-action.flat:insensitive > GtkLabel,
+    .header-bar .button.suggested-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.suggested-action:insensitive > GtkLabel, .header-bar .button.suggested-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.suggested-action:backdrop,
 .header-bar .button.suggested-action:backdrop,
@@ -1240,13 +1251,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ec1b22;
     border-color: #ec1b22; }
-  .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(240, 74, 80, 0.65); }
+  .primary-toolbar .button.destructive-action.flat:insensitive,
+  .header-bar .button.destructive-action.flat:insensitive,
   .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.destructive-action.flat:insensitive > GtkLabel,
+    .header-bar .button.destructive-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.destructive-action:insensitive > GtkLabel, .header-bar .button.destructive-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.destructive-action:backdrop,
 .header-bar .button.destructive-action:backdrop,
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
index 57de82b..b442a1a 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
@@ -430,9 +430,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(77, 173, 212, 0.65); }
+      color: rgba(211, 218, 227, 0.45); }
     .button.suggested-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(211, 218, 227, 0.45);
+      border-color: rgba(43, 46, 57, 0.55);
+      background-color: rgba(68, 74, 88, 0.55); }
+      .button.suggested-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.destructive-action {
     background-clip: border-box;
     color: #ffffff;
@@ -461,9 +465,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(240, 74, 80, 0.65); }
+      color: rgba(211, 218, 227, 0.45); }
     .button.destructive-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(211, 218, 227, 0.45);
+      border-color: rgba(43, 46, 57, 0.55);
+      background-color: rgba(68, 74, 88, 0.55); }
+      .button.destructive-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.image-button {
     padding: 8px; }
   .header-bar .button.image-button {
@@ -1200,13 +1208,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #2e96c0;
     border-color: #2e96c0; }
-  .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(77, 173, 212, 0.65); }
+  .primary-toolbar .button.suggested-action.flat:insensitive,
+  .header-bar .button.suggested-action.flat:insensitive,
   .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.suggested-action.flat:insensitive > GtkLabel,
+    .header-bar .button.suggested-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.suggested-action:insensitive > GtkLabel, .header-bar .button.suggested-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.suggested-action:backdrop,
 .header-bar .button.suggested-action:backdrop,
@@ -1237,13 +1248,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ec1b22;
     border-color: #ec1b22; }
-  .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(240, 74, 80, 0.65); }
+  .primary-toolbar .button.destructive-action.flat:insensitive,
+  .header-bar .button.destructive-action.flat:insensitive,
   .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.destructive-action.flat:insensitive > GtkLabel,
+    .header-bar .button.destructive-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.destructive-action:insensitive > GtkLabel, .header-bar .button.destructive-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.destructive-action:backdrop,
 .header-bar .button.destructive-action:backdrop,
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
index 696308d..4d3157d 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
@@ -429,9 +429,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(77, 173, 212, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.suggested-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.suggested-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.destructive-action {
     background-clip: border-box;
     color: #ffffff;
@@ -460,9 +464,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(240, 74, 80, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.destructive-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.destructive-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.image-button {
     padding: 8px; }
   .header-bar .button.image-button {
@@ -1203,13 +1211,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #2e96c0;
     border-color: #2e96c0; }
-  .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(77, 173, 212, 0.65); }
+  .primary-toolbar .button.suggested-action.flat:insensitive,
+  .header-bar .button.suggested-action.flat:insensitive,
   .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.suggested-action.flat:insensitive > GtkLabel,
+    .header-bar .button.suggested-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.suggested-action:insensitive > GtkLabel, .header-bar .button.suggested-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.suggested-action:backdrop,
 .header-bar .button.suggested-action:backdrop,
@@ -1240,13 +1251,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ec1b22;
     border-color: #ec1b22; }
-  .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(240, 74, 80, 0.65); }
+  .primary-toolbar .button.destructive-action.flat:insensitive,
+  .header-bar .button.destructive-action.flat:insensitive,
   .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.destructive-action.flat:insensitive > GtkLabel,
+    .header-bar .button.destructive-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.destructive-action:insensitive > GtkLabel, .header-bar .button.destructive-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.destructive-action:backdrop,
 .header-bar .button.destructive-action:backdrop,
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css
index 97b5c9c..95d6255 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.css
@@ -429,9 +429,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(77, 173, 212, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.suggested-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.suggested-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.destructive-action {
     background-clip: border-box;
     color: #ffffff;
@@ -460,9 +464,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(240, 74, 80, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.destructive-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.destructive-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.image-button {
     padding: 8px; }
   .header-bar .button.image-button {
@@ -1203,13 +1211,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #2e96c0;
     border-color: #2e96c0; }
-  .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(77, 173, 212, 0.65); }
+  .primary-toolbar .button.suggested-action.flat:insensitive,
+  .header-bar .button.suggested-action.flat:insensitive,
   .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(82, 93, 118, 0.35);
+    background-color: rgba(231, 232, 235, 0);
+    border-color: rgba(231, 232, 235, 0); }
+    .primary-toolbar .button.suggested-action.flat:insensitive > GtkLabel,
+    .header-bar .button.suggested-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.suggested-action:insensitive > GtkLabel, .header-bar .button.suggested-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.suggested-action:backdrop,
 .header-bar .button.suggested-action:backdrop,
@@ -1240,13 +1251,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ec1b22;
     border-color: #ec1b22; }
-  .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(240, 74, 80, 0.65); }
+  .primary-toolbar .button.destructive-action.flat:insensitive,
+  .header-bar .button.destructive-action.flat:insensitive,
   .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(82, 93, 118, 0.35);
+    background-color: rgba(231, 232, 235, 0);
+    border-color: rgba(231, 232, 235, 0); }
+    .primary-toolbar .button.destructive-action.flat:insensitive > GtkLabel,
+    .header-bar .button.destructive-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.destructive-action:insensitive > GtkLabel, .header-bar .button.destructive-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.destructive-action:backdrop,
 .header-bar .button.destructive-action:backdrop,
diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index 1caa6be..ee1c932 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -429,9 +429,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(77, 173, 212, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.suggested-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.suggested-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.destructive-action {
     background-clip: border-box;
     color: #ffffff;
@@ -460,9 +464,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(240, 74, 80, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.destructive-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.destructive-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.image-button {
     padding: 8px; }
   .header-bar .button.image-button {
@@ -1203,13 +1211,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #2e96c0;
     border-color: #2e96c0; }
-  .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(77, 173, 212, 0.65); }
+  .primary-toolbar .button.suggested-action.flat:insensitive,
+  .header-bar .button.suggested-action.flat:insensitive,
   .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(82, 93, 118, 0.35);
+    background-color: rgba(231, 232, 235, 0);
+    border-color: rgba(231, 232, 235, 0); }
+    .primary-toolbar .button.suggested-action.flat:insensitive > GtkLabel,
+    .header-bar .button.suggested-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.suggested-action:insensitive > GtkLabel, .header-bar .button.suggested-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.suggested-action:backdrop,
 .header-bar .button.suggested-action:backdrop,
@@ -1240,13 +1251,16 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ec1b22;
     border-color: #ec1b22; }
-  .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(240, 74, 80, 0.65); }
+  .primary-toolbar .button.destructive-action.flat:insensitive,
+  .header-bar .button.destructive-action.flat:insensitive,
   .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(82, 93, 118, 0.35);
+    background-color: rgba(231, 232, 235, 0);
+    border-color: rgba(231, 232, 235, 0); }
+    .primary-toolbar .button.destructive-action.flat:insensitive > GtkLabel,
+    .header-bar .button.destructive-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .button.destructive-action:insensitive > GtkLabel, .header-bar .button.destructive-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.destructive-action:backdrop,
 .header-bar .button.destructive-action:backdrop,
diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss
index 60cb16b..6d075ed 100644
--- a/common/gtk-3.0/3.16/sass/_common.scss
+++ b/common/gtk-3.0/3.16/sass/_common.scss
@@ -518,9 +518,9 @@ $_dot_color: $selected_bg_color;
       }
       &.flat:insensitive {
         @include button(undecorated);
-        color: transparentize($b_color, 0.35);
+        color: $insensitive_fg_color;
       }
-      &:insensitive { opacity: 0.75; }
+      &:insensitive { @include button(insensitive); }
     }
   }
 
@@ -1317,11 +1317,8 @@ GtkComboBox {
       &:active, &:checked {
         @include button(suggested_destructive, darken($b_color, 10%));
       }
-      &.flat:insensitive {
-        @include button(undecorated);
-        color: transparentize($b_color, 0.35);
-      }
-      &:insensitive { opacity: 0.75; }
+      &.flat:insensitive,
+      &:insensitive { @include button(header-insensitive); }
     }
     .button.#{$b_type}:backdrop,
     .button.#{$b_type}:backdrop {
diff --git a/common/gtk-3.0/3.18/gtk-contained-dark.css b/common/gtk-3.0/3.18/gtk-contained-dark.css
index 9bdd971..3fb621f 100644
--- a/common/gtk-3.0/3.18/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-dark.css
@@ -396,9 +396,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(77, 173, 212, 0.65); }
+      color: rgba(211, 218, 227, 0.45); }
     .button.suggested-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(211, 218, 227, 0.45);
+      border-color: rgba(43, 46, 57, 0.55);
+      background-color: rgba(68, 74, 88, 0.55); }
+      .button.suggested-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.destructive-action {
     background-clip: border-box;
     color: #ffffff;
@@ -427,9 +431,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(240, 74, 80, 0.65); }
+      color: rgba(211, 218, 227, 0.45); }
     .button.destructive-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(211, 218, 227, 0.45);
+      border-color: rgba(43, 46, 57, 0.55);
+      background-color: rgba(68, 74, 88, 0.55); }
+      .button.destructive-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.image-button {
     padding: 8px; }
   .header-bar .button.image-button {
@@ -1336,13 +1344,20 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #2e96c0;
     border-color: #2e96c0; }
-  .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive, .primary-toolbar .suggested-action.sidebar-button.button:insensitive, .header-bar .suggested-action.sidebar-button.button:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(77, 173, 212, 0.65); }
+  .primary-toolbar .button.suggested-action.flat:insensitive,
+  .header-bar .button.suggested-action.flat:insensitive,
+  .primary-toolbar .suggested-action.sidebar-button.button:insensitive,
+  .header-bar .suggested-action.sidebar-button.button:insensitive,
   .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.suggested-action.flat:insensitive > GtkLabel,
+    .header-bar .button.suggested-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .suggested-action.sidebar-button.button:insensitive > GtkLabel,
+    .header-bar .suggested-action.sidebar-button.button:insensitive > GtkLabel,
+    .primary-toolbar .button.suggested-action:insensitive > GtkLabel, .header-bar .button.suggested-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.suggested-action:backdrop,
 .header-bar .button.suggested-action:backdrop,
@@ -1373,13 +1388,20 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ec1b22;
     border-color: #ec1b22; }
-  .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive, .primary-toolbar .destructive-action.sidebar-button.button:insensitive, .header-bar .destructive-action.sidebar-button.button:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(240, 74, 80, 0.65); }
+  .primary-toolbar .button.destructive-action.flat:insensitive,
+  .header-bar .button.destructive-action.flat:insensitive,
+  .primary-toolbar .destructive-action.sidebar-button.button:insensitive,
+  .header-bar .destructive-action.sidebar-button.button:insensitive,
   .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.destructive-action.flat:insensitive > GtkLabel,
+    .header-bar .button.destructive-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .destructive-action.sidebar-button.button:insensitive > GtkLabel,
+    .header-bar .destructive-action.sidebar-button.button:insensitive > GtkLabel,
+    .primary-toolbar .button.destructive-action:insensitive > GtkLabel, .header-bar .button.destructive-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.destructive-action:backdrop,
 .header-bar .button.destructive-action:backdrop,
diff --git a/common/gtk-3.0/3.18/gtk-contained-darker.css b/common/gtk-3.0/3.18/gtk-contained-darker.css
index 4926270..2a1f900 100644
--- a/common/gtk-3.0/3.18/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-darker.css
@@ -395,9 +395,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(77, 173, 212, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.suggested-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.suggested-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.destructive-action {
     background-clip: border-box;
     color: #ffffff;
@@ -426,9 +430,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(240, 74, 80, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.destructive-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.destructive-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.image-button {
     padding: 8px; }
   .header-bar .button.image-button {
@@ -1339,13 +1347,20 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #2e96c0;
     border-color: #2e96c0; }
-  .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive, .primary-toolbar .suggested-action.sidebar-button.button:insensitive, .header-bar .suggested-action.sidebar-button.button:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(77, 173, 212, 0.65); }
+  .primary-toolbar .button.suggested-action.flat:insensitive,
+  .header-bar .button.suggested-action.flat:insensitive,
+  .primary-toolbar .suggested-action.sidebar-button.button:insensitive,
+  .header-bar .suggested-action.sidebar-button.button:insensitive,
   .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.suggested-action.flat:insensitive > GtkLabel,
+    .header-bar .button.suggested-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .suggested-action.sidebar-button.button:insensitive > GtkLabel,
+    .header-bar .suggested-action.sidebar-button.button:insensitive > GtkLabel,
+    .primary-toolbar .button.suggested-action:insensitive > GtkLabel, .header-bar .button.suggested-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.suggested-action:backdrop,
 .header-bar .button.suggested-action:backdrop,
@@ -1376,13 +1391,20 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ec1b22;
     border-color: #ec1b22; }
-  .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive, .primary-toolbar .destructive-action.sidebar-button.button:insensitive, .header-bar .destructive-action.sidebar-button.button:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(240, 74, 80, 0.65); }
+  .primary-toolbar .button.destructive-action.flat:insensitive,
+  .header-bar .button.destructive-action.flat:insensitive,
+  .primary-toolbar .destructive-action.sidebar-button.button:insensitive,
+  .header-bar .destructive-action.sidebar-button.button:insensitive,
   .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.destructive-action.flat:insensitive > GtkLabel,
+    .header-bar .button.destructive-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .destructive-action.sidebar-button.button:insensitive > GtkLabel,
+    .header-bar .destructive-action.sidebar-button.button:insensitive > GtkLabel,
+    .primary-toolbar .button.destructive-action:insensitive > GtkLabel, .header-bar .button.destructive-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.destructive-action:backdrop,
 .header-bar .button.destructive-action:backdrop,
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
index c4a5dcb..dbd1a08 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
@@ -396,9 +396,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(77, 173, 212, 0.65); }
+      color: rgba(211, 218, 227, 0.45); }
     .button.suggested-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(211, 218, 227, 0.45);
+      border-color: rgba(43, 46, 57, 0.55);
+      background-color: rgba(68, 74, 88, 0.55); }
+      .button.suggested-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.destructive-action {
     background-clip: border-box;
     color: #ffffff;
@@ -427,9 +431,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(240, 74, 80, 0.65); }
+      color: rgba(211, 218, 227, 0.45); }
     .button.destructive-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(211, 218, 227, 0.45);
+      border-color: rgba(43, 46, 57, 0.55);
+      background-color: rgba(68, 74, 88, 0.55); }
+      .button.destructive-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.image-button {
     padding: 8px; }
   .header-bar .button.image-button {
@@ -1336,13 +1344,20 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #2e96c0;
     border-color: #2e96c0; }
-  .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive, .primary-toolbar .suggested-action.sidebar-button.button:insensitive, .header-bar .suggested-action.sidebar-button.button:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(77, 173, 212, 0.65); }
+  .primary-toolbar .button.suggested-action.flat:insensitive,
+  .header-bar .button.suggested-action.flat:insensitive,
+  .primary-toolbar .suggested-action.sidebar-button.button:insensitive,
+  .header-bar .suggested-action.sidebar-button.button:insensitive,
   .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.suggested-action.flat:insensitive > GtkLabel,
+    .header-bar .button.suggested-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .suggested-action.sidebar-button.button:insensitive > GtkLabel,
+    .header-bar .suggested-action.sidebar-button.button:insensitive > GtkLabel,
+    .primary-toolbar .button.suggested-action:insensitive > GtkLabel, .header-bar .button.suggested-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.suggested-action:backdrop,
 .header-bar .button.suggested-action:backdrop,
@@ -1373,13 +1388,20 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ec1b22;
     border-color: #ec1b22; }
-  .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive, .primary-toolbar .destructive-action.sidebar-button.button:insensitive, .header-bar .destructive-action.sidebar-button.button:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(240, 74, 80, 0.65); }
+  .primary-toolbar .button.destructive-action.flat:insensitive,
+  .header-bar .button.destructive-action.flat:insensitive,
+  .primary-toolbar .destructive-action.sidebar-button.button:insensitive,
+  .header-bar .destructive-action.sidebar-button.button:insensitive,
   .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.destructive-action.flat:insensitive > GtkLabel,
+    .header-bar .button.destructive-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .destructive-action.sidebar-button.button:insensitive > GtkLabel,
+    .header-bar .destructive-action.sidebar-button.button:insensitive > GtkLabel,
+    .primary-toolbar .button.destructive-action:insensitive > GtkLabel, .header-bar .button.destructive-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.destructive-action:backdrop,
 .header-bar .button.destructive-action:backdrop,
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
index a95daf0..cca8e15 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
@@ -395,9 +395,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(77, 173, 212, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.suggested-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.suggested-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.destructive-action {
     background-clip: border-box;
     color: #ffffff;
@@ -426,9 +430,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(240, 74, 80, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.destructive-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.destructive-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.image-button {
     padding: 8px; }
   .header-bar .button.image-button {
@@ -1339,13 +1347,20 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #2e96c0;
     border-color: #2e96c0; }
-  .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive, .primary-toolbar .suggested-action.sidebar-button.button:insensitive, .header-bar .suggested-action.sidebar-button.button:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(77, 173, 212, 0.65); }
+  .primary-toolbar .button.suggested-action.flat:insensitive,
+  .header-bar .button.suggested-action.flat:insensitive,
+  .primary-toolbar .suggested-action.sidebar-button.button:insensitive,
+  .header-bar .suggested-action.sidebar-button.button:insensitive,
   .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.suggested-action.flat:insensitive > GtkLabel,
+    .header-bar .button.suggested-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .suggested-action.sidebar-button.button:insensitive > GtkLabel,
+    .header-bar .suggested-action.sidebar-button.button:insensitive > GtkLabel,
+    .primary-toolbar .button.suggested-action:insensitive > GtkLabel, .header-bar .button.suggested-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.suggested-action:backdrop,
 .header-bar .button.suggested-action:backdrop,
@@ -1376,13 +1391,20 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ec1b22;
     border-color: #ec1b22; }
-  .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive, .primary-toolbar .destructive-action.sidebar-button.button:insensitive, .header-bar .destructive-action.sidebar-button.button:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(240, 74, 80, 0.65); }
+  .primary-toolbar .button.destructive-action.flat:insensitive,
+  .header-bar .button.destructive-action.flat:insensitive,
+  .primary-toolbar .destructive-action.sidebar-button.button:insensitive,
+  .header-bar .destructive-action.sidebar-button.button:insensitive,
   .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(207, 218, 231, 0.35);
+    background-color: rgba(47, 52, 63, 0);
+    border-color: rgba(47, 52, 63, 0); }
+    .primary-toolbar .button.destructive-action.flat:insensitive > GtkLabel,
+    .header-bar .button.destructive-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .destructive-action.sidebar-button.button:insensitive > GtkLabel,
+    .header-bar .destructive-action.sidebar-button.button:insensitive > GtkLabel,
+    .primary-toolbar .button.destructive-action:insensitive > GtkLabel, .header-bar .button.destructive-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.destructive-action:backdrop,
 .header-bar .button.destructive-action:backdrop,
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid.css b/common/gtk-3.0/3.18/gtk-contained-solid.css
index 7f5af84..2759387 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid.css
@@ -395,9 +395,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(77, 173, 212, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.suggested-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.suggested-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.destructive-action {
     background-clip: border-box;
     color: #ffffff;
@@ -426,9 +430,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(240, 74, 80, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.destructive-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.destructive-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.image-button {
     padding: 8px; }
   .header-bar .button.image-button {
@@ -1339,13 +1347,20 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #2e96c0;
     border-color: #2e96c0; }
-  .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive, .primary-toolbar .suggested-action.sidebar-button.button:insensitive, .header-bar .suggested-action.sidebar-button.button:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(77, 173, 212, 0.65); }
+  .primary-toolbar .button.suggested-action.flat:insensitive,
+  .header-bar .button.suggested-action.flat:insensitive,
+  .primary-toolbar .suggested-action.sidebar-button.button:insensitive,
+  .header-bar .suggested-action.sidebar-button.button:insensitive,
   .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(82, 93, 118, 0.35);
+    background-color: rgba(231, 232, 235, 0);
+    border-color: rgba(231, 232, 235, 0); }
+    .primary-toolbar .button.suggested-action.flat:insensitive > GtkLabel,
+    .header-bar .button.suggested-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .suggested-action.sidebar-button.button:insensitive > GtkLabel,
+    .header-bar .suggested-action.sidebar-button.button:insensitive > GtkLabel,
+    .primary-toolbar .button.suggested-action:insensitive > GtkLabel, .header-bar .button.suggested-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.suggested-action:backdrop,
 .header-bar .button.suggested-action:backdrop,
@@ -1376,13 +1391,20 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ec1b22;
     border-color: #ec1b22; }
-  .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive, .primary-toolbar .destructive-action.sidebar-button.button:insensitive, .header-bar .destructive-action.sidebar-button.button:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(240, 74, 80, 0.65); }
+  .primary-toolbar .button.destructive-action.flat:insensitive,
+  .header-bar .button.destructive-action.flat:insensitive,
+  .primary-toolbar .destructive-action.sidebar-button.button:insensitive,
+  .header-bar .destructive-action.sidebar-button.button:insensitive,
   .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(82, 93, 118, 0.35);
+    background-color: rgba(231, 232, 235, 0);
+    border-color: rgba(231, 232, 235, 0); }
+    .primary-toolbar .button.destructive-action.flat:insensitive > GtkLabel,
+    .header-bar .button.destructive-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .destructive-action.sidebar-button.button:insensitive > GtkLabel,
+    .header-bar .destructive-action.sidebar-button.button:insensitive > GtkLabel,
+    .primary-toolbar .button.destructive-action:insensitive > GtkLabel, .header-bar .button.destructive-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.destructive-action:backdrop,
 .header-bar .button.destructive-action:backdrop,
diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css
index 41bc07d..a23e773 100644
--- a/common/gtk-3.0/3.18/gtk-contained.css
+++ b/common/gtk-3.0/3.18/gtk-contained.css
@@ -395,9 +395,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(77, 173, 212, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.suggested-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.suggested-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.destructive-action {
     background-clip: border-box;
     color: #ffffff;
@@ -426,9 +430,13 @@ GtkSearchEntry.entry {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
-      color: rgba(240, 74, 80, 0.65); }
+      color: rgba(92, 97, 108, 0.55); }
     .button.destructive-action:insensitive {
-      opacity: 0.75; }
+      color: rgba(92, 97, 108, 0.55);
+      border-color: rgba(207, 214, 230, 0.55);
+      background-color: rgba(251, 251, 252, 0.55); }
+      .button.destructive-action:insensitive > GtkLabel {
+        color: inherit; }
   .button.image-button {
     padding: 8px; }
   .header-bar .button.image-button {
@@ -1339,13 +1347,20 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #2e96c0;
     border-color: #2e96c0; }
-  .primary-toolbar .button.suggested-action.flat:insensitive, .header-bar .button.suggested-action.flat:insensitive, .primary-toolbar .suggested-action.sidebar-button.button:insensitive, .header-bar .suggested-action.sidebar-button.button:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(77, 173, 212, 0.65); }
+  .primary-toolbar .button.suggested-action.flat:insensitive,
+  .header-bar .button.suggested-action.flat:insensitive,
+  .primary-toolbar .suggested-action.sidebar-button.button:insensitive,
+  .header-bar .suggested-action.sidebar-button.button:insensitive,
   .primary-toolbar .button.suggested-action:insensitive, .header-bar .button.suggested-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(82, 93, 118, 0.35);
+    background-color: rgba(231, 232, 235, 0);
+    border-color: rgba(231, 232, 235, 0); }
+    .primary-toolbar .button.suggested-action.flat:insensitive > GtkLabel,
+    .header-bar .button.suggested-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .suggested-action.sidebar-button.button:insensitive > GtkLabel,
+    .header-bar .suggested-action.sidebar-button.button:insensitive > GtkLabel,
+    .primary-toolbar .button.suggested-action:insensitive > GtkLabel, .header-bar .button.suggested-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.suggested-action:backdrop,
 .header-bar .button.suggested-action:backdrop,
@@ -1376,13 +1391,20 @@ GtkComboBox {
     outline-color: rgba(255, 255, 255, 0.3);
     background-color: #ec1b22;
     border-color: #ec1b22; }
-  .primary-toolbar .button.destructive-action.flat:insensitive, .header-bar .button.destructive-action.flat:insensitive, .primary-toolbar .destructive-action.sidebar-button.button:insensitive, .header-bar .destructive-action.sidebar-button.button:insensitive {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    color: rgba(240, 74, 80, 0.65); }
+  .primary-toolbar .button.destructive-action.flat:insensitive,
+  .header-bar .button.destructive-action.flat:insensitive,
+  .primary-toolbar .destructive-action.sidebar-button.button:insensitive,
+  .header-bar .destructive-action.sidebar-button.button:insensitive,
   .primary-toolbar .button.destructive-action:insensitive, .header-bar .button.destructive-action:insensitive {
-    opacity: 0.75; }
+    color: rgba(82, 93, 118, 0.35);
+    background-color: rgba(231, 232, 235, 0);
+    border-color: rgba(231, 232, 235, 0); }
+    .primary-toolbar .button.destructive-action.flat:insensitive > GtkLabel,
+    .header-bar .button.destructive-action.flat:insensitive > GtkLabel,
+    .primary-toolbar .destructive-action.sidebar-button.button:insensitive > GtkLabel,
+    .header-bar .destructive-action.sidebar-button.button:insensitive > GtkLabel,
+    .primary-toolbar .button.destructive-action:insensitive > GtkLabel, .header-bar .button.destructive-action:insensitive > GtkLabel {
+      color: inherit; }
 
 .primary-toolbar .button.destructive-action:backdrop,
 .header-bar .button.destructive-action:backdrop,
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index 86545a1..8d492ed 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -324,7 +324,7 @@ $_dot_color: $selected_bg_color;
 
   @include button(normal);
 
-  &.flat { 
+  &.flat {
     @include button(undecorated);
     background-color: transparentize($button_bg, 1);
     border-color: transparentize($button_border, 1);
@@ -457,9 +457,9 @@ $_dot_color: $selected_bg_color;
       }
       &.flat:insensitive {
         @include button(undecorated);
-        color: transparentize($b_color, 0.35);
+        color: $insensitive_fg_color;
       }
-      &:insensitive { opacity: 0.75; }
+      &:insensitive { @include button(insensitive); }
     }
   }
 
@@ -1420,11 +1420,8 @@ GtkComboBox {
       &:active, &:checked {
         @include button(suggested_destructive, darken($b_color, 10%));
       }
-      &.flat:insensitive {
-        @include button(undecorated);
-        color: transparentize($b_color, 0.35);
-      }
-      &:insensitive { opacity: 0.75; }
+      &.flat:insensitive,
+      &:insensitive { @include button(header-insensitive); }
     }
     .button.#{$b_type}:backdrop,
     .button.#{$b_type}:backdrop {