diff --git a/scss/_forms.scss b/scss/_forms.scss
index 32836182c3..24b2a20372 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -336,19 +336,16 @@ select.form-control-lg {
 
     // Remove default margin on radios/checkboxes that were used for stacking, and
     // then undo the floating of radios and checkboxes to match.
-    .radio,
-    .checkbox {
+    .form-check {
       display: inline-block;
       margin-top: 0;
       margin-bottom: 0;
       vertical-align: middle;
-
-      label {
-        padding-left: 0;
-      }
     }
-    .radio input[type="radio"],
-    .checkbox input[type="checkbox"] {
+    .form-check-label {
+      padding-left: 0;
+    }
+    .form-check-input {
       position: relative;
       margin-left: 0;
     }