diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 72e42129c..d3bff464d 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -122,9 +122,15 @@
{{ vc_member }}
|
- {{ vc_member.vc_position }} |
- {% if object.virtual_chassis.master == vc_member %}{% endif %} |
- {{ vc_member.vc_priority|default:"" }} |
+
+ {% badge vc_member.vc_position %}
+ |
+
+ {% if object.virtual_chassis.master == vc_member %}{% endif %}
+ |
+
+ {{ vc_member.vc_priority|default:"" }}
+ |
{% endfor %}
diff --git a/netbox/templates/dcim/virtualchassis.html b/netbox/templates/dcim/virtualchassis.html
index 7046b1d49..12088e892 100644
--- a/netbox/templates/dcim/virtualchassis.html
+++ b/netbox/templates/dcim/virtualchassis.html
@@ -60,9 +60,17 @@
{{ vc_member }}
|
- {{ vc_member.vc_position }} |
- {% if object.master == vc_member %}{% endif %} |
- {{ vc_member.vc_priority|placeholder }} |
+
+ {% badge vc_member.vc_position %}
+ |
+
+ {% if object.master == vc_member %}
+
+ {% endif %}
+ |
+
+ {{ vc_member.vc_priority|placeholder }}
+ |
{% endfor %}
diff --git a/netbox/templates/ipam/iprange/base.html b/netbox/templates/ipam/iprange/base.html
index 1993e29c4..f799b5bc1 100644
--- a/netbox/templates/ipam/iprange/base.html
+++ b/netbox/templates/ipam/iprange/base.html
@@ -18,7 +18,7 @@
{% if perms.ipam.view_ipaddress %}
- IP Addresses {{ object.get_child_ips.count }}
+ IP Addresses {% badge object.get_child_ips.count %}
{% endif %}
diff --git a/netbox/templates/ipam/vlan/base.html b/netbox/templates/ipam/vlan/base.html
index 9eeb0f160..74af7f16f 100644
--- a/netbox/templates/ipam/vlan/base.html
+++ b/netbox/templates/ipam/vlan/base.html
@@ -20,10 +20,10 @@
VLAN
- Device Interfaces {{ object.get_interfaces.count }}
+ Device Interfaces {% badge object.get_interfaces.count %}
- VM Interfaces {{ object.get_vminterfaces.count }}
+ VM Interfaces {% badge object.get_vminterfaces.count %}
{% if perms.extras.view_journalentry %}
diff --git a/netbox/templates/search.html b/netbox/templates/search.html
index df145091b..7e92ea43a 100644
--- a/netbox/templates/search.html
+++ b/netbox/templates/search.html
@@ -38,8 +38,10 @@