diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index f1451b5912..85e6a24734 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -389,14 +389,20 @@
 	socket.on('api:posts.favourite', function(data) {
 		if (data.status === 'ok' && data.pid) {
 			var favEl = document.querySelector('.post_rep_' + data.pid).nextSibling;
-			if (favEl) favEl.className = 'icon-star';
+			if (favEl) {
+				favEl.className = 'icon-star';
+				$(favEl).parent().addClass('btn-warning');
+			}
 		}
 	});
 
 	socket.on('api:posts.unfavourite', function(data) {
 		if (data.status === 'ok' && data.pid) {
 			var favEl = document.querySelector('.post_rep_' + data.pid).nextSibling;
-			if (favEl) favEl.className = 'icon-star-empty';
+			if (favEl) {
+				favEl.className = 'icon-star-empty';
+				$(favEl).parent().removeClass('btn-warning');
+			}	
 		}
 	});
 
diff --git a/public/templates/category.tpl b/public/templates/category.tpl
index d49af806b8..bbaae0322d 100644
--- a/public/templates/category.tpl
+++ b/public/templates/category.tpl
@@ -10,13 +10,8 @@
 		<div id="category_active_users"></div>
 	</ul>
 </div>
-<div class="alert alert-warning hide {no_topics_message}" id="category-no-topics">
-	<strong>There are no topics in this category.</strong><br />
-	Why don't you try posting one?
-</div>
 
 <div>
-
 	<button id="new_post" class="btn btn-primary btn-large {show_topic_button}">New Topic</button>
 
 	<div class="inline-block pull-right">
@@ -27,7 +22,12 @@
 	</div>
 </div>
 
-<hr class="{show_sidebar}" />
+<hr/>
+
+<div class="alert alert-warning hide {no_topics_message}" id="category-no-topics">
+	<strong>There are no topics in this category.</strong><br />
+	Why don't you try posting one?
+</div>
 
 <div class="category row">
 	<div class="{topic_row_size}">
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index 4068c4c29b..aed8274cc9 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -42,7 +42,7 @@
 						<button id="ids_{main_posts.pid}_{main_posts.uid}" class="btn delete {main_posts.display_moderator_tools}" type="button" title="Delete"><i class="icon-trash"></i></button>
 						<div class="btn-group">
 							<button class="btn follow" type="button" title="Be notified of new replies in this topic"><i class="icon-eye-open"></i></button>
-							<button id="favs_{main_posts.pid}_{main_posts.uid}" class="favourite btn" type="button">
+							<button id="favs_{main_posts.pid}_{main_posts.uid}" class="favourite btn {main_posts.fav_button_class}" type="button">
 								<span>Favourite</span>
 								<span class="post_rep_{main_posts.pid}">{main_posts.post_rep} </span><i class="{main_posts.fav_star_class}"></i>
 							</button>
diff --git a/src/posts.js b/src/posts.js
index c6033071fb..0943fad986 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -226,7 +226,8 @@ var	RDB = require('./redis.js'),
 
 					postData.content = postTools.markdownToHTML(postData.content);
 					postData.post_rep = 0;
-					postData.relativeTime = utils.relativeTime(postData.timestamp)
+					postData.relativeTime = utils.relativeTime(postData.timestamp);
+					postData.fav_button_class = '';
 					postData.fav_star_class = 'icon-star-empty';
 					postData['edited-class'] = 'none';
 					postData.show_banned = 'hide';
diff --git a/src/topics.js b/src/topics.js
index 29c435bde3..8ab3604734 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -79,6 +79,7 @@ marked.setOptions({
 					privileges = results[2];
 
 				for(var i=0; i<postData.length; ++i) {
+					postData[i].fav_button_class = fav_data[postData[i].pid]? 'btn-warning' : '';
 					postData[i].fav_star_class = fav_data[postData[i].pid] ? 'icon-star' : 'icon-star-empty';
 					postData[i]['display_moderator_tools'] = (postData[i].uid == current_user || privileges.editable) ? 'show' : 'none';
 					postData[i].show_banned = postData[i].user_banned === '1'?'show':'hide';