diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index 8ed4ecab4..3e753bcac 100644
Binary files a/netbox/project-static/dist/netbox.css and b/netbox/project-static/dist/netbox.css differ
diff --git a/netbox/project-static/styles/variables.scss b/netbox/project-static/styles/variables.scss
index 547931622..4b85b6158 100644
--- a/netbox/project-static/styles/variables.scss
+++ b/netbox/project-static/styles/variables.scss
@@ -1,3 +1,8 @@
 // NetBox CSS Variables
 
+// Set the navigation sidebar width
 $sidebar-width: 18rem;
+
+// Reduce the default button padding
+$btn-padding-x: 0.5rem;
+$btn-padding-y: 0.25rem;
diff --git a/netbox/templates/account/bookmarks.html b/netbox/templates/account/bookmarks.html
index 4b90beed3..93f741fd4 100644
--- a/netbox/templates/account/bookmarks.html
+++ b/netbox/templates/account/bookmarks.html
@@ -23,12 +23,10 @@
     </div>
 
     {# Form buttons #}
-    <div class="noprint bulk-buttons">
-      <div class="bulk-button-group">
-        {% if 'bulk_delete' in actions %}
-          {% bulk_delete_button model query_params=request.GET %}
-        {% endif %}
-      </div>
+    <div class="btn-list d-print-none mt-2">
+      {% if 'bulk_delete' in actions %}
+        {% bulk_delete_button model query_params=request.GET %}
+      {% endif %}
     </div>
   </form>
 {% endblock %}
diff --git a/netbox/templates/account/token_list.html b/netbox/templates/account/token_list.html
index cfcdeb537..ee57c29d5 100644
--- a/netbox/templates/account/token_list.html
+++ b/netbox/templates/account/token_list.html
@@ -8,7 +8,7 @@
 {% block content %}
   <div class="row">
     <div class="col col-md-12 text-end">
-      <a href="{% url 'account:usertoken_add' %}" class="btn btn-sm btn-primary my-3">
+      <a href="{% url 'account:usertoken_add' %}" class="btn btn-primary my-3">
         <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add a Token" %}
       </a>
     </div>
diff --git a/netbox/templates/base/40x.html b/netbox/templates/base/40x.html
index 7942b9ffd..d14882964 100644
--- a/netbox/templates/base/40x.html
+++ b/netbox/templates/base/40x.html
@@ -14,7 +14,7 @@
                 {% block message %}{% endblock %}
             </div>
             <div class="card-footer text-end">
-                <a href="{% url 'home' %}" class="btn btn-sm btn-primary">{% trans "Home Page" %}</a>
+                <a href="{% url 'home' %}" class="btn btn-primary">{% trans "Home Page" %}</a>
             </div>
         </div>
     </div>
diff --git a/netbox/templates/circuits/circuittype.html b/netbox/templates/circuits/circuittype.html
index 407ee4042..fe82bc4b9 100644
--- a/netbox/templates/circuits/circuittype.html
+++ b/netbox/templates/circuits/circuittype.html
@@ -6,7 +6,7 @@
 
 {% block extra_controls %}
   {% if perms.circuits.add_circuit %}
-    <a href="{% url 'circuits:circuit_add' %}?type={{ object.pk }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'circuits:circuit_add' %}?type={{ object.pk }}" class="btn btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Circuit" %}
     </a>
   {% endif %}
diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html
index 7ca83d265..eafaba57d 100644
--- a/netbox/templates/circuits/inc/circuit_termination.html
+++ b/netbox/templates/circuits/inc/circuit_termination.html
@@ -5,20 +5,20 @@
     <div class="card-header">
         <div class="float-md-end">
             {% if not termination and perms.circuits.add_circuittermination %}
-                <a href="{% url 'circuits:circuittermination_add' %}?circuit={{ object.pk }}&term_side={{ side }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-success lh-1">
+                <a href="{% url 'circuits:circuittermination_add' %}?circuit={{ object.pk }}&term_side={{ side }}&return_url={{ object.get_absolute_url }}" class="btn btn-success lh-1">
                     <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add" %}
                 </a>
             {% endif %}
             {% if termination and perms.circuits.change_circuittermination %}
-                <a href="{% url 'circuits:circuittermination_edit' pk=termination.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-warning lh-1">
+                <a href="{% url 'circuits:circuittermination_edit' pk=termination.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-warning lh-1">
                     <span class="mdi mdi-pencil" aria-hidden="true"></span> {% trans "Edit" %}
                 </a>
-                <a href="{% url 'circuits:circuit_terminations_swap' pk=object.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-primary lh-1">
+                <a href="{% url 'circuits:circuit_terminations_swap' pk=object.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-primary lh-1">
                     <span class="mdi mdi-swap-vertical" aria-hidden="true"></span> {% trans "Swap" %}
                 </a>
             {% endif %}
             {% if termination and perms.circuits.delete_circuittermination %}
-                <a href="{% url 'circuits:circuittermination_delete' pk=termination.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-danger lh-1">
+                <a href="{% url 'circuits:circuittermination_delete' pk=termination.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-danger lh-1">
                     <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> {% trans "Delete" %}
                 </a>
             {% endif %}
@@ -55,23 +55,23 @@
                     {{ peer|linkify }}{% if not forloop.last %},{% endif %}
                   {% endfor %}
                   <div class="mt-1">
-                    <a href="{% url 'circuits:circuittermination_trace' pk=termination.pk %}" class="btn btn-primary btn-sm lh-1" title="{% trans "Trace" %}">
+                    <a href="{% url 'circuits:circuittermination_trace' pk=termination.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
                       <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i> {% trans "Trace" %}
                     </a>
                     {% if perms.dcim.change_cable %}
-                      <a href="{% url 'dcim:cable_edit' pk=termination.cable.pk %}?return_url={{ termination.circuit.get_absolute_url }}" title="{% trans "Edit cable" %}" class="btn btn-warning btn-sm">
+                      <a href="{% url 'dcim:cable_edit' pk=termination.cable.pk %}?return_url={{ termination.circuit.get_absolute_url }}" title="{% trans "Edit cable" %}" class="btn btn-warning">
                         <i class="mdi mdi-ethernet-cable" aria-hidden="true"></i> {% trans "Edit" %}
                       </a>
                     {% endif %}
                     {% if perms.dcim.delete_cable %}
-                      <a href="{% url 'dcim:cable_delete' pk=termination.cable.pk %}?return_url={{ termination.circuit.get_absolute_url }}" title="{% trans "Remove cable" %}" class="btn btn-danger btn-sm lh-1">
+                      <a href="{% url 'dcim:cable_delete' pk=termination.cable.pk %}?return_url={{ termination.circuit.get_absolute_url }}" title="{% trans "Remove cable" %}" class="btn btn-danger lh-1">
                         <i class="mdi mdi-ethernet-cable-off" aria-hidden="true"></i> {% trans "Disconnect" %}
                       </a>
                     {% endif %}
                   </div>
                 {% elif perms.dcim.add_cable %}
                   <div class="dropdown">
-                    <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <button type="button" class="btn btn-success dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                       <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> {% trans "Connect" %}
                     </button>
                     <ul class="dropdown-menu">
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index 6fabb304d..6ea4a6f1f 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -7,7 +7,7 @@
 
 {% block extra_controls %}
   {% if perms.circuits.add_circuit %}
-    <a href="{% url 'circuits:circuit_add' %}?provider={{ object.pk }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'circuits:circuit_add' %}?provider={{ object.pk }}" class="btn btn-primary">
       <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add circuit" %}
     </a>
   {% endif %}
diff --git a/netbox/templates/core/datasource.html b/netbox/templates/core/datasource.html
index 51090b0c9..abd366901 100644
--- a/netbox/templates/core/datasource.html
+++ b/netbox/templates/core/datasource.html
@@ -10,13 +10,13 @@
     {% if object.ready_for_sync %}
       <form action="{% url 'core:datasource_sync' pk=object.pk %}" method="post">
         {% csrf_token %}
-        <button type="submit" class="btn btn-sm btn-primary">
+        <button type="submit" class="btn btn-primary">
           <i class="mdi mdi-sync" aria-hidden="true"></i> {% trans "Sync" %}
         </button>
       </form>
     {% else %}
       <span class="inline-block" tabindex="0" data-bs-toggle="tooltip" data-bs-delay="100" data-bs-placement="bottom">
-        <button class="btn btn-sm btn-primary" disabled>
+        <button class="btn btn-primary" disabled>
           <i class="mdi mdi-sync" aria-hidden="true"></i> {% trans "Sync" %}
         </button>
       </span>
diff --git a/netbox/templates/dcim/cable_trace.html b/netbox/templates/dcim/cable_trace.html
index b004634bb..e925c79d8 100644
--- a/netbox/templates/dcim/cable_trace.html
+++ b/netbox/templates/dcim/cable_trace.html
@@ -17,7 +17,7 @@
             <div class="text-center my-3">
               <object data="{{ svg_url }}" class="rack_elevation"></object>
               <div>
-                <a class="btn btn-outline-primary btn-sm my-3" href="{{ svg_url }}">
+                <a class="btn btn-outline-primary my-3" href="{{ svg_url }}">
                     <i class="mdi mdi-file-download"></i> {% trans "Download SVG" %}
                 </a>
               </div>
diff --git a/netbox/templates/dcim/component_list.html b/netbox/templates/dcim/component_list.html
index a80dcfea8..4f9b543f0 100644
--- a/netbox/templates/dcim/component_list.html
+++ b/netbox/templates/dcim/component_list.html
@@ -10,7 +10,7 @@
     {% endif %}
     {% if 'bulk_rename' in actions %}
       {% with bulk_rename_view=model|validated_viewname:"bulk_rename" %}
-        <button type="submit" name="_rename" formaction="{% url bulk_rename_view %}" class="btn btn-outline-warning btn-sm">
+        <button type="submit" name="_rename" formaction="{% url bulk_rename_view %}" class="btn btn-outline-warning">
           <i class="mdi mdi-pencil-outline" aria-hidden="true"></i> {% trans "Rename Selected" %}
         </button>
       {% endwith %}
diff --git a/netbox/templates/dcim/consoleport.html b/netbox/templates/dcim/consoleport.html
index b501215e6..52da72142 100644
--- a/netbox/templates/dcim/consoleport.html
+++ b/netbox/templates/dcim/consoleport.html
@@ -67,7 +67,7 @@
                   {% trans "Not Connected" %}
                   {% if perms.dcim.add_cable %}
                     <div class="dropdown float-end">
-                      <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+                      <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
                         <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> {% trans "Connect" %}
                       </button>
                       <ul class="dropdown-menu dropdown-menu-end">
diff --git a/netbox/templates/dcim/consoleserverport.html b/netbox/templates/dcim/consoleserverport.html
index 14fa572ec..86fc705bd 100644
--- a/netbox/templates/dcim/consoleserverport.html
+++ b/netbox/templates/dcim/consoleserverport.html
@@ -67,7 +67,7 @@
                   {% trans "Not Connected" %}
                   {% if perms.dcim.add_cable %}
                     <div class="dropdown float-end">
-                      <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+                      <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
                         <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> {% trans "Connect" %}
                       </button>
                       <ul class="dropdown-menu dropdown-menu-end">
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 39e78c81b..435fb4f0b 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -32,7 +32,7 @@
                                 {% if object.rack %}
                                     {{ object.rack|linkify }}
                                     <div class="position-absolute top-50 end-0 translate-middle-y noprint">
-                                      <a href="{{ object.rack.get_absolute_url }}?device={{ object.pk }}" class="btn btn-primary btn-sm" title="{% trans "Highlight device" %}">
+                                      <a href="{{ object.rack.get_absolute_url }}?device={{ object.pk }}" class="btn btn-primary" title="{% trans "Highlight device" %}">
                                         <i class="mdi mdi-view-day-outline"></i>
                                       </a>
                                     </div>
@@ -66,7 +66,7 @@
                             {% if object.latitude and object.longitude %}
                               {% if config.MAPS_URL %}
                                 <div class="position-absolute top-50 end-0 translate-middle-y noprint">
-                                  <a href="{{ config.MAPS_URL }}{{ object.latitude }},{{ object.longitude }}" target="_blank" class="btn btn-primary btn-sm">
+                                  <a href="{{ config.MAPS_URL }}{{ object.latitude }},{{ object.longitude }}" target="_blank" class="btn btn-primary">
                                     <i class="mdi mdi-map-marker"></i> {% trans "Map It" %}
                                   </a>
                                 </div>
@@ -149,7 +149,7 @@
                         </table>
                     </div>
                     <div class="card-footer text-end noprint">
-                        <a href="{{ object.virtual_chassis.get_absolute_url }}" class="btn btn-primary btn-sm">
+                        <a href="{{ object.virtual_chassis.get_absolute_url }}" class="btn btn-primary">
                             <span class="mdi mdi-arrow-right-bold" aria-hidden="true"></span> {% trans "View Virtual Chassis" %}
                         </a>
                     </div>
@@ -166,7 +166,7 @@
               ></div>
               {% if perms.dcim.add_virtualdevicecontext %}
                 <div class="card-footer text-end noprint">
-                  <a href="{% url 'dcim:virtualdevicecontext_add' %}?device={{ object.pk }}" class="btn btn-sm btn-primary">
+                  <a href="{% url 'dcim:virtualdevicecontext_add' %}?device={{ object.pk }}" class="btn btn-primary">
                     <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Create VDC" %}
                   </a>
                 </div>
@@ -308,7 +308,7 @@
               ></div>
               {% if perms.ipam.add_service %}
                 <div class="card-footer text-end noprint">
-                  <a href="{% url 'ipam:service_add' %}?device={{ object.pk }}" class="btn btn-sm btn-primary">
+                  <a href="{% url 'ipam:service_add' %}?device={{ object.pk }}" class="btn btn-primary">
                     <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add a service" %}
                   </a>
                 </div>
