diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index b6a3e902c5..4d3b337ce2 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -52,15 +52,19 @@
 			</a>
 		</div>
 		{% if v and v.username == u.username %}
-		<div class="ml-auto">
+		<ul class="ml-auto flex flex-row flex-wrap gap-2">
 			{% for b in u.badges %}
+			<li>
 				{% if b.url %}
-					<a rel="nofollow noopener noreferrer" href="{{b.url}}"><img class="w-5 h-5 object-contain" loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{b.name}} - {{b.text}}"></a>
+					<a rel="nofollow noopener noreferrer" href="{{b.url}}">
+						<img class="flex-shrink-0 w-8 h-8 object-contain" loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{b.name}} - {{b.text}}">
+					</a>
 				{% else %}
-					<img class="w-5 h-5 object-contain" loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{b.name}} - {{b.text}}">
+					<img class="flex-shrink-0 w-8 h-8 object-contain" loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{b.name}} - {{b.text}}">
 				{% endif %}
+			</li>
 			{% endfor %}
-		</div>
+		</ul>
 		{% endif %}
 	</div>
 </div>