diff --git a/src/styles/components/_buddylist.scss b/src/styles/components/_buddylist.scss
index 4b40a7b8..1d6b7542 100644
--- a/src/styles/components/_buddylist.scss
+++ b/src/styles/components/_buddylist.scss
@@ -126,13 +126,13 @@
 }
 
 .buddy {
-  &.withSubline .display-name {
+  &.withSubline .buddy1 {
     top: 15px;
   }
   &.hovered .buddyactions {
     right: 0;
   }
-  .avatar {
+  .buddyPicture {
     background: $actioncolor1;
     border-radius: 2px;
     float: left;
@@ -155,7 +155,7 @@
       top: 0;
     }
   }
-  .display-name {
+  .buddy1 {
     color: $componentfg1;
     font-weight: bold;
     font-size: 14px;
@@ -168,7 +168,7 @@
     top: 24px;
     white-space: nowrap;
   }
-  .browser {
+  .buddy2 {
     color: $componentfg2;
     left: 65px;
     overflow: hidden;
diff --git a/src/styles/components/_chat.scss b/src/styles/components/_chat.scss
index 3171c527..8246edc2 100644
--- a/src/styles/components/_chat.scss
+++ b/src/styles/components/_chat.scss
@@ -341,11 +341,11 @@
 }
 
 .chat .message {
-  &.is_self .avatar {
+  &.is_self .buddyPicture {
     left: auto;
     right: 4px;
   }
-  .avatar {
+  .buddyPicture {
     background: $actioncolor1;
     border-radius: 2px;
     height: 46px;
diff --git a/static/js/controllers/chatroomcontroller.js b/static/js/controllers/chatroomcontroller.js
index b3341029..2cf1fcf5 100644
--- a/static/js/controllers/chatroomcontroller.js
+++ b/static/js/controllers/chatroomcontroller.js
@@ -299,7 +299,7 @@ define(['underscore', 'moment', 'text!partials/fileinfo.html'], function(_, mome
                     title.html(displayName(from, true));
                     extra_css += "with_name ";
                     var imgSrc = buddyImageSrc(from);
-                    picture = $('<div class="avatar"><i class="fa fa-user fa-3x"/><img/></div>');
+                    picture = $('<div class="buddyPicture"><i class="fa fa-user fa-3x"/><img/></div>');
                     if (imgSrc) {
                         picture.find("img").attr("src", imgSrc);
                     }
diff --git a/static/partials/buddy.html b/static/partials/buddy.html
index 34cfd853..0f94e185 100644
--- a/static/partials/buddy.html
+++ b/static/partials/buddy.html
@@ -1,5 +1,5 @@
 <div class="buddy withSubline">
-    <div class="avatar"><i class="fa fa-user fa-3x"/><img ng-show="status.buddyPicture" alt ng-src="{{status.buddyPicture}}" width="46" height="46"/></div>
-    <div class="display-name">{{session.Id|displayName}}</div>
-    <div class="browser"><i ng-show="session.Userid" class="fa fa-star-o"></i> {{session.Ua}}</div>
-</div>
\ No newline at end of file
+    <div class="buddyPicture"><i class="fa fa-user fa-3x"/><img ng-show="status.buddyPicture" alt ng-src="{{status.buddyPicture}}" width="46" height="46"/></div>
+    <div class="buddy1">{{session.Id|displayName}}</div>
+    <div class="buddy2"><i ng-show="session.Userid" class="fa fa-star-o"></i> {{session.Ua}}</div>
+</div>