diff --git a/phpBB/styles/prosilver/template/posting_review.html b/phpBB/styles/prosilver/template/posting_review.html
index 25b719420b..3093630461 100644
--- a/phpBB/styles/prosilver/template/posting_review.html
+++ b/phpBB/styles/prosilver/template/posting_review.html
@@ -14,7 +14,16 @@
 
 	<div class="postbody" id="ppr{post_review_row.POST_ID}">
 		<h3><a href="#ppr{post_review_row.POST_ID}">{post_review_row.POST_SUBJECT}</a></h3>
-		<p class="author"><!-- IF S_IS_BOT -->{post_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{post_review_row.U_MINI_POST}">{post_review_row.MINI_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR}<strong>  {post_review_row.POST_AUTHOR_FULL}</strong> &raquo; {post_review_row.POST_DATE}</p>
+		<p class="author">
+			<!-- IF S_IS_BOT -->
+				<span><i class="icon fa-file fa-fw icon-lightgray icon-md"></i><span class="sr-only">{post_review_row.MINI_POST}</span></span>
+			<!-- ELSE -->
+				<a href="{post_review_row.U_MINI_POST}" title="{post_review_row.MINI_POST}">
+					<i class="icon fa-file fa-fw icon-lightgray icon-md"></i><span class="sr-only">{post_review_row.MINI_POST}</span>
+				</a>
+			<!-- ENDIF -->
+			{L_POST_BY_AUTHOR}<strong>  {post_review_row.POST_AUTHOR_FULL}</strong> &raquo; {post_review_row.POST_DATE}
+		</p>
 		<div class="content">{post_review_row.MESSAGE}</div>
 
 		<!-- IF post_review_row.S_HAS_ATTACHMENTS -->
diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html
index 9016e40ded..803de267ac 100644
--- a/phpBB/styles/prosilver/template/posting_topic_review.html
+++ b/phpBB/styles/prosilver/template/posting_topic_review.html
@@ -28,22 +28,31 @@
 			<ul class="post-buttons">
 			<!-- IF topic_review_row.U_MCP_DETAILS -->
 				<li>
-					<a href="{topic_review_row.U_MCP_DETAILS}" title="{L_POST_DETAILS}" class="button icon-button info-icon">
-						<span>{L_POST_DETAILS}</span>
+					<a href="{topic_review_row.U_MCP_DETAILS}" title="{L_POST_DETAILS}" class="button">
+						<i class="icon fa-info fa-fw"></i><span>{L_POST_DETAILS}</span>
 					</a>
 				<li>
 			<!-- ENDIF -->
 			<!-- IF topic_review_row.POSTER_QUOTE and topic_review_row.DECODED_MESSAGE -->
 				<li>
-					<a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}', {post_id:{topic_review_row.POST_ID},time:{topic_review_row.POST_TIME},user_id:{topic_review_row.USER_ID}});" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}" class="button icon-button quote-icon">
-						<span>{L_QUOTE} {topic_review_row.POST_AUTHOR}</span>
+					<a href="#postingbox" onclick="addquote({topic_review_row.POST_ID}, '{topic_review_row.POSTER_QUOTE}', '{LA_WROTE}', {post_id:{topic_review_row.POST_ID},time:{topic_review_row.POST_TIME},user_id:{topic_review_row.USER_ID}});" title="{L_QUOTE} {topic_review_row.POST_AUTHOR}" class="button">
+						<i class="icon fa-quote-left fa-fw"></i><span>{L_QUOTE} {topic_review_row.POST_AUTHOR}</span>
 					</a>
 				</li>
 			<!-- ENDIF -->
 			</ul>
 			<!-- ENDIF -->
 
