diff --git a/netbox/project-static/dist/netbox.css b/netbox/project-static/dist/netbox.css
index 7c74491a3..d07eb73c7 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/netbox.scss b/netbox/project-static/styles/netbox.scss
index 13a05445b..93a88f5cd 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -5,8 +5,8 @@
 
 // Overrides of external libraries
 @import 'overrides/slim-select';
+@import 'overrides/tabler';
 
-// Transitional styling
+// Transitional styling to ease migration of templates from NetBox v3.x
 @import 'transitional/cards';
-@import 'transitional/icons';
 @import 'transitional/tables';
diff --git a/netbox/project-static/styles/overrides/_tabler.scss b/netbox/project-static/styles/overrides/_tabler.scss
new file mode 100644
index 000000000..4a3e20dce
--- /dev/null
+++ b/netbox/project-static/styles/overrides/_tabler.scss
@@ -0,0 +1,13 @@
+// Buttons
+.btn {
+  // Tabler sets display: flex
+  display: inline-block;
+}
+
+// Tabs
+.nav-tabs {
+  .nav-link {
+    // Tabler sets display: flex
+    display: inline-block;
+  }
+}
diff --git a/netbox/project-static/styles/transitional/_icons.scss b/netbox/project-static/styles/transitional/_icons.scss
deleted file mode 100644
index a18a9a843..000000000
--- a/netbox/project-static/styles/transitional/_icons.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-// Add padding between icon and text
-// TODO: Find a more robust solution for this
-.mdi {
-  padding-right: 4px;
-}
-// Omit padding inside small buttons (no text)
-.btn-sm {
-  .mdi {
-    padding-right: 0;
-  }
-}