diff --git a/files/classes/user.py b/files/classes/user.py
index 791232b1dc..909a4e731e 100644
--- a/files/classes/user.py
+++ b/files/classes/user.py
@@ -202,7 +202,7 @@ class User(Base):
 			return 'Cakeday.webp'
 
 		if self.equipped_hats:
-			return random.choice(self.equipped_hats).name + '.webp'
+			return random.choice(self.equipped_hats)
 
 		return ''
 
@@ -215,7 +215,7 @@ class User(Base):
 			return "I've spent another year rotting my brain with dramaposting, please ridicule me 🤓"
 
 		if self.equipped_hats:
-			return random.choice(self.equipped_hats).censored_description(v)
+			return self.hat_active.name + ' - ' + self.hat_active.censored_description(v)
 
 		return ''
 
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 6553faaf8b..abe93a548d 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -171,7 +171,7 @@
 						<div class="profile-pic-30-wrapper">
 							<img loading="lazy" src="{{c.author.profile_url}}" class="profile-pic-30 mr-2">
 							{% if c.author.hat_active -%}
-								<img class="profile-pic-30-hat hat" loading="lazy" src="/i/hats/{{c.author.hat_active}}?v=3" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{c.author.hat_tooltip(v)}}">
+								<img class="profile-pic-30-hat hat" loading="lazy" src="/i/hats/{{c.author.hat_active.name}}.webp?v=3" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{c.author.hat_tooltip(v)}}">
 							{%- endif %}
 						</div>
 						<span {% if c.author.patron and not c.distinguish_level %}class="patron" style="background-color:#{{c.author.name_color}};"{% elif c.distinguish_level %}class="mod"{% endif %}>{{c.author_name}}</span>
diff --git a/files/templates/header.html b/files/templates/header.html
index 406584f345..52457b6424 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -207,7 +207,7 @@
 							<div class="profile-pic-35-wrapper">
 								<img loading="lazy" src="{{v.profile_url}}" class="profile-pic-35">
 								{% if v.hat_active -%}
-									<img id="profile-pic-35-hat" class="profile-pic-35-hat hat" loading="lazy" src="/i/hats/{{v.hat_active}}?v=3" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{v.hat_tooltip(v)}}">
+									<img id="profile-pic-35-hat" class="profile-pic-35-hat hat" loading="lazy" src="/i/hats/{{v.hat_active.name}}.webp?v=3" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{v.hat_tooltip(v)}}">
 								{% elif request.path == '/hats' %}
 									<img id="profile-pic-35-hat" class="profile-pic-35-hat hat d-none" loading="lazy" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{v.hat_tooltip(v)}}">
 								{%- endif %}
diff --git a/files/templates/leaderboard.html b/files/templates/leaderboard.html
index 628a718070..e72bf42138 100644
--- a/files/templates/leaderboard.html
+++ b/files/templates/leaderboard.html
@@ -248,18 +248,22 @@
 		</tr>
 	</thead>
 	<tbody id="followers-table">
-	{% for user in users9 %}
-		<tr {% if v.id == user[0].id %}class="self"{% endif %}>
+	{% for user, num in users9 %}
+		<tr {% if v.id == user.id %}class="self"{% endif %}>
 			<td>{{loop.index}}</td>
-			<td><a style="color:#{{user[0].name_color}};font-weight:bold" href="/@{{user[0].username}}"><img loading="lazy" src="{{user[0].profile_url}}" class="pp20"><span {% if user[0].patron %}class="patron" style="background-color:#{{user[0].name_color}}"{% endif %}>{{user[0].username}}</span></a></td>
-			<td>{{user[1]}}</td>
+			<td>{% include "user_in_table.html" %}</td>
+			<td>{{num}}</td>
 		</tr>
 	{% endfor %}
 	{% if pos9 and (pos9[0] > 25 or not pos9[1]) %}
 		<tr style="border-top:2px solid var(--primary)">
 			<td>{{pos9[0]}}</td>
