diff --git a/netbox/templates/dcim/inc/devicetype_component_table.html b/netbox/templates/dcim/inc/devicetype_component_table.html
index dd79a668c..900e0f818 100644
--- a/netbox/templates/dcim/inc/devicetype_component_table.html
+++ b/netbox/templates/dcim/inc/devicetype_component_table.html
@@ -1,4 +1,6 @@
 {% load helpers %}
+{% load render_table from django_tables2 %}
+
 {% if perms.dcim.change_devicetype %}
     <form method="post">
         {% csrf_token %}
@@ -6,8 +8,8 @@
             <h5 class="card-header">
                 {{ title }}
             </h5>
-            <div class="card-body">
-                {% include 'inc/responsive_table.html' %}
+            <div class="card-body table-responsive">
+                {% render_table table 'inc/table.html' %}
             </div>
             <div class="card-footer noprint">
                 {% if table.rows %}
@@ -36,8 +38,8 @@
         <h5 class="card-header">
             {{ title }}
         </h5>
-        <div class="card-body">
-            {% include 'inc/responsive_table.html' %}
+        <div class="card-body table-responsive">
+            {% render_table table 'inc/table.html' %}
         </div>
     </div>
 {% endif %}
diff --git a/netbox/templates/home.html b/netbox/templates/home.html
index 3fbcc4f45..a2b09c8ae 100644
--- a/netbox/templates/home.html
+++ b/netbox/templates/home.html
@@ -71,8 +71,8 @@
               <i class="mdi mdi-clipboard-clock"></i>
               <span class="ms-1">Change Log</span>
             </h6>
-            <div class="card-body">
-              {% include 'inc/responsive_table.html' with table=changelog_table %}
+            <div class="card-body table-responsive">
+              {% render_table changelog_table 'inc/table.html' %}
             </div>
           </div>
         </div>
diff --git a/netbox/templates/import_success.html b/netbox/templates/import_success.html
index 6feb7dab5..122555b81 100644
--- a/netbox/templates/import_success.html
+++ b/netbox/templates/import_success.html
@@ -1,9 +1,12 @@
 {% extends 'base/layout.html' %}
+{% load render_table from django_tables2 %}
 
 {% block title %}Import Completed{% endblock %}
 
 {% block content %}
-    {% include 'inc/responsive_table.html' %}
+    <div class="table-responsive">
+        {% render_table table 'inc/table.html' %}
+    </div>
     {% if return_url %}
         <a href="{{ return_url }}" class="btn btn-outline-dark">View All</a>
     {% endif %}
diff --git a/netbox/templates/inc/responsive_table.html b/netbox/templates/inc/responsive_table.html
deleted file mode 100644
index a6aaf5a6f..000000000
--- a/netbox/templates/inc/responsive_table.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% load render_table from django_tables2 %}
-
-<div class="table-responsive">
-    {% render_table table 'inc/table.html' %}
-</div>
diff --git a/netbox/templates/ipam/aggregate.html b/netbox/templates/ipam/aggregate.html
index 43760ed80..29aeec1ef 100644
--- a/netbox/templates/ipam/aggregate.html
+++ b/netbox/templates/ipam/aggregate.html
@@ -77,6 +77,6 @@
 <div class="row mb-3">
     <div class="col col-md-12">
         {% include 'utilities/obj_table.html' with table=prefix_table heading='Child Prefixes' bulk_edit_url='ipam:prefix_bulk_edit' bulk_delete_url='ipam:prefix_bulk_delete' %}
-	</div>
+	  </div>
 </div>
 {% endblock %}
diff --git a/netbox/templates/ipam/vlan.html b/netbox/templates/ipam/vlan.html
index 33541827f..5ecd6efed 100644
--- a/netbox/templates/ipam/vlan.html
+++ b/netbox/templates/ipam/vlan.html
@@ -1,5 +1,6 @@
 {% extends 'ipam/vlan/base.html' %}
 {% load helpers %}
+{% load render_table from django_tables2 %}
 {% load plugins %}
 
 {% block content %}
@@ -92,8 +93,8 @@
                 <h5 class="card-header">
                     Prefixes
                 </h5>
-                <div class="card-body">
-                    {% include 'inc/responsive_table.html' with table=prefix_table %}
+                <div class="card-body table-responsive">
+                    {% render_table prefix_table 'inc/table.html' %}
                 </div>
                 {% if perms.ipam.add_prefix %}
                 <div class="card-footer text-end noprint">
diff --git a/netbox/templates/utilities/obj_table.html b/netbox/templates/utilities/obj_table.html
index fdcc59fa8..c8c0f07f2 100644
--- a/netbox/templates/utilities/obj_table.html
+++ b/netbox/templates/utilities/obj_table.html
@@ -1,4 +1,5 @@
 {% load helpers %}
+{% load render_table from django_tables2 %}
 
 {% if permissions.change or permissions.delete %}
     <form method="post" class="form form-horizontal">
@@ -28,7 +29,9 @@
             </div>
         {% endif %}
 
-        {% include table_template|default:'inc/responsive_table.html' %}
+        <div class="table-responsive">
+          {% render_table table 'inc/table.html' %}
+        </div>
 
         <div class="float-start noprint">
             {% block extra_actions %}{% endblock %}
@@ -48,7 +51,9 @@
     </form>
 {% else %}
 
-    {% include table_template|default:'inc/responsive_table.html' %}
+    <div class="table-responsive">
+      {% render_table table 'inc/table.html' %}
+    </div>
 
 {% endif %}
 
diff --git a/netbox/templates/virtualization/cluster/devices.html b/netbox/templates/virtualization/cluster/devices.html
index 658162243..9f4b7fc3e 100644
--- a/netbox/templates/virtualization/cluster/devices.html
+++ b/netbox/templates/virtualization/cluster/devices.html
@@ -1,5 +1,6 @@
 {% extends 'virtualization/cluster/base.html' %}
 {% load helpers %}
+{% load render_table from django_tables2 %}
 
 {% block content %}
 <div class="row">
@@ -10,8 +11,8 @@
       </h5>
       <form action="{% url 'virtualization:cluster_remove_devices' pk=object.pk %}" method="post">
       {% csrf_token %}
-      <div class="card-body">
-        {% include 'inc/responsive_table.html' with table=devices_table %}
+      <div class="card-body table-responsive">
+        {% render_table devices_table 'inc/table.html' %}
       </div>
       {% if perms.virtualization.change_cluster %}
         <div class="card-footer noprint">
diff --git a/netbox/templates/virtualization/cluster/virtual_machines.html b/netbox/templates/virtualization/cluster/virtual_machines.html
index 5c92f14cb..42843db5f 100644
--- a/netbox/templates/virtualization/cluster/virtual_machines.html
+++ b/netbox/templates/virtualization/cluster/virtual_machines.html
@@ -1,5 +1,6 @@
 {% extends 'virtualization/cluster/base.html' %}
 {% load helpers %}
+{% load render_table from django_tables2 %}
 
 {% block content %}
 <div class="row">
@@ -8,8 +9,8 @@
       <h5 class="card-header">
         Virtual Machines
       </h5>
-      <div class="card-body">
-        {% include 'inc/responsive_table.html' with table=virtualmachines_table %}
+      <div class="card-body table-responsive">
+        {% render_table virtualmachines_table 'inc/table.html' %}
       </div>
     </div>
   </div>