diff --git a/netbox/templates/dcim/device/consoleports.html b/netbox/templates/dcim/device/consoleports.html
index 1fcc347b5..7422c878a 100644
--- a/netbox/templates/dcim/device/consoleports.html
+++ b/netbox/templates/dcim/device/consoleports.html
@@ -6,11 +6,7 @@
 {% block content %}
   <form method="post">
     {% csrf_token %}
-    <div class="float-end noprint">
-      {% if request.user.is_authenticated %}
-        <button type="button" class="btn btn-outline-dark btn-sm" data-bs-toggle="modal" data-bs-target="#DeviceConsolePortTable_config" title="Configure table"><i class="mdi mdi-cog"></i> Configure</button>
-      {% endif %}
-    </div>
+    {% include 'inc/table_controls.html' with table_modal="DeviceConsolePortTable_config" %}
     {% render_table consoleport_table 'inc/table.html' %}
     <div class="noprint">
         {% if perms.dcim.change_consoleport %}
diff --git a/netbox/templates/dcim/device/consoleserverports.html b/netbox/templates/dcim/device/consoleserverports.html
index 17a2f897e..2e690e978 100644
--- a/netbox/templates/dcim/device/consoleserverports.html
+++ b/netbox/templates/dcim/device/consoleserverports.html
@@ -6,11 +6,7 @@
 {% block content %}
   <form method="post">
     {% csrf_token %}
-    <div class="float-end noprint">
-      {% if request.user.is_authenticated %}
-        <button type="button" class="btn btn-outline-dark btn-sm" data-bs-toggle="modal" data-bs-target="#DeviceConsoleServerPortTable_config" title="Configure table"><i class="mdi mdi-cog"></i> Configure</button>
-      {% endif %}
-    </div>
+    {% include 'inc/table_controls.html' with table_modal="DeviceConsoleServerPortTable_config" %}
     {% render_table consoleserverport_table 'inc/table.html' %}
     <div class="noprint">
         {% if perms.dcim.change_consoleserverport %}
diff --git a/netbox/templates/dcim/device/devicebays.html b/netbox/templates/dcim/device/devicebays.html
index ddcac4b06..1a06cb830 100644
--- a/netbox/templates/dcim/device/devicebays.html
+++ b/netbox/templates/dcim/device/devicebays.html
@@ -6,11 +6,7 @@
 {% block content %}
   <form method="post">
     {% csrf_token %}
-    <div class="float-end noprint">
-      {% if request.user.is_authenticated %}
-        <button type="button" class="btn btn-outline-dark btn-sm" data-bs-toggle="modal" data-bs-target="#DeviceDeviceBayTable_config" title="Configure table"><i class="mdi mdi-cog"></i> Configure</button>
-      {% endif %}
-    </div>
+    {% include 'inc/table_controls.html' with table_modal="DeviceDeviceBayTable_config" %}
     {% render_table devicebay_table 'inc/table.html' %}
     <div class="noprint">
         {% if perms.dcim.change_devicebay %}
diff --git a/netbox/templates/dcim/device/frontports.html b/netbox/templates/dcim/device/frontports.html
index 9b6f89800..cfbe03863 100644
--- a/netbox/templates/dcim/device/frontports.html
+++ b/netbox/templates/dcim/device/frontports.html
@@ -6,11 +6,7 @@
 {% block content %}
   <form method="post">
     {% csrf_token %}
-    <div class="float-end noprint">
-      {% if request.user.is_authenticated %}
-        <button type="button" class="btn btn-outline-dark btn-sm" data-bs-toggle="modal" data-bs-target="#DeviceFrontPortTable_config" title="Configure table"><i class="mdi mdi-cog"></i> Configure</button>
-      {% endif %}
-    </div>
+    {% include 'inc/table_controls.html' with table_modal="DeviceFrontPortTable_config" %}
     {% render_table frontport_table 'inc/table.html' %}
     <div class="noprint">
         {% if perms.dcim.change_frontport %}
diff --git a/netbox/templates/dcim/device/interfaces.html b/netbox/templates/dcim/device/interfaces.html
index 8ab18436e..002d2cd63 100644
--- a/netbox/templates/dcim/device/interfaces.html
+++ b/netbox/templates/dcim/device/interfaces.html
@@ -6,26 +6,32 @@
 {% block content %}
   <form method="post">
     {% csrf_token %}
-    <div class="float-end col-md-4 noprint table-controls mw-33">
-        <div class="input-group input-group-sm">
-            <input type="text" class="form-control interface-filter" placeholder="Filter" title="Filter text (regular expressions supported)" />
-            <button class="btn btn-sm btn-outline-dark dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-                <i class="mdi mdi-table-cog"></i>
-            </button>
-            <ul class="dropdown-menu">
+    <div class="row mb-3 justify-content-between">
+        <div class="col col-md-2 float-end noprint table-controls mb-0 mw-33">
+            <div class="input-group input-group-sm">
                 {% if request.user.is_authenticated %}
                     <button
                         type="button"
