diff --git a/templates/AdminPages/EntityAdminBase.html.twig b/templates/AdminPages/EntityAdminBase.html.twig
index 35280bd2..d64d04ba 100644
--- a/templates/AdminPages/EntityAdminBase.html.twig
+++ b/templates/AdminPages/EntityAdminBase.html.twig
@@ -140,7 +140,7 @@
                                     <div class="btn-group">
                                         {{ form_widget(form.save) }}
                                         <button type="button" class="btn {% if entity.id is not null %}btn-primary{% else %}btn-success{% endif %} dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                            <span class="sr-only">Toggle Dropdown</span>
+                                            <span class="visually-hidden">Toggle Dropdown</span>
                                         </button>
                                         <div class="dropdown-menu p-2">
                                             {{ form_row(form.log_comment)}}
diff --git a/templates/AdminPages/_delete_form.html.twig b/templates/AdminPages/_delete_form.html.twig
index d07c0ac1..4392db70 100644
--- a/templates/AdminPages/_delete_form.html.twig
+++ b/templates/AdminPages/_delete_form.html.twig
@@ -10,7 +10,7 @@
             <div class="btn-group">
                 <button class="btn btn-danger" {% if delete_disabled %}disabled{% endif %}>{% trans %}entity.delete{% endtrans %}</button>
                 <button type="button" class="btn btn-danger dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <span class="sr-only">Toggle Dropdown</span>
+                    <span class="visually-hidden">Toggle Dropdown</span>
                 </button>
                 <div class="dropdown-menu p-2">
                     <div class="form-group"><label for="delete_log_comment">{% trans %}edit.log_comment{% endtrans %}</label>
diff --git a/templates/Parts/edit/edit_part_info.html.twig b/templates/Parts/edit/edit_part_info.html.twig
index bdeb3241..d00a3fce 100644
--- a/templates/Parts/edit/edit_part_info.html.twig
+++ b/templates/Parts/edit/edit_part_info.html.twig
@@ -100,7 +100,7 @@
             <div class="btn-group">
                 {{ form_widget(form.save) }}
                 <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <span class="sr-only">Toggle Dropdown</span>
+                    <span class="visually-hidden">Toggle Dropdown</span>
                 </button>
                 <div class="dropdown-menu">
                     {{ form_widget(form.save_and_clone, {'attr': {'class': 'dropdown-item'}}) }}
diff --git a/templates/Parts/info/_picture.html.twig b/templates/Parts/info/_picture.html.twig
index 429427e9..590e3b89 100644
--- a/templates/Parts/info/_picture.html.twig
+++ b/templates/Parts/info/_picture.html.twig
@@ -23,11 +23,11 @@
         {% if pictures | length > 1 %}
             <a class="carousel-control-prev carousel-control" href="#pictureCarousel" role="button" data-slide="prev">
                 <span class="carousel-control-prev-icon" aria-hidden="true"></span>
-                <span class="sr-only">{% trans %}part.info.prev_picture{% endtrans %}</span>
+                <span class="visually-hidden">{% trans %}part.info.prev_picture{% endtrans %}</span>
             </a>
             <a class="carousel-control-next carousel-control" href="#pictureCarousel" role="button" data-slide="next">
                 <span class="carousel-control-next-icon" aria-hidden="true"></span>
-                <span class="sr-only">{% trans %}part.info.next_picture{% endtrans %}</span>
+                <span class="visually-hidden">{% trans %}part.info.next_picture{% endtrans %}</span>
             </a>
         {% endif %}
     </div>
diff --git a/templates/Parts/info/_tools.html.twig b/templates/Parts/info/_tools.html.twig
index ab9537b0..e00a362d 100644
--- a/templates/Parts/info/_tools.html.twig
+++ b/templates/Parts/info/_tools.html.twig
@@ -39,7 +39,7 @@
                 {% trans %}part.delete{% endtrans %}
             </button>
             <button type="button" class="btn btn-danger dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                <span class="sr-only">Toggle Dropdown</span>
+                <span class="visually-hidden">Toggle Dropdown</span>
             </button>
             <div class="dropdown-menu p-2">
                 <div class="form-group"><label for="delete_log_comment">{% trans %}edit.log_comment{% endtrans %}</label>
diff --git a/templates/Parts/lists/_info_card.html.twig b/templates/Parts/lists/_info_card.html.twig
index b750d0a5..ed598f5c 100644
--- a/templates/Parts/lists/_info_card.html.twig
+++ b/templates/Parts/lists/_info_card.html.twig
@@ -68,7 +68,7 @@
                                 <div class="col-sm-3">
                                     {% block quick_links %}{% endblock %}
 
-                                    <a class="btn btn-secondary btn-block mb-2" href="{{ entity | entityURL('edit') }}">
+                                    <a class="btn btn-secondary w-100 mb-2" href="{{ entity | entityURL('edit') }}">
                                         <i class="fas fa-edit"></i> {% trans %}entity.edit.btn{% endtrans %}
                                     </a>
                                     <div class="">