diff --git a/netbox/templates/dcim/device/base.html b/netbox/templates/dcim/device/base.html
index 43d5c5ae9..fd0557fd0 100644
--- a/netbox/templates/dcim/device/base.html
+++ b/netbox/templates/dcim/device/base.html
@@ -17,7 +17,7 @@
 {% block extra_controls %}
     {% if perms.dcim.change_device %}
         <div class="dropdown">
-            <button id="add-components" type="button" class="btn btn-sm btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+            <button id="add-components" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
                 <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Components" %}
             </button>
             <ul class="dropdown-menu" aria-labeled-by="add-components">
diff --git a/netbox/templates/dcim/device/components_base.html b/netbox/templates/dcim/device/components_base.html
index b6ec700b0..40d3f0f80 100644
--- a/netbox/templates/dcim/device/components_base.html
+++ b/netbox/templates/dcim/device/components_base.html
@@ -6,7 +6,7 @@
         {% if 'bulk_edit' in actions and bulk_edit_view %}
             <button type="submit" name="_edit"
                     formaction="{% url bulk_edit_view %}?device={{ object.pk }}&return_url={{ return_url }}"
-                    class="btn btn-warning btn-sm">
+                    class="btn btn-warning">
                 <i class="mdi mdi-pencil" aria-hidden="true"></i> Edit Selected
             </button>
         {% endif %}
@@ -15,7 +15,7 @@
         {% if 'bulk_rename' in actions and bulk_rename_view %}
             <button type="submit" name="_rename"
                     formaction="{% url bulk_rename_view %}?return_url={{ return_url }}"
-                    class="btn btn-outline-warning btn-sm">
+                    class="btn btn-outline-warning">
                 <i class="mdi mdi-pencil-outline" aria-hidden="true"></i> Rename
             </button>
         {% endif %}
diff --git a/netbox/templates/dcim/device/consoleports.html b/netbox/templates/dcim/device/consoleports.html
index 90f4f99ed..0e9fcb7bf 100644
--- a/netbox/templates/dcim/device/consoleports.html
+++ b/netbox/templates/dcim/device/consoleports.html
@@ -8,7 +8,7 @@
         {% if 'bulk_disconnect' in actions and bulk_disconnect_view %}
             <button type="submit" name="_disconnect"
                     formaction="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
-                    class="btn btn-outline-danger btn-sm">
+                    class="btn btn-outline-danger">
                 <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> {% trans "Disconnect" %}
             </button>
         {% endif %}
@@ -18,9 +18,9 @@
 {% block bulk_extra_controls %}
     {{ block.super }}
     {% if perms.dcim.add_consoleport %}
-        <div class="bulk-button-group">
+        <div class="btn-group" role="group">
             <a href="{% url 'dcim:consoleport_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_consoleports' pk=object.pk %}"
-               class="btn btn-primary btn-sm">
+               class="btn btn-primary">
                 <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Console Ports" %}
             </a>
         </div>
diff --git a/netbox/templates/dcim/device/consoleserverports.html b/netbox/templates/dcim/device/consoleserverports.html
index 39289f2e5..09598e4f1 100644
--- a/netbox/templates/dcim/device/consoleserverports.html
+++ b/netbox/templates/dcim/device/consoleserverports.html
@@ -8,7 +8,7 @@
         {% if 'bulk_disconnect' in actions and bulk_disconnect_view %}
             <button type="submit" name="_disconnect"
                     formaction="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
-                    class="btn btn-outline-danger btn-sm">
+                    class="btn btn-outline-danger">
                 <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> {% trans "Disconnect" %}
             </button>
         {% endif %}
@@ -18,9 +18,9 @@
 {% block bulk_extra_controls %}
     {{ block.super }}
     {% if perms.dcim.add_consoleserverport %}
-        <div class="bulk-button-group">
+        <div class="btn-group" role="group">
             <a href="{% url 'dcim:consoleserverport_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_consoleserverports' pk=object.pk %}"
-               class="btn btn-primary btn-sm">
+               class="btn btn-primary">
                 <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Console Server Ports" %}
             </a>
         </div>
diff --git a/netbox/templates/dcim/device/devicebays.html b/netbox/templates/dcim/device/devicebays.html
index 5b2a396d7..b558cdfb4 100644
--- a/netbox/templates/dcim/device/devicebays.html
+++ b/netbox/templates/dcim/device/devicebays.html
@@ -4,9 +4,9 @@
 {% block bulk_extra_controls %}
     {{ block.super }}
     {% if perms.dcim.add_devicebay %}
-        <div class="bulk-button-group">
+        <div class="btn-group" role="group">
             <a href="{% url 'dcim:devicebay_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_devicebays' pk=object.pk %}"
-               class="btn btn-primary btn-sm">
+               class="btn btn-primary">
                 <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Device Bays" %}
             </a>
         </div>
diff --git a/netbox/templates/dcim/device/frontports.html b/netbox/templates/dcim/device/frontports.html
index 2edef9894..ed7a6a0ba 100644
--- a/netbox/templates/dcim/device/frontports.html
+++ b/netbox/templates/dcim/device/frontports.html
@@ -8,7 +8,7 @@
         {% if 'bulk_disconnect' in actions and bulk_disconnect_view %}
             <button type="submit" name="_disconnect"
                     formaction="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
-                    class="btn btn-outline-danger btn-sm">
+                    class="btn btn-outline-danger">
                 <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> {% trans "Disconnect" %}
             </button>
         {% endif %}
@@ -18,9 +18,9 @@
 {% block bulk_extra_controls %}
     {{ block.super }}
     {% if perms.dcim.add_frontport %}
-        <div class="bulk-button-group">
+        <div class="btn-group" role="group">
             <a href="{% url 'dcim:frontport_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_frontports' pk=object.pk %}"
-               class="btn btn-primary btn-sm">
+               class="btn btn-primary">
                 <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Front Ports" %}
             </a>
         </div>
diff --git a/netbox/templates/dcim/device/inc/interface_table_controls.html b/netbox/templates/dcim/device/inc/interface_table_controls.html
index 7868d99db..f942ba9ca 100644
--- a/netbox/templates/dcim/device/inc/interface_table_controls.html
+++ b/netbox/templates/dcim/device/inc/interface_table_controls.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% block extra_table_controls %}
-  <button class="btn btn-sm btn-outline-dark dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+  <button class="btn btn-outline-dark dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
     <i class="mdi mdi-eye"></i>
   </button>
   <ul class="dropdown-menu">
diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html
index 8b3fe3097..8b668e7eb 100644
--- a/netbox/templates/dcim/device/interfaces.html
+++ b/netbox/templates/dcim/device/interfaces.html
@@ -12,7 +12,7 @@
         {% if 'bulk_disconnect' in actions and bulk_disconnect_view %}
             <button type="submit" name="_disconnect"
                     formaction="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
-                    class="btn btn-outline-danger btn-sm">
+                    class="btn btn-outline-danger">
                 <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> {% trans "Disconnect" %}
             </button>
         {% endif %}
@@ -22,11 +22,9 @@
 {% block bulk_extra_controls %}
     {{ block.super }}
     {% if perms.dcim.add_interface %}
-        <div class="bulk-button-group">
-            <a href="{% url 'dcim:interface_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_interfaces' pk=object.pk %}"
-               class="btn btn-primary btn-sm">
-                <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Interfaces" %}
-            </a>
-        </div>
+        <a href="{% url 'dcim:interface_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_interfaces' pk=object.pk %}"
+           class="btn btn-primary">
+            <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Interfaces" %}
+        </a>
     {% endif %}
 {% endblock bulk_extra_controls %}
diff --git a/netbox/templates/dcim/device/inventory.html b/netbox/templates/dcim/device/inventory.html
index 15d70d959..cbc113d86 100644
--- a/netbox/templates/dcim/device/inventory.html
+++ b/netbox/templates/dcim/device/inventory.html
@@ -4,9 +4,9 @@
 {% block bulk_extra_controls %}
     {{ block.super }}
     {% if perms.dcim.add_inventoryitem %}
-        <div class="bulk-button-group">
+        <div class="btn-group" role="group">
             <a href="{% url 'dcim:inventoryitem_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_inventory' pk=object.pk %}"
-               class="btn btn-primary btn-sm">
+               class="btn btn-primary">
                 <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Inventory Item" %}
             </a>
         </div>
diff --git a/netbox/templates/dcim/device/modulebays.html b/netbox/templates/dcim/device/modulebays.html
index b218242be..c23532efe 100644
--- a/netbox/templates/dcim/device/modulebays.html
+++ b/netbox/templates/dcim/device/modulebays.html
@@ -4,9 +4,9 @@
 {% block bulk_extra_controls %}
     {{ block.super }}
     {% if perms.dcim.add_modulebay %}
-        <div class="bulk-button-group">
+        <div class="btn-group" role="group">
             <a href="{% url 'dcim:modulebay_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_modulebays' pk=object.pk %}"
-               class="btn btn-primary btn-sm">
+               class="btn btn-primary">
                 <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Module Bays" %}
             </a>
         </div>
diff --git a/netbox/templates/dcim/device/poweroutlets.html b/netbox/templates/dcim/device/poweroutlets.html
index 34f51e389..7f786d13c 100644
--- a/netbox/templates/dcim/device/poweroutlets.html
+++ b/netbox/templates/dcim/device/poweroutlets.html
@@ -8,7 +8,7 @@
         {% if 'bulk_disconnect' in actions and bulk_disconnect_view %}
             <button type="submit" name="_disconnect"
                     formaction="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
-                    class="btn btn-outline-danger btn-sm">
+                    class="btn btn-outline-danger">
                 <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> {% trans "Disconnect" %}
             </button>
         {% endif %}
@@ -18,9 +18,9 @@
 {% block bulk_extra_controls %}
     {{ block.super }}
     {% if perms.dcim.add_poweroutlet %}
-        <div class="bulk-button-group">
+        <div class="btn-group" role="group">
             <a href="{% url 'dcim:poweroutlet_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_poweroutlets' pk=object.pk %}"
-               class="btn btn-primary btn-sm">
+               class="btn btn-primary">
                 <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Power Outlets" %}
             </a>
         </div>
diff --git a/netbox/templates/dcim/device/powerports.html b/netbox/templates/dcim/device/powerports.html
index ee9d57fd2..af7c69549 100644
--- a/netbox/templates/dcim/device/powerports.html
+++ b/netbox/templates/dcim/device/powerports.html
@@ -8,7 +8,7 @@
         {% if 'bulk_disconnect' in actions and bulk_disconnect_view %}
             <button type="submit" name="_disconnect"
                     formaction="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
-                    class="btn btn-outline-danger btn-sm">
+                    class="btn btn-outline-danger">
                 <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> {% trans "Disconnect" %}
             </button>
         {% endif %}
@@ -18,9 +18,9 @@
 {% block bulk_extra_controls %}
     {{ block.super }}
     {% if perms.dcim.add_powerport %}
-        <div class="bulk-button-group">
+        <div class="btn-group" role="group">
             <a href="{% url 'dcim:powerport_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_powerports' pk=object.pk %}"
-               class="btn btn-primary btn-sm">
+               class="btn btn-primary">
                 <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Power Port" %}
             </a>
         </div>
diff --git a/netbox/templates/dcim/device/rearports.html b/netbox/templates/dcim/device/rearports.html
index 0c7781005..5db8fb7bc 100644
--- a/netbox/templates/dcim/device/rearports.html
+++ b/netbox/templates/dcim/device/rearports.html
@@ -8,7 +8,7 @@
         {% if 'bulk_disconnect' in actions and bulk_disconnect_view %}
             <button type="submit" name="_disconnect"
                     formaction="{% url bulk_disconnect_view %}?return_url={{ return_url }}"
-                    class="btn btn-outline-danger btn-sm">
+                    class="btn btn-outline-danger">
                 <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> {% trans "Disconnect" %}
             </button>
         {% endif %}
@@ -18,9 +18,9 @@
 {% block bulk_extra_controls %}
     {{ block.super }}
     {% if perms.dcim.add_rearport %}
-        <div class="bulk-button-group">
+        <div class="btn-group" role="group">
             <a href="{% url 'dcim:rearport_add' %}?device={{ object.pk }}&return_url={% url 'dcim:device_rearports' pk=object.pk %}"
-               class="btn btn-primary btn-sm">
+               class="btn btn-primary">
                 <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Rear Ports" %}
             </a>
         </div>
diff --git a/netbox/templates/dcim/device/render_config.html b/netbox/templates/dcim/device/render_config.html
index 090bfccdf..759fc7177 100644
--- a/netbox/templates/dcim/device/render_config.html
+++ b/netbox/templates/dcim/device/render_config.html
@@ -53,7 +53,7 @@
       <div class="card">
         <div class="card-header">
           <div class="float-end">
-            <a href="?export=True" class="btn btn-sm btn-primary" role="button">
+            <a href="?export=True" class="btn btn-primary" role="button">
               <i class="mdi mdi-download" aria-hidden="true"></i> {% trans "Download" %}
             </a>
           </div>
diff --git a/netbox/templates/dcim/device_list.html b/netbox/templates/dcim/device_list.html
index e30a92265..6ccb78480 100644
--- a/netbox/templates/dcim/device_list.html
+++ b/netbox/templates/dcim/device_list.html
@@ -5,7 +5,7 @@
 {% block bulk_buttons %}
   {% if perms.dcim.change_device %}
     <div class="dropdown">
-      <button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+      <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Components" %}
       </button>
       <ul class="dropdown-menu">
@@ -78,7 +78,7 @@
   {% if 'bulk_edit' in actions %}
     <div class="btn-group" role="group">
       {% bulk_edit_button model query_params=request.GET %}
-      <button type="submit" name="_rename" formaction="{% url 'dcim:device_bulk_rename' %}?return_url={% url 'dcim:device_list' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-outline-warning btn-sm">
+      <button type="submit" name="_rename" formaction="{% url 'dcim:device_bulk_rename' %}?return_url={% url 'dcim:device_list' %}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}" class="btn btn-outline-warning">
         <i class="mdi mdi-pencil-outline" aria-hidden="true"></i> {% trans "Rename" %}
       </button>
     </div>
