diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index 6be4204fc..597a96969 100644
Binary files a/netbox/project-static/dist/netbox-dark.css and b/netbox/project-static/dist/netbox-dark.css differ
diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index e321f1d50..f3a42a28d 100644
Binary files a/netbox/project-static/dist/netbox-light.css and b/netbox/project-static/dist/netbox-light.css differ
diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index 4bfbe2c31..e9c2621b2 100644
Binary files a/netbox/project-static/dist/netbox-print.css and b/netbox/project-static/dist/netbox-print.css differ
diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index 8f0f174c1..2e1cd3482 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -806,18 +806,21 @@ table tbody {
 // Style objects with statuses/roles within a table. As of implementation, used for IP addresses
 // assigned to interfaces.
 table .table-badge-group {
-  font-family: $font-family-monospace;
-
   .table-badge {
     display: block;
     width: min-content;
-    // Apply badge padding so that IP addresses *not* within a badge appear aligned with IP
-    // addresses that *are* within a badge.
-    padding: $badge-padding-y $badge-padding-x;
-    margin-top: map.get($spacers, 1);
-    margin-bottom: map.get($spacers, 1);
-    font-size: $font-size-xs;
+    font-size: $font-size-sm;
     font-weight: $font-weight-base;
+
+    &:not(.badge) {
+      // Apply badge horizontal padding so that IP addresses *not* within a badge appear aligned
+      // with IP addresses that *are* within a badge.
+      padding: 0 $badge-padding-x;
+    }
+
+    &.badge:not(:last-of-type):not(:only-child) {
+      margin-bottom: map.get($spacers, 2);
+    }
   }
 }