diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index e676750356..551fd81b64 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -1090,7 +1090,12 @@ GtkSwitch {
       &:insensitive { @include button(insensitive, $noedge: true); }
       &:backdrop { @include button(backdrop); }
       &:backdrop:active{ border-color: $selected_bg_color; }
-      &:backdrop:insensitive { @include button(backdrop-insensitive); }
+      &:backdrop:insensitive {
+        @include button(backdrop-insensitive);
+        @if $variant=='dark' {
+          border-color: $backdrop_insensitive_color;
+        }
+      }
     }
 }
 
@@ -1239,8 +1244,11 @@ GtkCheckButton.text-button:selected { background-color: transparent; }
       background-image: linear-gradient(to bottom, $backdrop_bg_color);
       box-shadow: none;
     }
-    &:backdrop:insensitive { @include button(backdrop-insensitive); }
-    //FIXME we need a better color for the dark variant
+    &:backdrop:insensitive { @include button(backdrop-insensitive);
+      @if $variant=='dark' {
+        border-color: $backdrop_insensitive_color;
+      }
+    }
     &:active { border: 1px solid darken($selected_borders_color, 3%); }
     &.fine-tune:active { //FIXME: Lapo doesn't like the shrinkage. Bad for touch
       border: 4px solid transparent; //margin
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index f2a43ff6fc..78463389f5 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -1237,7 +1237,8 @@ GtkSwitch {
       color: #454c4c;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #393f3f);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+      border-color: #454c4c; }
 
 /*************************
  * Check and Radio items *
@@ -1580,7 +1581,8 @@ GtkCheckButton.text-button:selected {
       color: #454c4c;
       border-color: #1e2222;
       background-image: linear-gradient(to bottom, #393f3f);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+      border-color: #454c4c; }
     .scale.slider:active {
       border: 1px solid #0c233b; }
     .scale.slider.fine-tune:active {