diff --git a/bin/materialize.css b/bin/materialize.css
index 73e9c78922..4578def441 100644
--- a/bin/materialize.css
+++ b/bin/materialize.css
@@ -6418,7 +6418,7 @@ form p:last-child {
   margin-right: 10px;
   transition: background 0.3s ease;
   vertical-align: middle;
-  margin-left: 16px; }
+  margin: 0px 16px; }
 
 .switch label .lever:after {
   content: "";
diff --git a/css/ghpages-materialize.css b/css/ghpages-materialize.css
index fc0b76e1d7..5df5340abd 100644
--- a/css/ghpages-materialize.css
+++ b/css/ghpages-materialize.css
@@ -6418,7 +6418,7 @@ form p:last-child {
   margin-right: 10px;
   transition: background 0.3s ease;
   vertical-align: middle;
-  margin-left: 5px; }
+  margin: 0px 16px; }
 
 .switch label .lever:after {
   content: "";
@@ -6433,15 +6433,15 @@ form p:last-child {
   top: -2px;
   transition: left 0.3s ease, background 0.3s ease, box-shadow 0.1s ease; }
 
-.switch label input[type=checkbox][disabled]:first-child + .lever:after, .switch label input[type=checkbox][disabled]:checked:first-child + .lever:after {
-  background-color: #BDBDBD; }
-
-input[type=checkbox]:first-child:checked ~ .lever:active:after {
+input[type=checkbox]:first-child:checked:not(:disabled) ~ .lever:active:after {
   box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.4), 0 0 0 15px rgba(0, 149, 135, 0.1); }
 
-input[type=checkbox]:first-child ~ .lever:active:after, input[type=checkbox][disabled]:first-child ~ .lever:active:after {
+input[type=checkbox]:first-child:not(:disabled) ~ .lever:active:after {
   box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.4), 0 0 0 15px rgba(0, 0, 0, 0.1); }
 
+.switch label input[type=checkbox][disabled]:first-child + .lever:after, .switch label input[type=checkbox][disabled]:checked:first-child + .lever:after {
+  background-color: #BDBDBD; }
+
 .switch label input[type=checkbox]:first-child:checked + .lever:after {
   left: 30px; }
 
diff --git a/sass/components/_form.scss b/sass/components/_form.scss
index c29ea62c52..1e9640af4a 100644
--- a/sass/components/_form.scss
+++ b/sass/components/_form.scss
@@ -392,7 +392,7 @@ form p {
     margin-right: 10px;
     transition: background 0.3s ease;
     vertical-align: middle;
-    margin-left: 16px;
+    margin: 0px 16px;
 }
 .switch label .lever:after {
     content: "";