diff --git a/public/src/forum/accountedit.js b/public/src/forum/accountedit.js
index ab0d1a6cba..816c1a6181 100644
--- a/public/src/forum/accountedit.js
+++ b/public/src/forum/accountedit.js
@@ -221,10 +221,10 @@ $(document).ready(function() {
 			passwordvalid = utils.isPasswordValid(password.val());
 			if (password.val().length < 6) {
 				password_notify.html('Password too short');
-				password_notify.attr('class', 'label label-important');
+				password_notify.attr('class', 'label label-danger');
 			} else if(!passwordvalid) {
 				password_notify.html('Invalid password');
-				password_notify.attr('class', 'label label-important');
+				password_notify.attr('class', 'label label-danger');
 			} else {
 				password_notify.html('OK!');
 				password_notify.attr('class', 'label label-success');
@@ -236,7 +236,7 @@ $(document).ready(function() {
 		function onPasswordConfirmChanged() {
 			if(password.val() !== password_confirm.val()) {
 				password_confirm_notify.html('Passwords must match!');
-				password_confirm_notify.attr('class', 'label label-important');
+				password_confirm_notify.attr('class', 'label label-danger');
 				passwordsmatch = false;
 			} else {
 				password_confirm_notify.html('OK!');
diff --git a/public/src/forum/admin/users.js b/public/src/forum/admin/users.js
index 46a2f68b5f..d1fc9ab940 100644
--- a/public/src/forum/admin/users.js
+++ b/public/src/forum/admin/users.js
@@ -169,14 +169,14 @@
 			if(data && data.length === 0) {
 				$('#user-notfound-notify').html('User not found!')
 					.show()
-					.addClass('label-important')
+					.addClass('label-danger')
 					.removeClass('label-success');
 			}
 			else {
 				$('#user-notfound-notify').html(data.length + ' user'+(data.length>1?'s':'') + ' found!')
 					.show()
 					.addClass('label-success')
-					.removeClass('label-important');
+					.removeClass('label-danger');
 			}
 			
 			initUsers();
diff --git a/public/src/forum/users.js b/public/src/forum/users.js
index 0cba6d649b..1812f78faa 100644
--- a/public/src/forum/users.js
+++ b/public/src/forum/users.js
@@ -41,7 +41,7 @@
 			if(data === null) {
 				$('#user-notfound-notify').html('You need to be logged in to search!')
 					.show()
-					.addClass('label-important')
+					.addClass('label-danger')
 					.removeClass('label-success');
 				return;
 			}
@@ -57,14 +57,14 @@
 			if(data && data.length === 0) {
 				$('#user-notfound-notify').html('User not found!')
 					.show()
-					.addClass('label-important')
+					.addClass('label-danger')
 					.removeClass('label-success');
 			}
 			else {
 				$('#user-notfound-notify').html(data.length + ' user'+(data.length>1?'s':'') + ' found!')
 					.show()
 					.addClass('label-success')
-					.removeClass('label-important');
+					.removeClass('label-danger');
 			}
 
 		});
diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index aee7dec71b..760c8ae028 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -8,7 +8,7 @@ define(['taskbar'], function(taskbar) {
 		};
 
 	function createImageLabel(img, postImages) {
-		var imageLabel = $('<div class="label"><span>'+ img.name +'</span></div>');
+		var imageLabel = $('<div class="label label-primary"><span>'+ img.name +'</span></div>');
 		var closeButton = $('<button class="close">&times;</button>');
 
 		closeButton.on('click', function(e) {
diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index 04754479af..9f5c606a11 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -16,7 +16,7 @@
 				<span><i class="icon-circle-blank"></i> <span>offline</span></span>
 			</div>
 			<div class="{show_banned}">
-				<span class="label label-important">banned</span>
+				<span class="label label-danger">banned</span>
 			</div>
 			<div id="user-actions">
 				<a id="follow-btn" href="#" class="btn hide">Follow</a>
diff --git a/public/templates/accountedit.tpl b/public/templates/accountedit.tpl
index 945c94db9f..974147a6ef 100644
--- a/public/templates/accountedit.tpl
+++ b/public/templates/accountedit.tpl
@@ -140,14 +140,14 @@
 					<div class="control-group">
 						<label class="control-label" for="inputNewPassword">Password</label>
 						<div class="controls">
-							<input type="password" id="inputNewPassword" placeholder="New Password" value=""><br/><span id="password-notify" class="label label-important"></span>
+							<input type="password" id="inputNewPassword" placeholder="New Password" value=""><br/><span id="password-notify" class="label label-danger"></span>
 						</div>
 					</div>
 				
 					<div class="control-group">
 						<label class="control-label" for="inputNewPasswordAgain">Confirm Password</label>
 						<div class="controls">
-							<input type="password" id="inputNewPasswordAgain" placeholder="Confirm Password" value=""><br/><span id="password-confirm-notify" class="label label-important"></span>
+							<input type="password" id="inputNewPasswordAgain" placeholder="Confirm Password" value=""><br/><span id="password-confirm-notify" class="label label-danger"></span>
 						</div>
 					</div>
 				
diff --git a/public/templates/admin/users.tpl b/public/templates/admin/users.tpl
index 90b0e1ef16..ba4fcf4446 100644
--- a/public/templates/admin/users.tpl
+++ b/public/templates/admin/users.tpl
@@ -11,7 +11,7 @@
 <div class="search {search_display} well">
 	<input id="search-user" type="text" placeholder="Enter a username to search"/><br />
 	<i class="icon-spinner icon-spin none"></i>
-	<span id="user-notfound-notify" class="label label-important hide">User not found!</span><br/>
+	<span id="user-notfound-notify" class="label label-danger hide">User not found!</span><br/>
 </div>
 
 <ul id="users-container" class="users">
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index 2a576dbd45..1df6d1c766 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -85,7 +85,7 @@
 					<i class="icon-star"></i><span class="user_rep_{posts.uid} formatted-number">{posts.user_rep}</span>
 					<div id="ids_{posts.pid}_{posts.uid}" class="chat hidden-xs" title="Chat"><i class="icon-comment"></i></div>
 				</div>
-				<span class="label label-important {posts.show_banned}">banned</span>			
+				<span class="label label-danger {posts.show_banned}">banned</span>			
 			</div>
 			<div class="span11 col-md-12-tablet">
 				<div class="post-block speech-bubble">
diff --git a/public/templates/users.tpl b/public/templates/users.tpl
index 14a8e398d8..11ee202132 100644
--- a/public/templates/users.tpl
+++ b/public/templates/users.tpl
@@ -11,7 +11,7 @@
 	<div class="search {search_display} well">
 		<input id="search-user" type="text" placeholder="Enter a username to search"/><br />
 		<i class="icon-spinner icon-spin none"></i>
-		<span id="user-notfound-notify" class="label label-important hide">User not found!</span><br/>
+		<span id="user-notfound-notify" class="label label-danger hide">User not found!</span><br/>
 	</div>
 	
 	<ul id="users-container" class="users">