diff --git a/netbox/templates/dcim/devicerole.html b/netbox/templates/dcim/devicerole.html
index 8bc10bfc2..72bd3845f 100644
--- a/netbox/templates/dcim/devicerole.html
+++ b/netbox/templates/dcim/devicerole.html
@@ -10,7 +10,7 @@
 
 {% block extra_controls %}
   {% if perms.dcim.add_device %}
-    <a href="{% url 'dcim:device_add' %}?role={{ object.pk }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'dcim:device_add' %}?role={{ object.pk }}" class="btn btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Device" %}
     </a>
   {% endif %}
diff --git a/netbox/templates/dcim/devicetype/base.html b/netbox/templates/dcim/devicetype/base.html
index 5a6b5e15d..19d3ec33c 100644
--- a/netbox/templates/dcim/devicetype/base.html
+++ b/netbox/templates/dcim/devicetype/base.html
@@ -14,7 +14,7 @@
 {% block extra_controls %}
   {% if perms.dcim.change_devicetype %}
     <div class="dropdown">
-      <button type="button" class="btn btn-primary btn-sm dropdown-toggle"data-bs-toggle="dropdown" aria-expanded="false">
+      <button type="button" class="btn btn-primary dropdown-toggle"data-bs-toggle="dropdown" aria-expanded="false">
         <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Components" %}
       </button>
       <ul class="dropdown-menu">
diff --git a/netbox/templates/dcim/devicetype/component_templates.html b/netbox/templates/dcim/devicetype/component_templates.html
index 9a5210762..8c392965d 100644
--- a/netbox/templates/dcim/devicetype/component_templates.html
+++ b/netbox/templates/dcim/devicetype/component_templates.html
@@ -14,18 +14,18 @@
             </div>
             <div class="card-footer noprint">
                 {% if table.rows %}
-                    <button type="submit" name="_edit" formaction="{% url table.Meta.model|viewname:"bulk_rename" %}?return_url={{ return_url }}" class="btn btn-sm btn-warning">
+                    <button type="submit" name="_edit" formaction="{% url table.Meta.model|viewname:"bulk_rename" %}?return_url={{ return_url }}" class="btn btn-warning">
                         <span class="mdi mdi-pencil-outline" aria-hidden="true"></span> {% trans "Rename" %}
                     </button>
-                    <button type="submit" name="_edit" formaction="{% url table.Meta.model|viewname:"bulk_edit" %}?return_url={{ return_url }}" class="btn btn-sm btn-warning">
+                    <button type="submit" name="_edit" formaction="{% url table.Meta.model|viewname:"bulk_edit" %}?return_url={{ return_url }}" class="btn btn-warning">
                         <span class="mdi mdi-pencil" aria-hidden="true"></span> {% trans "Edit" %}
                     </button>
-                    <button type="submit" name="_delete" formaction="{% url table.Meta.model|viewname:"bulk_delete" %}?return_url={{ return_url }}" class="btn btn-sm btn-danger">
+                    <button type="submit" name="_delete" formaction="{% url table.Meta.model|viewname:"bulk_delete" %}?return_url={{ return_url }}" class="btn btn-danger">
                         <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> {% trans "Delete" %}
                     </button>
                 {% endif %}
                 <div class="float-end">
-                    <a href="{% url table.Meta.model|viewname:"add" %}?device_type={{ object.pk }}&return_url={{ return_url }}" class="btn btn-primary btn-sm">
+                    <a href="{% url table.Meta.model|viewname:"add" %}?device_type={{ object.pk }}&return_url={{ return_url }}" class="btn btn-primary">
                         <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
                         {% trans "Add" %} {{ title }}
                     </a>
diff --git a/netbox/templates/dcim/frontport.html b/netbox/templates/dcim/frontport.html
index e8b6216ac..0387f5206 100644
--- a/netbox/templates/dcim/frontport.html
+++ b/netbox/templates/dcim/frontport.html
@@ -84,7 +84,7 @@
                             <th scope="row">{% trans "Cable" %}</th>
                             <td>
                                 {{ object.cable|linkify }}
-                                <a href="{% url 'dcim:frontport_trace' pk=object.pk %}" class="btn btn-primary btn-sm lh-1" title="{% trans "Trace" %}">
+                                <a href="{% url 'dcim:frontport_trace' pk=object.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
                                     <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
                                 </a>
                             </td>
@@ -105,7 +105,7 @@
                         {% trans "Not Connected" %}
                         {% if perms.dcim.add_cable %}
                             <div class="dropdown float-end">
-                                <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                     <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> {% trans "Connect" %}
                                 </button>
                                 <ul class="dropdown-menu dropdown-menu-end">
diff --git a/netbox/templates/dcim/inc/connection_endpoints.html b/netbox/templates/dcim/inc/connection_endpoints.html
index 27b7ce468..79d2cf5d1 100644
--- a/netbox/templates/dcim/inc/connection_endpoints.html
+++ b/netbox/templates/dcim/inc/connection_endpoints.html
@@ -4,7 +4,7 @@
     <th scope="row">{% trans "Cable" %}</th>
     <td>
       {{ object.cable|linkify }}
-      <a href="{% url trace_url pk=object.pk %}" class="btn btn-primary btn-sm lh-1" title="{% trans "Trace" %}">
+      <a href="{% url trace_url pk=object.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
         <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
       </a>
     </td>
diff --git a/netbox/templates/dcim/inc/interface_vlans_table.html b/netbox/templates/dcim/inc/interface_vlans_table.html
index 399b9d6b8..72689b374 100644
--- a/netbox/templates/dcim/inc/interface_vlans_table.html
+++ b/netbox/templates/dcim/inc/interface_vlans_table.html
@@ -41,10 +41,10 @@
             <tr>
                 <td colspan="2"></td>
                 <td>
-                    <a href="#" id="clear_untagged_vlan" class="btn btn-outline-warning btn-sm">{% trans "Clear" %}</a>
+                    <a href="#" id="clear_untagged_vlan" class="btn btn-outline-warning">{% trans "Clear" %}</a>
                 </td>
                 <td>
-                    <a href="#" id="clear_tagged_vlans" class="btn btn-warning btn-sm">{% trans "Clear All" %}</a>
+                    <a href="#" id="clear_tagged_vlans" class="btn btn-warning">{% trans "Clear All" %}</a>
                 </td>
             </tr>
         {% endif %}
diff --git a/netbox/templates/dcim/inc/panels/inventory_items.html b/netbox/templates/dcim/inc/panels/inventory_items.html
index 5a2065827..c022f254a 100644
--- a/netbox/templates/dcim/inc/panels/inventory_items.html
+++ b/netbox/templates/dcim/inc/panels/inventory_items.html
@@ -21,12 +21,12 @@
             <td>{{ item.role|linkify|placeholder }}</td>
             <td class="text-end noprint">
               {% if perms.dcim.change_inventoryitem %}
-                <a href="{% url 'dcim:inventoryitem_edit' pk=item.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-warning btn-sm lh-1" title="{% trans "Edit" %}">
+                <a href="{% url 'dcim:inventoryitem_edit' pk=item.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-warning lh-1" title="{% trans "Edit" %}">
                   <i class="mdi mdi-pencil" aria-hidden="true"></i>
                 </a>
               {% endif %}
               {% if perms.ipam.delete_inventoryitem %}
-                <a href="{% url 'dcim:inventoryitem_delete' pk=item.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-danger btn-sm lh-1" title="{% trans "Delete" %}">
+                <a href="{% url 'dcim:inventoryitem_delete' pk=item.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-danger lh-1" title="{% trans "Delete" %}">
                   <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i>
                 </a>
               {% endif %}
@@ -42,7 +42,7 @@
   </div>
   <div class="card-footer text-end noprint">
     {% if perms.dcim.add_inventoryitem %}
-      <a href="{% url 'dcim:inventoryitem_add' %}?device={{ object.device.pk }}&component_type={{ object|content_type_id }}&component_id={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-primary">
+      <a href="{% url 'dcim:inventoryitem_add' %}?device={{ object.device.pk }}&component_type={{ object|content_type_id }}&component_id={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
         <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Inventory Item" %}
       </a>
     {% endif %}
diff --git a/netbox/templates/dcim/inc/rack_elevation.html b/netbox/templates/dcim/inc/rack_elevation.html
index 65897d4de..bfffa8272 100644
--- a/netbox/templates/dcim/inc/rack_elevation.html
+++ b/netbox/templates/dcim/inc/rack_elevation.html
@@ -3,7 +3,7 @@
     <object data="{% url 'dcim-api:rack-elevation' pk=object.pk %}?face={{face}}&render=svg{% if extra_params %}&{{ extra_params }}{% endif %}" class="rack_elevation"></object>
 </div>
 <div class="text-center mt-3">
-    <a class="btn btn-outline-primary btn-sm" href="{% url 'dcim-api:rack-elevation' pk=object.pk %}?face={{face}}&render=svg{% if extra_params %}&{{ extra_params }}{% endif %}">
+    <a class="btn btn-outline-primary" href="{% url 'dcim-api:rack-elevation' pk=object.pk %}?face={{face}}&render=svg{% if extra_params %}&{{ extra_params }}{% endif %}">
         <i class="mdi mdi-file-download"></i> {% trans "Download SVG" %}
     </a>
 </div>
diff --git a/netbox/templates/dcim/interface.html b/netbox/templates/dcim/interface.html
index 6b15a766d..c315fac59 100644
--- a/netbox/templates/dcim/interface.html
+++ b/netbox/templates/dcim/interface.html
@@ -13,7 +13,7 @@
 
 {% block extra_controls %}
   {% if perms.dcim.add_interface and not object.is_virtual %}
-    <a href="{% url 'dcim:interface_add' %}?device={{ object.device.pk }}&parent={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-success">
+    <a href="{% url 'dcim:interface_add' %}?device={{ object.device.pk }}&parent={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-success">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Child Interface" %}
     </a>
   {% endif %}
@@ -157,7 +157,7 @@
                   <th scope="row">{% trans "Wireless Link" %}</th>
                   <td>
                     {{ object.wireless_link|linkify }}
-                    <a href="{% url 'dcim:interface_trace' pk=object.pk %}" class="btn btn-primary btn-sm lh-1" title="{% trans "Trace" %}">
+                    <a href="{% url 'dcim:interface_trace' pk=object.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
                       <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
                     </a>
                   </td>
@@ -182,7 +182,7 @@
                 {% trans "Not Connected" %}
                 {% if object.is_wired and perms.dcim.add_cable %}
                   <div class="dropdown float-end">
-                    <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                       <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> {% trans "Connect" %}
                     </button>
                     <ul class="dropdown-menu dropdown-menu-end">
@@ -202,7 +202,7 @@
                   </div>
                 {% elif object.is_wireless and perms.wireless.add_wirelesslink %}
                   <div class="dropdown float-end">
-                    <a href="{% url 'wireless:wirelesslink_add' %}?interface_a={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
+                    <a href="{% url 'wireless:wirelesslink_add' %}?interface_a={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
                       <span class="mdi mdi-wifi-plus" aria-hidden="true"></span> {% trans "Connect" %}
                     </a>
                   </div>
@@ -355,7 +355,7 @@
         ></div>
         {% if perms.ipam.add_ipaddress %}
           <div class="card-footer text-end noprint">
-            <a href="{% url 'ipam:ipaddress_add' %}?device={{ object.device.pk }}&interface={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-primary">
+            <a href="{% url 'ipam:ipaddress_add' %}?device={{ object.device.pk }}&interface={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
               <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add IP Address" %}
             </a>
           </div>
diff --git a/netbox/templates/dcim/location.html b/netbox/templates/dcim/location.html
index 854b93f9e..705e07da7 100644
--- a/netbox/templates/dcim/location.html
+++ b/netbox/templates/dcim/location.html
@@ -13,7 +13,7 @@
 
 {% block extra_controls %}
   {% if perms.dcim.add_location %}
-    <a href="{% url 'dcim:location_add' %}?site={{ object.site.pk }}&parent={{ object.pk }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'dcim:location_add' %}?site={{ object.site.pk }}&parent={{ object.pk }}" class="btn btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Child Location" %}
     </a>
   {% endif %}
@@ -80,7 +80,7 @@
       ></div>
       {% if perms.dcim.add_location %}
         <div class="card-footer text-end noprint">
-          <a href="{% url 'dcim:location_add' %}?site={{ object.site.pk }}&parent={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
+          <a href="{% url 'dcim:location_add' %}?site={{ object.site.pk }}&parent={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
             <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add a Location" %}
           </a>
         </div>
@@ -94,7 +94,7 @@
       ></div>
       {% if perms.dcim.add_device %}
         <div class="card-footer text-end noprint">
-          <a href="{% url 'dcim:device_add' %}?site={{ object.site.pk }}&location={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
+          <a href="{% url 'dcim:device_add' %}?site={{ object.site.pk }}&location={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
             <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add a Device" %}
           </a>
         </div>
diff --git a/netbox/templates/dcim/manufacturer.html b/netbox/templates/dcim/manufacturer.html
index 8734fbdf9..abde714f0 100644
--- a/netbox/templates/dcim/manufacturer.html
+++ b/netbox/templates/dcim/manufacturer.html
@@ -7,7 +7,7 @@
 {% block extra_controls %}
   {% if perms.dcim.add_devicetype or perms.dcim.add_moduletype %}
     <div class="dropdown">
-      <button id="add-components" type="button" class="btn btn-sm btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+      <button id="add-components" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
         <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add" %}
       </button>
       <ul class="dropdown-menu" aria-labeled-by="add-components">
diff --git a/netbox/templates/dcim/module.html b/netbox/templates/dcim/module.html
index 0b6604cc7..677717478 100644
--- a/netbox/templates/dcim/module.html
+++ b/netbox/templates/dcim/module.html
@@ -14,7 +14,7 @@
 {% block extra_controls %}
   {% if perms.dcim.change_module %}
     <div class="dropdown">
