diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index a150e1b3d..6fbdd0629 100644
Binary files a/netbox/project-static/dist/netbox-dark.css and b/netbox/project-static/dist/netbox-dark.css differ
diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index eda89d8fb..9ba27cc53 100644
Binary files a/netbox/project-static/dist/netbox-light.css and b/netbox/project-static/dist/netbox-light.css differ
diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index 43c39157b..b537ef81a 100644
Binary files a/netbox/project-static/dist/netbox-print.css and b/netbox/project-static/dist/netbox-print.css differ
diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index 46b252dea..7ccdf64d1 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -1044,7 +1044,7 @@ html {
 
 .sticky-bottom-content-p0 {
   background-color: $tab-content-bg;
-  bottom: 0.05em;
+  bottom: 0.01em;
   z-index: 900;
 }
 .sticky-bottom-content-p1 {
@@ -1055,7 +1055,7 @@ html {
 
 .sticky-bottom-table-p0 {
   background-color: var(--nbx-select-content-bg);
-  bottom: 0.05em;
+  bottom: 0.01em;
   z-index: 900;
 }
 .sticky-bottom-table-p1 {
@@ -1066,12 +1066,12 @@ html {
 
 .sticky-top-table-p0 {
   background-color: var(--nbx-select-content-bg);
-  top: 3.5em;
+  top: 3.3em;
   z-index: 900;
 }
 .sticky-top-table-p1 {
   background-color: var(--nbx-select-content-bg);
-  top: 5.3em;
+  top: 5.1em;
   z-index: 900;
 }
 
diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html
index af144c768..ae52f4ac5 100644
--- a/netbox/templates/generic/object_edit.html
+++ b/netbox/templates/generic/object_edit.html
@@ -98,7 +98,7 @@ Context:
           {% endif %}
 
         {% endblock form %}
-        <div class="text-end my-3 position-sticky sticky-bottom-content-p0">
+        <div class="text-end my-3 py-1 position-sticky sticky-bottom-content-p0">
           {% block buttons %}
             {% if object.pk %}
               <button type="submit" name="_update" class="btn btn-primary">
diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 32aefb04d..38cab5083 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -116,7 +116,7 @@ Context:
           </div>
 
           {# Form buttons #}
-          <div class="noprint bulk-buttons position-sticky sticky-bottom-content-p0">
+          <div class="noprint bulk-buttons py-1 position-sticky sticky-bottom-content-p0">
             <div class="bulk-button-group">
               {% block bulk_buttons %}
                 {% if 'bulk_edit' in actions %}
diff --git a/netbox/templates/htmx/table.html b/netbox/templates/htmx/table.html
index cf8850b5a..5247cf0b3 100644
--- a/netbox/templates/htmx/table.html
+++ b/netbox/templates/htmx/table.html
@@ -4,13 +4,13 @@
 
 {% with preferences|get_key:"pagination.placement" as paginator_placement %}
   {% if paginator_placement == 'top' or paginator_placement == 'both' %}
-    <div class="position-sticky sticky-top-table-p0">
+    <div class="position-sticky py-1 sticky-top-table-p0">
       {% include 'inc/paginator_htmx.html' with paginator=table.paginator page=table.page %}
     </div>
   {% endif %}
   {% render_table table 'inc/table_htmx.html' %}
   {% if paginator_placement != 'top' %}
-    <div class="position-sticky sticky-bottom-table-p1">
+    <div class="position-sticky py-1 sticky-bottom-table-p1">
       {% include 'inc/paginator_htmx.html' with paginator=table.paginator page=table.page %}
     </div>
   {% endif %}