diff --git a/templates/partials/topic/post-menu-list.tpl b/templates/partials/topic/post-menu-list.tpl
index 5e7f434..0185d03 100644
--- a/templates/partials/topic/post-menu-list.tpl
+++ b/templates/partials/topic/post-menu-list.tpl
@@ -2,23 +2,23 @@
 <li role="presentation" class="dropdown-header">[[topic:tools]]</li>
 <li role="presentation">
 	<a component="post/edit" role="menuitem" tabindex="-1" href="#">
-		<span class="menu-icon"><i class="fa fa-pencil"></i></span> [[topic:edit]]
+		<span class="menu-icon"><i class="fa fa-fw fa-pencil"></i></span> [[topic:edit]]
 	</a>
 </li>
 <li role="presentation">
 	<a component="post/delete" role="menuitem" tabindex="-1" href="#" class="<!-- IF posts.deleted -->hidden<!-- ENDIF posts.deleted -->">
-		<div class="inline menu-icon"><i class="fa fa-trash-o"></i></div> <span>[[topic:delete]]</span>
+		<div class="inline menu-icon"><i class="fa fa-fw fa-trash-o"></i></div> <span>[[topic:delete]]</span>
 	</a>
 </li>
 <li role="presentation">
 	<a component="post/restore" role="menuitem" tabindex="-1" href="#" class="<!-- IF !posts.deleted -->hidden<!-- ENDIF !posts.deleted -->">
-		<div class="inline menu-icon"><i class="fa fa-history"></i></div> <span>[[topic:restore]]</span>
+		<div class="inline menu-icon"><i class="fa fa-fw fa-history"></i></div> <span>[[topic:restore]]</span>
 	</a>
 </li>
 <!-- IF posts.display_purge_tools -->
 <li role="presentation">
 	<a component="post/purge" role="menuitem" tabindex="-1" href="#" class="<!-- IF !posts.deleted -->hidden<!-- ENDIF !posts.deleted -->">
-		<span class="menu-icon"><i class="fa fa-eraser"></i></span> [[topic:purge]]
+		<span class="menu-icon"><i class="fa fa-fw fa-eraser"></i></span> [[topic:purge]]
 	</a>
 </li>
 <!-- END -->
@@ -26,7 +26,7 @@
 <!-- IF posts.display_history -->
 <li role="presentation">
 	<a component="post/view-history" role="menuitem" tabindex="-1" href="#">
-		<span class="menu-icon"><i class="fa fa-history"></i></span> [[topic:view-history]]
+		<span class="menu-icon"><i class="fa fa-fw fa-history"></i></span> [[topic:view-history]]
 	</a>
 </li>
 <!-- END -->
@@ -34,7 +34,7 @@
 <!-- IF posts.display_move_tools -->
 <li role="presentation">
 	<a component="post/move" role="menuitem" tabindex="-1" href="#">
-		<span class="menu-icon"><i class="fa fa-arrows"></i></span> [[topic:move]]
+		<span class="menu-icon"><i class="fa fa-fw fa-arrows"></i></span> [[topic:move]]
 	</a>
 </li>
 <!-- ENDIF posts.display_move_tools -->
@@ -42,13 +42,13 @@
 <!-- IF posts.ip -->
 <li role="presentation">
 	<a component="post/copy-ip" role="menuitem" tabindex="-1" href="#" data-clipboard-text="{posts.ip}">
-		<span class="menu-icon" ><i class="fa fa-copy"></i></span> [[topic:copy-ip]] {posts.ip}
+		<span class="menu-icon" ><i class="fa fa-fw fa-copy"></i></span> [[topic:copy-ip]] {posts.ip}
 	</a>
 </li>
 <!-- IF posts.display_ip_ban -->
 <li role="presentation">
 	<a component="post/ban-ip" role="menuitem" tabindex="-1" href="#" data-ip="{posts.ip}">
-		<span class="menu-icon"><i class="fa fa-ban"></i></span> [[topic:ban-ip]] {posts.ip}
+		<span class="menu-icon"><i class="fa fa-fw fa-ban"></i></span> [[topic:ban-ip]] {posts.ip}
 	</a>
 </li>
 <!-- ENDIF posts.display_ip_ban -->
@@ -58,7 +58,7 @@
 <!-- BEGIN posts.tools -->
 <li role="presentation">
 	<a component="{posts.tools.action}" role="menuitem" tabindex="-1" href="#">
-		<span class="menu-icon"><i class="fa {posts.tools.icon}"></i></span> {{posts.tools.html}}
+		<span class="menu-icon"><i class="fa fa-fw {posts.tools.icon}"></i></span> {{posts.tools.html}}
 	</a>
 </li>
 <!-- END posts.tools -->
@@ -74,8 +74,8 @@
 		<span class="bookmark-text">[[topic:bookmark]]</span>
 		<span component="post/bookmark-count" class="bookmarkCount" data-bookmarks="{posts.bookmarks}">{posts.bookmarks}</span>&nbsp;
 
-		<i component="post/bookmark/on" class="fa fa-heart <!-- IF !posts.bookmarked -->hidden<!-- ENDIF !posts.bookmarked -->"></i>
-		<i component="post/bookmark/off" class="fa fa-heart-o <!-- IF posts.bookmarked -->hidden<!-- ENDIF posts.bookmarked -->"></i>
+		<i component="post/bookmark/on" class="fa fa-fw fa-heart <!-- IF !posts.bookmarked -->hidden<!-- ENDIF !posts.bookmarked -->"></i>
+		<i component="post/bookmark/off" class="fa fa-fw fa-heart-o <!-- IF posts.bookmarked -->hidden<!-- ENDIF posts.bookmarked -->"></i>
 	</a>
 </li>
 <!-- ENDIF config.loggedIn -->
@@ -86,7 +86,7 @@
 <!-- ENDIF postSharing.length -->
 <!-- BEGIN postSharing -->
 	<li role="presentation">
-		<a role="menuitem" component="share/{postSharing.id}" tabindex="-1" href="#"><span class="menu-icon"><i class="fa {postSharing.class}"></i></span> {postSharing.name}</a>
+		<a role="menuitem" component="share/{postSharing.id}" tabindex="-1" href="#"><span class="menu-icon"><i class="fa fa-fw {postSharing.class}"></i></span> {postSharing.name}</a>
 	</li>
 <!-- END postSharing -->