diff --git a/gtk-3.0/scss/widgets/_toggle.scss b/gtk-3.0/scss/widgets/_toggle.scss
index a47434a..8deb805 100644
--- a/gtk-3.0/scss/widgets/_toggle.scss
+++ b/gtk-3.0/scss/widgets/_toggle.scss
@@ -56,10 +56,20 @@ $suffix: if($variant == "dark", "-dark", "");
 
     .check { @include toggle("checkbox"); }
 
-    GtkIconView.content-view.cell.check {
-        -gtk-icon-source: url("assets/grid-selection-unchecked#{$suffix}.png");
-
-        &:active { -gtk-icon-source: url("assets/grid-selection-checked#{$suffix}.png"); }
+    //selection-mode
+    @each $s,$as in ('', '-unchecked'),
+                  (':hover', '-unchecked'),
+                  (':active', '-checked'),
+                  (':backdrop', '-unchecked'),
+                  (':checked', '-checked'),
+                  (':checked:hover', '-checked'),
+                  (':checked:active', '-checked'),
+                  (':backdrop:checked', '-checked') {
+        .view.content-view.check#{$s}:not(list) {
+            -gtk-icon-shadow: none;
+            -gtk-icon-source: url("../assets/grid-selection#{$as}#{$suffix}.png");
+            background-color: transparent;
+        }
     }
 }
 
diff --git a/gtk-3.20/scss/widgets/_toggle.scss b/gtk-3.20/scss/widgets/_toggle.scss
index 692d2d6..094ab0c 100644
--- a/gtk-3.20/scss/widgets/_toggle.scss
+++ b/gtk-3.20/scss/widgets/_toggle.scss
@@ -66,10 +66,20 @@ $suffix: if($variant == "dark", "-dark", "");
         margin-left: $spacing;
     }
 
-    iconview.content-view.cell.check {
-        -gtk-icon-source: url("assets/grid-selection-unchecked#{$suffix}.png");
-
-        &:active { -gtk-icon-source: url("assets/grid-selection-checked#{$suffix}.png"); }
+    //selection-mode
+    @each $s,$as in ('', '-unchecked'),
+                  (':hover', '-unchecked'),
+                  (':active', '-checked'),
+                  (':backdrop', '-unchecked'),
+                  (':checked', '-checked'),
+                  (':checked:hover', '-checked'),
+                  (':checked:active', '-checked'),
+                  (':backdrop:checked', '-checked') {
+        .view.content-view.check#{$s}:not(list) {
+            -gtk-icon-shadow: none;
+            -gtk-icon-source: url("../assets/grid-selection#{$as}#{$suffix}.png");
+            background-color: transparent;
+        }
     }
 }