diff --git a/less/chats.less b/less/chats.less
index 4eeaad3..882d1d6 100644
--- a/less/chats.less
+++ b/less/chats.less
@@ -41,7 +41,7 @@
 		}
 
 		.username {
-			font-size: 18px;
+			font-size: 14px;
 
 			&:after {
 				display: inline-block;
@@ -54,9 +54,6 @@
 
 		.teaser-timestamp {
 			font-size: 10px;
-			position: absolute;
-			top: 8px;
-			right: 24px;
 		}
 
 		a {
diff --git a/less/header.less b/less/header.less
index 8b6b350..5b4db30 100644
--- a/less/header.less
+++ b/less/header.less
@@ -17,7 +17,6 @@
 
 			img, .user-icon {
 				.user-icon-style(@border-radius: 50%);
-				float: left;
 			}
 
 			a {
diff --git a/templates/chat.tpl b/templates/chat.tpl
index f80d9dd..83dc601 100644
--- a/templates/chat.tpl
+++ b/templates/chat.tpl
@@ -6,11 +6,7 @@
 			<div class="modal-header">
 				<button id="chat-close-btn" type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
 				<button type="button" class="close" data-action="maximize"><span aria-hidden="true"><i class="fa fa-expand"></i></span><span class="sr-only">[[modules:chat.maximize]]</span></button>
-				<h4>
-					<i component="user/status" class="fa fa-circle status offline" title="[[global:offline]]"></i>
-					[[modules:chat.chatting_with]]
-					<span class="user-typing hide"><i class="fa fa-keyboard-o fa-fw"></i></span>
-				</h4>
+				<h4>[[modules:chat.chatting_with]]</h4>
 
 				<div class="users-tag-container inline-block">
 					<input class="users-tag-input" type="text" class="form-control" placeholder="enter users here" tabindex="4"/>
diff --git a/templates/chats.tpl b/templates/chats.tpl
index bd59294..24ea44d 100644
--- a/templates/chats.tpl
+++ b/templates/chats.tpl
@@ -6,11 +6,19 @@
 		<ul component="chat/recent" class="chats-list" data-nextstart="{nextStart}">
 			<!-- BEGIN rooms -->
 			<li component="chat/recent/room" data-roomid="{rooms.roomId}" class="<!-- IF ../unread -->unread<!-- ENDIF ../unread -->">
-			<!-- BEGIN rooms.users -->
-			<!-- IMPORT partials/chat_contact.tpl -->
-			<!-- END rooms.users -->
+
+			<div data-username="{rooms.lastUser.username}" data-uid="{rooms.lastUser.uid}">
+				<!-- IF rooms.lastUser.picture -->
+				<img class="user-img" src="{rooms.lastUser.picture}">
+				<!-- ELSE -->
+				<div class="user-icon user-img" style="background-color: {rooms.lastUser.icon:bgColor};">{rooms.lastUser.icon:text}</div>
+				<!-- ENDIF rooms.lastUser.picture -->
+				<i component="user/status" title="[[global:{rooms.lastUser.status}]]" class="fa fa-circle status {rooms.lastUser.status}"></i>
+				<span class="username">{rooms.usernames}</span>
+			</div>
+
 			<span class="teaser-content">{rooms.teaser.content}</span>
-			<span class="teaser-timestamp timeago" title="{rooms.teaser.timestampISO}"></span>
+			<span class="teaser-timestamp timeago pull-right" title="{rooms.teaser.timestampISO}"></span>
 			</li>
 			<!-- END rooms -->
 		</ul>
@@ -26,7 +34,7 @@
 		<div component="chat/messages" class="expanded-chat" data-roomid="{roomId}">
 
 			<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>
-			<h1 component="chat/title">{usernames}</h1>
+			<h4 component="chat/title">[[modules:chat.chatting_with]]</h4>
 
 			<div class="users-tag-container">
 				<input class="users-tag-input" type="text" class="form-control" placeholder="enter users here" tabindex="4"/>