diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index c5453595a661..ee51215675a0 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -445,12 +445,12 @@
 				uid = ids[1];
 
 			if (thread_state.locked !== '1') {
-				if (this.children[1].className == 'icon-star-empty') {
-					this.children[1].className = 'icon-star';
+				if (this.children[2].className == 'icon-star-empty') {
+					this.children[2].className = 'icon-star';
 					socket.emit('api:posts.favourite', {pid: pid, room_id: app.current_room});
 				}
 				else {
-					this.children[1].className = 'icon-star-empty';
+					this.children[2].className = 'icon-star-empty';
 					socket.emit('api:posts.unfavourite', {pid: pid, room_id: app.current_room});
 				}
 			}
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index 4f7aee5441a7..f6c4d3433346 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -37,7 +37,9 @@
 						<button id="ids_{main_posts.pid}_{main_posts.uid}" class="btn delete {main_posts.display_moderator_tools}" type="button"><i class="icon-trash"></i></button>
 						<button id="quote_{main_posts.pid}_{main_posts.uid}" class="btn quote" type="button"><i class="icon-quote-left"></i></button>
 
-						<button id="favs_{main_posts.pid}_{main_posts.uid}" class="favourite btn" type="button"><span class="post_rep_{main_posts.pid}">Favourite {main_posts.post_rep} </span><i class="{main_posts.fav_star_class}"></i></button>
+						<button id="favs_{main_posts.pid}_{main_posts.uid}" class="favourite btn" 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>
 						<button id="post_reply" class="btn btn-primary btn post_reply hidden-phone" type="button">Reply <i class="icon-reply"></i></button>
 					</div>
 					<div style="clear:both; margin-bottom: 10px;"></div>