-                        class="dropdown-item"
+                        class="btn btn-sm btn-outline-dark"
                         data-bs-toggle="modal"
                         data-bs-target="#DeviceInterfaceTable_config"
                         title="Configure Table">
-                        Configure Table
+                        <i class="mdi mdi-cog"></i> Configure Table
                     </button>
-                {% endif %}
-                <button type="button" class="dropdown-item toggle-enabled" data-state="show">Hide Enabled</button>
-                <button type="button" class="dropdown-item toggle-disabled" data-state="show">Hide Disabled</button>
-            </ul>
+                    {% endif %}
+                <button class="btn btn-sm btn-outline-dark dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+                    <i class="mdi mdi-eye"></i>
+                </button>
+                <ul class="dropdown-menu">
+                    <button type="button" class="dropdown-item toggle-enabled" data-state="show">Hide Enabled</button>
+                    <button type="button" class="dropdown-item toggle-disabled" data-state="show">Hide Disabled</button>
+                </ul>
+            </div>
+        </div>
+        <div class="col col-md-4 float-end noprint table-controls mw-33">
+            <div class="input-group input-group-sm">
+                <input type="text" class="form-control interface-filter" placeholder="Filter" title="Filter text (regular expressions supported)" />
+            </div>
         </div>
     </div>
     {% render_table interface_table 'inc/table.html' %}
diff --git a/netbox/templates/dcim/device/inventory.html b/netbox/templates/dcim/device/inventory.html
index b97131f17..fff2875d5 100644
--- a/netbox/templates/dcim/device/inventory.html
+++ b/netbox/templates/dcim/device/inventory.html
@@ -6,11 +6,7 @@
 {% block content %}
   <form method="post">
     {% csrf_token %}
-    <div class="float-end noprint">
-      {% if request.user.is_authenticated %}
-        <button type="button" class="btn btn-outline-dark btn-sm" data-bs-toggle="modal" data-bs-target="#DeviceInventoryItemTable_config" title="Configure table"><i class="mdi mdi-cog"></i> Configure</button>
-      {% endif %}
-    </div>
+    {% include 'inc/table_controls.html' with table_modal="DeviceInventoryItemTable_config" %}
     {% render_table inventoryitem_table 'inc/table.html' %}
     <div class="noprint">
         {% if perms.dcim.change_inventoryitem %}
diff --git a/netbox/templates/dcim/device/poweroutlets.html b/netbox/templates/dcim/device/poweroutlets.html
index 476c86b8e..b86b44f10 100644
--- a/netbox/templates/dcim/device/poweroutlets.html
+++ b/netbox/templates/dcim/device/poweroutlets.html
@@ -6,11 +6,7 @@
 {% block content %}
   <form method="post">
     {% csrf_token %}
-    <div class="float-end noprint">
-      {% if request.user.is_authenticated %}
-        <button type="button" class="btn btn-outline-dark btn-sm" data-bs-toggle="modal" data-bs-target="#DevicePowerOutletTable_config" title="Configure table"><i class="mdi mdi-cog"></i> Configure</button>
-      {% endif %}
-    </div>
+    {% include 'inc/table_controls.html' with table_modal="DevicePowerOutletTable_config" %}
     {% render_table poweroutlet_table 'inc/table.html' %}
     <div class="noprint">
         {% if perms.dcim.change_powerport %}
diff --git a/netbox/templates/dcim/device/powerports.html b/netbox/templates/dcim/device/powerports.html
index 4d25ad306..7c0dae0fe 100644
--- a/netbox/templates/dcim/device/powerports.html
+++ b/netbox/templates/dcim/device/powerports.html
@@ -6,11 +6,7 @@
 {% block content %}
   <form method="post">
     {% csrf_token %}
-    <div class="float-end noprint">
-      {% if request.user.is_authenticated %}
-        <button type="button" class="btn btn-outline-dark btn-sm" data-bs-toggle="modal" data-bs-target="#DevicePowerPortTable_config" title="Configure table"><i class="mdi mdi-cog"></i> Configure</button>
-      {% endif %}
-    </div>
+    {% include 'inc/table_controls.html' with table_modal="DevicePowerPortTable_config" %}
     {% render_table powerport_table 'inc/table.html' %}
     <div class="noprint">
         {% if perms.dcim.change_powerport %}