-      <button id="add-components" type="button" class="btn btn-sm btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+      <button id="add-components" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
         <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Components" %}
       </button>
       <ul class="dropdown-menu" aria-labeled-by="add-components">
diff --git a/netbox/templates/dcim/moduletype/base.html b/netbox/templates/dcim/moduletype/base.html
index e41010f2f..1aaaa427f 100644
--- a/netbox/templates/dcim/moduletype/base.html
+++ b/netbox/templates/dcim/moduletype/base.html
@@ -14,7 +14,7 @@
 {% block extra_controls %}
   {% if perms.dcim.change_devicetype %}
     <div class="dropdown">
-      <button type="button" class="btn btn-primary btn-sm dropdown-toggle"data-bs-toggle="dropdown" aria-expanded="false">
+      <button type="button" class="btn btn-primary dropdown-toggle"data-bs-toggle="dropdown" aria-expanded="false">
         <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Components" %}
       </button>
       <ul class="dropdown-menu">
diff --git a/netbox/templates/dcim/moduletype/component_templates.html b/netbox/templates/dcim/moduletype/component_templates.html
index bb54a33f9..6beb4258a 100644
--- a/netbox/templates/dcim/moduletype/component_templates.html
+++ b/netbox/templates/dcim/moduletype/component_templates.html
@@ -14,18 +14,18 @@
             </div>
             <div class="card-footer noprint">
                 {% if table.rows %}
-                    <button type="submit" name="_edit" formaction="{% url table.Meta.model|viewname:"bulk_rename" %}?return_url={{ return_url }}" class="btn btn-sm btn-warning">
+                    <button type="submit" name="_edit" formaction="{% url table.Meta.model|viewname:"bulk_rename" %}?return_url={{ return_url }}" class="btn btn-warning">
                         <span class="mdi mdi-pencil-outline" aria-hidden="true"></span> {% trans "Rename" %}
                     </button>
-                    <button type="submit" name="_edit" formaction="{% url table.Meta.model|viewname:"bulk_edit" %}?return_url={{ return_url }}" class="btn btn-sm btn-warning">
+                    <button type="submit" name="_edit" formaction="{% url table.Meta.model|viewname:"bulk_edit" %}?return_url={{ return_url }}" class="btn btn-warning">
                         <span class="mdi mdi-pencil" aria-hidden="true"></span> {% trans "Edit" %}
                     </button>
-                    <button type="submit" name="_delete" formaction="{% url table.Meta.model|viewname:"bulk_delete" %}?return_url={{ return_url }}" class="btn btn-sm btn-danger">
+                    <button type="submit" name="_delete" formaction="{% url table.Meta.model|viewname:"bulk_delete" %}?return_url={{ return_url }}" class="btn btn-danger">
                         <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> {% trans "Delete" %}
                     </button>
                 {% endif %}
                 <div class="float-end">
-                    <a href="{% url table.Meta.model|viewname:"add" %}?module_type={{ object.pk }}&return_url={{ return_url }}" class="btn btn-primary btn-sm">
+                    <a href="{% url table.Meta.model|viewname:"add" %}?module_type={{ object.pk }}&return_url={{ return_url }}" class="btn btn-primary">
                         <i class="mdi mdi-plus-thick" aria-hidden="true"></i>
                         {% trans "Add" %} {{ title }}
                     </a>
diff --git a/netbox/templates/dcim/platform.html b/netbox/templates/dcim/platform.html
index 9448ad3e5..5a37dc6af 100644
--- a/netbox/templates/dcim/platform.html
+++ b/netbox/templates/dcim/platform.html
@@ -13,7 +13,7 @@
 
 {% block extra_controls %}
   {% if perms.dcim.add_device %}
-    <a href="{% url 'dcim:device_add' %}?platform={{ object.pk }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'dcim:device_add' %}?platform={{ object.pk }}" class="btn btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Device" %}
     </a>
   {% endif %}
diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html
index 9b791d0e2..40e6cdb54 100644
--- a/netbox/templates/dcim/powerfeed.html
+++ b/netbox/templates/dcim/powerfeed.html
@@ -132,7 +132,7 @@
         {% if not object.mark_connected and not object.cable %}
         <div class="card-footer">
           {% if perms.dcim.add_cable %}
-            <a href="{% url 'dcim:cable_add' %}?a_terminations_type=dcim.powerfeed&a_terminations={{ object.pk }}&b_terminations_type=dcim.powerport&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm float-end">
+            <a href="{% url 'dcim:cable_add' %}?a_terminations_type=dcim.powerfeed&a_terminations={{ object.pk }}&b_terminations_type=dcim.powerport&return_url={{ object.get_absolute_url }}" class="btn btn-primary float-end">
               <i class="mdi mdi-ethernet-cable" aria-hidden="true"></i> {% trans "Connect" %}
             </a>
           {% endif %}
diff --git a/netbox/templates/dcim/poweroutlet.html b/netbox/templates/dcim/poweroutlet.html
index 8c8294a8a..800eb056b 100644
--- a/netbox/templates/dcim/poweroutlet.html
+++ b/netbox/templates/dcim/poweroutlet.html
@@ -72,7 +72,7 @@
                 <div class="text-muted">
                   {% trans "Not Connected" %}
                   {% if perms.dcim.add_cable %}
-                    <a href="{% url 'dcim:cable_add' %}?a_terminations_type=dcim.poweroutlet&a_terminations={{ object.pk }}&b_terminations_type=dcim.powerport&return_url={{ object.get_absolute_url }}" title="{% trans "Connect" %}" class="btn btn-primary btn-sm float-end">
+                    <a href="{% url 'dcim:cable_add' %}?a_terminations_type=dcim.poweroutlet&a_terminations={{ object.pk }}&b_terminations_type=dcim.powerport&return_url={{ object.get_absolute_url }}" title="{% trans "Connect" %}" class="btn btn-primary float-end">
                       <i class="mdi mdi-ethernet-cable" aria-hidden="true"></i> {% trans "Connect" %}
                     </a>
                   {% endif %}
diff --git a/netbox/templates/dcim/powerpanel.html b/netbox/templates/dcim/powerpanel.html
index 0340f7990..8cb4158ff 100644
--- a/netbox/templates/dcim/powerpanel.html
+++ b/netbox/templates/dcim/powerpanel.html
@@ -57,23 +57,23 @@
         ></div>
         <div class="card-footer noprint">
           {% if perms.dcim.change_powerfeed %}
-            <button type="submit" name="_edit" formaction="{% url 'dcim:powerfeed_bulk_edit' %}?return_url={% url 'dcim:powerpanel' pk=object.pk %}" class="btn btn-warning btn-sm">
+            <button type="submit" name="_edit" formaction="{% url 'dcim:powerfeed_bulk_edit' %}?return_url={% url 'dcim:powerpanel' pk=object.pk %}" class="btn btn-warning">
               <span class="mdi mdi-pencil" aria-hidden="true"></span> {% trans "Edit" %}
             </button>
           {% endif %}
           {% if perms.dcim.delete_cable %}
-            <button type="submit" name="_disconnect" formaction="{% url 'dcim:powerfeed_bulk_disconnect' %}?return_url={% url 'dcim:powerpanel' pk=object.pk %}" class="btn btn-outline-danger btn-sm">
+            <button type="submit" name="_disconnect" formaction="{% url 'dcim:powerfeed_bulk_disconnect' %}?return_url={% url 'dcim:powerpanel' pk=object.pk %}" class="btn btn-outline-danger">
               <span class="mdi mdi-ethernet-cable-off" aria-hidden="true"></span> {% trans "Disconnect" %}
             </button>
           {% endif %}
           {% if perms.dcim.delete_powerfeed %}
-            <button type="submit" name="_delete" formaction="{% url 'dcim:powerfeed_bulk_delete' %}?return_url={% url 'dcim:powerpanel' pk=object.pk %}" class="btn btn-danger btn-sm">
+            <button type="submit" name="_delete" formaction="{% url 'dcim:powerfeed_bulk_delete' %}?return_url={% url 'dcim:powerpanel' pk=object.pk %}" class="btn btn-danger">
               <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> {% trans "Delete" %}
             </button>
           {% endif %}
           {% if perms.dcim.add_powerfeed %}
             <div class="float-end">
-              <a href="{% url 'dcim:powerfeed_add' %}?power_panel={{ object.pk }}&return_url={% url 'dcim:powerpanel' pk=object.pk %}" class="btn btn-primary btn-sm">
+              <a href="{% url 'dcim:powerfeed_add' %}?power_panel={{ object.pk }}&return_url={% url 'dcim:powerpanel' pk=object.pk %}" class="btn btn-primary">
                 <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Power Feeds" %}
               </a>
             </div>
diff --git a/netbox/templates/dcim/powerport.html b/netbox/templates/dcim/powerport.html
index 48bbc9cfe..e0699fade 100644
--- a/netbox/templates/dcim/powerport.html
+++ b/netbox/templates/dcim/powerport.html
@@ -73,7 +73,7 @@
                   {% trans "Not Connected" %}
                   {% if perms.dcim.add_cable %}
                     <span class="dropdown float-end">
-                      <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                      <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                         <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> {% trans "Connect" %}
                       </button>
                       <ul class="dropdown-menu dropdown-menu-end">
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index 857061d00..a3ed6c6ad 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -169,7 +169,7 @@
 	  </div>
     <div class="col col-12 col-xl-7">
       <div class="text-end mb-4">
-        <select class="btn btn-sm btn-outline-dark rack-view">
+        <select class="btn btn-outline-dark rack-view">
           <option value="images-and-labels" selected="selected">{% trans "Images and Labels" %}</option>
           <option value="images-only">{% trans "Images only" %}</option>
           <option value="labels-only">{% trans "Labels only" %}</option>
diff --git a/netbox/templates/dcim/rack/base.html b/netbox/templates/dcim/rack/base.html
index 2f4eb227c..4ab211ac3 100644
--- a/netbox/templates/dcim/rack/base.html
+++ b/netbox/templates/dcim/rack/base.html
@@ -17,14 +17,14 @@
 {% block extra_controls %}
   <div class="btn-group" role="group" aria-label="RackNavigation">
     {% if prev_rack %}
-      <a href="{{ prev_rack.get_absolute_url }}" class="btn btn-sm btn-primary">
+      <a href="{{ prev_rack.get_absolute_url }}" class="btn btn-primary">
         <i class="mdi mdi-chevron-left" aria-hidden="true"></i> {{ prev_rack }}
       </a>
     {% endif %}
 
     {% if peer_racks %}
       <div class="btn-group" role="group">
-        <button class="btn btn-sm btn-primary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">{{ object }}</button>
+        <button class="btn btn-primary dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">{{ object }}</button>
         <ul class="dropdown-menu">
           {% for peer_rack in peer_racks %}
             <li><a class="dropdown-item{% if peer_rack.pk == object.pk %} active{% endif %}" href="{{ peer_rack.get_absolute_url }}">{{ peer_rack }}</a></li>
@@ -34,7 +34,7 @@
     {% endif %}
 
     {% if next_rack %}
-      <a href="{{ next_rack.get_absolute_url }}" class="btn btn-sm btn-primary">
+      <a href="{{ next_rack.get_absolute_url }}" class="btn btn-primary">
         {{ next_rack }} <i class="mdi mdi-chevron-right" aria-hidden="true"></i>
       </a>
     {% endif %}
diff --git a/netbox/templates/dcim/rack/non_racked_devices.html b/netbox/templates/dcim/rack/non_racked_devices.html
index e52b8647f..609dc55ec 100644
--- a/netbox/templates/dcim/rack/non_racked_devices.html
+++ b/netbox/templates/dcim/rack/non_racked_devices.html
@@ -2,11 +2,9 @@
 
 {% block extra_controls %}
     {% if perms.dcim.add_device %}
-        <div class="bulk-button-group">
-            <a href="{% url 'dcim:device_add' %}?rack={{ object.pk }}&site={{ object.site.pk }}&return_url={% url 'dcim:rack_nonracked_devices' pk=object.pk %}"
-               class="btn btn-primary btn-sm">
-                <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add non-racked device
-            </a>
-        </div>
+        <a href="{% url 'dcim:device_add' %}?rack={{ object.pk }}&site={{ object.site.pk }}&return_url={% url 'dcim:rack_nonracked_devices' pk=object.pk %}"
+           class="btn btn-primary">
+            <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add non-racked device
+        </a>
     {% endif %}
 {% endblock extra_controls %}
diff --git a/netbox/templates/dcim/rack/reservations.html b/netbox/templates/dcim/rack/reservations.html
index cca8800e7..360cf0ea9 100644
--- a/netbox/templates/dcim/rack/reservations.html
+++ b/netbox/templates/dcim/rack/reservations.html
@@ -3,11 +3,9 @@
 
 {% block extra_controls %}
     {% if perms.dcim.add_rackreservation %}
-        <div class="bulk-button-group">
-            <a href="{% url 'dcim:rackreservation_add' %}?rack={{ object.pk }}&return_url={% url 'dcim:rack_reservations' pk=object.pk %}"
-               class="btn btn-primary btn-sm">
-                <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add reservation" %}
-            </a>
-        </div>
+        <a href="{% url 'dcim:rackreservation_add' %}?rack={{ object.pk }}&return_url={% url 'dcim:rack_reservations' pk=object.pk %}"
+           class="btn btn-primary">
+            <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add reservation" %}
+        </a>
     {% endif %}
 {% endblock extra_controls %}
diff --git a/netbox/templates/dcim/rack_elevation_list.html b/netbox/templates/dcim/rack_elevation_list.html
index e1512e7ba..4cff6f68a 100644
--- a/netbox/templates/dcim/rack_elevation_list.html
+++ b/netbox/templates/dcim/rack_elevation_list.html
@@ -8,11 +8,11 @@
 {% block controls %}
   <div class="controls">
     <div class="control-group">
-      <a href="{% url 'dcim:rack_list' %}{% querystring request %}" class="btn btn-sm btn-primary">
+      <a href="{% url 'dcim:rack_list' %}{% querystring request %}" class="btn btn-primary">
         <i class="mdi mdi-format-list-checkbox"></i> {% trans "View List" %}
       </a>
       <div class="btn-group btn-group-sm" role="group">
