diff --git a/src/bootstrap-table.js b/src/bootstrap-table.js
index b96f98234c..5679728b64 100644
--- a/src/bootstrap-table.js
+++ b/src/bootstrap-table.js
@@ -379,7 +379,7 @@ class BootstrapTable {
         if (column.checkbox) {
           text = ''
           if (!this.options.singleSelect && this.options.checkboxHeader) {
-            text = '<label><input name="btSelectAll" type="checkbox" /><span></span></label>'
+            text = '<label><input name="btSelectAll" type="checkbox" class="form-check-input" /><span></span></label>'
           }
           this.header.stateField = column.field
         }
@@ -682,7 +682,7 @@ class BootstrapTable {
 
             html.push(
               Utils.sprintf(this.constants.html.toolbarDropdownItem,
-                Utils.sprintf('<input type="checkbox" class="toggle-all" %s> <span>%s</span>',
+                Utils.sprintf('<div class="form-check"><input type="checkbox" class="toggle-all form-check-input" %s> <span>%s</span></div>',
                   allFieldsVisible ? 'checked="checked"' : '', opts.formatColumnsToggleAll())
               )
             )
@@ -712,7 +712,7 @@ class BootstrapTable {
 
             if (column.switchable) {
               html.push(Utils.sprintf(this.constants.html.toolbarDropdownItem,
-                Utils.sprintf('<input type="checkbox" data-field="%s" value="%s"%s%s> <span>%s</span>',
+                Utils.sprintf('<div class="form-check"><input type="checkbox" class="form-check-input" data-field="%s" value="%s"%s%s> <span>%s</span></div>',
                   column.field, i, checked, disabled, column.title)))
               switchableCount++
             }
@@ -1678,6 +1678,7 @@ class BootstrapTable {
             `<td class="bs-checkbox ${c}"${class_}${style_}>`,
           `<label>
             <input
+            class="form-check-input"
             data-index="${i}"
             name="${this.options.selectItemName}"
             type="${type}"
diff --git a/src/themes/_theme.scss b/src/themes/_theme.scss
index e85dd3e02c..597ee5ea0b 100644
--- a/src/themes/_theme.scss
+++ b/src/themes/_theme.scss
@@ -159,11 +159,6 @@
 
         label {
           margin-bottom: 0;
-
-          input[type="radio"],
-          input[type="checkbox"] {
-            margin: 0 auto !important;
-          }
         }
       }