diff --git a/file/js/be.bastelstu.Chat.litcoffee b/file/js/be.bastelstu.Chat.litcoffee
index 3ab3f6d..701d5bb 100644
--- a/file/js/be.bastelstu.Chat.litcoffee
+++ b/file/js/be.bastelstu.Chat.litcoffee
@@ -736,11 +736,18 @@ Open private channel
 					li.addClass 'privateChannel'
 					
 					span = $ '<span class="userAvatar framed" />'
-					span.addClass 'jsTooltip'
-					span.attr 'title', userList.allTime[userID].username
 					
-					li.append $(userList.allTime[userID].avatar[16]).wrap(span).parent().addClass 'small'
-					li.append $(userList.allTime[userID].avatar[32]).wrap(span).parent().addClass 'large'
+					avatar = $ userList.allTime[userID].avatar[16]
+					avatar.addClass 'jsTooltip'
+					avatar.attr 'title', userList.allTime[userID].username
+					avatar.wrap span
+					li.append avatar.parent().addClass 'small'
+					
+					avatar = $ userList.allTime[userID].avatar[32]
+					avatar.addClass 'jsTooltip'
+					avatar.attr 'title', userList.allTime[userID].username
+					avatar.wrap span
+					li.append avatar.parent().addClass 'large'
 					
 					$('#privateChannelsMenu ul').append li
 					
diff --git a/template/chat.tpl b/template/chat.tpl
index 9efa291..d7194f3 100644
--- a/template/chat.tpl
+++ b/template/chat.tpl
@@ -78,11 +78,11 @@
 	<div id="privateChannelsMenu">
 		<ul>
 			<li id="privateChannel0" class="privateChannel active" data-private-channel-id="0">
-				<span class="userAvatar framed jsTooltip small" title="{lang}chat.general.room{/lang}">
-					<span class="icon icon16 icon-comment-alt"></span>
+				<span class="userAvatar framed small">
+					<span class="icon icon16 icon-comment-alt jsTooltip" title="{lang}chat.general.room{/lang}"></span>
 				</span>
-				<span class="userAvatar framed jsTooltip large" title="{lang}chat.general.room{/lang}">
-					<span class="icon icon32 icon-comment-alt"></span>
+				<span class="userAvatar framed large">
+					<span class="icon icon32 icon-comment-alt jsTooltip" title="{lang}chat.general.room{/lang}"></span>
 				</span>
 			</li>
 		</ul>