-        <select class="btn btn-sm btn-outline-secondary rack-view">
+        <select class="btn btn-outline-secondary rack-view">
           <option value="images-and-labels" selected="selected">{% trans "Images and Labels" %}</option>
           <option value="images-only">{% trans "Images only" %}</option>
           <option value="labels-only">{% trans "Labels only" %}</option>
@@ -23,7 +23,7 @@
         <a href="{% url 'dcim:rack_elevation_list' %}{% querystring request face='rear' %}" class="btn btn-outline-secondary{% if rack_face == 'rear' %} active{% endif %}">{% trans "Rear" %}</a>
       </div>
       <div class="dropdown">
-        <button type="button" class="btn btn-sm btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+        <button type="button" class="btn btn-outline-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
           <i class="mdi mdi-sort"></i> {% trans "Sort By" %} {{ sort_display_name }}
         </button>
         <ul class="dropdown-menu dropdown-menu-end">
diff --git a/netbox/templates/dcim/rack_list.html b/netbox/templates/dcim/rack_list.html
index e0452a5e3..ca72d2f25 100644
--- a/netbox/templates/dcim/rack_list.html
+++ b/netbox/templates/dcim/rack_list.html
@@ -4,7 +4,7 @@
 {% load i18n %}
 
 {% block extra_controls %}
-  <a href="{% url 'dcim:rack_elevation_list' %}{% querystring request %}" class="btn btn-sm btn-primary">
+  <a href="{% url 'dcim:rack_elevation_list' %}{% querystring request %}" class="btn btn-primary">
     <i class="mdi mdi-view-day-outline"></i> {% trans "View Elevations" %}
   </a>
 {% endblock %}
diff --git a/netbox/templates/dcim/rackrole.html b/netbox/templates/dcim/rackrole.html
index f1148e6ec..22865b505 100644
--- a/netbox/templates/dcim/rackrole.html
+++ b/netbox/templates/dcim/rackrole.html
@@ -6,7 +6,7 @@
 
 {% block extra_controls %}
   {% if perms.dcim.add_rack %}
-    <a href="{% url 'dcim:rack_add' %}?role={{ object.pk }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'dcim:rack_add' %}?role={{ object.pk }}" class="btn btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Rack" %}
     </a>
   {% endif %}
diff --git a/netbox/templates/dcim/rearport.html b/netbox/templates/dcim/rearport.html
index 38b40b6c0..5b4a7a7aa 100644
--- a/netbox/templates/dcim/rearport.html
+++ b/netbox/templates/dcim/rearport.html
@@ -80,7 +80,7 @@
                             <th scope="row">{% trans "Cable" %}</th>
                             <td>
                                 {{ object.cable|linkify }}
-                                <a href="{% url 'dcim:rearport_trace' pk=object.pk %}" class="btn btn-primary btn-sm lh-1" title="{% trans "Trace" %}">
+                                <a href="{% url 'dcim:rearport_trace' pk=object.pk %}" class="btn btn-primary lh-1" title="{% trans "Trace" %}">
                                     <i class="mdi mdi-transit-connection-variant" aria-hidden="true"></i>
                                 </a>
                             </td>
@@ -101,7 +101,7 @@
                         {% trans "Not connected" %}
                         {% if perms.dcim.add_cable %}
                             <span class="dropdown float-end">
-                                <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                     <span class="mdi mdi-ethernet-cable" aria-hidden="true"></span> {% trans "Connect" %}
                                 </button>
                                 <ul class="dropdown-menu dropdown-menu-end">
diff --git a/netbox/templates/dcim/region.html b/netbox/templates/dcim/region.html
index b677e8f5a..8a74a9faa 100644
--- a/netbox/templates/dcim/region.html
+++ b/netbox/templates/dcim/region.html
@@ -13,7 +13,7 @@
 
 {% block extra_controls %}
   {% if perms.dcim.add_site %}
-    <a href="{% url 'dcim:site_add' %}?region={{ object.pk }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'dcim:site_add' %}?region={{ object.pk }}" class="btn btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Site" %}
     </a>
   {% endif %}
@@ -60,7 +60,7 @@
       ></div>
       {% if perms.dcim.add_region %}
         <div class="card-footer text-end noprint">
-          <a href="{% url 'dcim:region_add' %}?parent={{ object.pk }}" class="btn btn-sm btn-primary">
+          <a href="{% url 'dcim:region_add' %}?parent={{ object.pk }}" class="btn btn-primary">
             <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Region" %}
           </a>
         </div>
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index 16a870182..6d42a160a 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -77,7 +77,7 @@
               {% if object.physical_address %}
                 {% if config.MAPS_URL %}
                   <div class="position-absolute top-50 end-0 translate-middle-y noprint">
-                    <a href="{{ config.MAPS_URL }}{{ object.physical_address|urlencode }}" target="_blank" class="btn btn-primary btn-sm">
+                    <a href="{{ config.MAPS_URL }}{{ object.physical_address|urlencode }}" target="_blank" class="btn btn-primary">
                       <i class="mdi mdi-map-marker"></i> {% trans "Map" %}
                     </a>
                   </div>
@@ -98,7 +98,7 @@
               {% if object.latitude and object.longitude %}
                 {% if config.MAPS_URL %}
                   <div class="position-absolute top-50 end-0 translate-middle-y noprint">
-                    <a href="{{ config.MAPS_URL }}{{ object.latitude }},{{ object.longitude }}" target="_blank" class="btn btn-primary btn-sm">
+                    <a href="{{ config.MAPS_URL }}{{ object.latitude }},{{ object.longitude }}" target="_blank" class="btn btn-primary">
                       <i class="mdi mdi-map-marker"></i> {% trans "Map It" %}
                     </a>
                   </div>
@@ -133,7 +133,7 @@
       ></div>
       {% if perms.dcim.add_location %}
         <div class="card-footer text-end noprint">
-          <a href="{% url 'dcim:location_add' %}?site={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
+          <a href="{% url 'dcim:location_add' %}?site={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
             <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add a Location" %}
           </a>
         </div>
@@ -147,7 +147,7 @@
       ></div>
       {% if perms.dcim.add_device %}
         <div class="card-footer text-end noprint">
-          <a href="{% url 'dcim:device_add' %}?site={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
+          <a href="{% url 'dcim:device_add' %}?site={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
             <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add a Device" %}
           </a>
         </div>
diff --git a/netbox/templates/dcim/sitegroup.html b/netbox/templates/dcim/sitegroup.html
index 30dfa8503..abe353d4c 100644
--- a/netbox/templates/dcim/sitegroup.html
+++ b/netbox/templates/dcim/sitegroup.html
@@ -13,7 +13,7 @@
 
 {% block extra_controls %}
   {% if perms.dcim.add_site %}
-    <a href="{% url 'dcim:site_add' %}?group={{ object.pk }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'dcim:site_add' %}?group={{ object.pk }}" class="btn btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Site" %}
     </a>
   {% endif %}
@@ -60,7 +60,7 @@
       ></div>
       {% if perms.dcim.add_sitegroup %}
         <div class="card-footer text-end noprint">
-          <a href="{% url 'dcim:sitegroup_add' %}?parent={{ object.pk }}" class="btn btn-sm btn-primary">
+          <a href="{% url 'dcim:sitegroup_add' %}?parent={{ object.pk }}" class="btn btn-primary">
             <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Site Group" %}
           </a>
         </div>
diff --git a/netbox/templates/dcim/virtualchassis.html b/netbox/templates/dcim/virtualchassis.html
index afde397c6..1c6bdd353 100644
--- a/netbox/templates/dcim/virtualchassis.html
+++ b/netbox/templates/dcim/virtualchassis.html
@@ -82,7 +82,7 @@
         </div>
         {% if perms.dcim.change_virtualchassis %}
           <div class="card-footer text-end noprint">
-            <a href="{% url 'dcim:virtualchassis_add_member' pk=object.pk %}?site={{ object.master.site.pk }}&rack={{ object.master.rack.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
+            <a href="{% url 'dcim:virtualchassis_add_member' pk=object.pk %}?site={{ object.master.site.pk }}&rack={{ object.master.rack.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
               <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Member" %}
             </a>
           </div>
diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html
index b8f232fc2..ca80f0071 100644
--- a/netbox/templates/dcim/virtualchassis_edit.html
+++ b/netbox/templates/dcim/virtualchassis_edit.html
@@ -89,7 +89,7 @@
                               </td>
                               <td>
                                   {% if virtual_chassis.pk %}
-                                      <a href="{% url 'dcim:virtualchassis_remove_member' pk=device.pk %}?return_url={% url 'dcim:virtualchassis_edit' pk=virtual_chassis.pk %}" class="btn btn-danger btn-sm{% if virtual_chassis.master == device %} disabled{% endif %}">
+                                      <a href="{% url 'dcim:virtualchassis_remove_member' pk=device.pk %}?return_url={% url 'dcim:virtualchassis_edit' pk=virtual_chassis.pk %}" class="btn btn-danger{% if virtual_chassis.master == device %} disabled{% endif %}">
                                           <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span>
                                       </a>
                                   {% endif %}
diff --git a/netbox/templates/extras/configcontext_list.html b/netbox/templates/extras/configcontext_list.html
index 94a168cc6..e3835a682 100644
--- a/netbox/templates/extras/configcontext_list.html
+++ b/netbox/templates/extras/configcontext_list.html
@@ -3,7 +3,7 @@
 
 {% block bulk_buttons %}
   {% if perms.extras.sync_configcontext %}
-    <button type="submit" name="_sync" formaction="{% url 'extras:configcontext_bulk_sync' %}" class="btn btn-primary btn-sm">
+    <button type="submit" name="_sync" formaction="{% url 'extras:configcontext_bulk_sync' %}" class="btn btn-primary">
       <i class="mdi mdi-sync" aria-hidden="true"></i> {% trans "Sync Data" %}
     </button>
   {% endif %}
diff --git a/netbox/templates/extras/configtemplate_list.html b/netbox/templates/extras/configtemplate_list.html
index dc8a26488..14e1e41b2 100644
--- a/netbox/templates/extras/configtemplate_list.html
+++ b/netbox/templates/extras/configtemplate_list.html
@@ -3,7 +3,7 @@
 
 {% block bulk_buttons %}
   {% if perms.extras.sync_configtemplate %}
-    <button type="submit" name="_sync" formaction="{% url 'extras:configtemplate_bulk_sync' %}" class="btn btn-primary btn-sm">
+    <button type="submit" name="_sync" formaction="{% url 'extras:configtemplate_bulk_sync' %}" class="btn btn-primary">
       <i class="mdi mdi-sync" aria-hidden="true"></i> {% trans "Sync Data" %}
     </button>
   {% endif %}
diff --git a/netbox/templates/extras/exporttemplate_list.html b/netbox/templates/extras/exporttemplate_list.html
index 6684c2cd0..0d4200aba 100644
--- a/netbox/templates/extras/exporttemplate_list.html
+++ b/netbox/templates/extras/exporttemplate_list.html
@@ -3,7 +3,7 @@
 
 {% block bulk_buttons %}
   {% if perms.extras.sync_configcontext %}
-    <button type="submit" name="_sync" formaction="{% url 'extras:exporttemplate_bulk_sync' %}" class="btn btn-primary btn-sm">
+    <button type="submit" name="_sync" formaction="{% url 'extras:exporttemplate_bulk_sync' %}" class="btn btn-primary">
       <i class="mdi mdi-sync" aria-hidden="true"></i> {% trans "Sync Data" %}
     </button>
   {% endif %}
diff --git a/netbox/templates/extras/report_list.html b/netbox/templates/extras/report_list.html
index d4d3962c3..0a38ea75c 100644
--- a/netbox/templates/extras/report_list.html
+++ b/netbox/templates/extras/report_list.html
@@ -30,7 +30,7 @@
         <h5 class="card-header" id="module{{ module.pk }}">
           {% if perms.extras.delete_reportmodule %}
             <div class="float-end">
-              <a href="{% url 'extras:reportmodule_delete' pk=module.pk %}" class="btn btn-danger btn-sm">
+              <a href="{% url 'extras:reportmodule_delete' pk=module.pk %}" class="btn btn-danger">
                 <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> {% trans "Delete" %}
               </a>
             </div>
@@ -83,7 +83,7 @@
                             <div class="float-end noprint">
                               <form action="{% url 'extras:report' module=report.module name=report.class_name %}" method="post">
                                 {% csrf_token %}
-                                <button type="submit" name="_run" class="btn btn-primary btn-sm" style="width: 110px">
+                                <button type="submit" name="_run" class="btn btn-primary" style="width: 110px">
                                   {% if last_job %}
                                     <i class="mdi mdi-replay"></i> {% trans "Run Again" %}
                                   {% else %}
diff --git a/netbox/templates/extras/script_list.html b/netbox/templates/extras/script_list.html
index 167e3073c..e90562f0f 100644
--- a/netbox/templates/extras/script_list.html
+++ b/netbox/templates/extras/script_list.html
@@ -29,7 +29,7 @@
         <h5 class="card-header" id="module{{ module.pk }}">
           {% if perms.extras.delete_scriptmodule %}
             <div class="float-end">
-              <a href="{% url 'extras:scriptmodule_delete' pk=module.pk %}" class="btn btn-danger btn-sm">
+              <a href="{% url 'extras:scriptmodule_delete' pk=module.pk %}" class="btn btn-danger">
                 <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> {% trans "Delete" %}
               </a>
             </div>
diff --git a/netbox/templates/generic/bulk_edit.html b/netbox/templates/generic/bulk_edit.html
index 3783c990e..33eb9e798 100644
--- a/netbox/templates/generic/bulk_edit.html
+++ b/netbox/templates/generic/bulk_edit.html
@@ -121,8 +121,8 @@ Context:
               </div>
 
               <div class="text-end">