-			<p class="author"><!-- IF S_IS_BOT -->{topic_review_row.MINI_POST_IMG}<!-- ELSE --><a href="{topic_review_row.U_MINI_POST}">{topic_review_row.MINI_POST_IMG}</a><!-- ENDIF --> {L_POST_BY_AUTHOR} <strong>{topic_review_row.POST_AUTHOR_FULL}</strong> &raquo; {topic_review_row.POST_DATE}  </p>
+			<p class="author">
+				<!-- IF S_IS_BOT -->
+					<span><i class="icon fa-file fa-fw icon-lightgray icon-md"></i><span class="sr-only">{topic_review_row.MINI_POST}</span></span>
+				<!-- ELSE -->
+					<a href="{topic_review_row.U_MINI_POST}" title="{topic_review_row.MINI_POST}">
+						<i class="icon fa-file fa-fw icon-lightgray icon-md"></i><span class="sr-only">{topic_review_row.MINI_POST}</span>
+					</a>
+				<!-- ENDIF -->
+				{L_POST_BY_AUTHOR} <strong>{topic_review_row.POST_AUTHOR_FULL}</strong> &raquo; {topic_review_row.POST_DATE}
+			</p>
 			<div class="content">{topic_review_row.MESSAGE}</div>
 
 			<!-- IF topic_review_row.S_HAS_ATTACHMENTS -->
@@ -66,8 +75,8 @@
 
 <hr />
 
-<!-- IF S_MCP_REPORT -->
-	<p><a href="#report" class="top2">{L_BACK_TO_TOP}</a></p>
-<!-- ELSE -->
-	<p><a href="#postingbox" class="top2">{L_BACK_TO_TOP}</a></p>
-<!-- ENDIF -->
+<p>
+	<a href="<!-- IF S_MCP_REPORT -->#report<!-- ELSE -->#postingbox<!-- ENDIF -->" class="top">
+		<i class="icon fa-chevron-circle-up fa-fw icon-gray"></i><span>{L_BACK_TO_TOP}</span>
+	</a>
+</p>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 05a643482f..c47b6308cd 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -32,8 +32,12 @@
 		<!-- EVENT viewtopic_buttons_top_before -->
 
 	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
-		<a href="{U_POST_REPLY_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->">
-			<!-- IF S_IS_LOCKED -->{L_BUTTON_TOPIC_LOCKED}<!-- ELSE -->{L_BUTTON_POST_REPLY}<!-- ENDIF -->
+		<a href="{U_POST_REPLY_TOPIC}" class="button" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->">
+			<!-- IF S_IS_LOCKED -->
+				<span>{L_BUTTON_TOPIC_LOCKED}</span> <i class="icon fa-lock fa-fw"></i>
+			<!-- ELSE -->
+				<span>{L_BUTTON_POST_REPLY}</span> <i class="icon fa-reply fa-fw"></i>
+			<!-- ENDIF -->
 		</a>
 	<!-- ENDIF -->
 
@@ -48,8 +52,12 @@
 			<form method="get" id="topic-search" action="{S_SEARCHBOX_ACTION}">
 			<fieldset>
 				<input class="inputbox search tiny"  type="search" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_TOPIC}" />
-				<button class="button icon-button search-icon" type="submit" title="{L_SEARCH}">{L_SEARCH}</button>
-				<a href="{U_SEARCH}" class="button icon-button search-adv-icon" title="{L_SEARCH_ADV}">{L_SEARCH_ADV}</a>
+				<button class="button" type="submit" title="{L_SEARCH}">
+					<i class="icon fa-search fa-fw"></i><span>{L_SEARCH}</span>
+				</button>
+				<a href="{U_SEARCH}" class="button" title="{L_SEARCH_ADV}">
+					<i class="icon fa-cog fa-fw"></i><span>{L_SEARCH_ADV}</span>
+				</a>
 				{S_SEARCH_LOCAL_HIDDEN_FIELDS}
 			</fieldset>
 			</form>
@@ -174,8 +182,10 @@
 			<dd class="profile-contact">
 				<strong>{L_CONTACT}{L_COLON}</strong>
 				<div class="dropdown-container dropdown-left">
-					<a href="#" class="dropdown-trigger"><span class="imageset icon_contact" title="{postrow.CONTACT_USER}">{postrow.CONTACT_USER}</span></a>
 					<div class="dropdown hidden">
