diff --git a/src/Form/AdminPages/BaseEntityAdminForm.php b/src/Form/AdminPages/BaseEntityAdminForm.php
index 8e89ac96..d66cc5c6 100644
--- a/src/Form/AdminPages/BaseEntityAdminForm.php
+++ b/src/Form/AdminPages/BaseEntityAdminForm.php
@@ -111,9 +111,6 @@ class BaseEntityAdminForm extends AbstractType
                         'required' => false,
                         'label' => 'entity.edit.not_selectable',
                         'help' => 'entity.edit.not_selectable.help',
-                        'label_attr' => [
-                            'class' => 'checkbox-custom',
-                        ],
                         'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
                     ]
                 );
diff --git a/src/Form/AdminPages/CategoryAdminForm.php b/src/Form/AdminPages/CategoryAdminForm.php
index 77e4717f..68ba9d17 100644
--- a/src/Form/AdminPages/CategoryAdminForm.php
+++ b/src/Form/AdminPages/CategoryAdminForm.php
@@ -57,9 +57,6 @@ class CategoryAdminForm extends BaseEntityAdminForm
             'required' => false,
             'label' => 'category.edit.disable_footprints',
             'help' => 'category.edit.disable_footprints.help',
-            'label_attr' => [
-                'class' => 'checkbox-custom',
-            ],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
         ]);
 
@@ -67,9 +64,6 @@ class CategoryAdminForm extends BaseEntityAdminForm
             'required' => false,
             'label' => 'category.edit.disable_manufacturers',
             'help' => 'category.edit.disable_manufacturers.help',
-            'label_attr' => [
-                'class' => 'checkbox-custom',
-            ],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
         ]);
 
@@ -77,9 +71,6 @@ class CategoryAdminForm extends BaseEntityAdminForm
             'required' => false,
             'label' => 'category.edit.disable_autodatasheets',
             'help' => 'category.edit.disable_autodatasheets.help',
-            'label_attr' => [
-                'class' => 'checkbox-custom',
-            ],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
         ]);
 
@@ -87,9 +78,6 @@ class CategoryAdminForm extends BaseEntityAdminForm
             'required' => false,
             'label' => 'category.edit.disable_properties',
             'help' => 'category.edit.disable_properties.help',
-            'label_attr' => [
-                'class' => 'checkbox-custom',
-            ],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
         ]);
 
diff --git a/src/Form/AdminPages/GroupAdminForm.php b/src/Form/AdminPages/GroupAdminForm.php
index 1beccd13..b8e9cfd1 100644
--- a/src/Form/AdminPages/GroupAdminForm.php
+++ b/src/Form/AdminPages/GroupAdminForm.php
@@ -57,9 +57,6 @@ class GroupAdminForm extends BaseEntityAdminForm
             'required' => false,
             'label' => 'group.edit.enforce_2fa',
             'help' => 'group.edit.enforce_2fa.help',
-            'label_attr' => [
-                'class' => 'checkbox-custom',
-            ],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
         ]);
 
diff --git a/src/Form/AdminPages/ImportType.php b/src/Form/AdminPages/ImportType.php
index 82e4aecb..3f1c697c 100644
--- a/src/Form/AdminPages/ImportType.php
+++ b/src/Form/AdminPages/ImportType.php
@@ -112,9 +112,6 @@ class ImportType extends AbstractType
                 'data' => true,
                 'required' => false,
                 'label' => 'import.preserve_children',
-                'label_attr' => [
-                    'class' => 'checkbox-custom',
-                ],
                 'disabled' => $disabled,
             ])
             ->add('abort_on_validation_error', CheckboxType::class, [
@@ -122,9 +119,6 @@ class ImportType extends AbstractType
                 'required' => false,
                 'label' => 'import.abort_on_validation',
                 'help' => 'import.abort_on_validation.help',
-                'label_attr' => [
-                    'class' => 'checkbox-custom',
-                ],
                 'disabled' => $disabled,
             ])
 
