diff --git a/templates/partials/topics_list.tpl b/templates/partials/topics_list.tpl
index d304855..abdf751 100644
--- a/templates/partials/topics_list.tpl
+++ b/templates/partials/topics_list.tpl
@@ -8,22 +8,30 @@
 			<div class="avatar pull-left">
 				<!-- IF showSelect -->
 				<div class="select" component="topic/select">
+					<!-- IF topics.thumb -->
+					<img src="{topics.thumb}" class="user-img" title="{topics.user.username}" />
+					<!-- ELSE -->
 					<!-- IF topics.user.picture -->
-					{function.renderTopicImage}
+					<img component="user/picture" data-uid="{topics.user.uid}" src="{topics.user.picture}" class="user-img" title="{topics.user.username}" />
 					<!-- ELSE -->
 					<div class="user-icon" style="background-color: {topics.user.icon:bgColor};" title="{topics.user.username}">{topics.user.icon:text}</div>
 					<!-- ENDIF topics.user.picture -->
+					<!-- ENDIF topics.thumb -->
 					<i class="fa fa-check"></i>
 				</div>
 				<!-- ENDIF showSelect -->
 
 				<!-- IF !showSelect -->
 				<a href="<!-- IF topics.user.userslug -->{config.relative_path}/user/{topics.user.userslug}<!-- ELSE -->#<!-- ENDIF topics.user.userslug -->" class="pull-left">
+					<!-- IF topics.thumb -->
+					<img src="{topics.thumb}" class="user-img" title="{topics.user.username}" />
+					<!-- ELSE -->
 					<!-- IF topics.user.picture -->
-					{function.renderTopicImage}
+					<img component="user/picture" data-uid="{topics.user.uid}" src="{topics.user.picture}" class="user-img" title="{topics.user.username}" />
 					<!-- ELSE -->
 					<div class="user-icon" style="background-color: {topics.user.icon:bgColor};" title="{topics.user.username}">{topics.user.icon:text}</div>
 					<!-- ENDIF topics.user.picture -->
+					<!-- ENDIF topics.thumb -->
 				</a>
 				<!-- ENDIF !showSelect -->