-			<td><a style="color:#{{v.name_color}};font-weight:bold" href="/@{{v.username}}"><img loading="lazy" src="{{v.profile_url}}" class="pp20"><span {% if v.patron %}class="patron" style="background-color:#{{v.name_color}}"{% endif %}>{{v.username}}</span></a></td>
-			<td>{{pos9[1]}}</td>
+			<td>
+				{% with user=v %}
+					{% include "user_in_table.html" %}
+				{% endwith %}
+			</td>
+		<td>{{pos9[1]}}</td>
 		</tr>
 	{% endif %}
 	</tbody>
@@ -379,17 +383,21 @@
 			</tr>
 		</thead>
 		<tbody id="followers-table">
-		{% for user in users13 %}
-			<tr {% if v.id == user[0].id %}class="self"{% endif %}>
+		{% for user, num in users13 %}
+			<tr {% if v.id == user.id %}class="self"{% endif %}>
 				<td>{{loop.index}}</td>
-				<td><a style="color:#{{user[0].name_color}};font-weight:bold" href="/@{{user[0].username}}"><img loading="lazy" src="{{user[0].profile_url}}" class="pp20"><span {% if user[0].patron %}class="patron" style="background-color:#{{user[0].name_color}}"{% endif %}>{{user[0].username}}</span></a></td>
-				<td>{{user[1]}}</td>
+				<td>{% include "user_in_table.html" %}</td>
+				<td>{{num}}</td>
 			</tr>
 		{% endfor %}
 		{% if pos13 and (pos13[0] > 25 or not pos13[1]) %}
 			<tr style="border-top:2px solid var(--primary)">
 				<td>{{pos13[0]}}</td>
-				<td><a style="color:#{{v.name_color}};font-weight:bold" href="/@{{v.username}}"><img loading="lazy" src="{{v.profile_url}}" class="pp20"><span {% if v.patron %}class="patron" style="background-color:#{{v.name_color}}"{% endif %}>{{v.username}}</span></a></td>
+				<td>
+					{% with user=v %}
+						{% include "user_in_table.html" %}
+					{% endwith %}
+				</td>
 				<td>{{pos13[1]}}</td>
 			</tr>
 		{% endif %}
diff --git a/files/templates/settings_blocks.html b/files/templates/settings_blocks.html
index 2e109238f7..0ac75789de 100644
--- a/files/templates/settings_blocks.html
+++ b/files/templates/settings_blocks.html
@@ -53,14 +53,16 @@
 			</thead>
 			<tbody class="text-muted">
 				{% for block in v.blocking %}
+					{% set user=block.target %}
 					<tr>
 						<td>
-							<a href="{{block.target.permalink}}">
-								<img loading="lazy" src="{{block.target.profile_url}}" class="pp20 align-top mr-2">@{{block.target.username}}</a>
+							{% include "user_in_table.html" %}
 						</td>
 
 						<td>
-							<button class="btn btn-primary" onclick="post_toast(this,'/settings/unblock?username={{block.target.username}}&formkey={{v.formkey}}')">Unblock</a>
+							<button class="btn btn-primary" onclick="post_toast(this,'/settings/unblock?username={{user.username}}&formkey={{v.formkey}}')">
+								Unblock
+							</button>
 						</td>
 					</tr>
 				{% else %}
diff --git a/files/templates/submission.html b/files/templates/submission.html
index 0e5ab96480..933da33360 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -677,7 +677,7 @@
 								<div class="profile-pic-30-wrapper">
 									<img loading="lazy" src="{{p.author.profile_url}}" class="profile-pic-30 mr-2">
 									{% if p.author.hat_active -%}
-										<img class="profile-pic-30-hat hat" loading="lazy" src="/i/hats/{{p.author.hat_active}}?v=3" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{p.author.hat_tooltip(v)}}">
+										<img class="profile-pic-30-hat hat" loading="lazy" src="/i/hats/{{p.author.hat_active.name}}.webp?v=3" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{p.author.hat_tooltip(v)}}">
 									{%- endif %}
 								</div>
 								<span {% if p.author.patron and not p.distinguish_level %}class="patron" style="background-color:#{{p.author.name_color}};"{% elif p.distinguish_level %}class="mod"{% endif %}>{{p.author_name}}</span>
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index afd8b99765..03014d99f6 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -172,7 +172,7 @@
 						<div class="profile-pic-30-wrapper">
 							<img loading="lazy" src="{{p.author.profile_url}}" class="profile-pic-30 mr-2">
 							{% if p.author.hat_active -%}
