diff --git a/public/templates/category.tpl b/public/templates/category.tpl
index 2001f7f6fe..dd52ce3873 100644
--- a/public/templates/category.tpl
+++ b/public/templates/category.tpl
@@ -32,7 +32,9 @@
 			<li class="category-item {topics.deleted-class}" itemprop="itemListElement">
 
 				<div class="col-md-12 panel panel-default topic-row">
-
+					<a href="../../user/{topics.userslug}" class="pull-left">
+						<img class="img-rounded user-img" src="{topics.picture}" title="{topics.username}" />
+					</a>
 
 					<h3>
 						<a href="../../topic/{topics.slug}" itemprop="url">
@@ -57,9 +59,6 @@
 						</span>
 						|
 						<span>
-							<a href="../../user/{topics.userslug}">
-								<img class="teaser-pic" src="{topics.picture}" title="{topics.username}"/>
-							</a>
 							[[category:posted]] <span class="timeago" title="{topics.relativeTime}"></span>
 						</span>
 
diff --git a/public/templates/recent.tpl b/public/templates/recent.tpl
index f25ecd76f9..5fb8aeddf6 100644
--- a/public/templates/recent.tpl
+++ b/public/templates/recent.tpl
@@ -25,6 +25,9 @@
 		<!-- BEGIN topics -->
 		<li class="category-item {topics.deleted-class}">
 			<div class="col-md-12 col-xs-12 panel panel-default topic-row">
+				<a href="{relative_path}/user/{topics.userslug}" class="pull-left">
+					<img class="img-rounded user-img" src="{topics.picture}" title="{topics.username}" />
+				</a>
 
 				<h3>
 					<a href="{relative_path}/topic/{topics.slug}">
@@ -50,9 +53,6 @@
 					</span>
 					|
 					<span>
-						<a href="{relative_path}/user/{topics.userslug}">
-							<img class="teaser-pic" src="{topics.picture}" title="{topics.username}"/>
-						</a>
 						posted in
 						<a href="{relative_path}/category/{topics.categorySlug}">
 							<i class="fa {topics.categoryIcon}"></i> {topics.categoryName}
diff --git a/public/templates/unread.tpl b/public/templates/unread.tpl
index 55c590e251..04bf76b247 100644
--- a/public/templates/unread.tpl
+++ b/public/templates/unread.tpl
@@ -20,7 +20,9 @@
 			<!-- BEGIN topics -->
 			<li class="category-item {topics.deleted-class}">
 				<div class="col-md-12 col-xs-12 panel panel-default topic-row">
-
+					<a href="{relative_path}/user/{topics.userslug}" class="pull-left">
+						<img class="img-rounded user-img" src="{topics.picture}" title="{topics.username}" />
+					</a>
 					<h3>
 						<a href="{relative_path}/topic/{topics.slug}">
 							<span class="topic-title">
@@ -45,9 +47,6 @@
 						</span>
 						|
 						<span>
-							<a href="{relative_path}/user/{topics.userslug}">
-								<img class="teaser-pic" src="{topics.picture}" title="{topics.username}"/>
-							</a>
 							posted in
 							<a href="{relative_path}/category/{topics.categorySlug}">
 								<i class="fa {topics.categoryIcon}"></i> {topics.categoryName}