diff --git a/templates/topic_alt.html b/templates/topic_alt.html
index 64ef4832..556b2d1a 100644
--- a/templates/topic_alt.html
+++ b/templates/topic_alt.html
@@ -37,9 +37,7 @@
 				{{range .Poll.QuickOptions}}
 				<div class="poll_option">
 					<input form="poll_{{$.Poll.ID}}_form" id="poll_option_{{.ID}}" name="poll_option_input" type="checkbox" value="{{.ID}}" />
-					<label class="poll_option_label" for="poll_option_{{.ID}}">
-						<div class="sel"></div>
-					</label>
+					<label class="poll_option_label" for="poll_option_{{.ID}}"><div class="sel"></div></label>
 					<span id="poll_option_text_{{.ID}}" class="poll_option_text">{{.Value}}</span>
 				</div>
 				{{end}}
diff --git a/templates/topic_alt_quick_reply.html b/templates/topic_alt_quick_reply.html
index 871cd509..2c91efb6 100644
--- a/templates/topic_alt_quick_reply.html
+++ b/templates/topic_alt_quick_reply.html
@@ -1,6 +1,6 @@
 <div class="rowblock topic_reply_container">
 	<div class="userinfo" aria-label="{{lang "topic.your_information"}}">
-		<div class="avatar_item" style="background-image:url({{.CurrentUser.Avatar}}),url(/s/white-dot.jpg);">&nbsp;</div>
+		<img class="aitem" src="{{.CurrentUser.Avatar}}" alt="Avatar">
 		<div class="user_meta">
 			<a href="{{.CurrentUser.Link}}" class="the_name" rel="author">{{.CurrentUser.Name}}</a>
 			<div class="tag_block">
diff --git a/templates/topic_alt_userinfo.html b/templates/topic_alt_userinfo.html
index 8ac83e06..35472df0 100644
--- a/templates/topic_alt_userinfo.html
+++ b/templates/topic_alt_userinfo.html
@@ -1,5 +1,6 @@
 <div class="userinfo" aria-label="{{lang "topic.userinfo_aria"}}">
-	<div class="avatar_item" style="background-image:url({{.Avatar}}),url(/s/white-dot.jpg);">&nbsp;</div>
+	<!--<div class="avatar_item" style="background-image:url({{.Avatar}}),url(/s/white-dot.jpg);">&nbsp;</div>-->
+	<img class="aitem" src="{{.Avatar}}" alt="Avatar">
 	<div class="user_meta">
 		<a href="{{.UserLink}}" class="the_name" rel="author">{{.CreatedByName}}</a>
 		<div class="tag_block">
diff --git a/themes/cosora/public/main.css b/themes/cosora/public/main.css
index 3dae42b5..efb333d8 100644
--- a/themes/cosora/public/main.css
+++ b/themes/cosora/public/main.css
@@ -1055,13 +1055,15 @@ blockquote:first-child {
 	flex-direction: column;
 }
 .avatar_item {
-	border-radius: 50px;
-	width: 84px;
-	height: 84px;
-	margin-bottom: 12px;
 	background-position: 0px -10px;
 	background-size: 120px;
 }
+.avatar_item, .aitem {
+	border-radius: 62px;
+	width: 72px;
+	height: 72px;
+	margin-bottom: 8px;
+}
 .the_name, .userinfo .tag_block {
 	margin-left: auto;
 	margin-right: auto;
diff --git a/themes/nox/public/main.css b/themes/nox/public/main.css
index e789b72c..487bece1 100644
--- a/themes/nox/public/main.css
+++ b/themes/nox/public/main.css
@@ -834,11 +834,13 @@ blockquote:first-child {
 	flex-direction: column;
 }
 .avatar_item {
-	border-radius: 36px;
-	height: 58px;
-	width: 58px;
 	background-position: 0px -10px;
 	background-size: 78px;
+}
+.aitem, .avatar_item {
+	height: 58px;
+	width: 58px;
+	border-radius: 36px;
 	margin-left: auto;
 	margin-right: auto;
 }