diff --git a/assets/css/app.css b/assets/css/app.css
index a46d6ce8..e4251e48 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -638,22 +638,6 @@ label:not(.form-check-label, custom-control-label) {
     padding: .1rem 1.5rem;
 }
 
-/* Font Awesome 5 with Checkbox support */
-.abc-checkbox input[type="checkbox"]:checked+label::after,
-.abc-checkbox input[type="radio"]:checked+label::after {
-    /*noinspection CssNoGenericFontName*/
-    font-family: "Font Awesome 5 Free";
-    font-weight: 900;
-    content: "\f00c";
-    font-weight: 900;
-}
-
-.form-check-dropdown {
-    display: flex;
-    width: auto;
-    padding-left: 10%;
-}
-
 .btn-group-append {
     border-top-left-radius: 0;
     border-bottom-left-radius: 0
diff --git a/assets/js/app.js b/assets/js/app.js
index 6bd7dc3c..e0946877 100644
--- a/assets/js/app.js
+++ b/assets/js/app.js
@@ -22,7 +22,6 @@ import 'datatables.net-buttons-bs4/css/buttons.bootstrap4.css'
 import 'datatables.net-fixedheader-bs4/css/fixedHeader.bootstrap4.css'
 import 'datatables.net-select-bs4/css/select.bootstrap4.css'
 import 'bootstrap-select/dist/css/bootstrap-select.css'
-import 'awesome-bootstrap-checkbox/awesome-bootstrap-checkbox.css'
 
 import "patternfly-bootstrap-treeview/src/css/bootstrap-treeview.css"
 
diff --git a/package.json b/package.json
index 8aff5212..885ac6c3 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,6 @@
         "@types/jquery": "^3.3.29",
         "@types/jquery.form": "^3.26.30",
         "@types/js-cookie": "^2.2.1",
-        "awesome-bootstrap-checkbox": "^1.0.1",
         "bootbox": "^5.1.0",
         "bootstrap-fileinput": "^5.0.1",
         "bootstrap-select": "^1.13.8",
diff --git a/templates/_navbar.html.twig b/templates/_navbar.html.twig
index ce648b4d..ef5401c0 100644
--- a/templates/_navbar.html.twig
+++ b/templates/_navbar.html.twig
@@ -24,32 +24,57 @@
                         {% trans %}search.options.label{% endtrans %}
                         <span class="caret"></span>
                     </button>
-                    <div class="dropdown-menu" aria-labelledby="SearchOptions">
-                        <div class="abc-checkbox form-check-dropdown"><input type="checkbox" class="form-check-input" name="search_name" value="true" checked>
-                            <label for="search_name" class="form-check-label">{% trans %}name.label{% endtrans %}</label></div>
-                        <div class="abc-checkbox form-check-dropdown"><input type="checkbox" class="form-check-input" name="search_category" value="true" checked>
-                            <label for="search_category" class="form-check-label">{% trans %}category.label{% endtrans %}</label></div>
-                        <div class="abc-checkbox form-check-dropdown"><input type="checkbox" class="form-check-input" name="search_description" value="true" checked>
-                            <label for="search_description" class="form-check-label"></label>{% trans %}description.label{% endtrans %}</div>
-                        <div class="abc-checkbox form-check-dropdown"><input type="checkbox" class="form-check-input" name="search_storelocation" value="true" checked>
-                            <label for="search_storelocation" class="form-check-label">{% trans %}storelocation.label{% endtrans %}</label></div>
-                        <div class="form-check-dropdown abc-checkbox" class="form-check-label"><input type="checkbox" class="form-check-input" name="search_comment" value="true" checked>
-                            <label for="search_comment" class="form-check-label">{% trans %}comment.label{% endtrans %}</label></div>
+                    <div class="dropdown-menu p-2" aria-labelledby="SearchOptions">
+                        <div class="custom-control custom-checkbox">
+                            <input type="checkbox" class="custom-control-input" id="search_name"  name="search_name" value="true" checked>
+                            <label for="search_name" class="custom-control-label">{% trans %}name.label{% endtrans %}</label>
+                        </div>
+                        <div class="custom-control custom-checkbox">
+                            <input type="checkbox" class="custom-control-input" id="search_category" name="search_category" value="true" checked>
+                            <label for="search_category" class="custom-control-label">{% trans %}category.label{% endtrans %}</label>
+                        </div>
+                        <div class="custom-control custom-checkbox">
+                            <input type="checkbox" class="custom-control-input" id="search_description" name="search_description" value="true" checked>
+                            <label for="search_description" class="custom-control-label"></label>{% trans %}description.label{% endtrans %}
+                        </div>
+                        <div class="custom-control custom-checkbox">
+                            <input type="checkbox" class="custom-control-input" id="search_storelocation" name="search_storelocation" value="true" checked>
+                            <label for="search_storelocation" class="custom-control-label">{% 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="search_comment" value="true" checked>
+                            <label for="search_comment" class="custom-control-label">{% trans %}comment.label{% endtrans %}</label>
+                        </div>
                         {% if true %}
-                            <div class="form-check-dropdown abc-checkbox"><input type="checkbox" class="form-check-input" name="search_supplierpartnr" value="true" checked>
-                                <label for="search_supplierpartnr" class="form-check-label">{% trans %}ordernumber.label.short{% endtrans %}</label></div>
-                            <li class="form-check-dropdown abc-checkbox"><input type="checkbox" class="form-check-input" name="search_supplier" value="true">
-                                <label for="search_supplier" class="form-check-label">{% trans %}supplier.label{% endtrans %}</label></li> {% endif %}
+                            <div class="custom-control custom-checkbox">
+                                <input type="checkbox" class="custom-control-input" id="search_supplierpartnr" name="search_supplierpartnr" value="true" checked>
+                                <label for="search_supplierpartnr" class="custom-control-label">{% trans %}ordernumber.label.short{% endtrans %}</label>
+                            </div>
+                            <div class="custom-control custom-checkbox">
+                                <input type="checkbox" class="custom-control-input" id="search_supplier" name="search_supplier" value="true">
+                                <label for="search_supplier" class="custom-control-label">{% trans %}supplier.label{% endtrans %}</label>
+                            </div>
+                        {% endif %}
                         {% if true %}
-                            <div class="form-check-dropdown abc-checkbox"><input type="checkbox"  class="form-check-input" name="search_manufacturer" value="true">
-                            <label for="search_manufacturer" class="form-check-label">{% trans %}manufacturer.label{% endtrans %}</label></div>{% endif %}
+                            <div class="custom-control custom-checkbox">
+                                <input type="checkbox" class="custom-control-input" id="search_manufacturer" name="search_manufacturer" value="true">
+                            <label for="search_manufacturer" class="custom-control-label">{% trans %}manufacturer.label{% endtrans %}</label>
+                            </div>
+                        {% endif %}
                         {% if true %}
-                            <div class="form-check-dropdown abc-checkbox"><input type="checkbox" class="form-check-input" name="search_footprint" value="true">
-                            <label for="search_footprint" class="form-check-label">{% trans %}footprint.label{% endtrans %}</label></div>{% endif %}
-                        <div class="form-c heck-dropdown abc-checkbox"><input type="checkbox" class="form-check-input" name="disable_pid_input" value="false">
-                            <label for="disable_pid_input" class="form-check-label">{% trans %}search.deactivateBarcode{% endtrans %}</label></div>
-                        <div class="form-check-dropdown abc-checkbox"><input type="checkbox" class="form-check-input" name="regex" value="true">
-                            <label for="regex" class="form-check-label">{% trans %}search.regexmatching{% endtrans %}</label></div>
+                            <div class="custom-control custom-checkbox">
+                            <input type="checkbox" class="custom-control-input" id="search_footprint" name="search_footprint" value="true">
+                            <label for="search_footprint" class="custom-control-label">{% 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="false">
+                            <label for="disable_pid_input" class="custom-control-label">{% trans %}search.deactivateBarcode{% endtrans %}</label>
+                        </div>
+                        <div class="custom-control custom-checkbox">
+                            <input type="checkbox" class="custom-control-input" id="regex" name="regex" value="true">
+                            <label for="regex" class="custom-control-label">{% trans %}search.regexmatching{% endtrans %}</label>
+                        </div>
                     </div>
                 </div>
 
diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig
index 696fb0b2..8abd0c25 100644
--- a/templates/security/login.html.twig
+++ b/templates/security/login.html.twig
@@ -44,9 +44,9 @@
 
         <div class="form-group row">
             <div class="col-md-9 offset-md-3 col-lg-10 offset-lg-2">
-                <div class="form-check abc-checkbox form-check-inline">
-                    <input class="form-check-input" name="_remember_me" type="checkbox">
-                    <label class="form-check-label" for="checkbox1">
+                <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">
                         {% trans %}login.rememberme{% endtrans %}
                     </label>
                 </div>
diff --git a/yarn.lock b/yarn.lock
index 2c2deeb1..7a11c120 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1221,11 +1221,6 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-awesome-bootstrap-checkbox@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/awesome-bootstrap-checkbox/-/awesome-bootstrap-checkbox-1.0.1.tgz#dab10146b6001129ab0a0ec1e54bb77c6c30457a"
-  integrity sha1-2rEBRrYAESmrCg7B5Uu3fGwwRXo=
-
 babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"