-                <button type="submit" name="_apply" class="btn btn-sm btn-primary">{% trans "Apply" %}</button>
-                <a href="{{ return_url }}" class="btn btn-sm btn-outline-danger">{% trans "Cancel" %}</a>
+                <button type="submit" name="_apply" class="btn btn-primary">{% trans "Apply" %}</button>
+                <a href="{{ return_url }}" class="btn btn-outline-danger">{% trans "Cancel" %}</a>
               </div>
             </div>
           </div>
diff --git a/netbox/templates/generic/bulk_import.html b/netbox/templates/generic/bulk_import.html
index f78cb0bf5..2fc5d0a14 100644
--- a/netbox/templates/generic/bulk_import.html
+++ b/netbox/templates/generic/bulk_import.html
@@ -138,7 +138,7 @@ Context:
                                 </td>
                                 <td>
                                     {% if field.STATIC_CHOICES %}
-                                        <button type="button" class="btn btn-link btn-sm float-end" data-bs-toggle="modal" data-bs-target="#{{ name }}_choices">
+                                        <button type="button" class="btn btn-link float-end" data-bs-toggle="modal" data-bs-target="#{{ name }}_choices">
                                             <i class="mdi mdi-help-circle"></i>
                                         </button>
                                         <div class="modal fade" id="{{ name }}_choices" tabindex="-1" role="dialog">
diff --git a/netbox/templates/generic/object_children.html b/netbox/templates/generic/object_children.html
index 3e93a7756..b9acdb6de 100644
--- a/netbox/templates/generic/object_children.html
+++ b/netbox/templates/generic/object_children.html
@@ -13,42 +13,38 @@
                 {% include 'htmx/table.html' %}
             </div>
         </div>
-        <div class="noprint bulk-buttons">
+        <div class="d-print-none mt-2">
             {% block bulk_controls %}
