diff --git a/netbox/templates/circuits/inc/circuit_termination.html b/netbox/templates/circuits/inc/circuit_termination.html
index eafaba57d..6c28ba252 100644
--- a/netbox/templates/circuits/inc/circuit_termination.html
+++ b/netbox/templates/circuits/inc/circuit_termination.html
@@ -2,29 +2,29 @@
 {% load i18n %}
 
 <div class="card">
-    <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-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-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-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-danger lh-1">
-                    <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> {% trans "Delete" %}
-                </a>
-            {% endif %}
-        </div>
-        <h5>{% blocktrans %}Termination {{ side }}{% endblocktrans %}</h5>
-    </div>
+    <h5 class="card-header d-flex justify-content-between">
+      {% blocktrans %}Termination{% endblocktrans %} {{ side }}
+      <div>
+        {% 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-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-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-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-danger lh-1">
+                <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> {% trans "Delete" %}
+            </a>
+        {% endif %}
+      </div>
+    </h5>
     <div class="card-body">
       {% if termination %}
         <table class="table table-hover attr-table">
@@ -59,7 +59,7 @@
                       <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">
+                      <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 lh-1">
                         <i class="mdi mdi-ethernet-cable" aria-hidden="true"></i> {% trans "Edit" %}
                       </a>
                     {% endif %}
diff --git a/netbox/templates/dcim/device/render_config.html b/netbox/templates/dcim/device/render_config.html
index 759fc7177..5b545c125 100644
--- a/netbox/templates/dcim/device/render_config.html
+++ b/netbox/templates/dcim/device/render_config.html
@@ -51,14 +51,12 @@
   <div class="row">
     <div class="col">
       <div class="card">
-        <div class="card-header">
-          <div class="float-end">
-            <a href="?export=True" class="btn btn-primary" role="button">
+        <h5 class="card-header d-flex justify-content-between">
+          {% trans "Rendered Config" %}
+            <a href="?export=True" class="btn btn-primary lh-1" role="button">
               <i class="mdi mdi-download" aria-hidden="true"></i> {% trans "Download" %}
             </a>
-          </div>
-          <h5>{% trans "Rendered Config" %}</h5>
-        </div>
+        </h5>
         {% if config_template %}
           <pre class="card-body">{{ rendered_config }}</pre>
         {% else %}
diff --git a/netbox/templates/extras/objectchange.html b/netbox/templates/extras/objectchange.html
index 63f2019ae..4cc0cb481 100644
--- a/netbox/templates/extras/objectchange.html
+++ b/netbox/templates/extras/objectchange.html
@@ -80,17 +80,17 @@
     </div>
     <div class="col col-md-7">
         <div class="card">
-            <div class="card-header">
-                <h5 class="d-inline">{% trans "Difference" %}</h5>
-                <div class="btn-group btn-group-sm float-end noprint">
-                    <a {% if prev_change %}href="{% url 'extras:objectchange' pk=prev_change.pk %}"{% else %}disabled{% endif %} class="btn btn-outline-secondary">
-                        <i class="mdi mdi-chevron-left" aria-hidden="true"></i> {% trans "Previous" %}
-                    </a>
-                    <a {% if next_change %}href="{% url 'extras:objectchange' pk=next_change.pk %}"{% else %}disabled{% endif %} class="btn btn-outline-secondary">
-                        {% trans "Next" %} <i class="mdi mdi-chevron-right" aria-hidden="true"></i>
-                    </a>
-                </div>
-            </div>
+            <h5 class="card-header d-flex justify-content-between">
+              {% trans "Difference" %}
+              <div class="btn-group btn-group-sm d-print-none">
+                <a {% if prev_change %}href="{% url 'extras:objectchange' pk=prev_change.pk %}"{% else %}disabled{% endif %} class="btn btn-outline-secondary">
+                  <i class="mdi mdi-chevron-left" aria-hidden="true"></i> {% trans "Previous" %}
+                </a>
+                <a {% if next_change %}href="{% url 'extras:objectchange' pk=next_change.pk %}"{% else %}disabled{% endif %} class="btn btn-outline-secondary">
+                  {% trans "Next" %} <i class="mdi mdi-chevron-right" aria-hidden="true"></i>
+                </a>
+              </div>
+            </h5>
             <div class="card-body">
                 {% if diff_added == diff_removed %}
                     <span class="text-muted" style="margin-left: 10px;">
diff --git a/netbox/templates/virtualization/virtualmachine/render_config.html b/netbox/templates/virtualization/virtualmachine/render_config.html
index 6d14b5e6d..e1ff26d0a 100644
--- a/netbox/templates/virtualization/virtualmachine/render_config.html
+++ b/netbox/templates/virtualization/virtualmachine/render_config.html
@@ -51,14 +51,12 @@
   <div class="row">
     <div class="col">
       <div class="card">
-        <div class="card-header">
-          <div class="float-end">
-            <a href="?export=True" class="btn btn-primary" role="button">
+        <h5 class="card-header d-flex justify-content-between">
+          {% trans "Rendered Config" %}
+            <a href="?export=True" class="btn btn-primary lh-1" role="button">
               <i class="mdi mdi-download" aria-hidden="true"></i> {% trans "Download" %}
             </a>
-          </div>
-          <h5>{% trans "Rendered Config" %}</h5>
-        </div>
+        </h5>
         {% if config_template %}
           <pre class="card-body">{{ rendered_config }}</pre>
         {% else %}