diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index c4b712c86..139c3ad17 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/custom/_misc.scss b/netbox/project-static/styles/custom/_misc.scss
index c8ace4392..5a5f71187 100644
--- a/netbox/project-static/styles/custom/_misc.scss
+++ b/netbox/project-static/styles/custom/_misc.scss
@@ -36,6 +36,12 @@ span.color-label {
 }
 
 // Override mdi font-size to adjust filter icon size
-.btn.dropdown-toggle > .mdi-filter-settings {
-  font-size: 1.25rem;
-}
\ No newline at end of file
+.column-filter.dropdown > .dropdown-toggle > .mdi-filter-settings {
+  font-size: .625rem;
+}
+
+.column-filter.dropdown > .dropdown-menu {
+  max-width: 300px;
+}
+
+.column-filter.dropdown-toggle:after { content: none }
\ No newline at end of file
diff --git a/netbox/templates/inc/table_header_filter_dropdown.html b/netbox/templates/inc/table_header_filter_dropdown.html
index 5242bc4b6..03b94cc7a 100644
--- a/netbox/templates/inc/table_header_filter_dropdown.html
+++ b/netbox/templates/inc/table_header_filter_dropdown.html
@@ -1,11 +1,11 @@
 {% load form_helpers %}
 {% if form_field %}
 <div class="column-filter dropdown">
-    <a href="#" class="btn dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="outside">
-        <i class="mdi mdi-filter-settings"></i>
-    </a>
+    <a href="#" class="dropdown-toggle" data-bs-toggle="dropdown" data-bs-auto-close="outside"><i class="mdi mdi-filter-settings"></i></a>
     <div class="dropdown-menu">
-        {% render_table_filter_field form_field table=table request=request %}
+        <div class="px-3 py-3">
+            {% render_table_filter_field form_field table=table request=request %}
+        </div>
     </div>
 </div>
 {% endif %}
\ No newline at end of file
diff --git a/netbox/utilities/templatetags/form_helpers.py b/netbox/utilities/templatetags/form_helpers.py
index 31d24b026..9245d7cc8 100644
--- a/netbox/utilities/templatetags/form_helpers.py
+++ b/netbox/utilities/templatetags/form_helpers.py
@@ -151,8 +151,8 @@ def render_table_filter_field(field, table, request):
             url = table.htmx_url + querystring(request, **kwargs)
         elif request:
             url = querystring(request, **kwargs)
-        # Set HTMX args
 
+    # Set HTMX args
     if hasattr(field.field, 'widget'):
         field.field.widget.attrs.update({
             'id': f'table_filter_id_{field.name}',