-                <div class="bulk-button-group">
-                    <div class="btn-group" role="group">
-                        {# Bulk edit buttons #}
-                        {% block bulk_edit_controls %}
-                            {% with bulk_edit_view=child_model|validated_viewname:"bulk_edit" %}
-                                {% if 'bulk_edit' in actions and bulk_edit_view %}
-                                    <button type="submit" name="_edit"
-                                            formaction="{% url bulk_edit_view %}?return_url={{ return_url }}"
-                                            class="btn btn-warning btn-sm">
-                                        <i class="mdi mdi-pencil" aria-hidden="true"></i> {% trans "Edit Selected" %}
-                                    </button>
-                                {% endif %}
-                            {% endwith %}
-                        {% endblock bulk_edit_controls %}
-                    </div>
-                    <div class="btn-group" role="group">
-                        {# Bulk delete buttons #}
-                        {% block bulk_delete_controls %}
-                            {% with bulk_delete_view=child_model|validated_viewname:"bulk_delete" %}
-                                {% if 'bulk_delete' in actions and bulk_delete_view %}
-                                    <button type="submit"
-                                            formaction="{% url bulk_delete_view %}?return_url={{ return_url }}"
-                                            class="btn btn-danger btn-sm">
-                                        <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> {% trans "Delete Selected" %}
-                                    </button>
-                                {% endif %}
-                            {% endwith %}
-                        {% endblock bulk_delete_controls %}
-                    </div>
+                <div class="btn-group" role="group">
+                    {# Bulk edit buttons #}
+                    {% block bulk_edit_controls %}
+                        {% with bulk_edit_view=child_model|validated_viewname:"bulk_edit" %}
+                            {% if 'bulk_edit' in actions and bulk_edit_view %}
+                                <button type="submit" name="_edit"
+                                        formaction="{% url bulk_edit_view %}?return_url={{ return_url }}"
+                                        class="btn btn-warning">
+                                    <i class="mdi mdi-pencil" aria-hidden="true"></i> {% trans "Edit Selected" %}
+                                </button>
+                            {% endif %}
+                        {% endwith %}
+                    {% endblock bulk_edit_controls %}
                 </div>
-                <div class="bulk-button-group">
-                    {# Other bulk action buttons #}
-                    {% block bulk_extra_controls %}{% endblock %}
+                <div class="btn-group" role="group">
+                    {# Bulk delete buttons #}
+                    {% block bulk_delete_controls %}
+                        {% with bulk_delete_view=child_model|validated_viewname:"bulk_delete" %}
+                            {% if 'bulk_delete' in actions and bulk_delete_view %}
+                                <button type="submit"
+                                        formaction="{% url bulk_delete_view %}?return_url={{ return_url }}"
+                                        class="btn btn-danger">
+                                    <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i> {% trans "Delete Selected" %}
+                                </button>
+                            {% endif %}
+                        {% endwith %}
+                    {% endblock bulk_delete_controls %}
                 </div>
+                {# Other bulk action buttons #}
+                {% block bulk_extra_controls %}{% endblock %}
             {% endblock bulk_controls %}
         </div>
     </form>
diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 2a1aa5c06..31783f241 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -116,17 +116,15 @@ Context:
           </div>
 
           {# Form buttons #}
-          <div class="bulk-buttons mt-2 d-print-none">
-            <div class="bulk-button-group">
-              {% block bulk_buttons %}
-                {% if 'bulk_edit' in actions %}
-                  {% bulk_edit_button model query_params=request.GET %}
-                {% endif %}
-                {% if 'bulk_delete' in actions %}
-                  {% bulk_delete_button model query_params=request.GET %}
-                {% endif %}
-              {% endblock %}
-            </div>
+          <div class="btn-list d-print-none mt-2">
+            {% block bulk_buttons %}
+              {% if 'bulk_edit' in actions %}
+                {% bulk_edit_button model query_params=request.GET %}
+              {% endif %}
+              {% if 'bulk_delete' in actions %}
+                {% bulk_delete_button model query_params=request.GET %}
+              {% endif %}
+            {% endblock %}
           </div>
         </div>
       </form>
diff --git a/netbox/templates/home.html b/netbox/templates/home.html
index 357eb8a7c..7dc9777af 100644
--- a/netbox/templates/home.html
+++ b/netbox/templates/home.html
@@ -33,7 +33,7 @@
   <div class="collapse multi-collapse show">
     <div class="d-flex px-3">
       <div class="flex-grow-1">
-        <button type="button" id="unlock_dashboard" class="btn btn-light btn-sm" data-bs-toggle="collapse" data-bs-target=".multi-collapse">
+        <button type="button" id="unlock_dashboard" class="btn btn-light" data-bs-toggle="collapse" data-bs-target=".multi-collapse">
           <i class="mdi mdi-lock-open-outline"></i> {% trans "Unlock Dashboard" %}
         </button>
       </div>
@@ -42,7 +42,7 @@
   <div class="collapse multi-collapse">
     <div class="d-flex px-3">
       <div class="flex-grow-1">
-        <button type="button" id="lock_dashboard" class="btn btn-light btn-sm" data-bs-toggle="collapse" data-bs-target=".multi-collapse">
+        <button type="button" id="lock_dashboard" class="btn btn-light" data-bs-toggle="collapse" data-bs-target=".multi-collapse">
           <i class="mdi mdi-lock-outline"></i> {% trans "Lock Dashboard" %}
         </button>
       </div>
@@ -52,14 +52,14 @@
           hx-target="#htmx-modal-content"
           data-bs-toggle="modal"
           data-bs-target="#htmx-modal"
-          class="btn btn-success btn-sm"
+          class="btn btn-success"
         >
           <i class="mdi mdi-plus"></i> {% trans "Add Widget" %}
         </a>
-        <button id="save_dashboard" class="btn btn-primary btn-sm" data-url="{% url 'extras-api:dashboard' %}">
+        <button id="save_dashboard" class="btn btn-primary" data-url="{% url 'extras-api:dashboard' %}">
           <i class="mdi mdi-content-save-outline"></i> {% trans "Save Layout" %}
         </button>
-        <a href="{% url 'extras:dashboard_reset' %}" class="btn btn-danger btn-sm">
+        <a href="{% url 'extras:dashboard_reset' %}" class="btn btn-danger">
           <i class="mdi mdi-backspace"></i>  {% trans "Reset Dashboard" %}
         </a>
       </div>
diff --git a/netbox/templates/htmx/object_selector.html b/netbox/templates/htmx/object_selector.html
index 280102ada..1e17b1fa9 100644
--- a/netbox/templates/htmx/object_selector.html
+++ b/netbox/templates/htmx/object_selector.html
@@ -25,7 +25,7 @@
         {% endfor %}
       </div>
       <div class="text-end">
-        <button type="submit" class="btn btn-sm btn-primary">{% trans "Search" %}</button>
+        <button type="submit" class="btn btn-primary">{% trans "Search" %}</button>
       </div>
     </form>
     <div id="selector_results" class="mt-3" data-selector-target="{{ target_id }}"></div>
diff --git a/netbox/templates/inc/filter_list.html b/netbox/templates/inc/filter_list.html
index 633cc7439..2a1676960 100644
--- a/netbox/templates/inc/filter_list.html
+++ b/netbox/templates/inc/filter_list.html
@@ -46,10 +46,10 @@
       {% endif %}
     </div>
     <div class="card-footer text-end noprint border-0">
-      <button type="button" class="btn btn-sm btn-outline-danger m-1" data-reset-select>
+      <button type="button" class="btn btn-outline-danger m-1" data-reset-select>
         <i class="mdi mdi-backspace"></i> {% trans "Reset" %}
       </button>
-      <button type="submit" class="btn btn-sm btn-primary m-1">
+      <button type="submit" class="btn btn-primary m-1">
         <i class="mdi mdi-magnify"></i> {% trans "Search" %}
       </button>
     </div>
diff --git a/netbox/templates/inc/panels/image_attachments.html b/netbox/templates/inc/panels/image_attachments.html
index a3c8b9102..df39e6e4a 100644
--- a/netbox/templates/inc/panels/image_attachments.html
+++ b/netbox/templates/inc/panels/image_attachments.html
@@ -6,7 +6,7 @@
   {% htmx_table 'extras:imageattachment_list' content_type_id=object|content_type_id object_id=object.pk %}
   {% if perms.extras.add_imageattachment %}
     <div class="card-footer text-end noprint">
-      <a href="{% url 'extras:imageattachment_add' %}?content_type={{ object|content_type_id }}&object_id={{ object.pk }}" class="btn btn-primary btn-sm">
+      <a href="{% url 'extras:imageattachment_add' %}?content_type={{ object|content_type_id }}&object_id={{ object.pk }}" class="btn btn-primary">
         <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Attach an image" %}
       </a>
     </div>
diff --git a/netbox/templates/ipam/aggregate/prefixes.html b/netbox/templates/ipam/aggregate/prefixes.html
index e1e53962d..c6f769a57 100644
--- a/netbox/templates/ipam/aggregate/prefixes.html
+++ b/netbox/templates/ipam/aggregate/prefixes.html
@@ -4,7 +4,7 @@
 {% block extra_controls %}
   {% include 'ipam/inc/toggle_available.html' %}
   {% if perms.ipam.add_prefix and first_available_prefix %}
-    <a href="{% url 'ipam:prefix_add' %}?prefix={{ first_available_prefix }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'ipam:prefix_add' %}?prefix={{ first_available_prefix }}" class="btn btn-primary">
       <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Prefix" %}
     </a>
   {% endif %}
diff --git a/netbox/templates/ipam/fhrpgroup.html b/netbox/templates/ipam/fhrpgroup.html
index 20bec9bd4..4fee4a802 100644
--- a/netbox/templates/ipam/fhrpgroup.html
+++ b/netbox/templates/ipam/fhrpgroup.html
@@ -76,7 +76,7 @@
         ></div>
         {% if perms.ipam.add_ipaddress %}
           <div class="card-footer text-end">
-            <a href="{% url 'ipam:ipaddress_add' %}?fhrpgroup={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-primary">
+            <a href="{% url 'ipam:ipaddress_add' %}?fhrpgroup={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
               <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add IP Address" %}
             </a>
           </div>
diff --git a/netbox/templates/ipam/inc/panels/fhrp_groups.html b/netbox/templates/ipam/inc/panels/fhrp_groups.html
index d01a04568..0fcbc2ad1 100644
--- a/netbox/templates/ipam/inc/panels/fhrp_groups.html
+++ b/netbox/templates/ipam/inc/panels/fhrp_groups.html
@@ -27,12 +27,12 @@
             <td>{{ assignment.priority }}</td>
             <td class="text-end noprint">
               {% if perms.ipam.change_fhrpgroupassignment %}
-                <a href="{% url 'ipam:fhrpgroupassignment_edit' pk=assignment.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-warning btn-sm lh-1" title="{% trans "Edit" %}">
+                <a href="{% url 'ipam:fhrpgroupassignment_edit' pk=assignment.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-warning lh-1" title="{% trans "Edit" %}">
                   <i class="mdi mdi-pencil" aria-hidden="true"></i>
                 </a>
               {% endif %}
               {% if perms.ipam.delete_fhrpgroupassignment %}
-                <a href="{% url 'ipam:fhrpgroupassignment_delete' pk=assignment.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-danger btn-sm lh-1" title="{% trans "Delete" %}">
+                <a href="{% url 'ipam:fhrpgroupassignment_delete' pk=assignment.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-danger lh-1" title="{% trans "Delete" %}">
                   <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i>
                 </a>
               {% endif %}
@@ -48,12 +48,12 @@
   </div>
   <div class="card-footer text-end noprint">
     {% if perms.ipam.add_fhrpgroup %}
-      <a href="{% url 'ipam:fhrpgroup_add' %}?return_url={% url 'ipam:fhrpgroupassignment_add' %}%3Finterface_type={{ object|content_type_id }}%26interface_id={{ object.pk }}" class="btn btn-sm btn-primary">
+      <a href="{% url 'ipam:fhrpgroup_add' %}?return_url={% url 'ipam:fhrpgroupassignment_add' %}%3Finterface_type={{ object|content_type_id }}%26interface_id={{ object.pk }}" class="btn btn-primary">
         <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Create Group" %}
       </a>
     {% endif %}
     {% if perms.ipam.add_fhrpgroupassignment %}
-      <a href="{% url 'ipam:fhrpgroupassignment_add' %}?interface_type={{ object|content_type_id }}&interface_id={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-primary">
+      <a href="{% url 'ipam:fhrpgroupassignment_add' %}?interface_type={{ object|content_type_id }}&interface_id={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
         <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Assign Group" %}
       </a>
     {% endif %}
diff --git a/netbox/templates/ipam/inc/toggle_available.html b/netbox/templates/ipam/inc/toggle_available.html
index 62f742e86..52d56481a 100644
--- a/netbox/templates/ipam/inc/toggle_available.html
+++ b/netbox/templates/ipam/inc/toggle_available.html
@@ -3,13 +3,13 @@
 
 {% if show_assigned or show_available is not None %}
   <div class="btn-group" role="group">
-    <a href="{{ request.path }}{% querystring request show_assigned='true' show_available='false' %}" class="btn btn-sm {% if show_assigned and not show_available %}btn-secondary active{% else %}btn-outline-secondary{% endif %}">
+    <a href="{{ request.path }}{% querystring request show_assigned='true' show_available='false' %}" class="btn {% if show_assigned and not show_available %}btn-secondary active{% else %}btn-outline-secondary{% endif %}">
       {% trans "Show Assigned" %}
     </a>
-    <a href="{{ request.path }}{% querystring request show_assigned='false' show_available='true' %}" class="btn btn-sm {% if show_available and not show_assigned %}btn-secondary active{% else %}btn-outline-secondary{% endif %}">
+    <a href="{{ request.path }}{% querystring request show_assigned='false' show_available='true' %}" class="btn {% if show_available and not show_assigned %}btn-secondary active{% else %}btn-outline-secondary{% endif %}">
       {% trans "Show Available" %}
     </a>
-    <a href="{{ request.path }}{% querystring request show_assigned='true' show_available='true' %}" class="btn btn-sm {% if show_available and show_assigned %}btn-secondary active{% else %}btn-outline-secondary{% endif %}">
+    <a href="{{ request.path }}{% querystring request show_assigned='true' show_available='true' %}" class="btn {% if show_available and show_assigned %}btn-secondary active{% else %}btn-outline-secondary{% endif %}">
       {% trans "Show All" %}
     </a>
   </div>
diff --git a/netbox/templates/ipam/iprange/ip_addresses.html b/netbox/templates/ipam/iprange/ip_addresses.html
index a9baccc39..f6c8e9101 100644
--- a/netbox/templates/ipam/iprange/ip_addresses.html
+++ b/netbox/templates/ipam/iprange/ip_addresses.html
@@ -3,7 +3,7 @@
 
 {% block extra_controls %}
   {% if perms.ipam.add_ipaddress and object.first_available_ip %}
-    <a href="{% url 'ipam:ipaddress_add' %}?address={{ object.first_available_ip }}&vrf={{ object.vrf.pk }}&tenant_group={{ object.tenant.group.pk }}&tenant={{ object.tenant.pk }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'ipam:ipaddress_add' %}?address={{ object.first_available_ip }}&vrf={{ object.vrf.pk }}&tenant_group={{ object.tenant.group.pk }}&tenant={{ object.tenant.pk }}" class="btn btn-primary">
         <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add IP Address" %}
     </a>
   {% endif %}
diff --git a/netbox/templates/ipam/prefix.html b/netbox/templates/ipam/prefix.html
index ec6138d69..7049a6a2a 100644
--- a/netbox/templates/ipam/prefix.html
+++ b/netbox/templates/ipam/prefix.html
@@ -147,7 +147,7 @@
         </table>
         {% if object.prefix.version == 4 %}
           <div class="float-end">
-            <a class="btn btn-primary btn-sm" data-bs-toggle="modal" data-bs-target="#prefix-modal">
+            <a class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#prefix-modal">
               <i class="mdi mdi-information-outline" aria-hidden="true"></i> {% trans "Addressing Details" %}
             </a>
           </div>
diff --git a/netbox/templates/ipam/prefix/ip_addresses.html b/netbox/templates/ipam/prefix/ip_addresses.html
index 51ebcc730..399f29799 100644
--- a/netbox/templates/ipam/prefix/ip_addresses.html
+++ b/netbox/templates/ipam/prefix/ip_addresses.html
@@ -3,7 +3,7 @@
 
 {% block extra_controls %}
   {% if perms.ipam.add_ipaddress and first_available_ip %}
-    <a href="{% url 'ipam:ipaddress_add' %}?address={{ first_available_ip }}&vrf={{ object.vrf.pk }}&tenant_group={{ object.tenant.group.pk }}&tenant={{ object.tenant.pk }}&return_url={% url 'ipam:prefix_ipaddresses' pk=object.pk %}" class="btn btn-sm btn-primary">
+    <a href="{% url 'ipam:ipaddress_add' %}?address={{ first_available_ip }}&vrf={{ object.vrf.pk }}&tenant_group={{ object.tenant.group.pk }}&tenant={{ object.tenant.pk }}&return_url={% url 'ipam:prefix_ipaddresses' pk=object.pk %}" class="btn btn-primary">
         <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add IP Address" %}
     </a>
   {% endif %}
diff --git a/netbox/templates/ipam/prefix/ip_ranges.html b/netbox/templates/ipam/prefix/ip_ranges.html
index 3bfba921f..f7a858c80 100644
--- a/netbox/templates/ipam/prefix/ip_ranges.html
+++ b/netbox/templates/ipam/prefix/ip_ranges.html
@@ -3,7 +3,7 @@
 
 {% block extra_controls %}
   {% if perms.ipam.add_iprange and first_available_ip %}
-    <a href="{% url 'ipam:iprange_add' %}?start_address={{ first_available_ip }}&vrf={{ object.vrf.pk }}&tenant_group={{ object.tenant.group.pk }}&tenant={{ object.tenant.pk }}&return_url={% url 'ipam:prefix_ipranges' pk=object.pk %}" class="btn btn-sm btn-primary">
+    <a href="{% url 'ipam:iprange_add' %}?start_address={{ first_available_ip }}&vrf={{ object.vrf.pk }}&tenant_group={{ object.tenant.group.pk }}&tenant={{ object.tenant.pk }}&return_url={% url 'ipam:prefix_ipranges' pk=object.pk %}" class="btn btn-primary">
         <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add IP Range" %}
     </a>
   {% endif %}
diff --git a/netbox/templates/ipam/prefix/prefixes.html b/netbox/templates/ipam/prefix/prefixes.html
index b8c2fd31c..3962455a2 100644
--- a/netbox/templates/ipam/prefix/prefixes.html
+++ b/netbox/templates/ipam/prefix/prefixes.html
@@ -4,7 +4,7 @@
 {% block extra_controls %}
   {% include 'ipam/inc/toggle_available.html' %}
   {% if perms.ipam.add_prefix and first_available_prefix %}
-    <a href="{% url 'ipam:prefix_add' %}?prefix={{ first_available_prefix }}&vrf={{ object.vrf.pk }}&site={{ object.site.pk }}&tenant_group={{ object.tenant.group.pk }}&tenant={{ object.tenant.pk }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'ipam:prefix_add' %}?prefix={{ first_available_prefix }}&vrf={{ object.vrf.pk }}&site={{ object.site.pk }}&tenant_group={{ object.tenant.group.pk }}&tenant={{ object.tenant.pk }}" class="btn btn-primary">
       <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Prefix" %}
     </a>
   {% endif %}
diff --git a/netbox/templates/ipam/prefix_list.html b/netbox/templates/ipam/prefix_list.html
index 00c0ed31a..5b7103b94 100644
--- a/netbox/templates/ipam/prefix_list.html
+++ b/netbox/templates/ipam/prefix_list.html
@@ -3,11 +3,11 @@
 {% load i18n %}
 
 {% block extra_controls %}
-    <button class="btn btn-sm btn-outline-secondary toggle-depth" type="button">
+    <button class="btn btn-outline-secondary toggle-depth" type="button">
         {% trans "Hide Depth Indicators" %}
     </button>
     <div class="dropdown">
-        <button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" id="max_depth" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+        <button class="btn btn-outline-secondary dropdown-toggle" type="button" id="max_depth" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
             {% trans "Max Depth" %}{% if "depth__lte" in request.GET %}: {{ request.GET.depth__lte }}{% endif %}
         </button>
         <ul class="dropdown-menu" aria-labelledby="max_depth">
@@ -24,7 +24,7 @@
         </ul>
     </div>
     <div class="dropdown">
-        <button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" id="max_length" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+        <button class="btn btn-outline-secondary dropdown-toggle" type="button" id="max_length" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
             {% trans "Max Length" %}{% if "mask_length__lte" in request.GET %}: {{ request.GET.mask_length__lte }}{% endif %}
         </button>
         <ul class="dropdown-menu" aria-labelledby="max_length">
diff --git a/netbox/templates/ipam/rir.html b/netbox/templates/ipam/rir.html
index 1cffc86f6..ab9f70b5b 100644
--- a/netbox/templates/ipam/rir.html
+++ b/netbox/templates/ipam/rir.html
@@ -6,7 +6,7 @@
 
 {% block extra_controls %}
   {% if perms.ipam.add_aggregate %}
-    <a href="{% url 'ipam:aggregate_add' %}?rir={{ object.pk }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'ipam:aggregate_add' %}?rir={{ object.pk }}" class="btn btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Aggregate" %}
     </a>
   {% endif %}
diff --git a/netbox/templates/ipam/role.html b/netbox/templates/ipam/role.html
index fb96d0fc3..cba9e2db5 100644
--- a/netbox/templates/ipam/role.html
+++ b/netbox/templates/ipam/role.html
@@ -6,7 +6,7 @@
 
 {% block extra_controls %}
   {% if perms.ipam.add_prefix %}
-    <a href="{% url 'ipam:prefix_add' %}?role={{ object.pk }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'ipam:prefix_add' %}?role={{ object.pk }}" class="btn btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Prefix" %}
     </a>
   {% endif %}
diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html
index a5ed9d643..fa7cf2564 100644
--- a/netbox/templates/ipam/vlan.html
+++ b/netbox/templates/ipam/vlan.html
@@ -91,7 +91,7 @@
           ></div>
           {% if perms.ipam.add_prefix %}
             <div class="card-footer text-end noprint">
-              <a href="{% url 'ipam:prefix_add' %}?{% if object.tenant %}tenant={{ object.tenant.pk }}&{% endif %}site={{ object.site.pk }}&vlan={{ object.pk }}" class="btn btn-primary btn-sm">
+              <a href="{% url 'ipam:prefix_add' %}?{% if object.tenant %}tenant={{ object.tenant.pk }}&{% endif %}site={{ object.site.pk }}&vlan={{ object.pk }}" class="btn btn-primary">
                 <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add a Prefix" %}
               </a>
             </div>
diff --git a/netbox/templates/ipam/vlangroup.html b/netbox/templates/ipam/vlangroup.html
index 2dfa229eb..4ea9062bc 100644
--- a/netbox/templates/ipam/vlangroup.html
+++ b/netbox/templates/ipam/vlangroup.html
@@ -14,7 +14,7 @@
 
 {% block extra_controls %}
   {% if perms.ipam.add_vlan %}
-    <a href="{% url 'ipam:vlan_add' %}?group={{ object.pk }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'ipam:vlan_add' %}?group={{ object.pk }}" class="btn btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add VLAN" %}
     </a>
   {% endif %}
diff --git a/netbox/templates/tenancy/contactgroup.html b/netbox/templates/tenancy/contactgroup.html
index cb97fa78e..e8f6a86a7 100644
--- a/netbox/templates/tenancy/contactgroup.html
+++ b/netbox/templates/tenancy/contactgroup.html
@@ -53,7 +53,7 @@
       ></div>
       {% if perms.tenancy.add_contactgroup %}
         <div class="card-footer text-end noprint">
-          <a href="{% url 'tenancy:contactgroup_add' %}?parent={{ object.pk }}" class="btn btn-sm btn-primary">
+          <a href="{% url 'tenancy:contactgroup_add' %}?parent={{ object.pk }}" class="btn btn-primary">
             <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Contact Group" %}
           </a>
         </div>
diff --git a/netbox/templates/tenancy/object_contacts.html b/netbox/templates/tenancy/object_contacts.html
index 6e4814d8e..4b78e53d3 100644
--- a/netbox/templates/tenancy/object_contacts.html
+++ b/netbox/templates/tenancy/object_contacts.html
@@ -5,7 +5,7 @@
 {% block extra_controls %}
   {% if perms.tenancy.add_contactassignment %}
     {% with viewname=object|viewname:"contacts" %}
-      <a href="{% url 'tenancy:contactassignment_add' %}?content_type={{ object|content_type_id }}&object_id={{ object.pk }}&return_url={% url viewname pk=object.pk %}" class="btn btn-primary btn-sm">
+      <a href="{% url 'tenancy:contactassignment_add' %}?content_type={{ object|content_type_id }}&object_id={{ object.pk }}&return_url={% url viewname pk=object.pk %}" class="btn btn-primary">
         <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add a contact" %}
       </a>
     {% endwith %}
diff --git a/netbox/templates/tenancy/tenantgroup.html b/netbox/templates/tenancy/tenantgroup.html
index afbc5509c..874c6912d 100644
--- a/netbox/templates/tenancy/tenantgroup.html
+++ b/netbox/templates/tenancy/tenantgroup.html
@@ -13,7 +13,7 @@
 
 {% block extra_controls %}
   {% if perms.tenancy.add_tenant %}
-    <a href="{% url 'tenancy:tenant_add' %}?group={{ object.pk }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'tenancy:tenant_add' %}?group={{ object.pk }}" class="btn btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Tenant" %}
     </a>
   {% endif %}
@@ -62,7 +62,7 @@
       ></div>
       {% if perms.tenancy.add_tenantgroup %}
         <div class="card-footer text-end noprint">
-          <a href="{% url 'tenancy:tenantgroup_add' %}?parent={{ object.pk }}" class="btn btn-sm btn-primary">
+          <a href="{% url 'tenancy:tenantgroup_add' %}?parent={{ object.pk }}" class="btn btn-primary">
             <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Tenant Group" %}
           </a>
         </div>
diff --git a/netbox/templates/virtualization/cluster/base.html b/netbox/templates/virtualization/cluster/base.html
index 72fa0d02e..e83a7fc58 100644
--- a/netbox/templates/virtualization/cluster/base.html
+++ b/netbox/templates/virtualization/cluster/base.html
@@ -14,13 +14,13 @@
 
 {% block extra_controls %}
   {% if perms.virtualization.change_cluster and perms.virtualization.add_virtualmachine %}
-    <a href="{% url 'virtualization:virtualmachine_add' %}?cluster={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'virtualization:virtualmachine_add' %}?cluster={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Virtual Machine" %}
     </a>
   {% endif %}
 
   {% if perms.virtualization.change_cluster %}
-    <a href="{% url 'virtualization:cluster_add_devices' pk=object.pk %}?site={{ object.site.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
+    <a href="{% url 'virtualization:cluster_add_devices' pk=object.pk %}?site={{ object.site.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Assign Device" %}
     </a>
   {% endif %}
diff --git a/netbox/templates/virtualization/cluster/devices.html b/netbox/templates/virtualization/cluster/devices.html
index caf0af0de..6f8082020 100644
--- a/netbox/templates/virtualization/cluster/devices.html
+++ b/netbox/templates/virtualization/cluster/devices.html
@@ -6,7 +6,7 @@
     {% if 'bulk_remove_devices' in actions %}
         <button type="submit" name="_remove"
                 formaction="{% url 'virtualization:cluster_remove_devices' pk=object.pk %}?return_url={{ return_url }}"
-                class="btn btn-danger btn-sm">
+                class="btn btn-danger">
             <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> {% trans "Remove Selected" %}
         </button>
     {% endif %}
diff --git a/netbox/templates/virtualization/clustergroup.html b/netbox/templates/virtualization/clustergroup.html
index d99eb5011..3571a20ea 100644
--- a/netbox/templates/virtualization/clustergroup.html
+++ b/netbox/templates/virtualization/clustergroup.html
@@ -6,7 +6,7 @@
 
 {% block extra_controls %}
   {% if perms.virtualization.add_cluster %}
-    <a href="{% url 'virtualization:cluster_add' %}?group={{ object.pk }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'virtualization:cluster_add' %}?group={{ object.pk }}" class="btn btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Cluster" %}
     </a>
   {% endif %}
