diff --git a/public/src/app.js b/public/src/app.js
index 4f2c848c0b..0460e440d7 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -473,6 +473,19 @@ app.cacheBuster = null;
 		});
 	}
 
+	app.updateUserStatus = function(el, status) {
+		if (!el.length) {
+			return;
+		}
+
+		translator.translate('[[global:' + status + ']]', function(translated) {
+			el.removeClass('online offline dnd away')
+				.addClass(status)
+				.attr('title', translated)
+				.attr('data-original-title', translated);
+		});
+	};
+
 	function handleNewTopic() {
 		$('#content').on('click', '#new_topic', function() {
 			require(['composer'], function(composer) {
diff --git a/public/src/client/account/profile.js b/public/src/client/account/profile.js
index b65b998d60..263b1ae873 100644
--- a/public/src/client/account/profile.js
+++ b/public/src/client/account/profile.js
@@ -69,18 +69,11 @@ define('forum/account/profile', ['forum/account/header', 'forum/infinitescroll',
 	}
 
 	function onUserStatusChange(data) {
-		var onlineStatus = $('.account-online-status');
-
-		if(parseInt(ajaxify.variables.get('theirid'), 10) !== parseInt(data.uid, 10)) {
+		if (parseInt(ajaxify.variables.get('theirid'), 10) !== parseInt(data.uid, 10)) {
 			return;
 		}
 
-		translator.translate('[[global:' + data.status + ']]', function(translated) {
-			onlineStatus.attr('class', 'account-online-status fa fa-circle status ' + data.status)
-				.attr('title', translated)
-				.attr('data-original-title', translated);
-		});
-
+		app.updateUserStatus($('.account [component="user/status"]'), data.status);
 	}
 
 	function loadMorePosts(direction) {
diff --git a/public/src/client/chats.js b/public/src/client/chats.js
index d506d81654..2e9221023f 100644
--- a/public/src/client/chats.js
+++ b/public/src/client/chats.js
@@ -163,16 +163,7 @@ define('forum/chats', ['string', 'sounds', 'forum/infinitescroll', 'translator']
 		});
 
 		socket.on('event:user_status_change', function(data) {
-			var userEl = $('.chats-list li[data-uid="' + data.uid +'"]');
-
-			if (userEl.length) {
-				var statusEl = userEl.find('.status');
-				translator.translate('[[global:' + data.status + ']]', function(translated) {
-					statusEl.attr('class', 'fa fa-circle status ' + data.status)
-						.attr('title', translated)
-						.attr('data-original-title', translated);
-				});
-			}
+			app.updateUserStatus($('.chats-list [data-uid="' + data.uid + '"] [component="user/status"]'), data.status);
 		});
 	};
 
diff --git a/public/src/client/topic/browsing.js b/public/src/client/topic/browsing.js
index 2a0eb1eac5..2c125ba4ec 100644
--- a/public/src/client/topic/browsing.js
+++ b/public/src/client/topic/browsing.js
@@ -12,7 +12,7 @@ define('forum/topic/browsing', ['translator'], function(translator) {
 		if (data && data.room.indexOf('topic_' + ajaxify.variables.get('topic_id')) !== -1) {
 			$('[component="topic/browsing/list"]').parent().toggleClass('hidden', !data.users.length);
 			for(var i=0; i<data.users.length; ++i) {
-				addUserIcon(data.users[i]);	
+				addUserIcon(data.users[i]);
 			}
 
 			updateUserCount(data.total);
@@ -48,20 +48,11 @@ define('forum/topic/browsing', ['translator'], function(translator) {
 	};
 
 	Browsing.onUserStatusChange = function(data) {
-		updateOnlineIcon($('.username-field[data-uid="' + data.uid + '"]'), data.status);
+		app.updateUserStatus($('[data-uid="' + data.uid + '"] [component="user/status"]'), data.status);
 
 		updateBrowsingUsers(data);
 	};
 
-	function updateOnlineIcon(el, status) {
-		translator.translate('[[global:' + status + ']]', function(translated) {
-			el.siblings('i')
-				.attr('class', 'fa fa-circle status ' + status)
-				.attr('title', translated)
-				.attr('data-original-title', translated);
-		});
-	}
-
 	function updateBrowsingUsers(data) {
 		var activeEl = $('[component="topic/browsing/list"]');
 		var user = activeEl.find('a[data-uid="'+ data.uid + '"]');
diff --git a/public/src/client/users.js b/public/src/client/users.js
index 0a08454ecb..5572c05cb1 100644
--- a/public/src/client/users.js
+++ b/public/src/client/users.js
@@ -182,17 +182,8 @@ define('forum/users', ['translator'], function(translator) {
 		if (data.status === 'offline') {
 			return;
 		}
-		var usersContainer = $('#users-container');
-		var userEl = usersContainer.find('li[data-uid="' + data.uid +'"]');
-
-		if (userEl.length) {
-			var statusEl = userEl.find('.status');
-			translator.translate('[[global:' + data.status + ']]', function(translated) {
-				statusEl.attr('class', 'fa fa-circle status ' + data.status)
-					.attr('title', translated)
-					.attr('data-original-title', translated);
-			});
-		}
+
+		app.updateUserStatus($('#users-container [data-uid="' + data.uid +'"] [component="user/status"]'), data.status);
 	}
 
 	function getActiveSection() {
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index da25e104d5..f2a994cf1e 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -118,7 +118,7 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats', 'translator'], fun
 
 		socket.on('event:user_status_change', function(data) {
 			var modal = module.getModal(data.uid);
-			updateStatus(modal, data.status);
+			app.updateUserStatus(modal.find('[component="user/status"]'), data.status);
 		});
 	};
 
@@ -153,20 +153,12 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats', 'translator'], fun
 			if (err) {
 				return app.alertError(err.message);
 			}
-			updateStatus(chatModal, status);
-		});
-	}
 
-	function updateStatus(chatModal, status) {
-		translator.translate('[[global:' + status + ']]', function(translated) {
-			chatModal.find('#chat-user-status').attr('class', 'fa fa-circle status ' + status)
-				.attr('title', translated)
-				.attr('data-original-title', translated);
+			app.updateUserStatus(chatModal.find('[component="user/status"]'), status);
 		});
 	}
 
 	module.createModal = function(username, touid, callback) {
-
 		templates.parse('chat', {}, function(chatTpl) {
 			translator.translate(chatTpl, function (chatTpl) {