diff --git a/src/Form/AdminPages/LabelProfileAdminForm.php b/src/Form/AdminPages/LabelProfileAdminForm.php
index 38cd05ef..3a3a8ffb 100644
--- a/src/Form/AdminPages/LabelProfileAdminForm.php
+++ b/src/Form/AdminPages/LabelProfileAdminForm.php
@@ -44,9 +44,6 @@ class LabelProfileAdminForm extends BaseEntityAdminForm
         $builder->add('show_in_dropdown', CheckboxType::class, [
             'required' => false,
             'label' => 'label_profile.showInDropdown',
-            'label_attr' => [
-                'class' => 'checkbox-custom',
-            ],
         ]);
         $builder->add('options', LabelOptionsType::class, [
             'label' => false,
diff --git a/src/Form/AdminPages/MeasurementUnitAdminForm.php b/src/Form/AdminPages/MeasurementUnitAdminForm.php
index d66f3125..0d23bc33 100644
--- a/src/Form/AdminPages/MeasurementUnitAdminForm.php
+++ b/src/Form/AdminPages/MeasurementUnitAdminForm.php
@@ -57,9 +57,6 @@ class MeasurementUnitAdminForm extends BaseEntityAdminForm
             'required' => false,
             'label' => 'measurement_unit.edit.is_integer',
             'help' => 'measurement_unit.edit.is_integer.help',
-            'label_attr' => [
-                'class' => 'checkbox-custom',
-            ],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
         ]);
 
@@ -67,9 +64,6 @@ class MeasurementUnitAdminForm extends BaseEntityAdminForm
             'required' => false,
             'label' => 'measurement_unit.edit.use_si_prefix',
             'help' => 'measurement_unit.edit.use_si_prefix.help',
-            'label_attr' => [
-                'class' => 'checkbox-custom',
-            ],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
         ]);
 
diff --git a/src/Form/AdminPages/StorelocationAdminForm.php b/src/Form/AdminPages/StorelocationAdminForm.php
index cf4df30e..2ed47cb9 100644
--- a/src/Form/AdminPages/StorelocationAdminForm.php
+++ b/src/Form/AdminPages/StorelocationAdminForm.php
@@ -58,9 +58,6 @@ class StorelocationAdminForm extends BaseEntityAdminForm
             'required' => false,
             'label' => 'storelocation.edit.is_full.label',
             'help' => 'storelocation.edit.is_full.help',
-            'label_attr' => [
-                'class' => 'checkbox-custom',
-            ],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'move', $entity),
         ]);
 
@@ -68,9 +65,6 @@ class StorelocationAdminForm extends BaseEntityAdminForm
             'required' => false,
             'label' => 'storelocation.limit_to_existing.label',
             'help' => 'storelocation.limit_to_existing.help',
-            'label_attr' => [
-                'class' => 'checkbox-custom',
-            ],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'move', $entity),
         ]);
 
@@ -78,9 +72,6 @@ class StorelocationAdminForm extends BaseEntityAdminForm
             'required' => false,
             'label' => 'storelocation.only_single_part.label',
             'help' => 'storelocation.only_single_part.help',
-            'label_attr' => [
-                'class' => 'checkbox-custom',
-            ],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'move', $entity),
         ]);
 
diff --git a/src/Form/AttachmentFormType.php b/src/Form/AttachmentFormType.php
index 8a07649a..39f1ed02 100644
--- a/src/Form/AttachmentFormType.php
+++ b/src/Form/AttachmentFormType.php
@@ -106,9 +106,6 @@ class AttachmentFormType extends AbstractType
             'attr' => [
                 'class' => 'form-control-sm',
             ],
