diff --git a/drama/templates/badmins.html b/drama/templates/badmins.html
index 42c4a93c6..1feff35c7 100644
--- a/drama/templates/badmins.html
+++ b/drama/templates/badmins.html
@@ -15,7 +15,7 @@
 </thead>
 {% for user in badmins %}
 	<tr>
-		<td><a style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}">{{user.username}}</a></td>
+		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/@{{user.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.dramacoins}}</td>
 	</tr>
 {% endfor %}
diff --git a/drama/templates/banned.html b/drama/templates/banned.html
index f927b4710..cfc0d4f8e 100644
--- a/drama/templates/banned.html
+++ b/drama/templates/banned.html
@@ -13,9 +13,9 @@
 {% for user in users %}
 	<tr>
 		<td style="font-weight:bold;">{{users.index(user)+1}}</td>
-		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}">{{user.username}}</a></td>
+		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/@{{user.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
 		<td style="font-weight:bold;">{% if user.ban_reason %}{{user.ban_reason}}{% endif %}</td>
-		<td><a {% if user.banned_by.animatedname %}class="{% if user.banned_by.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.banned_by.namecolor}}; font-weight:bold;" href="/@{{user.banned_by.username}}">{{user.banned_by.username}}</a></td>
+		<td><a {% if user.banned_by.animatedname %}class="{% if user.banned_by.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.banned_by.namecolor}}; font-weight:bold;" href="/@{{user.banned_by.username}}"><img src="/@{{user.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.banned_by.username}}</a></td>
 	</tr>
 {% endfor %}
 </table>
diff --git a/drama/templates/followers.html b/drama/templates/followers.html
index 4c0c5bc34..12da05893 100644
--- a/drama/templates/followers.html
+++ b/drama/templates/followers.html
@@ -12,8 +12,8 @@
 </thead>
 {% for user in users %}
 	<tr>
-			<td style="font-weight: bold">{{users.index(user)+1}}</td>
-				<td style="font-weight: bold"><a style="color: #{{user.namecolor}}" href="/@{{user.username}}"><img src="/@{{user.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
+		<td style="font-weight: bold">{{users.index(user)+1}}</td>
+		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/@{{user.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
 	</tr>
 {% endfor %}
 </table>
diff --git a/drama/templates/leaderboard.html b/drama/templates/leaderboard.html
index e49d6fede..512e521f7 100644
--- a/drama/templates/leaderboard.html
+++ b/drama/templates/leaderboard.html
@@ -17,7 +17,7 @@
 {% for user in users1 %}
 	<tr>
 		<td style="font-weight:bold;">{{users1.index(user)+1}}</td>
-		<td><a style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}">{{user.username}}</a></td>
+		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/@{{user.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.dramacoins}}</td>
 	</tr>
 {% endfor %}
@@ -42,7 +42,7 @@
 {% for user in users2 %}
 	<tr>
 		<td style="font-weight:bold;">{{users2.index(user)+1}}</td>
-		<td><a style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}">{{user.username}}</a></td>
+		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/@{{user.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.stored_subscriber_count}}</td>
 	</tr>
 {% endfor %}
@@ -67,7 +67,7 @@
 {% for user in users3 %}
 	<tr>
 		<td style="font-weight:bold;">{{users3.index(user)+1}}</td>
-		<td><a style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}">{{user.username}}</a></td>
+		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/@{{user.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.post_count}}</td>
 	</tr>
 {% endfor %}
@@ -92,7 +92,7 @@
 {% for user in users4 %}
 	<tr>
 		<td style="font-weight:bold;">{{users4.index(user)+1}}</td>
-		<td><a style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}">{{user.username}}</a></td>
+		<td><a {% if user.animatedname %}class="{% if user.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color:#{{user.namecolor}}; font-weight:bold;" href="/@{{user.username}}"><img src="/@{{user.username}}/pic/profile" class="profile-pic-20 mr-1">{{user.username}}</a></td>
 		<td style="font-weight:bold; text-align:right;">{{user.comment_count}}</td>
 	</tr>
 {% endfor %}
diff --git a/drama/templates/viewers.html b/drama/templates/viewers.html
index ca7086eaa..e32380488 100644
--- a/drama/templates/viewers.html
+++ b/drama/templates/viewers.html
@@ -12,7 +12,7 @@
 </thead>
 {% for view in viewers %}
 	<tr>
-        <td style="font-weight: bold"><a style="color: #{{view.viewer.namecolor}}" href="/@{{view.viewer.username}}"><img src="/@{{view.viewer.username}}/pic/profile" class="profile-pic-20 mr-1">{{view.viewer.username}}</a></td>
+        <td style="font-weight: bold"><a {% if view.viewer.animatedname %}class="{% if view.viewer.patron %}patron{% else %}leaderboard{% endif %}"{% endif %} style="color: #{{view.viewer.namecolor}}" href="/@{{view.viewer.username}}"><img src="/@{{view.viewer.username}}/pic/profile" class="profile-pic-20 mr-1">{{view.viewer.username}}</a></td>
         <td style="font-weight: bold">{{view.last_view_string}}</td>
 	</tr>
 {% endfor %}