diff --git a/public/src/app.js b/public/src/app.js
index 7b4eeecd50..6dd35d3608 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -274,7 +274,7 @@ var socket,
 					uid = el.parents('li').attr('data-uid');
 
 				if (uid && users[uid]) {
-					el.siblings('i').attr('class', 'fa fa-circle status-' + users[uid].status)
+					el.siblings('i').attr('class', 'fa fa-circle status ' + users[uid].status)
 				}
 			});
 		});
@@ -460,7 +460,7 @@ var socket,
 
 	function updateOnlineStatus(uid) {
 		socket.emit('user.isOnline', uid, function(err, data) {
-			$('#logged-in-menu #user_label #user-profile-link>i').attr('class', 'fa fa-circle status-' + data.status);
+			$('#logged-in-menu #user_label #user-profile-link>i').attr('class', 'fa fa-circle status ' + data.status);
 		});
 	}
 
diff --git a/public/src/forum/account.js b/public/src/forum/account.js
index 8d85955669..51f43d5ffb 100644
--- a/public/src/forum/account.js
+++ b/public/src/forum/account.js
@@ -90,7 +90,7 @@ define(['forum/accountheader'], function(header) {
 
 		translator.get('global:' + data.status, function(translated) {
 			onlineStatus.find('span span').text(translated);
-			onlineStatus.find('i').attr('class', 'fa fa-circle status-' + data.status);
+			onlineStatus.find('i').attr('class', 'fa fa-circle status ' + data.status);
 		});
 
 	};
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index 05ebec507a..b1ec331c18 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -91,7 +91,7 @@ define(['taskbar', 'string'], function(taskbar, S) {
 
 	function checkStatus(chatModal) {
 		socket.emit('user.isOnline', chatModal.touid, function(err, data) {
-			$('#chat-user-status').attr('class', 'fa fa-circle status-' + data.status);
+			$('#chat-user-status').attr('class', 'fa fa-circle status ' + data.status);
 		});
 	}
 
diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index 95330af0f8..4bcb96b7df 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -13,7 +13,7 @@
 				<img src="{picture}" class="user-profile-picture img-thumbnail"/>
 			</div>
 			<div class="account-online-status">
-				<span><i class="fa fa-circle status-offline"></i> <span>[[user:offline]]</span></span>
+				<span><i class="fa fa-circle status offline"></i> <span>[[user:offline]]</span></span>
 			</div>
 			<!-- IF banned -->
 			<div>
diff --git a/public/templates/chat.tpl b/public/templates/chat.tpl
index 946fe4054e..51612add45 100644
--- a/public/templates/chat.tpl
+++ b/public/templates/chat.tpl
@@ -4,7 +4,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-				<h4>[[modules:chat.chatting_with]] <i id="chat-user-status" class="fa fa-circle status-offline"></i></h4>
+				<h4>[[modules:chat.chatting_with]] <i id="chat-user-status" class="fa fa-circle status offline"></i></h4>
 
 			</div>
 			<div class="modal-body">
diff --git a/public/templates/header.tpl b/public/templates/header.tpl
index 6f976ffe3c..d3ff094b45 100644
--- a/public/templates/header.tpl
+++ b/public/templates/header.tpl
@@ -134,16 +134,16 @@
 							</li>
 							<li role="presentation" class="divider"></li>
 							<li>
-								<a href="#" class="user-status" data-status="online"><i class="fa fa-circle status-online"></i><span> [[global:online]]</span></a>
+								<a href="#" class="user-status" data-status="online"><i class="fa fa-circle status online"></i><span> [[global:online]]</span></a>
 							</li>
 							<li>
-								<a href="#" class="user-status" data-status="away"><i class="fa fa-circle status-away"></i><span> [[global:away]]</span></a>
+								<a href="#" class="user-status" data-status="away"><i class="fa fa-circle status away"></i><span> [[global:away]]</span></a>
 							</li>
 							<li>
-								<a href="#" class="user-status" data-status="dnd"><i class="fa fa-circle status-dnd"></i><span> [[global:dnd]]</span></a>
+								<a href="#" class="user-status" data-status="dnd"><i class="fa fa-circle status dnd"></i><span> [[global:dnd]]</span></a>
 							</li>
 							<li>
-								<a href="#" class="user-status" data-status="offline"><i class="fa fa-circle status-offline"></i><span> [[global:invisible]]</span></a>
+								<a href="#" class="user-status" data-status="offline"><i class="fa fa-circle status offline"></i><span> [[global:invisible]]</span></a>
 							</li>
 						</ul>
 					</li>
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index eb3ad9bab6..1643fc76f1 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -53,7 +53,7 @@
 
 						<div class="btn-group">
 							<button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" type="button" title="[[topic:posted_by]] {posts.username}">
-								<i class="fa fa-circle status-offline"></i>
+								<i class="fa fa-circle status offline"></i>
 								<span class="visible-xs visible-sm pull-left"><img class="" src="{posts.picture}" width=18 height=18 />&nbsp;</span>
 								<span class="username-field" href="{relative_path}/user/{posts.userslug}" itemprop="author">{posts.username}&nbsp;</span>
 								<span class="caret"></span>