@@ -82,7 +82,7 @@
                                     </div>
 
                                     {% if entity is instanceof("App\\Entity\\Parts\\Storelocation") %}
-                                        {{ dropdown.profile_dropdown('storelocation', entity.id, true, 'btn-secondary btn-block mt-2') }}
+                                        {{ dropdown.profile_dropdown('storelocation', entity.id, true, 'btn-secondary w-100 mt-2') }}
                                     {% endif %}
 
                                 </div>
diff --git a/templates/QuickLinks/_company.html.twig b/templates/QuickLinks/_company.html.twig
index f8def601..0b8e49f1 100644
--- a/templates/QuickLinks/_company.html.twig
+++ b/templates/QuickLinks/_company.html.twig
@@ -1,16 +1,16 @@
 <div class="btn-toolbar">
-    <div class="btn-group btn-block">
+    <div class="btn-group">
         {% if entity.website is not empty %}
-            <a class="btn btn-outline-dark" href="{{ entity.website }}" title="{% trans %}company.edit.quick.website{% endtrans %}" data-turbo="false"><i class="fas fa-globe fa-fw"></i></a>
+            <a class="btn btn-outline-secondary" href="{{ entity.website }}" title="{% trans %}company.edit.quick.website{% endtrans %}" data-turbo="false"><i class="fas fa-globe fa-fw"></i></a>
         {% endif %}
         {% if entity.emailAddress is not empty %}
-            <a class="btn btn-outline-dark" href="mailto:{{ entity.emailAddress }}" title="{% trans %}company.edit.quick.email{% endtrans %}" data-turbo="false"><i class="fas fa-envelope-open-text"></i></a>
+            <a class="btn btn-outline-secondary" href="mailto:{{ entity.emailAddress }}" title="{% trans %}company.edit.quick.email{% endtrans %}" data-turbo="false"><i class="fas fa-envelope-open-text"></i></a>
         {% endif %}
         {% if entity.phoneNumber is not empty %}
-            <a class="btn btn-outline-dark" href="tel:{{ entity.phoneNumber | replace({' ': ''}) }}" title="{% trans %}company.edit.quick.phone{% endtrans %}" data-turbo="false"><i class="fas fa-phone"></i></a>
+            <a class="btn btn-outline-secondary" href="tel:{{ entity.phoneNumber | replace({' ': ''}) }}" title="{% trans %}company.edit.quick.phone{% endtrans %}" data-turbo="false"><i class="fas fa-phone"></i></a>
         {% endif %}
         {% if entity.faxNumber is not empty %}
-            <a class="btn btn-outline-dark" href="tel:{{ entity.faxNumber | replace({' ': ''}) }}" title="{% trans %}company.edit.quick.fax{% endtrans %}" data-turbo="false"><i class="fas fa-fax"></i></a>
+            <a class="btn btn-outline-secondary" href="tel:{{ entity.faxNumber | replace({' ': ''}) }}" title="{% trans %}company.edit.quick.fax{% endtrans %}" data-turbo="false"><i class="fas fa-fax"></i></a>
         {% endif %}
     </div>
 </div>
\ No newline at end of file
diff --git a/templates/Users/backup_codes.html.twig b/templates/Users/backup_codes.html.twig
index f955aca6..874a5c1a 100644
--- a/templates/Users/backup_codes.html.twig
+++ b/templates/Users/backup_codes.html.twig
@@ -20,7 +20,7 @@
                     <div class="card-body">
                         <ul class="row list-unstyled" id="backup_codes_list">
                         {% for code in user.backupCodes %}
-                            <h4 class="col-6"><li><i class="far fa-square fa-fw"></i><span class="text-monospace text-dark ms-1">{{ code }}</span></li></h4>
+                            <h4 class="col-6"><li><i class="far fa-square fa-fw"></i><span class="font-monospace text-dark ms-1">{{ code }}</span></li></h4>
                         {% endfor %}
                         </ul>
                     </div>
diff --git a/templates/_navbar.html.twig b/templates/_navbar.html.twig
index 95073128..a2e11e7b 100644
--- a/templates/_navbar.html.twig
+++ b/templates/_navbar.html.twig
@@ -1,7 +1,7 @@
 <nav class="navbar navbar-expand-md navbar-light bg-light border-bottom shadow-sm fixed-top py-0" id="navbar">
     <div class="container-fluid">
         <button type="button" class="navbar-toggler" data-bs-toggle="collapse" data-target="#sidebar-container">
-            <span class="sr-only">{% trans %}sidebar.toggle{% endtrans %}</span>
+            <span class="visually-hidden">{% trans %}sidebar.toggle{% endtrans %}</span>
             <!-- <span class="navbar-toggler-icon"></span> -->
             <i class="fas fa-folder-open fa-lg fa-fw"></i>
         </button>