-								<img class="profile-pic-30-hat hat" loading="lazy" src="/i/hats/{{p.author.hat_active}}?v=3" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{p.author.hat_tooltip(v)}}">
+								<img class="profile-pic-30-hat hat" loading="lazy" src="/i/hats/{{p.author.hat_active.name}}.webp?v=3" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{p.author.hat_tooltip(v)}}">
 							{%- endif %}
 						</div>
 						<span {% if p.author.patron and not p.distinguish_level %}class="patron" style="background-color:#{{p.author.name_color}};"{% elif p.distinguish_level %}class="mod"{% endif %}>{{p.author_name}}</span>
diff --git a/files/templates/user_in_table.html b/files/templates/user_in_table.html
index b107590404..563ded4182 100644
--- a/files/templates/user_in_table.html
+++ b/files/templates/user_in_table.html
@@ -2,7 +2,7 @@
 	<div class="profile-pic-20-wrapper">
 		<img loading="lazy" src="{{user.profile_url}}" class="pp20">
 		{% if user.hat_active -%}
-			<img class="profile-pic-20-hat hat" loading="lazy" src="/i/hats/{{user.hat_active}}?v=3" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{user.hat_tooltip(v)}}">
+			<img class="profile-pic-20-hat hat" loading="lazy" src="/i/hats/{{user.hat_active.name}}.webp?v=3" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{user.hat_tooltip(v)}}">
 		{%- endif %}
 	</div>
 	<span {% if user.patron %}class="patron" style="background-color:#{{user.name_color}}"{% endif %}>{{user.username}}</span>
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index e1b0ea2f81..fd816e9029 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -42,7 +42,7 @@
 							<a rel="nofollow noopener noreferrer" href="{% if u.highres %}{{u.highres}}{% else %}{{u.profile_url}}{% endif %}" class="profile-pic-100-wrapper">
 								<img onclick="expandDesktopImage('{% if u.highres %}{{u.highres}}{% else %}{{u.profile_url}}{% endif %}')" loading="lazy" src="{{u.profile_url}}" class="profile-pic profile-pic-100 mb-5">
 								{% if u.hat_active -%}
-									<img onclick="expandDesktopImage('{% if u.highres %}{{u.highres}}{% else %}{{u.profile_url}}{% endif %}')" class="profile-pic-100-hat hat" loading="lazy" src="/i/hats/{{u.hat_active}}?v=3" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{u.hat_tooltip(v)}}">
+									<img onclick="expandDesktopImage('{% if u.highres %}{{u.highres}}{% else %}{{u.profile_url}}{% endif %}')" class="profile-pic-100-hat hat" loading="lazy" src="/i/hats/{{u.hat_active.name}}.webp?v=3" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{u.hat_tooltip(v)}}">
 								{%- endif %}
 							</a>
 						</div>
@@ -407,7 +407,7 @@
 				<a rel="nofollow noopener noreferrer" href="{% if u.highres %}{{u.highres}}{% else %}{{u.profile_url}}{% endif %}" class="profile-pic-65-wrapper">
 					<img onclick="expandDesktopImage('{% if u.highres %}{{u.highres}}{% else %}{{u.profile_url}}{% endif %}')" loading="lazy" src="{{u.profile_url}}" class="profile-pic-65 bg-white border-2 border-white mb-2">
 					{% if u.hat_active -%}
-						<img onclick="expandDesktopImage('{% if u.highres %}{{u.highres}}{% else %}{{u.profile_url}}{% endif %}')" class="profile-pic-65-hat hat" loading="lazy" src="/i/hats/{{u.hat_active}}?v=3" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{u.hat_tooltip(v)}}">
+						<img onclick="expandDesktopImage('{% if u.highres %}{{u.highres}}{% else %}{{u.profile_url}}{% endif %}')" class="profile-pic-65-hat hat" loading="lazy" src="/i/hats/{{u.hat_active.name}}.webp?v=3" data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{u.hat_tooltip(v)}}">
 					{%- endif %}
 				</a>
 			</div>