diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py
index d2cd0a0d4..0813deb36 100644
--- a/netbox/netbox/tables/columns.py
+++ b/netbox/netbox/tables/columns.py
@@ -162,7 +162,7 @@ class ToggleColumn(tables.CheckBoxColumn):
         if 'attrs' not in kwargs:
             kwargs['attrs'] = {
                 'td': {
-                    'class': 'min-width',
+                    'class': 'w-1',
                 },
                 'input': {
                     'class': 'form-check-input'
diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index 3e753bcac..f5c6bd268 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/variables.scss b/netbox/project-static/styles/variables.scss
index 4b85b6158..371c240c0 100644
--- a/netbox/project-static/styles/variables.scss
+++ b/netbox/project-static/styles/variables.scss
@@ -6,3 +6,7 @@ $sidebar-width: 18rem;
 // Reduce the default button padding
 $btn-padding-x: 0.5rem;
 $btn-padding-y: 0.25rem;
+
+// Reduce the default table cell padding
+$table-cell-padding-x: 0.5rem;
+$table-cell-padding-y: 0.5rem;
diff --git a/netbox/templates/account/bookmarks.html b/netbox/templates/account/bookmarks.html
index 93f741fd4..f7aa9bf57 100644
--- a/netbox/templates/account/bookmarks.html
+++ b/netbox/templates/account/bookmarks.html
@@ -15,7 +15,7 @@
     <div class="row">
       <div class="col col-md-12">
         <div class="card">
-          <div class="card-body htmx-container table-responsive" id="object_list">
+          <div class="htmx-container table-responsive" id="object_list">
             {% include 'htmx/table.html' %}
           </div>
         </div>
diff --git a/netbox/templates/dcim/connections_list.html b/netbox/templates/dcim/connections_list.html
index 0d67dcaf0..c0122e7ee 100644
--- a/netbox/templates/dcim/connections_list.html
+++ b/netbox/templates/dcim/connections_list.html
@@ -12,7 +12,7 @@
     <div class="tab-pane show active" id="object-list" role="tabpanel" aria-labelledby="object-list-tab">
       {% include 'inc/table_controls_htmx.html' %}
       <div class="card">
-        <div class="card-body htmx-container table-responsive" id="object_list">
+        <div class="htmx-container table-responsive" id="object_list">
           {% include 'htmx/table.html' %}
         </div>
       </div>
diff --git a/netbox/templates/dcim/devicetype/component_templates.html b/netbox/templates/dcim/devicetype/component_templates.html
index 8c392965d..68e2007c0 100644
--- a/netbox/templates/dcim/devicetype/component_templates.html
+++ b/netbox/templates/dcim/devicetype/component_templates.html
@@ -9,7 +9,7 @@
         {% csrf_token %}
         <div class="card">
             <h5 class="card-header">{{ title }}</h5>
-            <div class="card-body htmx-container table-responsive" id="object_list">
+            <div class="htmx-container table-responsive" id="object_list">
               {% include 'htmx/table.html' %}
             </div>
             <div class="card-footer noprint">
@@ -37,7 +37,7 @@
   {% else %}
     <div class="card">
       <h5 class="card-header">{{ title }}</h5>
-      <div class="card-body htmx-container table-responsive" id="object_list">
+      <div class="htmx-container table-responsive" id="object_list">
         {% include 'htmx/table.html' %}
       </div>
     </div>
diff --git a/netbox/templates/dcim/moduletype/component_templates.html b/netbox/templates/dcim/moduletype/component_templates.html
index 6beb4258a..c9786113e 100644
--- a/netbox/templates/dcim/moduletype/component_templates.html
+++ b/netbox/templates/dcim/moduletype/component_templates.html
@@ -9,7 +9,7 @@
         {% csrf_token %}
         <div class="card">
             <h5 class="card-header">{{ title }}</h5>
-            <div class="card-body htmx-container table-responsive" id="object_list">
+            <div class="htmx-container table-responsive" id="object_list">
               {% include 'htmx/table.html' %}
             </div>
             <div class="card-footer noprint">
@@ -37,7 +37,7 @@
   {% else %}
     <div class="card">
       <h5 class="card-header">{{ title }}</h5>
-      <div class="card-body htmx-container table-responsive" id="object_list">
+      <div class="htmx-container table-responsive" id="object_list">
         {% include 'htmx/table.html' %}
       </div>
     </div>
diff --git a/netbox/templates/generic/object_children.html b/netbox/templates/generic/object_children.html
index b9acdb6de..611f37a7d 100644
--- a/netbox/templates/generic/object_children.html
+++ b/netbox/templates/generic/object_children.html
@@ -9,7 +9,7 @@
     <form method="post">
         {% csrf_token %}
         <div class="card">
-            <div class="card-body htmx-container table-responsive" id="object_list">
+            <div class="htmx-container table-responsive" id="object_list">
                 {% include 'htmx/table.html' %}
             </div>
         </div>
diff --git a/netbox/templates/generic/object_list.html b/netbox/templates/generic/object_list.html
index 31783f241..335fc6af8 100644
--- a/netbox/templates/generic/object_list.html
+++ b/netbox/templates/generic/object_list.html
@@ -110,7 +110,7 @@ Context:
               {% endif %}
 
           <div class="card">
-            <div class="card-body htmx-container table-responsive p-1" id="object_list">
+            <div class="htmx-container table-responsive" id="object_list">
               {% include 'htmx/table.html' %}
             </div>
           </div>
diff --git a/netbox/templates/search.html b/netbox/templates/search.html
index 98f6d0bfd..a041c6bf7 100644
--- a/netbox/templates/search.html
+++ b/netbox/templates/search.html
@@ -31,7 +31,7 @@
   </div>
   <div class="row px-3">
     <div class="card">
-      <div class="card-body htmx-container table-responsive" id="object_list">
+      <div class="htmx-container table-responsive" id="object_list">
         {% include 'htmx/table.html' %}
       </div>
     </div>