-            'label_attr' => [
-                'class' => 'checkbox-custom',
-            ],
         ]);
 
         $builder->add('secureFile', CheckboxType::class, [
@@ -120,9 +117,6 @@ class AttachmentFormType extends AbstractType
                 'class' => 'form-control-sm',
             ],
             'help' => 'attachment.edit.secure_file.help',
-            'label_attr' => [
-                'class' => 'checkbox-custom',
-            ],
         ]);
 
         $builder->add('url', TextType::class, [
@@ -147,9 +141,6 @@ class AttachmentFormType extends AbstractType
             'attr' => [
                 'class' => 'form-control-sm',
             ],
-            'label_attr' => [
-                'class' => 'checkbox-custom',
-            ],
         ]);
 
         $builder->add('file', FileType::class, [
diff --git a/src/Form/Part/OrderdetailType.php b/src/Form/Part/OrderdetailType.php
index 013cf25e..81f4fdd5 100644
--- a/src/Form/Part/OrderdetailType.php
+++ b/src/Form/Part/OrderdetailType.php
@@ -92,9 +92,6 @@ class OrderdetailType extends AbstractType
 
         $builder->add('obsolete', CheckboxType::class, [
             'required' => false,
-            'label_attr' => [
-                'class' => 'checkbox-custom',
-            ],
             'label' => 'orderdetails.edit.obsolete',
         ]);
 
diff --git a/src/Form/Part/PartBaseType.php b/src/Form/Part/PartBaseType.php
index de4b40e2..de9fcf55 100644
--- a/src/Form/Part/PartBaseType.php
+++ b/src/Form/Part/PartBaseType.php
@@ -182,17 +182,11 @@ class PartBaseType extends AbstractType
 
         //Advanced section
         $builder->add('needsReview', CheckboxType::class, [
-            'label_attr' => [
-                'class' => 'checkbox-custom',
-            ],
             'required' => false,
             'label' => 'part.edit.needs_review',
             'disabled' => !$this->security->isGranted('edit', $part),
         ])
             ->add('favorite', CheckboxType::class, [
-                'label_attr' => [
-                    'class' => 'checkbox-custom',
-                ],
                 'required' => false,
                 'label' => 'part.edit.is_favorite',
                 'disabled' => !$this->security->isGranted('change_favorite', $part),
diff --git a/src/Form/Part/PartLotType.php b/src/Form/Part/PartLotType.php
index 54482c30..168d38be 100644
--- a/src/Form/Part/PartLotType.php
+++ b/src/Form/Part/PartLotType.php
@@ -103,15 +103,9 @@ class PartLotType extends AbstractType
             'attr' => [
                 'class' => 'form-control-sm',
             ],
-            'label_attr' => [
-                'class' => 'checkbox-custom',
-            ],
         ]);
 
         $builder->add('needs_refill', CheckboxType::class, [
-            'label_attr' => [
-                'class' => 'checkbox-custom',
-            ],
             'label' => 'part_lot.edit.needs_refill',
             'attr' => [
                 'class' => 'form-control-sm',
diff --git a/src/Form/Type/TriStateCheckboxType.php b/src/Form/Type/TriStateCheckboxType.php
index b073d07e..48755787 100644
--- a/src/Form/Type/TriStateCheckboxType.php
+++ b/src/Form/Type/TriStateCheckboxType.php
@@ -61,9 +61,6 @@ final class TriStateCheckboxType extends AbstractType implements DataTransformer
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
-            'label_attr' => [
-                'class' => 'checkbox-custom checkbox-inline',
-            ],
             'attr' => [
                 'class' => 'tristate',
             ],
diff --git a/src/Form/UserAdminForm.php b/src/Form/UserAdminForm.php
index ad4e4123..718132ef 100644
--- a/src/Form/UserAdminForm.php
+++ b/src/Form/UserAdminForm.php
@@ -214,18 +214,12 @@ class UserAdminForm extends AbstractType
 
             ->add('need_pw_change', CheckboxType::class, [
                 'required' => false,
-                'label_attr' => [
-                    'class' => 'checkbox-custom',
-                ],
                 'label' => 'user.edit.needs_pw_change',
                 'disabled' => !$this->security->isGranted('set_password', $entity),
             ])
 
             ->add('disabled', CheckboxType::class, [
                 'required' => false,
-                'label_attr' => [
-                    'class' => 'checkbox-custom',
-                ],
                 'label' => 'user.edit.user_disabled',
                 'disabled' => !$this->security->isGranted('set_password', $entity)
                     || $entity === $this->security->getUser(),
diff --git a/templates/AdminPages/_delete_form.html.twig b/templates/AdminPages/_delete_form.html.twig
index 8ee18912..d07c0ac1 100644
--- a/templates/AdminPages/_delete_form.html.twig
+++ b/templates/AdminPages/_delete_form.html.twig
@@ -20,8 +20,8 @@
             </div>
             {% if entity.parent is defined  %}
                 <div class="ms-2 custom-control custom-checkbox custom-control-inline">
-                    <input type="checkbox" class="custom-control-input" id="recursive" name="delete_recursive">
-                    <label class="custom-control-label" for="recursive">{% trans %}entity.delete.recursive{% endtrans %}</label>
+                    <input type="checkbox" class="form-check-input" id="recursive" name="delete_recursive">
+                    <label class="form-check-label" for="recursive">{% trans %}entity.delete.recursive{% endtrans %}</label>
                 </div>
             {% endif %}
         </div>
diff --git a/templates/AdminPages/_export_form.html.twig b/templates/AdminPages/_export_form.html.twig
index a20f0d0a..383a66eb 100644
--- a/templates/AdminPages/_export_form.html.twig
+++ b/templates/AdminPages/_export_form.html.twig
@@ -25,9 +25,9 @@
 
     <div class="form-row mt-2">
         <div class="offset-sm-3 col-sm">
-            <div class="custom-control custom-checkbox">
-                <input class="form-check-input custom-control-input" name="include_children" id="include_children" type="checkbox" checked>
-                <label class="form-check-label custom-control-label" for="include_children">
+            <div class="form-check">
+                <input class="form-check-input form-check-input" name="include_children" id="include_children" type="checkbox" checked>
+                <label class="form-check-label form-check-label" for="include_children">
                     {% trans %}export.include_children{% endtrans %}
                 </label>
             </div>
diff --git a/templates/Form/extendedBootstrap4_layout.html.twig b/templates/Form/extendedBootstrap4_layout.html.twig
index 42f8a1d6..36fdc5cb 100644
--- a/templates/Form/extendedBootstrap4_layout.html.twig
+++ b/templates/Form/extendedBootstrap4_layout.html.twig
@@ -64,7 +64,7 @@
         {% set is_parent_custom = parent_label_class is defined and ('checkbox-custom' in parent_label_class or 'radio-custom' in parent_label_class) %}
         {% set is_custom = label_attr.class is defined and ('checkbox-custom' in label_attr.class or 'radio-custom' in label_attr.class) %}
         {%- if is_parent_custom or is_custom -%}
-            {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' custom-control-label')|trim}) -%}
+            {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' form-check-label')|trim}) -%}
         {%- else %}
             {%- set label_attr = label_attr|merge({class: (label_attr.class|default('') ~ ' form-check-label')|trim}) -%}
         {%- endif %}
@@ -103,7 +103,7 @@
 {% block tristate_widget -%}
     {%- set parent_label_class = parent_label_class|default(label_attr.class|default('')) -%}
     {%- if 'checkbox-custom' in parent_label_class -%}
-        {%- set attr = attr|merge({class: (attr.class|default('') ~ ' custom-control-input')|trim}) -%}
+        {%- set attr = attr|merge({class: (attr.class|default('') ~ ' form-check-input')|trim}) -%}
         <div class="custom-control custom-checkbox{{ 'checkbox-inline' in parent_label_class ? ' custom-control-inline' }}">
             {{- form_label(form, null, { widget: block('tr_parent') }) -}}
         </div>
diff --git a/templates/Form/permissionLayout.html.twig b/templates/Form/permissionLayout.html.twig
index a48d0693..4124e960 100644
--- a/templates/Form/permissionLayout.html.twig
+++ b/templates/Form/permissionLayout.html.twig
@@ -3,9 +3,9 @@
         <td>
             {% if multi_checkbox %}
 
-                <div class="custom-control custom-checkbox">
-                    <input type="checkbox" class="custom-control-input tristate permission_multicheckbox" id="mulit_check_{{ form.vars.label }}">
-                    <label class="custom-control-label" for="mulit_check_{{ form.vars.label }}">
+                <div class="form-check">
+                    <input type="checkbox" class="form-check-input tristate permission_multicheckbox" id="mulit_check_{{ form.vars.label }}">
+                    <label class="form-check-label" for="mulit_check_{{ form.vars.label }}">
                         <b>{{ form.vars.label | trans }}</b>
                     </label>
                 </div>
@@ -53,16 +53,16 @@
             <label><b>{% trans %}permission.legend.title{% endtrans %}:</b></label>
             <div>
                 <div class="custom-control custom-control-inline custom-checkbox">
-                    <input type="checkbox" hidden class="custom-control-input">
-                    <label class="custom-control-label">{% trans %}permission.legend.disallow{% endtrans %}</label>
+                    <input type="checkbox" hidden class="form-check-input">
+                    <label class="form-check-label">{% trans %}permission.legend.disallow{% endtrans %}</label>
                 </div>
                 <div class="custom-control custom-control-inline custom-checkbox">
-                    <input class="custom-control-input" type="checkbox" hidden checked>
-                    <label class="custom-control-label">{% trans %}permission.legend.allow{% endtrans %}</label>
+                    <input class="form-check-input" type="checkbox" hidden checked>
+                    <label class="form-check-label">{% trans %}permission.legend.allow{% endtrans %}</label>
                 </div>
                 <div class="custom-control custom-control-inline custom-checkbox">
-                    <input type="checkbox" class="tristate custom-control-input" hidden indeterminate="indeterminate">
-                    <label class="custom-control-label">{% trans %}permission.legend.inherit{% endtrans %}</label>
+                    <input type="checkbox" class="tristate form-check-input" hidden indeterminate="indeterminate">
+                    <label class="form-check-label">{% trans %}permission.legend.inherit{% endtrans %}</label>
                 </div>
             </div>
         </div>
diff --git a/templates/_navbar.html.twig b/templates/_navbar.html.twig
index 8099fd0a..87a05497 100644
--- a/templates/_navbar.html.twig
+++ b/templates/_navbar.html.twig
@@ -60,8 +60,8 @@
                         <li role="separator" class="dropdown-divider" id="toggleDarkmodeSeparator" hidden></li>
                         <div class="px-4 px-3" id="toggleDarkmodeContainer" hidden>
                             <div class="custom-control custom-switch">
-                                <input type="checkbox" class="custom-control-input" id="toggleDarkmode">
-                                <label class="custom-control-label"
+                                <input type="checkbox" class="form-check-input" id="toggleDarkmode">
+                                <label class="form-check-label"
                                        for="toggleDarkmode">{% trans %}ui.toggle_darkmode{% endtrans %}</label>
                             </div>
                         </div>
diff --git a/templates/_navbar_search.html.twig b/templates/_navbar_search.html.twig
index d7b66f2f..e3cc7f56 100644
--- a/templates/_navbar_search.html.twig
+++ b/templates/_navbar_search.html.twig
@@ -1,64 +1,64 @@
 <form action="{{ url('parts_search') }}" class="d-flex my-lg-0 ms-auto" method="get">
     <div class="dropdown">
-        <button class="btn btn-light dropdown-toggle my-2" type="button" id="navbar-search-options" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-bs-auto-close="inside">
+        <button class="btn btn-light dropdown-toggle my-2" type="button" id="navbar-search-options" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-bs-auto-close="false">
             {% trans %}search.options.label{% endtrans %}
             <span class="caret"></span>
         </button>
         <div class="dropdown-menu" aria-labelledby="navbar-search-options">
-            <div class="px-1 py-2">
-                <div class="custom-control custom-checkbox">
-                    <input type="checkbox" class="custom-control-input" id="search_name"  name="name" value="1" checked>
-                    <label for="search_name" class="custom-control-label justify-content-start">{% trans %}name.label{% endtrans %}</label>
+            <div class="px-2">
+                <div class="form-check">
+                    <input type="checkbox" class="form-check-input" id="search_name"  name="name" value="1" checked>
+                    <label for="search_name" class="form-check-label justify-content-start">{% trans %}name.label{% endtrans %}</label>
                 </div>
-                <div class="custom-control custom-checkbox">
-                    <input type="checkbox" class="custom-control-input" id="search_category" name="category" value="1" checked>
-                    <label for="search_category" class="custom-control-label justify-content-start">{% trans %}category.label{% endtrans %}</label>
+                <div class="form-check">
+                    <input type="checkbox" class="form-check-input" id="search_category" name="category" value="1" checked>
+                    <label for="search_category" class="form-check-label justify-content-start">{% trans %}category.label{% endtrans %}</label>
                 </div>
-                <div class="custom-control custom-checkbox">
-                    <input type="checkbox" class="custom-control-input" id="search_description" name="description" value="1" checked>
-                    <label for="search_description" class="custom-control-label justify-content-start">{% trans %}description.label{% endtrans %}</label>
+                <div class="form-check">
+                    <input type="checkbox" class="form-check-input" id="search_description" name="description" value="1" checked>
+                    <label for="search_description" class="form-check-label justify-content-start">{% trans %}description.label{% endtrans %}</label>
                 </div>
-                <div class="custom-control custom-checkbox">
-                    <input type="checkbox" class="custom-control-input" id="search_tags" name="tags" value="1" checked>
-                    <label for="search_tags" class="custom-control-label justify-content-start">{% trans %}tags.label{% endtrans %}</label>
+                <div class="form-check">
+                    <input type="checkbox" class="form-check-input" id="search_tags" name="tags" value="1" checked>
+                    <label for="search_tags" class="form-check-label justify-content-start">{% trans %}tags.label{% endtrans %}</label>
                 </div>
-                <div class="custom-control custom-checkbox">
-                    <input type="checkbox" class="custom-control-input" id="search_storelocation" name="storelocation" value="1" checked>
-                    <label for="search_storelocation" class="custom-control-label justify-content-start">{% trans %}storelocation.label{% endtrans %}</label>
+                <div class="form-check">
+                    <input type="checkbox" class="form-check-input" id="search_storelocation" name="storelocation" value="1" checked>
+                    <label for="search_storelocation" class="form-check-label justify-content-start">{% trans %}storelocation.label{% endtrans %}</label>
                 </div>
                 <div class=" custom-control custom-checkbox">
-                    <input type="checkbox" id="search_comment" class="custom-control-input" id="search_comment" name="comment" value="1" checked>
-                    <label for="search_comment" class="custom-control-label justify-content-start">{% trans %}comment.label{% endtrans %}</label>
+                    <input type="checkbox" id="search_comment" class="form-check-input" id="search_comment" name="comment" value="1" checked>
+                    <label for="search_comment" class="form-check-label justify-content-start">{% trans %}comment.label{% endtrans %}</label>
                 </div>
                 {% if true %}
-                    <div class="custom-control custom-checkbox">
-                        <input type="checkbox" class="custom-control-input" id="search_supplierpartnr" name="ordernr" value="1" checked>
-                        <label for="search_supplierpartnr" class="custom-control-label justify-content-start">{% trans %}ordernumber.label.short{% endtrans %}</label>
+                    <div class="form-check">
+                        <input type="checkbox" class="form-check-input" id="search_supplierpartnr" name="ordernr" value="1" checked>
+                        <label for="search_supplierpartnr" class="form-check-label justify-content-start">{% trans %}ordernumber.label.short{% endtrans %}</label>
                     </div>
-                    <div class="custom-control custom-checkbox">
-                        <input type="checkbox" class="custom-control-input" id="search_supplier" name="supplier" value="1">
-                        <label for="search_supplier" class="custom-control-label justify-content-start">{% trans %}supplier.label{% endtrans %}</label>
+                    <div class="form-check">
+                        <input type="checkbox" class="form-check-input" id="search_supplier" name="supplier" value="1">
+                        <label for="search_supplier" class="form-check-label justify-content-start">{% trans %}supplier.label{% endtrans %}</label>
                     </div>
                 {% endif %}
                 {% if true %}
-                    <div class="custom-control custom-checkbox">
-                        <input type="checkbox" class="custom-control-input" id="search_manufacturer" name="manufacturer" value="1">
-                        <label for="search_manufacturer" class="custom-control-label justify-content-start">{% trans %}manufacturer.label{% endtrans %}</label>
+                    <div class="form-check">
+                        <input type="checkbox" class="form-check-input" id="search_manufacturer" name="manufacturer" value="1">
+                        <label for="search_manufacturer" class="form-check-label justify-content-start">{% trans %}manufacturer.label{% endtrans %}</label>
                     </div>
                 {% endif %}
                 {% if true %}
-                    <div class="custom-control custom-checkbox">
-                        <input type="checkbox" class="custom-control-input" id="search_footprint" name="footprint" value="1">
-                        <label for="search_footprint" class="custom-control-label justify-content-start">{% trans %}footprint.label{% endtrans %}</label>
+                    <div class="form-check">
+                        <input type="checkbox" class="form-check-input" id="search_footprint" name="footprint" value="1">
+                        <label for="search_footprint" class="form-check-label justify-content-start">{% trans %}footprint.label{% endtrans %}</label>
                     </div>
                 {% endif %}
-                <div class="custom-control custom-checkbox">
-                    <input type="checkbox" class="custom-control-input" id="disable_pid_input" name="disable_pid_input" value="1">
-                    <label for="disable_pid_input" class="custom-control-label justify-content-start">{% trans %}search.deactivateBarcode{% endtrans %}</label>
+                <div class="form-check">
+                    <input type="checkbox" class="form-check-input" id="disable_pid_input" name="disable_pid_input" value="1">
+                    <label for="disable_pid_input" class="form-check-label justify-content-start">{% trans %}search.deactivateBarcode{% endtrans %}</label>
                 </div>
-                <div class="custom-control custom-checkbox">
-                    <input type="checkbox" class="custom-control-input" id="regex" name="regex" value="1">
-                    <label for="regex" class="custom-control-label justify-content-start">{% trans %}search.regexmatching{% endtrans %}</label>
+                <div class="form-check">
+                    <input type="checkbox" class="form-check-input" id="regex" name="regex" value="1">
+                    <label for="regex" class="form-check-label justify-content-start">{% trans %}search.regexmatching{% endtrans %}</label>
                 </div>
             </div>
         </div>
diff --git a/templates/security/2fa_base_form.html.twig b/templates/security/2fa_base_form.html.twig
index 45ec64ce..8190e7a1 100644
--- a/templates/security/2fa_base_form.html.twig
+++ b/templates/security/2fa_base_form.html.twig
@@ -35,8 +35,8 @@
             <div class="form-group row mt-3">
                 <div class="offset-3">
                     <div class="custom-checkbox custom-control ms-2">
-                        <input id="_trusted" class="custom-control-input" type="checkbox" name="{{ trustedParameterName }}" />
-                        <label class="custom-control-label" for="_trusted">{% trans %}tfa.code.trusted_pc{% endtrans %}</label>
+                        <input id="_trusted" class="form-check-input" type="checkbox" name="{{ trustedParameterName }}" />
+                        <label class="form-check-label" for="_trusted">{% trans %}tfa.code.trusted_pc{% endtrans %}</label>
                     </div>
                 </div>
             </div>
diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig
index 82f0d740..6b5b08eb 100644
--- a/templates/security/login.html.twig
+++ b/templates/security/login.html.twig
@@ -45,8 +45,8 @@
         <div class="form-group row">
             <div class="col-md-9 offset-md-3 col-lg-10 offset-lg-2">
                 <div class="custom-control custom-checkbox custom-control-inline">
-                    <input class="custom-control-input" name="_remember_me" id="remember_me" type="checkbox">
-                    <label class="custom-control-label" for="remember_me">
+                    <input class="form-check-input" name="_remember_me" id="remember_me" type="checkbox">
+                    <label class="form-check-label" for="remember_me">
                         {% trans %}login.rememberme{% endtrans %}
                     </label>
                 </div>