diff --git a/modules/system/assets/ui/less/checkbox.less b/modules/system/assets/ui/less/checkbox.less
index 01c9582df..00e5e3b0b 100644
--- a/modules/system/assets/ui/less/checkbox.less
+++ b/modules/system/assets/ui/less/checkbox.less
@@ -142,13 +142,10 @@
     }
 
     input:disabled + label:before {
+        background-color: #999 !important;
         border: 1px solid @color-checkbox-border !important;
     }
 
-    input:disabled:checked + label:before {
-        background-color: #999;
-    }
-
     &:focus {
         outline: none;
         label:before {
diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css
index ec4263b9e..c52bc7218 100644
--- a/modules/system/assets/ui/storm.css
+++ b/modules/system/assets/ui/storm.css
@@ -4119,9 +4119,7 @@ html.cssanimations .cursor-loading-indicator.hide {display:none}
 .custom-checkbox input[type=checkbox]:indeterminate + label:before,
 .custom-radio input[type=checkbox]:indeterminate + label:before {font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;content:"\f068"}
 .custom-checkbox input:disabled + label:before,
-.custom-radio input:disabled + label:before {border:1px solid #d1d6d9 !important}
-.custom-checkbox input:disabled:checked + label:before,
-.custom-radio input:disabled:checked + label:before {background-color:#999}
+.custom-radio input:disabled + label:before {background-color:#999 !important;border:1px solid #d1d6d9 !important}
 .custom-checkbox:focus,
 .custom-radio:focus {outline:none}
 .custom-checkbox:focus label:before,