diff --git a/less/common/Checkbox.less b/less/common/Checkbox.less
index 42b8576d7..1b1b29613 100644
--- a/less/common/Checkbox.less
+++ b/less/common/Checkbox.less
@@ -3,7 +3,7 @@
   cursor: pointer;
   margin: 0;
 
-  & input[type=checkbox] {
+  & input[type="checkbox"] {
     display: none;
   }
 }
@@ -18,7 +18,7 @@
 
     .LoadingIndicator {
       display: inline-block;
-      margin-left: 10px;
+      margin-left: 20px;
     }
   }
 }
@@ -32,7 +32,7 @@
   .transition(background-color 0.2s);
 
   .on& {
-    background: #58A400;
+    background: #58a400;
   }
 
   &:before {
@@ -48,7 +48,7 @@
     }
   }
   &:before {
-    content: ' ';
+    content: " ";
     background: @body-bg;
     border-radius: 11px;
     box-shadow: 0 2px 4px @shadow-color;
@@ -58,12 +58,25 @@
   font-size: 14px;
 
   .on & {
-    color: #58A400;
+    color: #58a400;
   }
   .off & {
-    color: #D0021B;
+    color: #d0021b;
   }
   .disabled & {
     color: @muted-more-color !important;
   }
 }
+.Checkbox--switch.loading {
+  color: @muted-more-color !important;
+
+  &.on .Checkbox-display {
+    background: fade(#58a400, 0.5);
+  }
+  &.off .Checkbox-display {
+    background: fade(@control-bg, 0.5);
+  }
+  .LoadingIndicator {
+    color: darken(@muted-color, 50%);
+  }
+}