diff --git a/templates/multiFileField.lucius b/templates/multiFileField.lucius
index 9f371dc11..21712010e 100644
--- a/templates/multiFileField.lucius
+++ b/templates/multiFileField.lucius
@@ -6,7 +6,7 @@
 
   .checkbox {
     display: inline-block;
-    margin-left: 5px;
+    margin-left: 7px;
   }
 }
 
diff --git a/templates/standalone/inputs.lucius b/templates/standalone/inputs.lucius
index e8389bf4a..28a540d6e 100644
--- a/templates/standalone/inputs.lucius
+++ b/templates/standalone/inputs.lucius
@@ -234,7 +234,8 @@ input[type="checkbox"]:checked::after {
     height: 24px;
     width: 24px;
     background-color: #f3f3f3;
-    box-shadow: inset 0 1px 2px 1px rgba(50,50,50,.05);
+    box-shadow: inset 0 1px 2px 1px rgba(50, 50, 50, 0.05);
+    border: 2px solid var(--color-primary);
     border-radius: 4px;
     color: white;
     cursor: pointer;
@@ -242,7 +243,6 @@ input[type="checkbox"]:checked::after {
 
   label::before,
   label::after {
-    content: '';
     position: absolute;
     display: block;
     top: 12px;
@@ -251,7 +251,6 @@ input[type="checkbox"]:checked::after {
     width: 8px;
     background-color: var(--color-font);
     transition: all .2s;
-    opacity: 0.2;
   }
 
   :checked + label {
@@ -260,7 +259,7 @@ input[type="checkbox"]:checked::after {
 
   :checked + label::before,
   :checked + label::after {
-    opacity: 1;
+    content: '';
   }
 
   :checked + label::before {
@@ -275,6 +274,16 @@ input[type="checkbox"]:checked::after {
     top: 11px;
     width: 13px;
   }
+
+  [disabled] + label {
+    pointer-events: none;
+    border: none;
+  }
+
+  [disabled] + label::before,
+  [disabled] + label::after {
+    content: none !important;
+  }
 }
 
 .radio::before {