diff --git a/netbox/templates/virtualization/clustertype.html b/netbox/templates/virtualization/clustertype.html
index d32c474f5..e56cde8b7 100644
--- a/netbox/templates/virtualization/clustertype.html
+++ b/netbox/templates/virtualization/clustertype.html
@@ -6,7 +6,7 @@
 
 {% block extra_controls %}
   {% if perms.virtualization.add_cluster %}
-    <a href="{% url 'virtualization:cluster_add' %}?type={{ object.pk }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'virtualization:cluster_add' %}?type={{ object.pk }}" class="btn btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Cluster" %}
     </a>
   {% endif %}
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index 873f18158..128d03c33 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -161,7 +161,7 @@
           ></div>
           {% if perms.ipam.add_service %}
             <div class="card-footer text-end noprint">
-              <a href="{% url 'ipam:service_add' %}?virtual_machine={{ object.pk }}" class="btn btn-sm btn-primary">
+              <a href="{% url 'ipam:service_add' %}?virtual_machine={{ object.pk }}" class="btn btn-primary">
                 <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add a service" %}
               </a>
             </div>
@@ -181,7 +181,7 @@
       ></div>
       {% if perms.virtualization.add_virtualdisk %}
         <div class="card-footer text-end noprint">
-          <a href="{% url 'virtualization:virtualdisk_add' %}?device={{ object.device.pk }}&virtual_machine={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-primary">
+          <a href="{% url 'virtualization:virtualdisk_add' %}?device={{ object.device.pk }}&virtual_machine={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
             <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Virtual Disk" %}
           </a>
         </div>
diff --git a/netbox/templates/virtualization/virtualmachine/base.html b/netbox/templates/virtualization/virtualmachine/base.html
index a147ef944..610af6fb9 100644
--- a/netbox/templates/virtualization/virtualmachine/base.html
+++ b/netbox/templates/virtualization/virtualmachine/base.html
@@ -18,7 +18,7 @@
 {% block extra_controls %}
 
   <div class="dropdown">
-      <button id="add-components" type="button" class="btn btn-sm btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+      <button id="add-components" type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
           <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Components" %}
       </button>
       <ul class="dropdown-menu" aria-labeled-by="add-components">
diff --git a/netbox/templates/virtualization/virtualmachine/interfaces.html b/netbox/templates/virtualization/virtualmachine/interfaces.html
index b68872da8..94bdbacae 100644
--- a/netbox/templates/virtualization/virtualmachine/interfaces.html
+++ b/netbox/templates/virtualization/virtualmachine/interfaces.html
@@ -7,7 +7,7 @@
     {% if 'bulk_rename' in actions %}
         <button type="submit" name="_rename"
                 formaction="{% url 'virtualization:vminterface_bulk_rename' %}?return_url={{ return_url }}"
-                class="btn btn-outline-warning btn-sm">
+                class="btn btn-outline-warning">
             <i class="mdi mdi-pencil-outline" aria-hidden="true"></i> {% trans "Rename" %}
         </button>
     {% endif %}
diff --git a/netbox/templates/virtualization/virtualmachine/render_config.html b/netbox/templates/virtualization/virtualmachine/render_config.html
index 7b638199b..6d14b5e6d 100644
--- a/netbox/templates/virtualization/virtualmachine/render_config.html
+++ b/netbox/templates/virtualization/virtualmachine/render_config.html
@@ -53,7 +53,7 @@
       <div class="card">
         <div class="card-header">
           <div class="float-end">
-            <a href="?export=True" class="btn btn-sm btn-primary" role="button">
+            <a href="?export=True" class="btn btn-primary" role="button">
               <i class="mdi mdi-download" aria-hidden="true"></i> {% trans "Download" %}
             </a>
           </div>
diff --git a/netbox/templates/virtualization/virtualmachine/virtual_disks.html b/netbox/templates/virtualization/virtualmachine/virtual_disks.html
index a947f9824..0d63a984b 100644
--- a/netbox/templates/virtualization/virtualmachine/virtual_disks.html
+++ b/netbox/templates/virtualization/virtualmachine/virtual_disks.html
@@ -7,7 +7,7 @@
     {% if 'bulk_rename' in actions %}
         <button type="submit" name="_rename"
                 formaction="{% url 'virtualization:virtualdisk_bulk_rename' %}?return_url={{ return_url }}"
-                class="btn btn-outline-warning btn-sm">
+                class="btn btn-outline-warning">
             <i class="mdi mdi-pencil-outline" aria-hidden="true"></i> {% trans "Rename" %}
         </button>
     {% endif %}
diff --git a/netbox/templates/virtualization/virtualmachine_list.html b/netbox/templates/virtualization/virtualmachine_list.html
index 8c5e81256..5eed1c6a4 100644
--- a/netbox/templates/virtualization/virtualmachine_list.html
+++ b/netbox/templates/virtualization/virtualmachine_list.html
@@ -4,7 +4,7 @@
 {% block bulk_buttons %}
   {% if perms.virtualization.change_virtualmachine %}
     <div class="dropdown">
-      <button type="button" class="btn btn-sm btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+      <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
         <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add Components" %}
       </button>
       <ul class="dropdown-menu">
diff --git a/netbox/templates/virtualization/vminterface.html b/netbox/templates/virtualization/vminterface.html
index cf22ddf89..db567e7e0 100644
--- a/netbox/templates/virtualization/vminterface.html
+++ b/netbox/templates/virtualization/vminterface.html
@@ -92,7 +92,7 @@
             ></div>
             {% if perms.ipam.add_ipaddress %}
                 <div class="card-footer text-end noprint">
-                    <a href="{% url 'ipam:ipaddress_add' %}?virtual_machine={{ object.virtual_machine.pk }}&vminterface={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-primary">
+                    <a href="{% url 'ipam:ipaddress_add' %}?virtual_machine={{ object.virtual_machine.pk }}&vminterface={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
                         <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add IP Address" %}
                     </a>
                 </div>
diff --git a/netbox/templates/vpn/ikepolicy.html b/netbox/templates/vpn/ikepolicy.html
index da116cfa2..7217aaf28 100644
--- a/netbox/templates/vpn/ikepolicy.html
+++ b/netbox/templates/vpn/ikepolicy.html
@@ -31,7 +31,7 @@
               <td>
                 <span id="secret" class="font-monospace" data-secret="{{ object.preshared_key }}">{{ object.preshared_key|placeholder }}</span>
                 {% if object.preshared_key %}
-                  <button type="button" class="btn btn-sm btn-primary toggle-secret float-end" data-bs-toggle="button">{% trans "Show Secret" %}</button>
+                  <button type="button" class="btn btn-primary toggle-secret float-end" data-bs-toggle="button">{% trans "Show Secret" %}</button>
                 {% endif %}
               </td>
             </tr>
diff --git a/netbox/templates/vpn/l2vpn.html b/netbox/templates/vpn/l2vpn.html
index 2176a537f..7cc747ed8 100644
--- a/netbox/templates/vpn/l2vpn.html
+++ b/netbox/templates/vpn/l2vpn.html
@@ -61,7 +61,7 @@
       ></div>
       {% if perms.vpn.add_l2vpntermination %}
         <div class="card-footer text-end noprint">
-          <a href="{% url 'vpn:l2vpntermination_add' %}?l2vpn={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm{% if not object.can_add_termination %} disabled" aria-disabled="true{% endif %}">
+          <a href="{% url 'vpn:l2vpntermination_add' %}?l2vpn={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary{% if not object.can_add_termination %} disabled" aria-disabled="true{% endif %}">
             <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add a Termination" %}
           </a>
         </div>
diff --git a/netbox/templates/vpn/tunnel.html b/netbox/templates/vpn/tunnel.html
index d1607bd95..d8a831722 100644
--- a/netbox/templates/vpn/tunnel.html
+++ b/netbox/templates/vpn/tunnel.html
@@ -5,7 +5,7 @@
 
 {% block extra_controls %}
   {% if perms.vpn.add_tunneltermination %}
-    <a href="{% url 'vpn:tunneltermination_add' %}?tunnel={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'vpn:tunneltermination_add' %}?tunnel={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
       <i class="mdi mdi-plus-thick"></i> {% trans "Add Termination" %}
     </a>
   {% endif %}
@@ -77,7 +77,7 @@
         ></div>
         {% if perms.vpn.add_tunneltermination %}
           <div class="card-footer text-end noprint">
-            <a href="{% url 'vpn:tunneltermination_add' %}?tunnel={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
+            <a href="{% url 'vpn:tunneltermination_add' %}?tunnel={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary">
               <i class="mdi mdi-plus-thick" aria-hidden="true"></i> {% trans "Add a Termination" %}
             </a>
           </div>
diff --git a/netbox/templates/vpn/tunnelgroup.html b/netbox/templates/vpn/tunnelgroup.html
index 3afea48c4..3eac913bf 100644
--- a/netbox/templates/vpn/tunnelgroup.html
+++ b/netbox/templates/vpn/tunnelgroup.html
@@ -10,7 +10,7 @@
 
 {% block extra_controls %}
   {% if perms.vpn.add_tunnel %}
-    <a href="{% url 'vpn:tunnel_add' %}?group={{ object.pk }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'vpn:tunnel_add' %}?group={{ object.pk }}" class="btn btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Tunnel" %}
     </a>
   {% endif %}
diff --git a/netbox/templates/wireless/inc/authentication_attrs.html b/netbox/templates/wireless/inc/authentication_attrs.html
index c58518f95..683e7978a 100644
--- a/netbox/templates/wireless/inc/authentication_attrs.html
+++ b/netbox/templates/wireless/inc/authentication_attrs.html
@@ -18,7 +18,7 @@
           <td>
             <span id="secret" class="font-monospace" data-secret="{{ object.auth_psk }}">{{ object.auth_psk|placeholder }}</span>
             {% if object.auth_psk %}
-            <button type="button" class="btn btn-sm btn-primary toggle-secret float-end" data-bs-toggle="button">{% trans "Show Secret" %}</button>
+            <button type="button" class="btn btn-primary toggle-secret float-end" data-bs-toggle="button">{% trans "Show Secret" %}</button>
             {% endif %}
           </td>
       </tr>
diff --git a/netbox/templates/wireless/wirelesslangroup.html b/netbox/templates/wireless/wirelesslangroup.html
index 135064fd0..095ec9fc8 100644
--- a/netbox/templates/wireless/wirelesslangroup.html
+++ b/netbox/templates/wireless/wirelesslangroup.html
@@ -13,7 +13,7 @@
 
 {% block extra_controls %}
   {% if perms.wireless.add_wirelesslan %}
-    <a href="{% url 'wireless:wirelesslan_add' %}?group={{ object.pk }}" class="btn btn-sm btn-primary">
+    <a href="{% url 'wireless:wirelesslan_add' %}?group={{ object.pk }}" class="btn btn-primary">
       <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Wireless LAN" %}
     </a>
   {% endif %}
@@ -60,7 +60,7 @@
       ></div>
       {% if perms.wireless.add_wirelesslangroup %}
         <div class="card-footer text-end noprint">
-          <a href="{% url 'wireless:wirelesslangroup_add' %}?parent={{ object.pk }}" class="btn btn-sm btn-primary">
+          <a href="{% url 'wireless:wirelesslangroup_add' %}?parent={{ object.pk }}" class="btn btn-primary">
             <span class="mdi mdi-plus-thick" aria-hidden="true"></span> {% trans "Add Wireless LAN Group" %}
           </a>
         </div>