diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index d07eb73c7..664e218df 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/transitional/_tables.scss b/netbox/project-static/styles/transitional/_tables.scss
index dc9dfdb7a..31bb69b13 100644
--- a/netbox/project-static/styles/transitional/_tables.scss
+++ b/netbox/project-static/styles/transitional/_tables.scss
@@ -1,3 +1,14 @@
+// Object list tables
+table.object-list {
+
+  // Hide border of last row
+  tbody > tr:last-child > td {
+    border-bottom-width: 0;
+  }
+
+}
+
+// Object attribute tables
 table.attr-table {
 
   // Restyle row header
diff --git a/netbox/templates/inc/paginator.html b/netbox/templates/inc/paginator.html
index 1d122cf7a..0a9128034 100644
--- a/netbox/templates/inc/paginator.html
+++ b/netbox/templates/inc/paginator.html
@@ -1,115 +1,117 @@
 {% load helpers %}
 {% load i18n %}
 
-<div class="d-flex justify-content-between align-items-center p-2">
+{% if page %}
+  <div class="d-flex justify-content-between align-items-center border-top p-2">
 
-  {# Pages carousel #}
-  {% if paginator.num_pages > 1 %}
-    <nav aria-label="{% trans "Page selection" %}">
-      <ul class="pagination mb-0">
+    {# Pages carousel #}
+    {% if paginator.num_pages > 1 %}
+      <nav aria-label="{% trans "Page selection" %}">
+        <ul class="pagination mb-0">
 
-        {# Previous page #}
-        {% if page.has_previous %}
-          <li class="page-item">
-            {% if htmx %}
-              <a href="#"
-                hx-get="{{ table.htmx_url }}{% querystring request page=page.previous_page_number %}"
-                hx-target="closest .htmx-container"
-                {% if not table.embedded %}hx-push-url="true"{% endif %}
-                class="page-link"
-              >
-                <i class="mdi mdi-chevron-left"></i>
-              </a>
-            {% else %}
-              <a href="{% querystring request page=page.previous_page_number %}" class="page-link">
-                <i class="mdi mdi-chevron-left"></i>
-              </a>
-            {% endif %}
-          </li>
-        {% endif %}
-        {# /Previous page #}
+          {# Previous page #}
+          {% if page.has_previous %}
+            <li class="page-item">
+              {% if htmx %}
+                <a href="#"
+                  hx-get="{{ table.htmx_url }}{% querystring request page=page.previous_page_number %}"
+                  hx-target="closest .htmx-container"
+                  {% if not table.embedded %}hx-push-url="true"{% endif %}
+                  class="page-link"
+                >
+                  <i class="mdi mdi-chevron-left"></i>
+                </a>
+              {% else %}
+                <a href="{% querystring request page=page.previous_page_number %}" class="page-link">
+                  <i class="mdi mdi-chevron-left"></i>
+                </a>
+              {% endif %}
+            </li>
+          {% endif %}
+          {# /Previous page #}
 
-        {# Page numbers #}
-        {% for p in page.smart_pages %}
-          <li class="page-item{% if page.number == p %} active" aria-current="page{% endif %}">
-            {% if p and htmx %}
-              <a href="#"
-                hx-get="{{ table.htmx_url }}{% querystring request page=p %}"
-                hx-target="closest .htmx-container"
-                {% if not table.embedded %}hx-push-url="true"{% endif %}
-                class="page-link"
-              >
-                {{ p }}
-              </a>
-            {% elif p %}
-              <a href="{% querystring request page=p %}" class="btn btn-outline-secondary{% if page.number == p %} active{% endif %}">
-                {{ p }}
-              </a>
-            {% else %}
-              <span class="page-link" disabled>&hellip;</span>
-            {% endif %}
-          </li>
-        {% endfor %}
-        {# /Page numbers #}
-
-        {# Next page #}
-        {% if page.has_next %}
-          <li class="page-item">
-            {% if htmx %}
-              <a href="#"
-                hx-get="{{ table.htmx_url }}{% querystring request page=page.next_page_number %}"
-                hx-target="closest .htmx-container"
-                {% if not table.embedded %}hx-push-url="true"{% endif %}
-                class="page-link"
-              >
-                <i class="mdi mdi-chevron-right"></i>
-              </a>
-            {% else %}
-              <a href="{% querystring request page=page.next_page_number %}" class="page-link">
-                <i class="mdi mdi-chevron-right"></i>
-              </a>
-            {% endif %}
-          </li>
-        {% endif %}
-        {# /Next page #}
-
-      </ul>
-    </nav>
-  {% endif %}
-  {# /Pages carousel #}
-
-  {# Showing #}
-  <small class="text-end text-muted">
-    {% blocktrans trimmed with start=page.start_index end=page.end_index total=page.paginator.count %}
-      Showing {{ start }}-{{ end }} of {{ total }}
-    {% endblocktrans %}
-  </small>
-  {# /Showing #}
-
-  {# Pagination options #}
-  <nav class="text-end" aria-label="{% trans "Pagination options" %}">
-    {% if page %}
-      <div class="dropdown">
-        <button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown">
-          {% trans "Per Page" %}
-        </button>
-        <div class="dropdown-menu">
-          {% for n in page.paginator.get_page_lengths %}
-            {% if htmx %}
-              <a href="#"
-                hx-get="{{ table.htmx_url }}{% querystring request per_page=n %}"
-                hx-target="closest .htmx-container"
-                {% if not table.embedded %}hx-push-url="true"{% endif %}
-                class="dropdown-item"
-              >{{ n }}</a>
-            {% else %}
-              <a href="{% querystring request per_page=n %}" class="dropdown-item">{{ n }}</a>
-            {% endif %}
+          {# Page numbers #}
+          {% for p in page.smart_pages %}
+            <li class="page-item{% if page.number == p %} active" aria-current="page{% endif %}">
+              {% if p and htmx %}
+                <a href="#"
+                  hx-get="{{ table.htmx_url }}{% querystring request page=p %}"
+                  hx-target="closest .htmx-container"
+                  {% if not table.embedded %}hx-push-url="true"{% endif %}
+                  class="page-link"
+                >
+                  {{ p }}
+                </a>
+              {% elif p %}
+                <a href="{% querystring request page=p %}" class="btn btn-outline-secondary{% if page.number == p %} active{% endif %}">
+                  {{ p }}
+                </a>
+              {% else %}
+                <span class="page-link" disabled>&hellip;</span>
+              {% endif %}
+            </li>
           {% endfor %}
-        </div>
-      </div>
-    {% endif %}
-  </nav>
-  {# /Pagination options #}
+          {# /Page numbers #}
 
-</div>
+          {# Next page #}
+          {% if page.has_next %}
+            <li class="page-item">
+              {% if htmx %}
+                <a href="#"
+                  hx-get="{{ table.htmx_url }}{% querystring request page=page.next_page_number %}"
+                  hx-target="closest .htmx-container"
+                  {% if not table.embedded %}hx-push-url="true"{% endif %}
+                  class="page-link"
+                >
+                  <i class="mdi mdi-chevron-right"></i>
+                </a>
+              {% else %}
+                <a href="{% querystring request page=page.next_page_number %}" class="page-link">
+                  <i class="mdi mdi-chevron-right"></i>
+                </a>
+              {% endif %}
+            </li>
+          {% endif %}
+          {# /Next page #}
+
+        </ul>
+      </nav>
+    {% endif %}
+    {# /Pages carousel #}
+
+    {# Showing #}
+    <small class="text-end text-muted">
+      {% blocktrans trimmed with start=page.start_index end=page.end_index total=page.paginator.count %}
+        Showing {{ start }}-{{ end }} of {{ total }}
+      {% endblocktrans %}
+    </small>
+    {# /Showing #}
+
+    {# Pagination options #}
+    <nav class="text-end" aria-label="{% trans "Pagination options" %}">
+      {% if page %}
+        <div class="dropdown">
+          <button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown">
+            {% trans "Per Page" %}
+          </button>
+          <div class="dropdown-menu">
+            {% for n in page.paginator.get_page_lengths %}
+              {% if htmx %}
+                <a href="#"
+                  hx-get="{{ table.htmx_url }}{% querystring request per_page=n %}"
+                  hx-target="closest .htmx-container"
+                  {% if not table.embedded %}hx-push-url="true"{% endif %}
+                  class="dropdown-item"
+                >{{ n }}</a>
+              {% else %}
+                <a href="{% querystring request per_page=n %}" class="dropdown-item">{{ n }}</a>
+              {% endif %}
+            {% endfor %}
+          </div>
+        </div>
+      {% endif %}
+    </nav>
+    {# /Pagination options #}
+
+  </div>
+{% endif %}