diff --git a/netbox/templates/dcim/device/rearports.html b/netbox/templates/dcim/device/rearports.html
index 0e9260199..f76f7e66b 100644
--- a/netbox/templates/dcim/device/rearports.html
+++ b/netbox/templates/dcim/device/rearports.html
@@ -6,11 +6,7 @@
 {% block content %}
   <form method="post">
     {% csrf_token %}
-    <div class="float-end noprint">
-      {% if request.user.is_authenticated %}
-        <button type="button" class="btn btn-outline-dark btn-sm" data-bs-toggle="modal" data-bs-target="#DeviceRearPortTable_config" title="Configure table"><i class="mdi mdi-cog"></i> Configure</button>
-      {% endif %}
-    </div>
+    {% include 'inc/table_controls.html' with table_modal="DeviceRearPortTable_config" %}
     {% render_table rearport_table 'inc/table.html' %}
     <div class="noprint">
         {% if perms.dcim.change_rearport %}
diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 7b837dd23..72f79d764 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -58,27 +58,7 @@
 {% endif %}
 
 {# Object list filter, table config #}
-<div class="row mb-3">
-  <div class="col col-md-4 offset-md-8 d-flex noprint table-controls">
-    <div class="input-group input-group-sm">
-      <input type="text" class="form-control object-filter" placeholder="Filter" title="Filter text (regular expressions supported)" />
-      {% if request.user.is_authenticated and table_config_form %}
-        <button type="button" class="btn btn-outline-dark btn-sm" data-bs-toggle="modal" data-bs-target="#ObjectTable_config" title="Configure Table">
-          <i class="mdi mdi-table-eye"></i>
-        </button>
-      {% endif %}
-      {% if filter_form %}
-      <button
-        type="button"
-        class="btn btn-sm btn-outline-dark"
-        data-bs-toggle="collapse"
-        data-bs-target="#advanced-search-content">
-        Advanced Search
-      </button>
-    {% endif %}
-    </div>
-  </div>
-</div>
+{% include 'inc/table_controls.html' with table_modal="ObjectTable_config" %}
 
 {# Object table #}
 <div class="row">
diff --git a/netbox/templates/inc/table_controls.html b/netbox/templates/inc/table_controls.html
new file mode 100644
index 000000000..39b8a6510
--- /dev/null
+++ b/netbox/templates/inc/table_controls.html
@@ -0,0 +1,37 @@
+<div class="row mb-3 justify-content-between">
+    <div class="col col-md-2 mb-0 d-flex noprint table-controls">
+        {% if request.user.is_authenticated %}
+            <div class="input-group input-group-sm">
+                <button
+                    type="button"
+                    data-bs-toggle="modal"
+                    title="Configure Table"
+                    data-bs-target="#{{ table_modal }}"
+                    class="btn btn-sm btn-outline-dark"
+                    >
+                    <i class="mdi mdi-cog"></i> Configure Table
+                </button>
+            </div>
+        {% endif %}
+    </div>
+    <div class="col col-md-4 d-flex noprint table-controls">
+        <div class="input-group input-group-sm">
+            <input
+                type="text"
+                class="form-control object-filter"
+                placeholder="Filter"
+                title="Filter text (regular expressions supported)"
+            />
+            {% if filter_form %}
+                <button
+                    type="button"
+                    class="btn btn-sm btn-outline-dark"
+                    data-bs-toggle="collapse"
+                    data-bs-target="#advanced-search-content"
+                >
+                    Advanced Search
+                </button>
+            {% endif %}
+        </div>
+    </div>
+</div>
diff --git a/netbox/templates/virtualization/virtualmachine/interfaces.html b/netbox/templates/virtualization/virtualmachine/interfaces.html
index 0a793f8a6..496b0a8a6 100644
--- a/netbox/templates/virtualization/virtualmachine/interfaces.html
+++ b/netbox/templates/virtualization/virtualmachine/interfaces.html
@@ -6,14 +6,7 @@
 {% block content %}
   <form method="post">
     {% csrf_token %}
-    <div class="float-end col-md-4 noprint table-controls mw-33">
-        <div class="input-group input-group-sm">
-            <input type="text" class="form-control interface-filter" placeholder="Filter" title="Filter text (regular expressions supported)" />
-            {% if request.user.is_authenticated %}
-                <button type="button" class="btn btn-outline-dark btn-sm" data-bs-toggle="modal" data-bs-target="#VirtualMachineVMInterfaceTable_config" title="Configure Table"><i class="mdi mdi-table-eye"></i></button>
-            {% endif %}
-        </div>
-    </div>
+    {% include 'inc/table_controls.html' with table_modal="VirtualMachineVMInterfaceTable_config" %}
     {% render_table interface_table 'inc/table.html' %}
     <div class="noprint">
         {% if perms.virtualization.change_vminterface %}