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 @@
                                     <td>
                                         <a href="{{ vc_member.get_absolute_url }}">{{ vc_member }}</a>
                                     </td>
-                                    <td><span class="badge badge-default">{{ vc_member.vc_position }}</span></td>
-                                    <td>{% if object.virtual_chassis.master == vc_member %}<i class="mdi mdi-check-bold"></i>{% endif %}</td>
-                                    <td>{{ vc_member.vc_priority|default:"" }}</td>
+                                    <td>
+                                      {% badge vc_member.vc_position %}
+                                    </td>
+                                    <td>
+                                      {% if object.virtual_chassis.master == vc_member %}<i class="mdi mdi-check-bold"></i>{% endif %}
+                                    </td>
+                                    <td>
+                                      {{ vc_member.vc_priority|default:"" }}
+                                    </td>
                                 </tr>
                             {% endfor %}
                         </table>
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 @@
                             <td>
                                 <a href="{{ vc_member.get_absolute_url }}">{{ vc_member }}</a>
                             </td>
-                            <td><span class="badge bg-secondary">{{ vc_member.vc_position }}</span></td>
-                            <td>{% if object.master == vc_member %}<i class="mdi mdi-check-bold text-success"></i>{% endif %}</td>
-                            <td>{{ vc_member.vc_priority|placeholder }}</td>
+                            <td>
+                              {% badge vc_member.vc_position %}
+                            </td>
+                            <td>
+                              {% if object.master == vc_member %}
+                                <i class="mdi mdi-check-bold text-success"></i>
+                              {% endif %}
+                            </td>
+                            <td>
+                              {{ vc_member.vc_priority|placeholder }}
+                            </td>
                         </tr>
                     {% endfor %}
                 </table>
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 %}
     <li role="presentation" class="nav-item">
       <a class="nav-link{% if active_tab == 'ip-addresses' %} active{% endif %}" href="{% url 'ipam:iprange_ipaddresses' pk=object.pk %}">
-        IP Addresses <span class="badge bg-primary">{{ object.get_child_ips.count }}</span>
+        IP Addresses {% badge object.get_child_ips.count %}
       </a>
     </li>
   {% 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 @@
       <a class="nav-link{% if not active_tab %} active{% endif %}" href="{% url 'ipam:vlan' pk=object.pk %}">VLAN</a>
     </li>
     <li class="nav-item" role="presentation">
-      <a class="nav-link{% if active_tab == 'interfaces' %} active{% endif %}" href="{% url 'ipam:vlan_interfaces' pk=object.pk %}">Device Interfaces <span class="badge bg-primary">{{ object.get_interfaces.count }}</span></a>
+      <a class="nav-link{% if active_tab == 'interfaces' %} active{% endif %}" href="{% url 'ipam:vlan_interfaces' pk=object.pk %}">Device Interfaces {% badge object.get_interfaces.count %}</a>
     </li>
     <li class="nav-item" role="presentation">
-      <a class="nav-link{% if active_tab == 'vminterfaces' %} active{% endif %}" href="{% url 'ipam:vlan_vminterfaces' pk=object.pk %}">VM Interfaces <span class="badge bg-primary">{{ object.get_vminterfaces.count }}</span></a>
+      <a class="nav-link{% if active_tab == 'vminterfaces' %} active{% endif %}" href="{% url 'ipam:vlan_vminterfaces' pk=object.pk %}">VM Interfaces {% badge object.get_vminterfaces.count %}</a>
     </li>
     {% if perms.extras.view_journalentry %}
       <li class="nav-item" role="presentation">
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 @@
                             <div class="list-group list-group-flush">
                                 {% for obj_type in results %}
                                     <a href="#{{ obj_type.name|lower }}" class="list-group-item">
+                                        <div class="float-end">
+                                          {% badge obj_type.table.page.paginator.count %}
+                                        </div>
                                         {{ obj_type.name|bettertitle }}
-                                        <span class="badge bg-primary">{{ obj_type.table.page.paginator.count }}</span>
                                     </a>
                                 {% endfor %}
                             </div>