diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index 6de52c354..69fe83213 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/custom/_misc.scss b/netbox/project-static/styles/custom/_misc.scss
index 623c5f844..8461e71ed 100644
--- a/netbox/project-static/styles/custom/_misc.scss
+++ b/netbox/project-static/styles/custom/_misc.scss
@@ -39,5 +39,11 @@ span.color-label {
   position: sticky;
   bottom: 0px;
   z-index: 1;
-  padding: 2px 0px 10px 0px;
+  float: right;
+  padding: 0 0 10px;
+}
+
+// Override a transparent background
+.btn-float {
+  --tblr-btn-bg: var(--#{$prefix}bg-surface-tertiary) !important;
 }
diff --git a/netbox/project-static/styles/overrides/_tabler.scss b/netbox/project-static/styles/overrides/_tabler.scss
index 9899d2dd0..252da8f4a 100644
--- a/netbox/project-static/styles/overrides/_tabler.scss
+++ b/netbox/project-static/styles/overrides/_tabler.scss
@@ -52,7 +52,7 @@ pre {
 }
 
 // Altering background colors
-.page, .page-tabs .nav-tabs .nav-link.active, .btn-float-group {
+.page, .page-tabs .nav-tabs .nav-link.active {
   background-color: var(--#{$prefix}bg-surface-tertiary) !important;
 }
 .page-body .card .card-header {
@@ -105,7 +105,7 @@ body[data-bs-theme=dark] {
   .navbar, .page-header {
     background-color: $rich-black;
   }
-  .page, .page-tabs .nav-tabs .nav-link.active, .btn-float-group {
+  .page, .page-tabs .nav-tabs .nav-link.active {
     background-color: $rich-black-light !important;
   }
 
diff --git a/netbox/templates/generic/bulk_edit.html b/netbox/templates/generic/bulk_edit.html
index dc82bdb8c..5e5e8ec62 100644
--- a/netbox/templates/generic/bulk_edit.html
+++ b/netbox/templates/generic/bulk_edit.html
@@ -102,8 +102,8 @@ Context:
 
       {% endif %}
 
-      <div class="text-end btn-float-group">
-        <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
+      <div class="btn-float-group">
+        <a href="{{ return_url }}" class="btn btn-outline-secondary btn-float">{% trans "Cancel" %}</a>
         <button type="submit" name="_apply" class="btn btn-primary">{% trans "Apply" %}</button>
       </div>
 
diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html
index 1eaf68291..923b04aac 100644
--- a/netbox/templates/generic/object_edit.html
+++ b/netbox/templates/generic/object_edit.html
@@ -67,9 +67,9 @@ Context:
         {% endblock form %}
       </div>
 
-      <div class="text-end my-3 btn-float-group">
+      <div class="btn-float-group">
         {% block buttons %}
-          <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>
+          <a href="{{ return_url }}" class="btn btn-outline-secondary btn-float">{% trans "Cancel" %}</a>
           {% if object.pk %}
             <button type="submit" name="_update" class="btn btn-primary">
               {% trans "Save" %}
@@ -79,7 +79,7 @@ Context:
               <button type="submit" name="_create" class="btn btn-primary">
                 {% trans "Create" %}
               </button>
-              <button type="submit" name="_addanother" class="btn btn-outline-primary">
+              <button type="submit" name="_addanother" class="btn btn-outline-primary btn-float">
                 {% trans "Create & Add Another" %}
               </button>
             </div>
diff --git a/netbox/templates/inc/filter_list.html b/netbox/templates/inc/filter_list.html
index b5241b5ed..01f3fbb0e 100644
--- a/netbox/templates/inc/filter_list.html
+++ b/netbox/templates/inc/filter_list.html
@@ -37,13 +37,13 @@
         </div>
       {% endif %}
     </div>
-    <div class="card-footer text-end btn-float-group d-print-none border-0">
-      <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-primary m-1">
-        <i class="mdi mdi-magnify"></i> {% trans "Search" %}
-      </button>
-    </div>
+  </div>
+  <div class="btn-float-group me-1">
+    <button type="button" class="btn btn-outline-danger btn-float" data-reset-select>
+      <i class="mdi mdi-backspace"></i> {% trans "Reset" %}
+    </button>
+    <button type="submit" class="btn btn-primary">
+      <i class="mdi mdi-magnify"></i> {% trans "Search" %}
+    </button>
   </div>
 </form>