diff --git a/templates/account/profile.tpl b/templates/account/profile.tpl
index 1784926..6e5b490 100644
--- a/templates/account/profile.tpl
+++ b/templates/account/profile.tpl
@@ -14,7 +14,7 @@
 					<div>
 						<div class="text-center">
 							<span>
-								<i class="account-online-status fa fa-circle status {status}" title="[[global:{status}]]"></i>
+								<i component="user/status" class="fa fa-circle status {status}" title="[[global:{status}]]"></i>
 								<span class="account-username"> {username}</span>
 							</span>
 
diff --git a/templates/chat.tpl b/templates/chat.tpl
index 57275c4..e7747be 100644
--- a/templates/chat.tpl
+++ b/templates/chat.tpl
@@ -4,7 +4,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<button type="button" class="close hidden-xs" data-action="maximize"><span aria-hidden="true"><i class="fa fa-expand"></i></span><span class="sr-only">[[modules:chat.maximize]]</span></button>
-				<h4>[[modules:chat.chatting_with]] <i id="chat-user-status" class="fa fa-circle status offline" title="[[global:offline]]"></i></h4>
+				<h4>[[modules:chat.chatting_with]] <i component="user/status" class="fa fa-circle status offline" title="[[global:offline]]"></i></h4>
 			</div>
 			<div class="modal-body">
 				<span class="since-bar">
diff --git a/templates/chats.tpl b/templates/chats.tpl
index a13e77b..87132dc 100644
--- a/templates/chats.tpl
+++ b/templates/chats.tpl
@@ -39,7 +39,7 @@
 			<ul class="chats-list">
 				<!-- BEGIN contacts -->
 				<li data-username="{contacts.username}" data-uid="{contacts.uid}">
-					<i class="fa fa-circle status {contacts.status}"></i>
+					<i component="user/status" class="fa fa-circle status {contacts.status}"></i>
 					<img class="user-img" src="{contacts.picture}">
 					<span>{contacts.username}</span>
 				</li>
@@ -55,7 +55,7 @@
 			<ul class="chats-list recent-chats" data-nextstart="{nextStart}">
 				<!-- BEGIN chats -->
 				<li data-username="{chats.username}" data-uid="{chats.uid}" class="<!-- IF chats.unread -->unread<!-- ENDIF chats.unread -->">
-					<i class="fa fa-circle status {chats.status}"></i>
+					<i component="user/status" class="fa fa-circle status {chats.status}"></i>
 					<img class="user-img" src="{chats.picture}">
 					<span>{chats.username}</span>
 				</li>
diff --git a/templates/partials/topic/post.tpl b/templates/partials/topic/post.tpl
index 6a54340..b94dea8 100644
--- a/templates/partials/topic/post.tpl
+++ b/templates/partials/topic/post.tpl
@@ -9,9 +9,9 @@
 	</div>
 
 	<small class="pull-left">
-		<i class="fa fa-circle status {posts.user.status}" title="[[global:{posts.user.status}]]"></i>
+		<i component="user/status" class="fa fa-circle status {posts.user.status}" title="[[global:{posts.user.status}]]"></i>
 		<strong>
-			<a class="username-field" href="<!-- IF posts.user.userslug -->{relative_path}/user/{posts.user.userslug}<!-- ELSE -->#<!-- ENDIF posts.user.userslug -->" itemprop="author" data-username="{posts.user.username}" data-uid="{posts.user.uid}">{posts.user.username}</a>
+			<a href="<!-- IF posts.user.userslug -->{relative_path}/user/{posts.user.userslug}<!-- ELSE -->#<!-- ENDIF posts.user.userslug -->" itemprop="author" data-username="{posts.user.username}" data-uid="{posts.user.uid}">{posts.user.username}</a>
 		</strong>
 
 		<!-- IMPORT partials/topic/badge.tpl -->
diff --git a/templates/partials/users_list.tpl b/templates/partials/users_list.tpl
index fc3f575..1fc97f1 100644
--- a/templates/partials/users_list.tpl
+++ b/templates/partials/users_list.tpl
@@ -4,7 +4,7 @@
 	<br/>
 	<div class="user-info">
 		<span>
-			<i class="fa fa-circle status {users.status}" title="[[global:{users.status}]]"></i>
+			<i component="user/status" class="fa fa-circle status {users.status}" title="[[global:{users.status}]]"></i>
 			<a href="{relative_path}/user/{users.userslug}">{users.username}</a>
 		</span>
 		<br/>