diff --git a/modules/system/assets/ui/less/checkbox.less b/modules/system/assets/ui/less/checkbox.less
index 30c969409..0222cf355 100644
--- a/modules/system/assets/ui/less/checkbox.less
+++ b/modules/system/assets/ui/less/checkbox.less
@@ -170,6 +170,21 @@
     .border-radius(3px);
 }
 
+.inline-options {
+    .field-checkboxlist:not(.is-scrollable) {
+        padding: 20px !important;
+
+        .custom-checkbox {
+            display: inline-block;
+            margin: 0;
+
+            label {
+                margin-bottom: 0 !important;
+            }
+        }
+    }
+}
+
 //
 // ON / OFF Switcher
 //
@@ -280,4 +295,3 @@
         }
     }
 }
-
diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css
index 419d431d2..1cb04ec74 100644
--- a/modules/system/assets/ui/storm.css
+++ b/modules/system/assets/ui/storm.css
@@ -2456,6 +2456,9 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
 .custom-checkbox p.help-block,.custom-radio p.help-block{padding-left:6px;margin-bottom:17px}
 .custom-radio label:before{-webkit-border-radius:18px;-moz-border-radius:18px;border-radius:18px}
 .custom-checkbox label:before{-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}
+.inline-options .field-checkboxlist:not(.is-scrollable){padding:20px !important}
+.inline-options .field-checkboxlist:not(.is-scrollable) .custom-checkbox{display:inline-block;margin:0}
+.inline-options .field-checkboxlist:not(.is-scrollable) .custom-checkbox label{margin-bottom:0 !important}
 .switch-field .field-switch{padding-left:85px;float:left}
 .switch-field .field-switch > label{margin-top:3px}
 .custom-switch{display:block;width:65px;height:26px;position:relative;text-transform:uppercase;border:none;cursor:pointer;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}