diff --git a/modules/system/assets/ui/storm.css b/modules/system/assets/ui/storm.css
index e0d1e23a3e..93135f968f 100644
--- a/modules/system/assets/ui/storm.css
+++ b/modules/system/assets/ui/storm.css
@@ -874,7 +874,7 @@ input[type="button"].btn-block{width:100%}
 .btn-group-justified>.btn-group .btn{width:100%}
 [data-toggle="buttons"]>.btn>input[type="radio"],
 [data-toggle="buttons"]>.btn>input[type="checkbox"]{display:none}
-.btn{font-size:13px;outline:none !important;-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,.15);box-shadow:inset 0 -2px 0 rgba(0,0,0,.15)}
+.btn{font-size:13px;text-align:left;outline:none !important;-webkit-box-shadow:inset 0 -2px 0 rgba(0,0,0,.15);box-shadow:inset 0 -2px 0 rgba(0,0,0,.15)}
 .btn[disabled]{color:rgba(255,255,255,0.6)}
 .btn.active,
 .btn:active{-webkit-box-shadow:inset 0 1px 0 rgba(0,0,0,0.3);box-shadow:inset 0 1px 0 rgba(0,0,0,0.3)}
@@ -2837,7 +2837,8 @@ html.cssanimations .cursor-loading-indicator.hide{display:none}
 .inline-options .field-checkboxlist-inner .custom-checkbox label:before{top:10px}
 .inline-options.radio-field>label{display:block}
 .inline-options.radio-field .custom-radio{display:inline-block;margin-bottom:0}
-.switch-field .disabled{opacity:.5;}
+.switch-field .disabled{opacity:.5;cursor:not-allowed}
+.switch-field .disabled *{cursor:inherit}
 .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}