diff --git a/files/templates/sidebars/ProfileSidebar.html b/files/templates/sidebars/ProfileSidebar.html
index e51aca27b6..d1d6d1dbaa 100644
--- a/files/templates/sidebars/ProfileSidebar.html
+++ b/files/templates/sidebars/ProfileSidebar.html
@@ -18,4 +18,18 @@
 			{% endif %}
 		</div>
 	</div>
+	<h2 class="ml-2 font-bold text-lg font-heading leading-normal mb-2">Badges</h2>
+	<ul class="ml-auto 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="flex-shrink-0 w-8 h-8 object-contain transform transition-100 hover:scale-[1.15]" 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="flex-shrink-0 w-8 h-8 object-contain transform transition-100 hover:scale-[1.15]" loading="lazy" src="{{b.path}}" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-original-title="{{b.name}} - {{b.text}}">
+			{% endif %}
+		</li>
+		{% endfor %}
+	</ul>
 </div>
\ No newline at end of file
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index d8e4eef674..3a28c6d073 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -33,10 +33,12 @@
 {% block subHeader %}
 <img src="{{ u.banner_url}}" class="-mb-0.5 w-full h-72 lg:h-[28rem] object-cover"/>
 <div class="relative max-w-screen-2xl mx-auto px-4 py-4 grid grid-cols-12 rounded-t">
+	{% if v and v.username == u.username %}
 	<a href="/settings/profile" class="absolute -top-12 right-3 btn btn-gray shadow">
 		<i class="fas fa-user-edit fa-fw fa-sm mr-2"></i>
 		Edit profile
 	</a>
+	{% endif %}
 	<div class="absolute top-0 left-0 w-full h-full bg-gradient-to-t from-gray-300 to-gray-200 rounded-t sub-header-shadow"></div>
 	<div class="relative col-span-full flex items-center">
 		<div class="flex items-center">
@@ -63,8 +65,7 @@
 				</div>
 			</div>
 		</div>
-		{% if v and v.username == u.username %}
-		<ul class="ml-auto flex flex-row flex-wrap gap-2 mb-0">
+		<ul class="ml-auto hidden xl:flex flex-row flex-wrap gap-2 mb-0">
 			{% for b in u.badges %}
 			<li>
 				{% if b.url %}
@@ -77,7 +78,6 @@
 			</li>
 			{% endfor %}
 		</ul>
-		{% endif %}
 	</div>
 	<div class="relative col-span-full flex xl:hidden flex-col space-y-4">
 		<div>