diff --git a/src/styles/components/_buddylist.scss b/src/styles/components/_buddylist.scss
index 61ee7fbe..4b40a7b8 100644
--- a/src/styles/components/_buddylist.scss
+++ b/src/styles/components/_buddylist.scss
@@ -132,7 +132,7 @@
   &.hovered .buddyactions {
     right: 0;
   }
-  .buddyimage {
+  .avatar {
     background: $actioncolor1;
     border-radius: 2px;
     float: left;
diff --git a/src/styles/components/_chat.scss b/src/styles/components/_chat.scss
index 019c0d7d..aa82a366 100644
--- a/src/styles/components/_chat.scss
+++ b/src/styles/components/_chat.scss
@@ -327,7 +327,7 @@ content: '\f00c';
 color:#ccc;
 }
 
-.chat .output .message .buddyimage {
+.chat .output .message .avatar {
 position: absolute;
 top: 4px;
 width:46px;
@@ -338,15 +338,15 @@ border-radius: 2px;
 background: $actioncolor1;
 text-align:center;
 }
-.chat .output .message.is_self .buddyimage {
+.chat .output .message.is_self .avatar {
 right: 4px;
 left: auto;
 }
-.chat .output .message .buddyimage > i {
+.chat .output .message .avatar > i {
 line-height:46px;
 color:$actioncolor2;
 }
-.chat .output .message .buddyimage > img {
+.chat .output .message .avatar > img {
 position: absolute;
 left:0px;
 right:0px;
@@ -513,4 +513,4 @@ right:32px;
 		border-top: 1px solid $bordercolor;
 		top: 0px;
 	}
-}
\ No newline at end of file
+}
diff --git a/static/js/controllers/chatroomcontroller.js b/static/js/controllers/chatroomcontroller.js
index d7ddd6ec..b3341029 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="buddyimage"><i class="fa fa-user fa-3x"/><img/></div>');
+                    picture = $('<div class="avatar"><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 2af5865b..69aa87d8 100644
--- a/static/partials/buddy.html
+++ b/static/partials/buddy.html
@@ -1,5 +1,5 @@
 <div class="buddy withSubline" ng-click="doDefault(user.Id)">
-    <div class="buddyimage"><i class="fa fa-user fa-3x"/><img ng-show="status.buddyPicture" alt ng-src="{{status.buddyPicture}}" width="46" height="46"/></div>
+    <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">{{user.Id|displayName}}</div>
     <div class="browser">{{user.Ua}}</div>
 </div>