diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 1195f6d99..e492fefc6 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -59,7 +59,7 @@ Context:
 
 {% block content %}
 
-    {# Object list #}
+    {# Object list tab #}
     <div class="tab-pane show active" id="object-list" role="tabpanel" aria-labelledby="object-list-tab">
 
       {# Applied filters #}
@@ -102,17 +102,18 @@ Context:
           {% csrf_token %}
           <input type="hidden" name="return_url" value="{% if return_url %}{{ return_url }}{% else %}{{ request.path }}{% if request.GET %}?{{ request.GET.urlencode }}{% endif %}{% endif %}" />
 
-          {# Object table #}
-
-              {% if prerequisite_model %}
-                {% include 'inc/missing_prerequisites.html' %}
-              {% endif %}
+          {# Warn of any missing prerequisite objects #}
+          {% if prerequisite_model %}
+            {% include 'inc/missing_prerequisites.html' %}
+          {% endif %}
 
+          {# Objects table #}
           <div class="card">
             <div class="htmx-container table-responsive" id="object_list">
               {% include 'htmx/table.html' %}
             </div>
           </div>
+          {# /Objects table #}
 
           {# Form buttons #}
           <div class="btn-list d-print-none mt-2">
@@ -125,17 +126,20 @@ Context:
               {% endif %}
             {% endblock %}
           </div>
+          {# /Form buttons #}
+
         </div>
       </form>
-
     </div>
+    {# /Object list tab #}
 
-    {# Filter form #}
+    {# Filters tab #}
     {% if filter_form %}
       <div class="tab-pane show" id="filters-form" role="tabpanel" aria-labelledby="filters-form-tab">
         {% include 'inc/filter_list.html' %}
       </div>
     {% endif %}
+    {# /Filters tab #}
 
 {% endblock content %}
 
diff --git a/netbox/templates/inc/filter_list.html b/netbox/templates/inc/filter_list.html
index 2a1676960..5a7a94dab 100644
--- a/netbox/templates/inc/filter_list.html
+++ b/netbox/templates/inc/filter_list.html
@@ -12,7 +12,9 @@
       {% for heading, fields in filter_form.fieldsets %}
         <div class="col col-12">
           {% if heading %}
-            <h6>{{ heading }}</h6>
+            <div class="hr-text">
+              <span>{{ heading }}</span>
+            </div>
           {% endif %}
           {% for name in fields %}
             {% with field=filter_form|get_item:name %}
@@ -20,9 +22,6 @@
             {% endwith %}
           {% endfor %}
         </div>
-        {% if not forloop.last %}
-          <hr class="card-divider mt-0" />
-        {% endif %}
       {% empty %}
         {# List all non-customfield filters as declared in the form class #}
         {% for field in filter_form.visible_fields %}
@@ -35,14 +34,16 @@
       {% endfor %}
       {% if filter_form.custom_fields %}
         {# List all custom field filters #}
-        <hr class="card-divider mt-0" />
-        {% for name in filter_form.custom_fields %}
-          <div class="col col-12">
+        <div class="col col-12">
+          <div class="hr-text">
+            <span>{% trans "Custom Fields" %}</span>
+          </div>
+          {% for name in filter_form.custom_fields %}
             {% with field=filter_form|get_item:name %}
               {% render_field field %}
             {% endwith %}
-          </div>
-        {% endfor %}
+          {% endfor %}
+        </div>
       {% endif %}
     </div>
     <div class="card-footer text-end noprint border-0">