+					<a href="#" class="dropdown-trigger" title="{postrow.CONTACT_USER}">
+						<i class="icon fa-commenting-o fa-fw icon-lg"></i><span class="sr-only">{postrow.CONTACT_USER}</span>
+					</a>
 						<div class="pointer"><div class="pointer-inner"></div></div>
 						<div class="dropdown-contents contact-icons">
 							<!-- BEGIN contact -->
@@ -226,32 +236,44 @@
 					<!-- EVENT viewtopic_body_post_buttons_before -->
 					<!-- IF postrow.U_EDIT -->
 						<li>
-							<a href="{postrow.U_EDIT}" title="{L_EDIT_POST}" class="button icon-button edit-icon"><span>{L_BUTTON_EDIT}</span></a>
+							<a href="{postrow.U_EDIT}" title="{L_EDIT_POST}" class="button icon-button">
+								<i class="icon fa-pencil fa-fw"></i><span>{L_BUTTON_EDIT}</span>
+							</a>
 						</li>
 					<!-- ENDIF -->
 					<!-- IF postrow.U_DELETE -->
 						<li>
-							<a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button icon-button delete-icon"><span>{L_DELETE_POST}</span></a>
+							<a href="{postrow.U_DELETE}" title="{L_DELETE_POST}" class="button icon-button">
+								<i class="icon fa-times fa-fw"></i><span>{L_DELETE_POST}</span>
+							</a>
 						</li>
 					<!-- ENDIF -->
 					<!-- IF postrow.U_REPORT -->
 						<li>
-							<a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button icon-button report-icon"><span>{L_REPORT_POST}</span></a>
+							<a href="{postrow.U_REPORT}" title="{L_REPORT_POST}" class="button icon-button">
+								<i class="icon fa-exclamation fa-fw"></i><span>{L_REPORT_POST}</span>
+							</a>
 						</li>
 					<!-- ENDIF -->
 					<!-- IF postrow.U_WARN -->
 						<li>
-							<a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button icon-button warn-icon"><span>{L_WARN_USER}</span></a>
+							<a href="{postrow.U_WARN}" title="{L_WARN_USER}" class="button icon-button">
+								<i class="icon fa-exclamation-triangle fa-fw"></i><span>{L_WARN_USER}</span>
+							</a>
 						</li>
 					<!-- ENDIF -->
 					<!-- IF postrow.U_INFO -->
 						<li>
-							<a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button icon-button info-icon"><span>{L_INFORMATION}</span></a>
+							<a href="{postrow.U_INFO}" title="{L_INFORMATION}" class="button icon-button">
+								<i class="icon fa-info fa-fw"></i><span>{L_INFORMATION}</span>
+							</a>
 						</li>
 					<!-- ENDIF -->
 					<!-- IF postrow.U_QUOTE -->
 						<li>
-							<a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button icon-button quote-icon"><span>{L_QUOTE}</span></a>
+							<a href="{postrow.U_QUOTE}" title="{L_REPLY_WITH_QUOTE}" class="button icon-button">
+								<i class="icon fa-quote-left fa-fw"></i><span>{L_QUOTE}</span>
+							</a>
 						</li>
 					<!-- ENDIF -->
 					<!-- EVENT viewtopic_body_post_buttons_after -->
@@ -261,7 +283,16 @@
 		<!-- EVENT viewtopic_body_post_buttons_list_after -->
 
 			<!-- EVENT viewtopic_body_postrow_post_details_before -->
