diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index 59e4f01fc6..95e0b07b5f 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -915,7 +915,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 				x;
 
 			if (locked === true) {
-				translator.translate('<i class="fa fa-unlock"></i> [[topic:thread_tools.unlock]]', function(translated) {
+				translator.translate('<i class="fa fa-fw fa-unlock"></i> [[topic:thread_tools.unlock]]', function(translated) {
 					lockThreadEl.html(translated);
 				});
 				threadReplyBtn.attr('disabled', true);
@@ -939,7 +939,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 
 				thread_state.locked = '1';
 			} else {
-				translator.translate('<i class="fa fa-lock"></i> [[topic:thread_tools.lock]]', function(translated) {
+				translator.translate('<i class="fa fa-fw fa-lock"></i> [[topic:thread_tools.lock]]', function(translated) {
 					lockThreadEl.html(translated);
 				});
 				threadReplyBtn.attr('disabled', false);
@@ -973,7 +973,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 				deleteNotice = document.getElementById('thread-deleted') || document.createElement('div');
 
 			if (deleted) {
-				translator.translate('<i class="fa fa-comment"></i> [[topic:thread_tools.restore]]', function(translated) {
+				translator.translate('<i class="fa fa-fw fa-comment"></i> [[topic:thread_tools.restore]]', function(translated) {
 					deleteTextEl.html(translated);
 				});
 				threadEl.addClass('deleted');
@@ -986,7 +986,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 
 				thread_state.deleted = '1';
 			} else {
-				translator.translate('<i class="fa fa-trash-o"></i> [[topic:thread_tools.delete]]', function(translated) {
+				translator.translate('<i class="fa fa-fw fa-trash-o"></i> [[topic:thread_tools.delete]]', function(translated) {
 					deleteTextEl.html(translated);
 				});
 				threadEl.removeClass('deleted');
@@ -999,7 +999,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
 		function set_pinned_state(pinned, alert) {
 			var pinEl = $('.pin_thread');
 
-			translator.translate('<i class="fa fa-thumb-tack"></i> [[topic:thread_tools.' + (pinned ? 'unpin' : 'pin') + ']]', function(translated) {
+			translator.translate('<i class="fa fa-fw fa-thumb-tack"></i> [[topic:thread_tools.' + (pinned ? 'unpin' : 'pin') + ']]', function(translated) {
 				if (pinned) {
 					pinEl.html(translated);
 					if (alert) {
diff --git a/public/templates/topic.tpl b/public/templates/topic.tpl
index 8bca98cdd0..a4a3b686ea 100644
--- a/public/templates/topic.tpl
+++ b/public/templates/topic.tpl
@@ -177,14 +177,14 @@
 					<div class="btn-group thread-tools hide">
 						<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">[[topic:thread_tools.title]] <span class="caret"></span></button>
 						<ul class="dropdown-menu pull-right">
-							<li><a href="#" class="markAsUnreadForAll"><i class="fa fa-inbox"></i> [[topic:thread_tools.markAsUnreadForAll]]</a></li>
-							<li><a href="#" class="pin_thread"><i class="fa fa-thumb-tack"></i> [[topic:thread_tools.pin]]</a></li>
-							<li><a href="#" class="lock_thread"><i class="fa fa-lock"></i> [[topic:thread_tools.lock]]</a></li>
+							<li><a href="#" class="markAsUnreadForAll"><i class="fa fa-fw fa-inbox"></i> [[topic:thread_tools.markAsUnreadForAll]]</a></li>
+							<li><a href="#" class="pin_thread"><i class="fa fa-fw fa-thumb-tack"></i> [[topic:thread_tools.pin]]</a></li>
+							<li><a href="#" class="lock_thread"><i class="fa fa-fw fa-lock"></i> [[topic:thread_tools.lock]]</a></li>
 							<li class="divider"></li>
-							<li><a href="#" class="move_thread"><i class="fa fa-arrows"></i> [[topic:thread_tools.move]]</a></li>
-							<li><a href="#" class="fork_thread"><i class="fa fa-code-fork"></i> [[topic:thread_tools.fork]]</a></li>
+							<li><a href="#" class="move_thread"><i class="fa fa-fw fa-arrows"></i> [[topic:thread_tools.move]]</a></li>
+							<li><a href="#" class="fork_thread"><i class="fa fa-fw fa-code-fork"></i> [[topic:thread_tools.fork]]</a></li>
 							<li class="divider"></li>
-							<li><a href="#" class="delete_thread"><span class="text-error"><i class="fa fa-trash-o"></i> [[topic:thread_tools.delete]]</span></a></li>
+							<li><a href="#" class="delete_thread"><span class="text-error"><i class="fa fa-fw fa-trash-o"></i> [[topic:thread_tools.delete]]</span></a></li>
 						</ul>
 					</div>
 				</div>
@@ -205,14 +205,14 @@
 			<div class="btn-group thread-tools hide dropup">
 				<button class="btn btn-default dropdown-toggle" data-toggle="dropdown" type="button">[[topic:thread_tools.title]] <span class="caret"></span></button>
 				<ul class="dropdown-menu pull-right">
-					<li><a href="#" class="markAsUnreadForAll"><i class="fa fa-inbox"></i> [[topic:thread_tools.markAsUnreadForAll]]</a></li>
-					<li><a href="#" class="pin_thread"><i class="fa fa-thumb-tack"></i> [[topic:thread_tools.pin]]</a></li>
-					<li><a href="#" class="lock_thread"><i class="fa fa-lock"></i> [[topic:thread_tools.lock]]</a></li>
+					<li><a href="#" class="markAsUnreadForAll"><i class="fa fa-fw fa-inbox"></i> [[topic:thread_tools.markAsUnreadForAll]]</a></li>
+					<li><a href="#" class="pin_thread"><i class="fa fa-fw fa-thumb-tack"></i> [[topic:thread_tools.pin]]</a></li>
+					<li><a href="#" class="lock_thread"><i class="fa fa-fw fa-lock"></i> [[topic:thread_tools.lock]]</a></li>
 					<li class="divider"></li>
-					<li><a href="#" class="move_thread"><i class="fa fa-arrows"></i> [[topic:thread_tools.move]]</a></li>
-					<li><a href="#" class="fork_thread"><i class="fa fa-code-fork"></i> [[topic:thread_tools.fork]]</a></li>
+					<li><a href="#" class="move_thread"><i class="fa fa-fw fa-arrows"></i> [[topic:thread_tools.move]]</a></li>
+					<li><a href="#" class="fork_thread"><i class="fa fa-fw fa-code-fork"></i> [[topic:thread_tools.fork]]</a></li>
 					<li class="divider"></li>
-					<li><a href="#" class="delete_thread"><span class="text-error"><i class="fa fa-trash-o"></i> [[topic:thread_tools.delete]]</span></a></li>
+					<li><a href="#" class="delete_thread"><span class="text-error"><i class="fa fa-fw fa-trash-o"></i> [[topic:thread_tools.delete]]</span></a></li>
 				</ul>
 			</div>
 		</div>