diff --git a/less/chats.less b/less/chats.less
index 918f734..c4fac2f 100644
--- a/less/chats.less
+++ b/less/chats.less
@@ -308,6 +308,7 @@
 					width: 28px;
 					height: 28px;
 					line-height: 26px;
+					vertical-align: bottom;
 				}
 
 				img {
@@ -561,7 +562,6 @@
 
 [component="chat/manage-modal"] {
 	.list-group-item .avatar {
-		border-radius: 0;
 		margin-right: 1em;
 	}
 
diff --git a/templates/account/blocks.tpl b/templates/account/blocks.tpl
index ae78240..43dbf48 100644
--- a/templates/account/blocks.tpl
+++ b/templates/account/blocks.tpl
@@ -22,12 +22,7 @@
 							<hr />
 							<button class="btn btn-sm btn-primary pull-right" data-uid="{../uid}" data-action="toggle">[[user:block_toggle]]</button>
 							<div class="pull-left">
-								<a href="{config.relative_path}/uid/{../uid}">
-									<!-- IF ../picture -->
-									<img class="avatar avatar-sm" component="user/picture" src="{../picture}" itemprop="image" />
-									<!-- ELSE -->
-									<div class="avatar avatar-sm" component="user/picture" style="background-color: {../icon:bgColor};">{../icon:text}</div><!-- END -->{../username}
-								</a>
+								<a href="{config.relative_path}/uid/{../uid}">{buildAvatar(edit, "sm", true)} {../username}</a>
 							</div>
 							<!-- END -->
 							<!-- END -->
diff --git a/templates/chat.tpl b/templates/chat.tpl
index a88c145..e5632f9 100644
--- a/templates/chat.tpl
+++ b/templates/chat.tpl
@@ -13,12 +13,7 @@
 						<li class="dropdown-header">[[modules:chat.in-room]]</li>
 						<!-- BEGIN users -->
 						<li>
-							<a href="{config.relative_path}/uid/{../uid}">
-								<!-- IF ../picture -->
-								<img class="avatar avatar-sm" component="user/picture" src="{../picture}" itemprop="image" />
-								<!-- ELSE -->
-								<div class="avatar avatar-sm" component="user/picture" style="background-color: {../icon:bgColor};">{../icon:text}</div><!-- END -->{../username}
-							</a>
+							<a href="{config.relative_path}/uid/{../uid}">{buildAvatar(users, "sm", true)} {../username}</a>
 						</li>
 						<!-- END -->
 						<li role="separator" class="divider"></li>
diff --git a/templates/partials/chats/message-window.tpl b/templates/partials/chats/message-window.tpl
index 0fdc7be..e0c8043 100644
--- a/templates/partials/chats/message-window.tpl
+++ b/templates/partials/chats/message-window.tpl
@@ -3,7 +3,7 @@
 	<div component="chat/header">
 		<button type="button" class="close" data-action="pop-out"><span aria-hidden="true"><i class="fa fa-compress"></i></span><span class="sr-only">[[modules:chat.pop-out]]</span></button>
 		<button type="button" class="close" aria-label="Close" data-action="close"><span aria-hidden="true">&times;</span></button>
-		
+
 		<div class="dropdown pull-right">
 			<button class="close" data-toggle="dropdown" component="chat/controlsToggle"><i class="fa fa-gear"></i></button>
 			<ul class="dropdown-menu dropdown-menu-right pull-right" component="chat/controls">
@@ -11,12 +11,7 @@
 				<li class="dropdown-header">[[modules:chat.in-room]]</li>
 				<!-- BEGIN users -->
 				<li>
-					<a href="{config.relative_path}/uid/{../uid}">
-						<!-- IF ../picture -->
-						<img class="avatar avatar-sm" component="user/picture" src="{../picture}" itemprop="image" />
-						<!-- ELSE -->
-						<div class="avatar avatar-sm" component="user/picture" style="background-color: {../icon:bgColor};">{../icon:text}</div><!-- END -->{../username}
-					</a>
+					<a href="{config.relative_path}/uid/{../uid}">{buildAvatar(users, "sm", true)} {../username}</a>
 				</li>
 				<!-- END -->
 				<li role="separator" class="divider"></li>
diff --git a/templates/partials/modals/manage_room_users.tpl b/templates/partials/modals/manage_room_users.tpl
index 4185c46..dcccc96 100644
--- a/templates/partials/modals/manage_room_users.tpl
+++ b/templates/partials/modals/manage_room_users.tpl
@@ -1,13 +1,7 @@
 <!-- BEGIN users -->
 <li class="list-group-item">
 	<!-- IF ../canKick --><button class="pull-right btn btn-xs btn-link" data-action="kick" data-uid="{../uid}">[[modules:chat.kick]]</button><!-- END -->
-	<!-- IF ../isOwner --><i class="fa fa-star text-warning" title="[[modules:chat.owner]]"></i><!-- END -->
-	<!-- IF ../picture -->
-	<img class="avatar avatar-sm" component="user/picture" data-uid="{../uid}" src="{../picture}" align="left" itemprop="image" />
-	<!-- ELSE -->
-	<div class="avatar avatar-sm" component="user/picture" data-uid="{../uid}" style="background-color: {../icon:bgColor};">{../icon:text}</div>
-	<!-- ENDIF ../picture -->
-
-	<span>{../username}</span>
+	{buildAvatar(users, "sm", true)}
+	<span>{../username} <!-- IF ../isOwner --><i class="fa fa-star text-warning" title="[[modules:chat.owner]]"></i><!-- END --></span>
 </li>
 <!-- END -->
\ No newline at end of file
diff --git a/templates/partials/users_list.tpl b/templates/partials/users_list.tpl
index afb08b4..c838577 100644
--- a/templates/partials/users_list.tpl
+++ b/templates/partials/users_list.tpl
@@ -1,6 +1,6 @@
 <!-- BEGIN users -->
 <li class="users-box registered-user" data-uid="{users.uid}">
-	<a href="{config.relative_path}/user/{users.userslug}">{buildAvatar(users, "lg", true)}</a>
+	<a href="{config.relative_path}/user/{users.userslug}">{buildAvatar(users, "80", true)}</a>
 	<br/>
 	<div class="user-info">
 		<span>