-			<p class="author"><!-- IF S_IS_BOT -->{postrow.MINI_POST_IMG}<!-- ELSE --><a href="{postrow.U_MINI_POST}">{postrow.MINI_POST_IMG}</a><!-- ENDIF --><span class="responsive-hide">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> &raquo; </span>{postrow.POST_DATE} </p>
+			<p class="author">
+				<!-- IF S_IS_BOT -->
+					<span><i class="icon fa-file fa-fw icon-lightgray icon-md"></i><span class="sr-only">{postrow.MINI_POST}</span></span>
+				<!-- ELSE -->
+					<a href="{postrow.U_MINI_POST}" title="{postrow.MINI_POST}">
+						<i class="icon fa-file fa-fw icon-lightgray icon-md"></i><span class="sr-only">{postrow.MINI_POST}</span>
+					</a>
+				<!-- ENDIF -->
+				<span class="responsive-hide">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> &raquo; </span>{postrow.POST_DATE} 
+			</p>
 			<!-- EVENT viewtopic_body_postrow_post_details_after -->
 
 			<!-- IF postrow.S_POST_UNAPPROVED -->
@@ -328,7 +359,12 @@
 
 		</div>
 
-		<div class="back2top"><a href="#top" class="top" title="{L_BACK_TO_TOP}">{L_BACK_TO_TOP}</a></div>
+		<div class="back2top">
+			<a href="#top" class="top" title="{L_BACK_TO_TOP}">
+				<i class="icon fa-chevron-circle-up fa-fw icon-gray"></i>
+				<span class="sr-only">{L_BACK_TO_TOP}</span>
+			</a>
+		</div>
 
 		</div>
 	</div>
@@ -360,8 +396,12 @@
 		<!-- EVENT viewtopic_buttons_bottom_before -->
 
 	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
-		<a href="{U_POST_REPLY_TOPIC}" class="button icon-button <!-- IF S_IS_LOCKED -->locked-icon<!-- ELSE -->reply-icon<!-- ENDIF -->" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->">
-			<!-- IF S_IS_LOCKED -->{L_BUTTON_TOPIC_LOCKED}<!-- ELSE -->{L_BUTTON_POST_REPLY}<!-- ENDIF -->
+		<a href="{U_POST_REPLY_TOPIC}" class="button" title="<!-- IF S_IS_LOCKED -->{L_TOPIC_LOCKED}<!-- ELSE -->{L_POST_REPLY}<!-- ENDIF -->">
+			<!-- IF S_IS_LOCKED -->
+				<span>{L_BUTTON_TOPIC_LOCKED}</span> <i class="icon fa-lock fa-fw"></i>
+			<!-- ELSE -->
+				<span>{L_BUTTON_POST_REPLY}</span> <i class="icon fa-reply fa-fw"></i>
+			<!-- ENDIF -->
 		</a>
 	<!-- ENDIF -->
 
@@ -371,11 +411,14 @@
 	<!-- INCLUDE viewtopic_topic_tools.html -->
 
 	<!-- IF .quickmod -->
-		<div class="dropdown-container dropdown-container-left dropdown-up dropdown-{S_CONTENT_FLOW_END} dropdown-button-control" id="quickmod">
-			<span title="{L_QUICK_MOD}" class="dropdown-trigger button icon-button modtools-icon dropdown-select">{L_QUICK_MOD}</span>
 			<div class="dropdown hidden">
 				<div class="pointer"><div class="pointer-inner"></div></div>
 				<ul class="dropdown-contents">
+	<div class="quickmod dropdown-container dropdown-container-left dropdown-up dropdown-{S_CONTENT_FLOW_END} dropdown-button-control" id="quickmod">
+		<span title="{L_QUICK_MOD}" class="button dropdown-trigger dropdown-select">
+			<i class="icon fa-gavel fa-fw"></i><span class="sr-only">{L_QUICK_MOD}</span>
+			<span class="caret"><i class="icon fa-sort-down fa-fw"></i></span>
+		</span>
 				<!-- BEGIN quickmod -->
 					<!-- DEFINE $QUICKMOD_AJAX = (quickmod.VALUE in ['lock', 'unlock', 'delete_topic', 'restore_topic', 'make_normal', 'make_sticky', 'make_announce', 'make_global']) -->
 					<li><a href="{quickmod.LINK}"<!-- IF $QUICKMOD_AJAX --> data-ajax="true" data-refresh="true"<!-- ENDIF -->>{quickmod.TITLE}</a></li>