diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 9870d16ea0..43f276faf0 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -98,11 +98,11 @@
 						<span>
 							<!-- IF forumrow.U_UNAPPROVED_TOPICS -->
 								<a href="{forumrow.U_UNAPPROVED_TOPICS}" title="{L_TOPICS_UNAPPROVED}">
-									{{ Icon('iconify', 'mdi:alert-decagram', lang('TOPICS_UNAPPROVED'), true, 'c-unapproved-icon') }}
+									{{ Icon('font', 'circle-question', lang('TOPICS_UNAPPROVED'), true, 'fas c-unapproved-icon') }}
 								</a>
 							<!-- ELSEIF forumrow.U_UNAPPROVED_POSTS -->
 								<a href="{forumrow.U_UNAPPROVED_POSTS}" title="{L_POSTS_UNAPPROVED_FORUM}">
-									{{ Icon('iconify', 'mdi:alert-decagram', lang('POSTS_UNAPPROVED_FORUM'), true, 'c-unapproved-icon') }}
+									{{ Icon('font', 'circle-question', lang('POSTS_UNAPPROVED_FORUM'), true, 'fas c-unapproved-icon') }}
 								</a>
 							<!-- ENDIF -->
 							<!-- IF forumrow.LAST_POST_TIME_RFC3339 -->
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index f304b65b51..c0318712a1 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -63,24 +63,24 @@
 					<!-- EVENT mcp_forum_topic_title_after -->
 					<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
 						<a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}">
-							{{ Icon('iconify', 'fa:question', lang('TOPIC_UNAPPROVED'), true, 'c-unapproved-icon') }}
+							{{ Icon('font', 'circle-question', lang('TOPIC_UNAPPROVED'), true, 'fas c-unapproved-icon o-icon-baseline') }}
 						</a>
 					<!-- ENDIF -->
 					<!-- IF topicrow.S_TOPIC_DELETED or topicrow.S_POSTS_DELETED -->
 						<a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_DELETED}">
-							{{ Icon('iconify', 'fa:recycle', lang('TOPIC_DELETED'), true, 'c-topic-deleted-icon') }}
+							{{ Icon('font', 'recycle', lang('TOPIC_DELETED'), true, 'fas c-topic-deleted-icon o-icon-baseline') }}
 						</a>
 					<!-- ENDIF -->
 					<!-- IF topicrow.S_TOPIC_REPORTED -->
 						<a href="{topicrow.U_MCP_REPORT}" title="{L_TOPIC_REPORTED}">
-							{{ Icon('iconify', 'fa:exclamation', lang('TOPIC_REPORTED'), true, 'c-topic-reported-icon') }}
+							{{ Icon('font', 'triangle-exclamation', lang('TOPIC_REPORTED'), true, 'fas c-topic-reported-icon o-icon-baseline') }}
 						</a>
 					<!-- ENDIF -->
 					<!-- IF topicrow.S_MOVED_TOPIC and S_CAN_DELETE -->&nbsp;<a href="{topicrow.U_DELETE_TOPIC}" class="topictitle">[ {L_DELETE_SHADOW_TOPIC} ]</a><!-- ENDIF -->
 					<br />
 					<!-- EVENT topiclist_row_topic_title_after -->
 					<div class="responsive-show" style="display: none;">
-						{% if topicrow.ATTACH_ICON_IMG %}{{ Icon('iconify', 'fa:paperclip', '', true) }} {% endif %}
+						{% if topicrow.ATTACH_ICON_IMG %}{{ Icon('font', 'paperclip', '', true) }} {% endif %}
 						{L_LAST_POST} {L_POST_BY_AUTHOR} {% EVENT mcp_forum_last_post_author_username_prepend %}{topicrow.LAST_POST_AUTHOR_FULL}{% EVENT mcp_forum_last_post_author_username_append %} &laquo; {topicrow.LAST_POST_TIME}<br />
 					</div>
 					<span class="responsive-show left-box" style="display: none;">{L_REPLIES}{L_COLON} <strong>{topicrow.REPLIES}</strong></span>
@@ -104,7 +104,7 @@
 					<!-- ENDIF -->
 
 					<div class="responsive-hide">
-						{% if topicrow.ATTACH_ICON_IMG %}{{ Icon('iconify', 'fa:paperclip', '', true) }} {% endif %}
+						{% if topicrow.ATTACH_ICON_IMG %}{{ Icon('font', 'paperclip', '', true) }} {% endif %}
 						{% EVENT topiclist_row_topic_by_author_before %}
 						{L_POST_BY_AUTHOR} {% EVENT mcp_forum_topic_author_username_prepend %}{topicrow.TOPIC_AUTHOR_FULL}{% EVENT mcp_forum_topic_author_username_append %} &raquo; {topicrow.FIRST_POST_TIME}
 						{% EVENT topiclist_row_topic_by_author_after %}
diff --git a/phpBB/styles/prosilver/template/mcp_front.html b/phpBB/styles/prosilver/template/mcp_front.html
index 9e3fa3238d..b594fc7bcb 100644
--- a/phpBB/styles/prosilver/template/mcp_front.html
+++ b/phpBB/styles/prosilver/template/mcp_front.html
@@ -31,7 +31,7 @@
 				<dl>
 					<dt>
 						<div class="list-inner">
-							<a href="{unapproved.U_POST_DETAILS}" class="topictitle">{unapproved.SUBJECT}</a> <!-- IF unapproved.ATTACH_ICON_IMG -->{{ Icon('iconify', 'fa:paperclip', '', true) }}<!-- ENDIF --> <br />
+							<a href="{unapproved.U_POST_DETAILS}" class="topictitle">{unapproved.SUBJECT}</a> <!-- IF unapproved.ATTACH_ICON_IMG -->{{ Icon('font', 'paperclip', '', true) }}<!-- ENDIF --> <br />
 							{L_POSTED} {L_POST_BY_AUTHOR} {unapproved.AUTHOR_FULL} &raquo; {unapproved.POST_TIME}
 						</div>
 					</dt>
@@ -87,7 +87,7 @@
 				<dl>
 					<dt>
 						<div class="list-inner">
-							<a href="{report.U_POST_DETAILS}#reports" class="topictitle">{report.SUBJECT}</a> <!-- IF report.ATTACH_ICON_IMG -->{{ Icon('iconify', 'fa:paperclip', '', true) }}<!-- ENDIF --> <br />
+							<a href="{report.U_POST_DETAILS}#reports" class="topictitle">{report.SUBJECT}</a> <!-- IF report.ATTACH_ICON_IMG -->{{ Icon('font', 'paperclip', '', true) }}<!-- ENDIF --> <br />
 							<span>{L_POSTED} {L_POST_BY_AUTHOR} {report.AUTHOR_FULL} &raquo; {report.POST_TIME}</span>
 						</div>
 					</dt>
@@ -130,7 +130,7 @@
 				<dl>
 					<dt>
 						<div class="list-inner">
-							<a href="{pm_report.U_PM_DETAILS}" class="topictitle">{pm_report.PM_SUBJECT}</a> <!-- IF pm_report.ATTACH_ICON_IMG -->{{ Icon('iconify', 'fa:paperclip', '', true) }}<!-- ENDIF --> <br />
+							<a href="{pm_report.U_PM_DETAILS}" class="topictitle">{pm_report.PM_SUBJECT}</a> <!-- IF pm_report.ATTACH_ICON_IMG -->{{ Icon('font', 'paperclip', '', true) }}<!-- ENDIF --> <br />
 							<span>{L_MESSAGE_BY_AUTHOR} {pm_report.PM_AUTHOR_FULL} &raquo; {pm_report.PM_TIME}</span><br />
 							<span>{L_MESSAGE_TO} {pm_report.RECIPIENTS}</span>
 						</div>
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
index 9c443cc6a9..92059d53b5 100644
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ b/phpBB/styles/prosilver/template/mcp_post.html
@@ -14,7 +14,7 @@
 			<h3>{L_REPORT_REASON}{L_COLON} {REPORT_REASON_TITLE}</h3>
 			<p class="author">{L_REPORTED} {L_POST_BY_AUTHOR} {REPORTER_FULL} &laquo; {REPORT_DATE}</p>
 		<!-- IF S_REPORT_CLOSED -->
-			<p class="post-notice reported">{{ Icon('iconify', 'fa:exclamation', '', true,  'c-topic-reported-icon') }}{L_REPORT_CLOSED}</p>
+			<p class="post-notice reported">{{ Icon('font', 'exclamation', '', true,  'fas c-topic-reported-icon') }}{L_REPORT_CLOSED}</p>
 		<!-- ENDIF -->
 			<div class="content">
 			<!-- IF REPORT_TEXT -->
@@ -61,7 +61,7 @@
 			<!-- IF U_EDIT -->
 				<li>
 					<a href="{U_EDIT}" title="{L_EDIT_POST}" class="button">
-						{{ Icon('iconify', 'fa:pencil', lang('EDIT_POST'), true, 'c-button-icon') }}
+						{{ Icon('font', 'pencil', lang('EDIT_POST'), true, 'fas c-button-icon') }}
 					</a>
 				</li>
 			<!-- ENDIF -->
@@ -75,7 +75,7 @@
 			<!-- IF S_BCC_RECIPIENT --><br /><strong>{L_BCC}{L_COLON}</strong> <!-- BEGIN bcc_recipient --><!-- IF bcc_recipient.NAME_FULL -->{bcc_recipient.NAME_FULL}<!-- ELSE --><a href="{bcc_recipient.U_VIEW}"<!-- IF bcc_recipient.COLOUR --> style="color:{bcc_recipient.COLOUR};"<!-- ENDIF -->><strong>{bcc_recipient.NAME}</strong></a><!-- ENDIF -->&nbsp;<!-- END bcc_recipient --><!-- ENDIF -->
 		</p>
 		<!-- ELSE -->
-		<p class="author"><span>{{ Icon('iconify', 'fa:file', MINI_POST, true,  'c-topic-icon') }}</span> {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} &raquo; {POST_DATE}</p>
+		<p class="author"><span>{{ Icon('font', 'file', MINI_POST, true, 'fas c-topic-icon') }}</span> {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} &raquo; {POST_DATE}</p>
 		<!-- ENDIF -->
 
 		<!-- IF S_POST_UNAPPROVED -->
@@ -104,7 +104,7 @@
 
 		{% if S_POST_REPORTED and not S_MCP_REPORT %}
 			<p class="post-notice reported">
-				{{ Icon('iconify', 'fa:exclamation', lang('TOPIC_REPORTED'), true, 'c-topic-reported-icon') }}
+				{{ Icon('font', 'exclamation', lang('TOPIC_REPORTED'), true, 'fas c-topic-reported-icon') }}
 				<a href="{U_MCP_REPORT}"><strong>{{ lang('POST_REPORTED') }}</strong></a>
 			</p>
 		{% endif %}
@@ -340,13 +340,13 @@
 				<ul>
 				<!-- BEGIN pagination_ips -->
 					<!-- IF pagination_ips.S_IS_PREV -->
-					<li class="arrow previous"><a class="button button-icon-only" href="{pagination_ips.PAGE_URL}" rel="prev" role="button">{{ Icon('iconify', 'fa:chevron-' ~ S_CONTENT_FLOW_BEGIN, lang('PREVIOUS'), true, 'c-button-icon') }}</a></li>
+					<li class="arrow previous"><a class="button button-icon-only" href="{pagination_ips.PAGE_URL}" rel="prev" role="button">{{ Icon('font', 'chevron-' ~ S_CONTENT_FLOW_BEGIN, lang('PREVIOUS'), true, 'fas c-button-icon') }}</a></li>
 					<!-- ELSEIF pagination_ips.S_IS_CURRENT -->
 					<li class="active"><span>{pagination_ips.PAGE_NUMBER}</span></li>
 					<!-- ELSEIF pagination_ips.S_IS_ELLIPSIS -->
 					<li class="ellipsis" role="separator"><span>{L_ELLIPSIS}</span></li>
 					<!-- ELSEIF pagination_ips.S_IS_NEXT -->
-					<li class="arrow next"><a class="button button-icon-only" href="{pagination_ips.PAGE_URL}" rel="next" role="button">{{ Icon('iconify', 'fa:chevron-' ~ S_CONTENT_FLOW_END, lang('NEXT'), true, 'c-button-icon') }}</a></li>
+					<li class="arrow next"><a class="button button-icon-only" href="{pagination_ips.PAGE_URL}" rel="next" role="button">{{ Icon('font', 'chevron-' ~ S_CONTENT_FLOW_END, lang('NEXT'), true, 'fas c-button-icon') }}</a></li>
 					<!-- ELSE -->
 					<li><a class="button" href="{pagination_ips.PAGE_URL}" role="button">{pagination_ips.PAGE_NUMBER}</a></li>
 					<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/mcp_queue.html b/phpBB/styles/prosilver/template/mcp_queue.html
index 31599ec5d0..7c5dbeccdc 100644
--- a/phpBB/styles/prosilver/template/mcp_queue.html
+++ b/phpBB/styles/prosilver/template/mcp_queue.html
@@ -48,7 +48,7 @@
 			<dl>
 				<dt>
 					<div class="list-inner">
-						<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a><!-- IF postrow.S_HAS_ATTACHMENTS --> {{ Icon('iconify', 'fa:paperclip', '', true) }} <!-- ENDIF --><br />
+						<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a><!-- IF postrow.S_HAS_ATTACHMENTS --> {{ Icon('font', 'paperclip', '', true) }} <!-- ENDIF --><br />
 						<span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} &raquo; {postrow.POST_TIME}</span>
 					</div>
 				</dt>
diff --git a/phpBB/styles/prosilver/template/mcp_reports.html b/phpBB/styles/prosilver/template/mcp_reports.html
index f52a77eafb..df8cc60d4f 100644
--- a/phpBB/styles/prosilver/template/mcp_reports.html
+++ b/phpBB/styles/prosilver/template/mcp_reports.html
@@ -47,7 +47,7 @@
 					<dt>
 						<div class="list-inner">
 							<a href="{{ postrow.U_VIEW_DETAILS }}" class="topictitle">{{ postrow.PM_SUBJECT }}</a>
-							{% if postrow.ATTACH_ICON_IMG %}{{ Icon('iconify', 'fa:paperclip', '', true) }}{% endif %}
+							{% if postrow.ATTACH_ICON_IMG %}{{ Icon('font', 'paperclip', '', true) }}{% endif %}
 							<br>
 							<span>{L_MESSAGE_BY_AUTHOR} {postrow.PM_AUTHOR_FULL} &raquo; {postrow.PM_TIME}</span><br />
 							<span>{L_MESSAGE_TO} {postrow.RECIPIENTS}</span>
@@ -63,7 +63,7 @@
 					<dt>
 						<div class="list-inner">
 							<a href="{postrow.U_VIEW_DETAILS}" class="topictitle">{postrow.POST_SUBJECT}</a>
-							{% if postrow.ATTACH_ICON_IMG %}{{ Icon('iconify', 'fa:paperclip', '', true) }} {% endif %}
+							{% if postrow.ATTACH_ICON_IMG %}{{ Icon('font', 'paperclip', '', true) }} {% endif %}
 							<br>
 							<span>{L_POSTED} {L_POST_BY_AUTHOR} {postrow.POST_AUTHOR_FULL} &raquo; {postrow.POST_TIME}</span>
 							<div class="responsive-show" style="display: none;">
diff --git a/phpBB/styles/prosilver/template/mcp_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index e784675c26..641c3b9876 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -105,7 +105,7 @@
 				<ul class="post-buttons">
 					<li>
 						<a href="{postrow.U_POST_DETAILS}" title="{L_POST_DETAILS}" class="button button-icon-only">
-							{{ Icon('iconify', 'fa:info', lang('POST_DETAILS'), true, 'c-button-icon') }}
+							{{ Icon('font', 'info', lang('POST_DETAILS'), true, 'fas c-button-icon') }}
 						</a>
 					</li>
 					<li>
@@ -122,14 +122,14 @@
 				<!-- EVENT mcp_topic_postrow_post_details_before -->
 				<p class="author">
 					<a href="{postrow.U_MINI_POST}" title="{postrow.MINI_POST}">
-						{{ Icon('iconify', 'fa:file', postrow.MINI_POST, true) }}
+						{{ Icon('font', 'file', postrow.MINI_POST, true) }}
 					</a> {L_POSTED} {postrow.POST_DATE} {L_POST_BY_AUTHOR} {% EVENT mcp_topic_post_author_full_prepend %}<strong>{postrow.POST_AUTHOR_FULL}</strong>{% EVENT mcp_topic_post_author_full_append %}<!-- IF postrow.U_MCP_DETAILS --> [ <a href="{postrow.U_MCP_DETAILS}">{L_POST_DETAILS}</a> ]<!-- ENDIF -->
 				</p>
 				<!-- EVENT mcp_topic_postrow_post_details_after -->
 
 				<!-- IF postrow.S_POST_UNAPPROVED -->
 				<p class="post-notice unapproved">
-					<a href="{postrow.U_MCP_APPROVE}">{{ Icon('iconify', 'fa:exclamation', '', true, 'c-topic-reported-icon') }}<strong>{L_POST_UNAPPROVED}</strong></a>
+					<a href="{postrow.U_MCP_APPROVE}">{{ Icon('font', 'exclamation', '', true, 'fas c-topic-reported-icon') }}<strong>{L_POST_UNAPPROVED}</strong></a>
 				</p>
 				<!-- ENDIF -->
 
@@ -141,7 +141,7 @@
 
 				<!-- IF postrow.S_POST_REPORTED -->
 				<p class="post-notice reported">
-					<a href="{postrow.U_MCP_REPORT}">{{ Icon('iconify', 'fa:exclamation', '', true, 'c-topic-reported-icon') }}<strong>{L_POST_REPORTED}</strong></a>
+					<a href="{postrow.U_MCP_REPORT}">{{ Icon('font', 'exclamation', '', true, 'fas c-topic-reported-icon') }}<strong>{L_POST_REPORTED}</strong></a>
 				</p>
 				<!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/mcp_whois.html b/phpBB/styles/prosilver/template/mcp_whois.html
index 1aa626441d..732a5387ed 100644
--- a/phpBB/styles/prosilver/template/mcp_whois.html
+++ b/phpBB/styles/prosilver/template/mcp_whois.html
@@ -5,7 +5,7 @@
 	<div class="inner">
 		<p>
 			<a href="{U_RETURN_POST}" class="arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">
-				{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_POST'), false, 'c-return-arrow-icon') }}
+				{{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_POST'), false, 'fas c-return-arrow-icon') }}
 			</a>
 		</p>
 		<div class="postbody"><div class="content">
@@ -13,7 +13,7 @@
 		</div></div>
 		<p>
 			<a href="{U_RETURN_POST}" class="arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">
-				{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_POST'), false, 'c-return-arrow-icon') }}
+				{{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_POST'), false, 'fas c-return-arrow-icon') }}
 			</a>
 		</p>
 	</div>
diff --git a/phpBB/styles/prosilver/template/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index 92410e9c04..6914778623 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -22,7 +22,7 @@
 			{L_USERNAME}{L_COLON}
 		</dt>
 		<dd>
-			<!-- EVENT memberlist_view_username_prepend --><!-- IF USER_COLOR --><span style="color: {USER_COLOR}; font-weight: bold;"><!-- ELSE --><span><!-- ENDIF -->{USERNAME}</span><!-- EVENT memberlist_view_username_append --> <!-- IF S_ONLINE -->  {{ Icon('iconify', 'fa:circle', lang('ONLINE'), true, 'c-online-icon') }}<!-- ENDIF -->
+			<!-- EVENT memberlist_view_username_prepend --><!-- IF USER_COLOR --><span style="color: {USER_COLOR}; font-weight: bold;"><!-- ELSE --><span><!-- ENDIF -->{USERNAME}</span><!-- EVENT memberlist_view_username_append --> <!-- IF S_ONLINE -->  {{ Icon('font', 'circle', lang('ONLINE'), true, 'fas c-online-icon') }}<!-- ENDIF -->
 			<!-- IF U_EDIT_SELF --> [ <a href="{U_EDIT_SELF}">{L_EDIT_PROFILE}</a> ]<!-- ENDIF -->
 			<!-- IF U_USER_ADMIN --> [ <a href="{U_USER_ADMIN}">{L_USER_ADMIN}</a> ]<!-- ENDIF -->
 			<!-- IF U_USER_BAN --> [ <a href="{U_USER_BAN}">{L_USER_BAN}</a> ]<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/message_body.html b/phpBB/styles/prosilver/template/message_body.html
index a0c38c7ee4..ef3c53b22f 100644
--- a/phpBB/styles/prosilver/template/message_body.html
+++ b/phpBB/styles/prosilver/template/message_body.html
@@ -11,7 +11,7 @@
 	<!-- IF SCRIPT_NAME == "search" and not S_BOARD_DISABLED and not S_NO_SEARCH and L_RETURN_TO_SEARCH_ADV -->
 		<p>
 			<a href="{U_SEARCH}" class="arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">
-				{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('GO_TO_SEARCH_ADV'), true, 'c-return-arrow-icon') }}
+				{{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_BEGIN, lang('GO_TO_SEARCH_ADV'), true, 'fas c-return-arrow-icon') }}
 			</a>
 		</p>
 	<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html
index e059b7f002..18026e384d 100644
--- a/phpBB/styles/prosilver/template/navbar_footer.html
+++ b/phpBB/styles/prosilver/template/navbar_footer.html
@@ -7,7 +7,7 @@
 					{% apply spaceless %}
 						<span class="crumb">
 							<a href="{{ U_SITE_HOME }}" data-navbar-reference="home">
-								{{ Icon('iconify', 'fa:home', lang('SITE_HOME'), false) }}
+								{{ Icon('font', 'home', lang('SITE_HOME'), false) }}
 							</a>
 						</span>
 					{% endapply %}
@@ -21,7 +21,7 @@
 							{% if U_SITE_HOME %}
 								<span>{{ lang('INDEX') }}</span>
 							{% else %}
-								{{ Icon('iconify', 'fa:home', lang('INDEX'), false) }}
+								{{ Icon('font', 'home', lang('INDEX'), false) }}
 							{% endif %}
 						</a>
 					</span>
@@ -59,14 +59,14 @@
 				{% if not S_IS_BOT %}
 					<li class="rightside in-menu">
 						<a href="{{ U_DELETE_COOKIES }}" data-ajax="true" data-refresh="true" role="menuitem">
-							{{ Icon('iconify', 'fa:trash', lang('DELETE_COOKIES'), false) }}
+							{{ Icon('font', 'trash', lang('DELETE_COOKIES'), false) }}
 						</a>
 					</li>
 
 					{% if S_DISPLAY_MEMBERLIST %}
 						<li class="rightside in-menu">
 							<a href="{{ U_MEMBERLIST }}" title="{{ lang('MEMBERLIST_EXPLAIN') }}" role="menuitem">
-								{{ Icon('iconify', 'fa:group', lang('MEMBERLIST'), false) }}
+								{{ Icon('font', 'users', lang('MEMBERLIST'), false) }}
 							</a>
 						</li>
 					{% endif %}
@@ -77,7 +77,7 @@
 				{% if U_TEAM %}
 					<li class="rightside in-menu">
 						<a href="{{ U_TEAM }}" role="menuitem">
-							{{ Icon('iconify', 'fa:shield', lang('THE_TEAM'), false) }}
+							{{ Icon('font', 'shield-halved', lang('THE_TEAM'), false) }}
 						</a>
 					</li>
 				{% endif %}
@@ -87,7 +87,7 @@
 				{% if U_CONTACT_US %}
 					<li class="rightside in-menu">
 						<a href="{{ U_CONTACT_US }}" role="menuitem">
-							{{ Icon('iconify', 'fa:envelope', lang('CONTACT_US'), false) }}
+							{{ Icon('font', 'envelope', lang('CONTACT_US'), false) }}
 						</a>
 					</li>
 				{% endif %}
@@ -97,7 +97,7 @@
 
 			<li class="rightside dropdown-container responsive-menu">
 				<a class="dropdown-toggle" href="">
-					{{ Icon('iconify', 'fa:bars', '', true) }}
+					{{ Icon('font', 'bars', '', true) }}
 				</a>
 				<div class="dropdown">
 					<div class="pointer">
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html
index 1bc31a883e..ef6da4ab91 100644
--- a/phpBB/styles/prosilver/template/navbar_header.html
+++ b/phpBB/styles/prosilver/template/navbar_header.html
@@ -209,7 +209,7 @@
 					<span class="crumb" {{ MICRODATA }}>
 						{% apply spaceless %}
 						<a itemprop="item" href="{{ U_SITE_HOME }}" data-navbar-reference="home">
-							{{ Icon('font', 'home', '', true) }}
+							{{ Icon('font', 'home', '', true, 'fas o-icon-baseline') }}
 							<span itemprop="name">{{ L_SITE_HOME }}</span>
 						</a>
 						{% endapply %}
@@ -222,7 +222,7 @@
 				<span class="crumb" {{ MICRODATA }}>
 					{% apply spaceless %}
 					<a itemprop="item" href="{{ U_INDEX }}" accesskey="h" data-navbar-reference="index">
-						{% if not U_SITE_HOME %}{{ Icon('font', 'home', '', true) }}{% endif %}
+						{% if not U_SITE_HOME %}{{ Icon('font', 'home', '', true, 'fas o-icon-baseline') }}{% endif %}
 						<span itemprop="name">{{ L_INDEX }}</span>
 					</a>
 					{% endapply %}
diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html
index fa713515fd..e4fc984d8a 100644
--- a/phpBB/styles/prosilver/template/notification_dropdown.html
+++ b/phpBB/styles/prosilver/template/notification_dropdown.html
@@ -33,7 +33,7 @@
 					<!-- IF notifications.URL --></a><!-- ENDIF -->
 					<!-- IF notifications.UNREAD -->
 						<a href="{notifications.U_MARK_READ}" class="mark_read icon-mark" data-ajax="notification.mark_read" title="{L_MARK_READ}">
-							 {{ Icon('iconify', 'fa:check-circle', lang('MARK_READ'), true, 'c-notification-check-icon') }}
+							 {{ Icon('font', 'circle-check', lang('MARK_READ'), true, 'fas c-notification-check-icon') }}
 						</a>
 					<!-- ENDIF -->
 				</li>
diff --git a/phpBB/styles/prosilver/template/overall_footer.html b/phpBB/styles/prosilver/template/overall_footer.html
index 72df38141a..a96bb53e89 100644
--- a/phpBB/styles/prosilver/template/overall_footer.html
+++ b/phpBB/styles/prosilver/template/overall_footer.html
@@ -52,13 +52,13 @@
 
 	<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}">
 		<a href="#" class="alert_close">
-			{{ Icon('iconify', 'fa:times-circle', '', true) }}
+			{{ Icon('font', 'circle-xmark', '', true) }}
 		</a>
 		<h3 class="alert_title">&nbsp;</h3><p class="alert_text"></p>
 	</div>
 	<div id="phpbb_confirm" class="phpbb_alert">
 		<a href="#" class="alert_close">
-			{{ Icon('iconify', 'fa:times-circle', '', true) }}
+			{{ Icon('font', 'circle-xmark', '', true) }}
 		</a>
 		<div class="alert_text"></div>
 	</div>
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index 6e632041fb..b88de2aaa8 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -94,10 +94,10 @@
 				<fieldset>
 					<input name="keywords" id="keywords" type="search" maxlength="128" title="{L_SEARCH_KEYWORDS}" class="inputbox search tiny" size="20" value="{SEARCH_WORDS}" placeholder="{L_SEARCH_MINI}" />
 					<button class="button button-search" type="submit" title="{L_SEARCH}">
-						{{ Icon('iconify', 'fa:search', lang('SEARCH'), true, 'c-button-icon') }}
+						{{ Icon('font', 'search', lang('SEARCH'), true, 'fas c-button-icon') }}
 					</button>
 					<a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}">
-						{{ Icon('iconify', 'fa:cog', lang('SEARCH_ADV'), true, 'c-button-icon') }}
+						{{ Icon('font', 'gear', lang('SEARCH_ADV'), true, 'fas c-button-icon') }}
 					</a>
 					{S_SEARCH_HIDDEN_FIELDS}
 				</fieldset>
diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html
index 7830273985..f5f3eb5752 100644
--- a/phpBB/styles/prosilver/template/pagination.html
+++ b/phpBB/styles/prosilver/template/pagination.html
@@ -16,13 +16,13 @@
 <!-- ENDIF -->
 <!-- BEGIN pagination -->
 	<!-- IF pagination.S_IS_PREV -->
-		<li class="arrow previous"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="prev" role="button">{{ Icon('iconify', 'fa:chevron-' ~ S_CONTENT_FLOW_BEGIN, lang('PREVIOUS'), true, 'c-button-icon c-pagination-icon') }}</a></li>
+		<li class="arrow previous"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="prev" role="button">{{ Icon('font', 'chevron-' ~ S_CONTENT_FLOW_BEGIN, lang('PREVIOUS'), true, 'fas c-button-icon c-pagination-icon') }}</a></li>
 	<!-- ELSEIF pagination.S_IS_CURRENT -->
 	<li class="active"><span>{pagination.PAGE_NUMBER}</span></li>
 	<!-- ELSEIF pagination.S_IS_ELLIPSIS -->
 	<li class="ellipsis" role="separator"><span>{L_ELLIPSIS}</span></li>
 	<!-- ELSEIF pagination.S_IS_NEXT -->
-		<li class="arrow next"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="next" role="button">{{ Icon('iconify', 'fa:chevron-' ~ S_CONTENT_FLOW_END, lang('NEXT'), true, 'c-button-icon c-pagination-icon') }}</a></li>
+		<li class="arrow next"><a class="button button-icon-only" href="{pagination.PAGE_URL}" rel="next" role="button">{{ Icon('font', 'chevron-' ~ S_CONTENT_FLOW_END, lang('NEXT'), true, 'fas c-button-icon c-pagination-icon') }}</a></li>
 	<!-- ELSE -->
 		<li><a class="button" href="{pagination.PAGE_URL}" role="button">{pagination.PAGE_NUMBER}</a></li>
 	<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index 72b1076a67..ec5e73762b 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -43,43 +43,43 @@
 <!-- EVENT posting_editor_buttons_before -->
 <div id="format-buttons" class="format-buttons"<!-- IF S_ALLOW_MENTIONS --> data-mention-url="{U_MENTION_URL}" data-mention-names-limit="{S_MENTION_NAMES_LIMIT}" data-topic-id="{S_TOPIC_ID}" data-user-id="{S_USER_ID}"<!-- ENDIF -->>
 	<button type="button" class="button button-icon-only bbcode-b" accesskey="b" name="addbbcode0" value=" B " onclick="bbstyle(0)" title="{L_BBCODE_B_HELP}">
-		{{ Icon('iconify', 'mdi:format-bold', '', true, 'c-button-icon') }}
+		{{ Icon('font', 'bold', '', true, 'fas c-button-icon') }}
 	</button>
 	<button type="button" class="button button-icon-only bbcode-i" accesskey="i" name="addbbcode2" value=" i " onclick="bbstyle(2)" title="{L_BBCODE_I_HELP}">
-		{{ Icon('iconify', 'mdi:format-italic', '', true, 'c-button-icon') }}
+		{{ Icon('font', 'italic', '', true, 'fas c-button-icon') }}
 	</button>
 	<button type="button" class="button button-icon-only bbcode-u" accesskey="u" name="addbbcode4" value=" u " onclick="bbstyle(4)" title="{L_BBCODE_U_HELP}">
-		{{ Icon('iconify', 'mdi:format-underline', '', true, 'c-button-icon') }}
+		{{ Icon('font', 'underline', '', true, 'fas c-button-icon') }}
 	</button>
 	<!-- IF S_BBCODE_QUOTE -->
 	<button type="button" class="button button-icon-only bbcode-quote" accesskey="q" name="addbbcode6" value="Quote" onclick="bbstyle(6)" title="{L_BBCODE_Q_HELP}">
-		{{ Icon('iconify', 'mdi:format-quote-open', '', true, 'c-button-icon') }}
+		{{ Icon('font', 'quote-left', '', true, 'fas c-button-icon') }}
 	</button>
 	<!-- ENDIF -->
 	<button type="button" class="button button-icon-only bbcode-code" accesskey="c" name="addbbcode8" value="Code" onclick="bbstyle(8)" title="{L_BBCODE_C_HELP}">
-		{{ Icon('iconify', 'fa:code', '', true, 'c-button-icon') }}
+		{{ Icon('font', 'code', '', true, 'fas c-button-icon') }}
 	</button>
 	<button type="button" class="button button-icon-only bbcode-list" accesskey="l" name="addbbcode10" value="List" onclick="bbstyle(10)" title="{L_BBCODE_L_HELP}">
-		{{ Icon('iconify', 'mdi:format-list-bulleted', '', true, 'c-button-icon') }}
+		{{ Icon('font', 'list-ul', '', true, 'fas c-button-icon') }}
 	</button>
 	<button type="button" class="button button-icon-only bbcode-list-" accesskey="o" name="addbbcode12" value="List=" onclick="bbstyle(12)" title="{L_BBCODE_O_HELP}">
-		{{ Icon('iconify', 'mdi:format-list-numbered', '', true, 'c-button-icon') }}
+		{{ Icon('font', 'list-ol', '', true, 'fas c-button-icon') }}
 	</button>
 	<button type="button" class="button button-icon-only bbcode-asterisk" accesskey="y" name="addlistitem" value="[*]" onclick="bbstyle(-1)" title="{L_BBCODE_LISTITEM_HELP}">
 		{{ Icon('iconify', 'mdi:playlist-add', '', true, 'c-button-icon') }}
 	</button>
 	<!-- IF S_BBCODE_IMG -->
 	<button type="button" class="button button-icon-only bbcode-img" accesskey="p" name="addbbcode14" value="Img" onclick="bbstyle(14)" title="{L_BBCODE_P_HELP}">
-		{{ Icon('iconify', 'mdi:image-outline', '', true, 'c-button-icon') }}
+		{{ Icon('font', 'image', '', true, 'far c-button-icon') }}
 	</button>
 	<!-- ENDIF -->
 	<!-- IF S_LINKS_ALLOWED -->
 	<button type="button" class="button button-icon-only bbcode-url" accesskey="w" name="addbbcode16" value="URL" onclick="bbstyle(16)" title="{L_BBCODE_W_HELP}">
-		{{ Icon('iconify', 'mdi:link-variant', '', true, 'c-button-icon') }}
+		{{ Icon('font', 'link', '', true, 'fas c-button-icon') }}
 	</button>
 	<!-- ENDIF -->
 	<button type="button" class="button button-icon-only bbcode-color" name="bbpalette" id="bbpalette" value="{L_FONT_COLOR}" onclick="change_palette();" title="{L_BBCODE_S_HELP}">
-		{{ Icon('iconify', 'fa:tint', '', true, 'c-button-icon') }}
+		{{ Icon('font', 'droplet', '', true, 'fas c-button-icon') }}
 	</button>
 	<select name="addbbcode20" class="bbcode-size" onchange="bbfontstyle('[size=' + this.form.addbbcode20.options[this.form.addbbcode20.selectedIndex].value + ']', '[/size]');this.form.addbbcode20.selectedIndex = 2;" title="{L_BBCODE_F_HELP}">
 		<option value="50">{L_FONT_TINY}</option>
diff --git a/phpBB/styles/prosilver/template/posting_review.html b/phpBB/styles/prosilver/template/posting_review.html
index 57a90def3a..8615143070 100644
--- a/phpBB/styles/prosilver/template/posting_review.html
+++ b/phpBB/styles/prosilver/template/posting_review.html
@@ -17,10 +17,10 @@
 		<h3><a href="{post_review_row.U_MINI_POST}">{post_review_row.POST_SUBJECT}</a></h3>
 		<p class="author">
 			<!-- IF S_IS_BOT -->
-				<span title="{post_review_row.MINI_POST}">{{ Icon('iconify', 'fa:file', post_review_row.MINI_POST, true, 'c-topic-icon') }}</span>
+				<span title="{post_review_row.MINI_POST}">{{ Icon('font', 'file', post_review_row.MINI_POST, true, 'fas c-topic-icon') }}</span>
 			<!-- ELSE -->
 				<a href="{post_review_row.U_MINI_POST}" title="{post_review_row.MINI_POST}">
-					{{ Icon('iconify', 'fa:file', post_review_row.MINI_POST, true, 'c-topic-icon') }}
+					{{ Icon('font', 'file', post_review_row.MINI_POST, true, 'fas c-topic-icon') }}
 				</a>
 			<!-- ENDIF -->
 			{L_POST_BY_AUTHOR} <!-- EVENT posting_review_row_post_author_username_prepend --><strong>{post_review_row.POST_AUTHOR_FULL}</strong><!-- EVENT posting_review_row_post_author_username_append --> &raquo; {post_review_row.POST_DATE}
diff --git a/phpBB/styles/prosilver/template/posting_topic_review.html b/phpBB/styles/prosilver/template/posting_topic_review.html
index 0cdbdeb664..7d602b2ccc 100644
--- a/phpBB/styles/prosilver/template/posting_topic_review.html
+++ b/phpBB/styles/prosilver/template/posting_topic_review.html
@@ -33,14 +33,14 @@
 			<!-- IF topic_review_row.U_MCP_DETAILS -->
 				<li>
 					<a href="{topic_review_row.U_MCP_DETAILS}" title="{L_POST_DETAILS}" class="button button-icon-only">
-						{{ Icon('iconify', 'fa:info', lang('POST_DETAILS'), true, 'c-button-icon') }}
+						{{ Icon('font', 'info', lang('POST_DETAILS'), true, 'fas c-button-icon') }}
 					</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 button-icon-only">
-						{{ Icon('iconify', 'fa:quote-left', '', true, 'c-button-icon') }}<span class="sr-only">{L_QUOTE} {topic_review_row.POST_AUTHOR}</span>
+						{{ Icon('font', 'quote-left', '', true, 'fas c-button-icon') }}<span class="sr-only">{L_QUOTE} {topic_review_row.POST_AUTHOR}</span>
 					</a>
 				</li>
 			<!-- ENDIF -->
@@ -50,10 +50,10 @@
 			<!-- EVENT posting_topic_review_row_post_details_before -->
 			<p class="author">
 				<!-- IF S_IS_BOT -->
-					<span title="{topic_review_row.MINI_POST}">{{ Icon('iconify', 'fa:file', topic_review_row.MINI_POST, true, 'c-topic-icon') }}</span>
+					<span title="{topic_review_row.MINI_POST}">{{ Icon('font', 'file', topic_review_row.MINI_POST, true, 'fas c-topic-icon') }}</span>
 				<!-- ELSE -->
 					<a href="{topic_review_row.U_MINI_POST}" title="{topic_review_row.MINI_POST}">
-						{{ Icon('iconify', 'fa:file', topic_review_row.MINI_POST, true, 'c-topic-icon') }}
+						{{ Icon('font', 'file', topic_review_row.MINI_POST, true, 'fas c-topic-icon') }}
 					</a>
 				<!-- ENDIF -->
 				{L_POST_BY_AUTHOR} <!-- EVENT posting_topic_review_row_post_author_username_prepend --><strong>{topic_review_row.POST_AUTHOR_FULL}</strong><!-- EVENT posting_topic_review_row_post_author_username_append --> &raquo; {topic_review_row.POST_DATE}
@@ -86,6 +86,6 @@
 
 <p>
 	<a href="<!-- IF S_MCP_REPORT -->#report<!-- ELSE -->#postingbox<!-- ENDIF -->" class="top">
-		{{ Icon('iconify', 'fa:chevron-circle-up', lang('BACK_TO_TOP'), false, 'c-top-icon') }}
+		{{ Icon('font', 'circle-chevron-up', lang('BACK_TO_TOP'), false, 'fas c-top-icon') }}
 	</a>
 </p>
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index c448ea52fd..34597e5158 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -10,13 +10,13 @@
 <!-- IF SEARCH_TOPIC -->
 	<p class="return-link">
 		<a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}">
-			{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_TO_TOPIC'), false, 'c-return-arrow-icon') }}
+			{{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_TO_TOPIC'), false, 'fas c-return-arrow-icon') }}
 		</a>
 	</p>
 <!-- ELSE -->
 	<p class="advanced-search-link">
 		<a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}">
-			{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('GO_TO_SEARCH_ADV'), false, 'c-return-arrow-icon') }}
+			{{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_BEGIN, lang('GO_TO_SEARCH_ADV'), false, 'fas c-return-arrow-icon') }}
 		</a>
 	</p>
 <!-- ENDIF -->
@@ -32,10 +32,10 @@
 			<fieldset>
 				<input class="inputbox search tiny" type="search" name="add_keywords" id="add_keywords" value="" placeholder="{L_SEARCH_IN_RESULTS}" />
 				<button class="button button-search" type="submit" title="{L_SEARCH}">
-					{{ Icon('iconify', 'fa:search', lang('SEARCH'), true, 'c-button-icon') }}
+					{{ Icon('font', 'search', lang('SEARCH'), true, 'fas c-button-icon') }}
 				</button>
 				<a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}">
-					{{ Icon('iconify', 'fa:cog', lang('SEARCH_ADV'), true, 'c-button-icon') }}
+					{{ Icon('font', 'gear', lang('SEARCH_ADV'), true, 'fas c-button-icon') }}
 				</a>
 			</fieldset>
 			</form>
@@ -106,17 +106,17 @@
 							{% endif %}
 							<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED -->
 								<a href="{searchresults.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}">
-									{{ Icon('iconify', 'fa:question', lang('TOPIC_UNAPPROVED'), true, 'c-uapproved-icon') }}
+									{{ Icon('font', 'circle-question', lang('TOPIC_UNAPPROVED'), true, 'fas c-unapproved-icon') }}
 								</a>
 							<!-- ENDIF -->
 							<!-- IF searchresults.S_TOPIC_DELETED -->
 								<a href="{searchresults.U_MCP_QUEUE}" title="{L_TOPIC_DELETED}">
-									{{ Icon('iconify', 'fa:recycle', lang('TOPIC_DELETED'), true, 'c-topic-deleted-icon') }}
+									{{ Icon('font', 'recycle', lang('TOPIC_DELETED'), true, 'fas c-topic-deleted-icon') }}
 								</a>
 							<!-- ENDIF -->
 							<!-- IF searchresults.S_TOPIC_REPORTED -->
 								<a href="{searchresults.U_MCP_REPORT}" title="{L_TOPIC_REPORTED}">
-									{{ Icon('iconify', 'fa:exclamation', lang('TOPIC_REPORTED'), true, 'c-topic-reported-icon') }}
+									{{ Icon('font', 'triangle-exclamation', lang('TOPIC_REPORTED'), true, 'fas c-topic-reported-icon') }}
 								</a>
 							<!-- ENDIF -->
 							<br />
@@ -131,8 +131,8 @@
 							<!-- ENDIF -->
 
 							<div class="responsive-hide left-box">
-								<!-- IF searchresults.S_HAS_POLL -->{{ Icon('iconify', 'fa:bar-chart', '', true) }}<!-- ENDIF -->
-								<!-- IF searchresults.ATTACH_ICON_IMG -->{{ Icon('iconify', 'fa:paperclip', '', true) }}<!-- ENDIF -->
+								<!-- IF searchresults.S_HAS_POLL -->{{ Icon('font', 'chart-bar', '', true) }}<!-- ENDIF -->
+								<!-- IF searchresults.ATTACH_ICON_IMG -->{{ Icon('font', 'paperclip', '', true) }}<!-- ENDIF -->
 								{% EVENT topiclist_row_topic_by_author_before %}
 								{L_POST_BY_AUTHOR} <!-- EVENT search_results_topic_author_username_prepend -->{searchresults.TOPIC_AUTHOR_FULL}<!-- EVENT search_results_topic_author_username_append --> &raquo; <time datetime="{searchresults.FIRST_POST_TIME_RFC3339}">{searchresults.FIRST_POST_TIME}</time> &raquo; {L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a>
 								{% EVENT topiclist_row_topic_by_author_after %}
@@ -140,7 +140,7 @@
 
 							<!-- IF .searchresults.pagination -->
 							<div class="pagination">
-								<span>{{ Icon('iconify', 'fa:clone', '', true) }}</span>
+								<span>{{ Icon('font', 'clone', '', true, 'far') }}</span>
 								<ul>
 								<!-- BEGIN pagination -->
 									<!-- IF searchresults.pagination.S_IS_PREV -->
@@ -163,7 +163,7 @@
 						<span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} <!-- EVENT search_results_last_post_author_username_prepend -->{searchresults.LAST_POST_AUTHOR_FULL}<!-- EVENT search_results_last_post_author_username_append -->
 							<!-- IF not S_IS_BOT -->
 								<a href="{searchresults.U_LAST_POST}" title="{L_GOTO_LAST_POST}">
-									{{ Icon('iconify', 'fa:external-link-square', VIEW_LATEST_POST, true, 'c-last-post-icon') }}
+									{{ Icon('font', 'arrow-up-right-from-square', VIEW_LATEST_POST, true, 'fas c-last-post-icon') }}
 								</a>
 							<!-- ENDIF -->
 							<br /><time datetime="{searchresults.LAST_POST_TIME_RFC3339}">{searchresults.LAST_POST_TIME}</time>
@@ -222,7 +222,7 @@
 		<ul class="searchresults">
 			<li>
 				<a href="{searchresults.U_VIEW_POST}" class="arrow-{S_CONTENT_FLOW_END}">
-					{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_END, lang('JUMP_TO_POST'), false, 'c-return-arrow-icon') }}
+					{{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_END, lang('JUMP_TO_POST'), false, 'fas c-return-arrow-icon') }}
 				</a>
 			</li>
 		</ul>
diff --git a/phpBB/styles/prosilver/template/simple_footer.html b/phpBB/styles/prosilver/template/simple_footer.html
index 71824a361c..e3a49dccac 100644
--- a/phpBB/styles/prosilver/template/simple_footer.html
+++ b/phpBB/styles/prosilver/template/simple_footer.html
@@ -29,13 +29,13 @@
 	</div>
 	<div id="phpbb_alert" class="phpbb_alert" data-l-err="{L_ERROR}" data-l-timeout-processing-req="{L_TIMEOUT_PROCESSING_REQ}">
 		<a href="#" class="alert_close">
-			{{ Icon('iconify', 'fa:times-circle', '', true) }}
+			{{ Icon('font', 'circle-xmark', '', true) }}
 		</a>
 		<h3 class="alert_title">&nbsp;</h3><p class="alert_text"></p>
 	</div>
 	<div id="phpbb_confirm" class="phpbb_confirm phpbb_alert">
 		<a href="#" class="alert_close">
-			{{ Icon('iconify', 'fa:times-circle', '', true) }}
+			{{ Icon('font', 'circle-xmark', '', true) }}
 		</a>
 		<div class="alert_text"></div>
 	</div>
diff --git a/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
index 29d732608a..38bb016de2 100644
--- a/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
+++ b/phpBB/styles/prosilver/template/ucp_avatar_options_upload.html
@@ -17,52 +17,52 @@
 	<div class="avatar-cropper-buttons" id="avatar-cropper-buttons">
 		<div class="button-group">
 			<button class="button" type="button" title="{{ lang('ZOOM_IN') }}" data-cropper-action="zoom,0.1">
-				{{ Icon('iconify', 'fa:search-plus', '', true) }}
+				{{ Icon('font', 'magnifying-glass-plus', '', true) }}
 			</button>
 			<button class="button" type="button" title="{{ lang('ZOOM_OUT') }}" data-cropper-action="zoom,-0.1">
-				{{ Icon('iconify', 'fa:search-minus', '', true) }}
+				{{ Icon('font', 'magnifying-glass-minus', '', true) }}
 			</button>
 		</div>
 
 		<div class="button-group">
 			<button class="button" type="button" title="{{ lang('MOVE_LEFT') }}" data-cropper-action="move,-10,0">
-				{{ Icon('iconify', 'fa:arrow-left', '', true) }}
+				{{ Icon('font', 'arrow-left', '', true) }}
 			</button>
 			<button class="button" type="button" title="{{ lang('MOVE_RIGHT') }}" data-cropper-action="move,10,0">
-				{{ Icon('iconify', 'fa:arrow-right', '', true) }}
+				{{ Icon('font', 'arrow-right', '', true) }}
 			</button>
 			<button class="button" type="button" title="{{ lang('MOVE_UP') }}" data-cropper-action="move,0,-10">
-				{{ Icon('iconify', 'fa:arrow-up', '', true) }}
+				{{ Icon('font', 'arrow-up', '', true) }}
 			</button>
 			<button class="button" type="button" title="{{ lang('MOVE_DOWN') }}" data-cropper-action="move,0,10">
-				{{ Icon('iconify', 'fa:arrow-down', '', true) }}
+				{{ Icon('font', 'arrow-down', '', true) }}
 			</button>
 		</div>
 
 		<div class="button-group">
 			<button class="button" type="button" title="{{ lang('ROTATE_LEFT') }}" data-cropper-action="rotate,-90">
-				{{ Icon('iconify', 'fa:rotate-left', '', true) }}
+				{{ Icon('font', 'rotate-left', '', true) }}
 			</button>
 			<button class="button" type="button" title="{{ lang('ROTATE_RIGHT') }}" data-cropper-action="rotate,90">
-				{{ Icon('iconify', 'fa:rotate-right', '', true) }}
+				{{ Icon('font', 'rotate-right', '', true) }}
 			</button>
 		</div>
 
 		<div class="button-group">
 			<button class="button" type="button" title="{{ lang('FLIP_HORIZONTALLY') }}" data-cropper-action="scaleX">
-				{{ Icon('iconify', 'fa:arrows-h', '', true) }}
+				{{ Icon('font', 'arrows-left-right', '', true) }}
 			</button>
 			<button class="button" type="button" title="{{ lang('FLIP_VERTICALLY') }}" data-cropper-action="scaleY">
-				{{ Icon('iconify', 'fa:arrows-v', '', true) }}
+				{{ Icon('font', 'arrows-up-down', '', true) }}
 			</button>
 		</div>
 
 		<div class="button-group">
 			<button class="button" type="button" title="{{ lang('RESET') }}" data-cropper-action="reset">
-				{{ Icon('iconify', 'fa:refresh', '', true) }}
+				{{ Icon('font', 'rotate', '', true) }}
 			</button>
 			<button class="button" type="button" title="{{ lang('CLEAR') }}" data-cropper-action="clear">
-				{{ Icon('iconify', 'fa:times', '', true) }}
+				{{ Icon('font', 'xmark', '', true) }}
 			</button>
 		</div>
 	</div>
diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
index 47bb3cbfac..1be97ecb1d 100644
--- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
+++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
@@ -61,12 +61,12 @@
 						{% endif %}
 						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
 							<a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}">
-								{{ Icon('iconify', 'fa:question', lang('TOPIC_UNAPPROVED'), true, 'c-unapproved-icon') }}
+								{{ Icon('font', 'circle-question', lang('TOPIC_UNAPPROVED'), true, 'fas c-unapproved-icon') }}
 							</a>
 						<!-- ENDIF -->
 						<!-- IF topicrow.S_TOPIC_REPORTED -->
 							<a href="{topicrow.U_MCP_REPORT}" title="{L_TOPIC_REPORTED}">
-								{{ Icon('iconify', 'fa:exclamation', lang('TOPIC_REPORTED'), true, 'c-topic-reported-icon') }}
+								{{ Icon('font', 'triangle-exclamation', lang('TOPIC_REPORTED'), true, 'fas c-topic-reported-icon') }}
 							</a>
 						<!-- ENDIF -->
 						<br />
@@ -89,11 +89,11 @@
 						</div>
 						<!-- ENDIF -->
 						<div class="responsive-hide">
-							<!-- IF topicrow.ATTACH_ICON_IMG -->{{ Icon('iconify', 'fa:paperclip', '', true) }} <!-- ENDIF -->
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{{ Icon('font', 'paperclip', '', true) }} <!-- ENDIF -->
 							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
 						</div>
 						<div class="responsive-show" style="display: none;">
-							<!-- IF topicrow.ATTACH_ICON_IMG -->{{ Icon('iconify', 'fa:paperclip', '', true) }} <!-- ENDIF -->
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{{ Icon('font', 'paperclip', '', true) }} <!-- ENDIF -->
 							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo;
 							<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
 						</div>
@@ -101,7 +101,7 @@
 				</dt>
 				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
 					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">
-						{{ Icon('iconify', 'fa:external-link-square', VIEW_LATEST_POST, true, 'c-last-post-icon') }}
+						{{ Icon('font', 'arrow-up-right-from-square', VIEW_LATEST_POST, true, 'fas c-last-post-icon') }}
 					</a>
 					<br />{topicrow.LAST_POST_TIME}</span>
 				</dd>
diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html
index 2744d28dd9..8892fe9a36 100644
--- a/phpBB/styles/prosilver/template/ucp_main_front.html
+++ b/phpBB/styles/prosilver/template/ucp_main_front.html
@@ -41,7 +41,7 @@
 						<br>
 						<!-- IF .topicrow.pagination -->
 						<div class="pagination">
-							<span>{{ Icon('iconify', 'fa:clone', '', true) }}</span>
+							<span>{{ Icon('font', 'clone', '', true, 'far') }}</span>
 							<ul>
 								<!-- BEGIN pagination -->
 									<!-- IF topicrow.pagination.S_IS_PREV -->
@@ -58,11 +58,11 @@
 						</div>
 						<!-- ENDIF -->
 						<div class="responsive-hide">
-							<!-- IF topicrow.ATTACH_ICON_IMG -->{{ Icon('iconify', 'fa:paperclip', '', true) }} <!-- ENDIF -->
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{{ Icon('font', 'paperclip', '', true) }} <!-- ENDIF -->
 							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
 						</div>
 						<div class="responsive-show" style="display: none;">
-							<!-- IF topicrow.ATTACH_ICON_IMG -->{{ Icon('iconify', 'fa:paperclip', '', true) }} <!-- ENDIF -->
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{{ Icon('font', 'paperclip', '', true) }} <!-- ENDIF -->
 							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
 						</div>
 					</div>
@@ -70,7 +70,7 @@
 				<dd class="lastpost">
 					<span>{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
 						<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">
-							{{ Icon('iconify', 'fa:external-link-square', VIEW_LATEST_POST, true, 'c-last-post-icon') }}
+							{{ Icon('font', 'arrow-up-right-from-square', VIEW_LATEST_POST, true, 'fas c-last-post-icon') }}
 						</a>
 						<br />{topicrow.LAST_POST_TIME}
 					</span>
@@ -91,7 +91,7 @@
 		<dt>{L_TOTAL_POSTS}{L_COLON}</dt> <dd><!-- IF POSTS_PCT -->{POSTS}<!-- IF S_DISPLAY_SEARCH --> | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><!-- ENDIF --><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd>
 		<!-- IF ACTIVE_FORUM != '' --><dt>{L_ACTIVE_IN_FORUM}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF -->
 		<!-- IF ACTIVE_TOPIC != '' --><dt>{L_ACTIVE_IN_TOPIC}{L_COLON}</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF -->
-		<!-- IF WARNINGS --><dt>{L_YOUR_WARNINGS}{L_COLON}</dt> <dd class="error">{{ Icon('iconify', 'fa:exclamation-triangle', '', true, 'c-warning-icon') }} [{WARNINGS}]</dd><!-- ENDIF -->
+		<!-- IF WARNINGS --><dt>{L_YOUR_WARNINGS}{L_COLON}</dt> <dd class="error">{{ Icon('font', 'exclamation-triangle', '', true, 'fas c-warning-icon') }} [{WARNINGS}]</dd><!-- ENDIF -->
 		<!-- EVENT ucp_main_front_user_activity_append -->
 	</dl>
 <!-- EVENT ucp_main_front_user_activity_after -->
diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
index 814f054a4a..dfe31e3713 100644
--- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html
+++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
@@ -46,7 +46,7 @@
 					<!-- IF forumrow.LAST_POST_TIME_RFC3339 -->
 						<span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {forumrow.LAST_POST_AUTHOR_FULL}
 							<a href="{forumrow.U_LAST_POST}">
-								{{ Icon('iconify', 'fa:external-link-square', VIEW_LATEST_POST, true, 'c-last-post-icon') }}
+								{{ Icon('font', 'arrow-up-right-from-square', VIEW_LATEST_POST, true, 'fas c-last-post-icon') }}
 							</a>
 							<br /><time datetime="{forumrow.LAST_POST_TIME_RFC3339}">{forumrow.LAST_POST_TIME}</time></span>
 					<!-- ELSE -->
@@ -111,19 +111,19 @@
 						{% endif %}
 						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
 							<a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}">
-								{{ Icon('iconify', 'fa:question', lang('TOPIC_UNAPPROVED'), true, 'c-unapproved-icon') }}
+								{{ Icon('font', 'circle-question', lang('TOPIC_UNAPPROVED'), true, 'fas c-unapproved-icon') }}
 							</a>
 						<!-- ENDIF -->
 						<!-- IF topicrow.S_TOPIC_REPORTED -->
 							<a href="{topicrow.U_MCP_REPORT}" title="{L_TOPIC_REPORTED}">
-								{{ Icon('iconify', 'fa:exclamation', lang('TOPIC_REPORTED'), true, 'c-topic-reported-icon') }}
+								{{ Icon('font', 'triangle-exclamation', lang('TOPIC_REPORTED'), true, 'fas c-topic-reported-icon') }}
 							</a>
 						<!-- ENDIF -->
 						<br />
 						{% EVENT ucp_main_subscribed_topic_title_after %}
 						<!-- IF .topicrow.pagination -->
 						<div class="pagination">
-							<span>{{ Icon('iconify', 'fa:clone', '', true) }}</span>
+							<span>{{ Icon('font', 'clone', '', true, 'far') }}</span>
 							<ul>
 							<!-- BEGIN pagination -->
 								<!-- IF topicrow.pagination.S_IS_PREV -->
@@ -140,18 +140,18 @@
 						</div>
 						<!-- ENDIF -->
 						<div class="responsive-hide">
-							<!-- IF topicrow.ATTACH_ICON_IMG -->{{ Icon('iconify', 'fa:paperclip', '', true) }} <!-- ENDIF -->
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{{ Icon('font', 'paperclip', '', true) }} <!-- ENDIF -->
 							{L_POST_BY_AUTHOR} {topicrow.TOPIC_AUTHOR_FULL} &raquo; {topicrow.FIRST_POST_TIME}
 						</div>
 						<div class="responsive-show" style="display: none;">
-							<!-- IF topicrow.ATTACH_ICON_IMG -->{{ Icon('iconify', 'fa:paperclip', '', true) }} <!-- ENDIF -->
+							<!-- IF topicrow.ATTACH_ICON_IMG -->{{ Icon('font', 'paperclip', '', true) }} <!-- ENDIF -->
 							{L_LAST_POST} {L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL} &laquo; <a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">{topicrow.LAST_POST_TIME}</a>
 						</div>
 					</div>
 				</dt>
 				<dd class="lastpost"><span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} {topicrow.LAST_POST_AUTHOR_FULL}
 					<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">
-						{{ Icon('iconify', 'fa:external-link-square', VIEW_LATEST_POST, true, 'c-last-post-icon') }}
+						{{ Icon('font', 'arrow-up-right-from-square', VIEW_LATEST_POST, true, 'fas c-last-post-icon') }}
 					</a>
 					<br />{topicrow.LAST_POST_TIME}</span>
 				</dd>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_history.html b/phpBB/styles/prosilver/template/ucp_pm_history.html
index 8bda941c2f..557ab8cae7 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_history.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_history.html
@@ -23,7 +23,7 @@
 				<!-- EVENT ucp_pm_history_post_buttons_before -->
 				<li>
 					<a <!-- IF history_row.U_QUOTE -->href="{history_row.U_QUOTE}"<!-- ELSE -->href="#postingbox" onclick="addquote({history_row.MSG_ID}, '{history_row.MESSAGE_AUTHOR_QUOTE}', '{LA_WROTE}', {time:{history_row.MESSAGE_TIME},user_id:{history_row.USER_ID}});"<!-- ENDIF --> title="{L_QUOTE} {history_row.MESSAGE_AUTHOR}" class="button button-icon-only">
-						{{ Icon('iconify', 'fa:quote-left', '', true, 'c-button-icon') }}<span class="sr-only">{L_QUOTE} {history_row.MESSAGE_AUTHOR}</span>
+						{{ Icon('font', 'quote-left', '', true, 'fas c-button-icon') }}<span class="sr-only">{L_QUOTE} {history_row.MESSAGE_AUTHOR}</span>
 					</a>
 				</li>
 				<!-- EVENT ucp_pm_history_post_buttons_after -->
@@ -32,7 +32,7 @@
 			<!-- EVENT ucp_pm_history_post_buttons_list_after -->
 
 			<p class="author">
-				{{ Icon('iconify', 'fa:file', history_row.MINI_POST, true, 'c-topic-icon') }} {L_SENT_AT}{L_COLON} <strong>{history_row.SENT_DATE}</strong>
+				{{ Icon('font', 'file', history_row.MINI_POST, true, 'fas c-topic-icon') }} {L_SENT_AT}{L_COLON} <strong>{history_row.SENT_DATE}</strong>
 				<br />
 				{L_MESSAGE_BY_AUTHOR} <!-- EVENT ucp_pm_history_row_message_author_username_prepend -->{history_row.MESSAGE_AUTHOR_FULL}<!-- EVENT ucp_pm_history_row_message_author_username_append -->
 			</p>
@@ -49,6 +49,6 @@
 <hr />
 <p>
 	<a href="#cp-main" class="top">
-		{{ Icon('iconify', 'fa:chevron-circle-up', lang('BACK_TO_TOP'), false, 'c-top-icon') }}
+		{{ Icon('font', 'circle-chevron-up', lang('BACK_TO_TOP'), false, 'c-top-icon') }}
 	</a>
 </p>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_message_header.html b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
index 8b76db9db4..7af6cde6fa 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -10,21 +10,21 @@
 	<!-- IF U_POST_REPLY_PM or U_POST_NEW_TOPIC or U_FORWARD_PM -->
 		<!-- IF U_POST_REPLY_PM -->
 			<a title="{L_POST_REPLY_PM}" href="{U_POST_REPLY_PM}" class="button">
-				<span>{L_BUTTON_PM_REPLY}</span> {{ Icon('iconify', 'fa:reply', '', true, 'c-button-icon') }}</i>
+				<span>{L_BUTTON_PM_REPLY}</span> {{ Icon('font', 'reply', '', true, 'fas c-button-icon') }}</i>
 			</a>
 		<!-- ELSEIF U_POST_NEW_TOPIC -->
 			<a href="{U_POST_NEW_TOPIC}" accesskey="n" title="{L_UCP_PM_COMPOSE}" class="button">
-				<span>{L_BUTTON_PM_NEW}</span> {{ Icon('iconify', 'fa:pencil', '', true, 'c-button-icon') }}
+				<span>{L_BUTTON_PM_NEW}</span> {{ Icon('font', 'pencil', '', true, 'fas c-button-icon') }}
 			</a>
 		<!-- ENDIF -->
 		<!-- IF U_FORWARD_PM -->
 			<a title="{L_POST_FORWARD_PM}" href="{U_FORWARD_PM}" class="button">
-				<span>{L_BUTTON_PM_FORWARD}</span> {{ Icon('iconify', 'fa:mail-forward', '', true, 'c-button-icon') }}
+				<span>{L_BUTTON_PM_FORWARD}</span> {{ Icon('font', 'share', '', true, 'fas c-button-icon') }}
 			</a>
 		<!-- ENDIF -->
 		<!-- IF U_POST_REPLY_PM and S_PM_RECIPIENTS gt 1 -->
 			<a title="{L_REPLY_TO_ALL}" href="{U_POST_REPLY_ALL}" class="button">
-				<span>{L_BUTTON_PM_REPLY_ALL}</span> {{ Icon('iconify', 'fa:pencil', '', true, 'c-button-icon') }}
+				<span>{L_BUTTON_PM_REPLY_ALL}</span> {{ Icon('font', 'pencil', '', true, 'fas c-button-icon') }}
 			</a>
 		<!-- ENDIF -->
 	<!-- ENDIF -->
@@ -32,8 +32,8 @@
 	<!-- IF not S_IS_BOT and U_PRINT_PM -->
 		<div class="dropdown-container dropdown-button-control topic-tools">
 			<span title="{L_PM_TOOLS}" class="button button-secondary dropdown-trigger dropdown-select">
-				{{ Icon('iconify', 'fa:wrench', '', true, 'c-button-icon') }}
-				<span class="caret">{{ Icon('iconify', 'fa:caret-down', '', true, 'c-button-icon') }}</span>
+				{{ Icon('font', 'wrench', '', true, 'fas c-button-icon') }}
+				<span class="caret">{{ Icon('font', 'caret-down', '', true, 'fas c-button-icon') }}</span>
 			</span>
 			<div class="dropdown">
 				<div class="pointer"><div class="pointer-inner"></div></div>
@@ -41,7 +41,7 @@
 					<!-- IF U_PRINT_PM -->
 						<li>
 							<a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p">
-								{{ Icon('iconify', 'fa:print', lang('PRINT_PM'), false) }}
+								{{ Icon('font', 'print', lang('PRINT_PM'), false) }}
 							</a>
 						</li>
 					<!-- ENDIF -->
@@ -54,7 +54,7 @@
 		<div class="pagination">
 			<!-- IF S_VIEW_MESSAGE -->
 				<a class="arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_CURRENT_FOLDER}">
-					{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_TO_FOLDER'), false, 'c-return-arrow-icon') }}
+					{{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_TO_FOLDER'), false, 'fas c-return-arrow-icon') }}
 				</a>
 			<!-- ELSEIF FOLDER_CUR_MESSAGES neq 0 -->
 				<!-- IF U_MARK_ALL --><a href="{U_MARK_ALL}" class="mark">{L_PM_MARK_ALL_READ}</a> &bull; <!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
index 8cf8231b2e..01c1c7f866 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
@@ -78,9 +78,9 @@
 						<!-- ENDIF -->
 						<!-- IF messagerow.S_PM_REPORTED -->
 							<a href="{messagerow.U_MCP_REPORT}">
-								{{ Icon('iconify', 'fa:exclamation', PM_REPORTED, true, 'c-topic-reported-icon') }}
+								{{ Icon('font', 'triangle-exclamation', PM_REPORTED, true, 'fas c-topic-reported-icon') }}
 							</a>
-						<!-- ENDIF --> <!-- IF messagerow.ATTACH_ICON_IMG -->{{ Icon('iconify', 'fa:paperclip', '', true) }} <!-- ENDIF --><br />
+						<!-- ENDIF --> <!-- IF messagerow.ATTACH_ICON_IMG -->{{ Icon('font', 'paperclip', '', true) }} <!-- ENDIF --><br />
 						<!-- IF S_SHOW_RECIPIENTS -->{L_MESSAGE_TO} {messagerow.RECIPIENTS}<!-- ELSE -->{L_MESSAGE_BY_AUTHOR} {messagerow.MESSAGE_AUTHOR_FULL} &raquo; {messagerow.SENT_TIME}<!-- ENDIF -->
 
 						</div>
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index adf8f3e0f3..70d005335b 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -10,12 +10,12 @@
 	<fieldset class="display-options clearfix">
 		<!-- IF U_VIEW_PREVIOUS_HISTORY -->
 			<a href="{U_VIEW_PREVIOUS_HISTORY}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">
-				{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('VIEW_PREVIOUS_HISTORY'), false, 'c-return-arrow-icon') }}
+				{{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_BEGIN, lang('VIEW_PREVIOUS_HISTORY'), false, 'fas c-return-arrow-icon') }}
 			</a>
 		<!-- ENDIF -->
 		<!-- IF U_VIEW_NEXT_HISTORY -->
 			<a href="{U_VIEW_NEXT_HISTORY}" class="right-box arrow-{S_CONTENT_FLOW_END}">
-				{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_END, lang('VIEW_NEXT_HISTORY'), false, 'c-return-arrow-icon') }}
+				{{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_END, lang('VIEW_NEXT_HISTORY'), false, 'fas c-return-arrow-icon') }}
 			</a>
 		<!-- ENDIF -->
 	</fieldset>
@@ -36,7 +36,7 @@
 					{% EVENT ucp_pm_viewmessage_author_full_before %}
 					{MESSAGE_AUTHOR_FULL}
 					{% EVENT ucp_pm_viewmessage_author_full_after %}
-					<!-- IF S_ONLINE -->  {{ Icon('iconify', 'fa:circle', lang('ONLINE'), true, 'c-online-icon') }}<!-- ENDIF -->
+					<!-- IF S_ONLINE -->  {{ Icon('font', 'circle', lang('ONLINE'), true, 'fas c-online-icon') }}<!-- ENDIF -->
 				{% endapply %}
 			</dt>
 
@@ -110,28 +110,28 @@
 				<!-- IF U_EDIT -->
 					<li>
 						<a href="{U_EDIT}" title="{L_POST_EDIT_PM}" class="button button-icon-only">
-							{{ Icon('iconify', 'fa:pencil', lang('BUTTON_EDIT'), true, 'c-button-icon') }}
+							{{ Icon('font', 'pencil', lang('BUTTON_EDIT'), true, 'fas c-button-icon') }}
 						</a>
 					</li>
 				<!-- ENDIF -->
 				<!-- IF U_DELETE -->
 					<li>
 						<a href="{U_DELETE}" title="{L_DELETE_MESSAGE}" class="button button-icon-only">
-							{{ Icon('iconify', 'fa:times', lang('BUTTON_DELETE'), true, 'c-button-icon') }}
+							{{ Icon('font', 'xmark', lang('BUTTON_DELETE'), true, 'fas c-button-icon') }}
 						</a>
 					</li>
 				<!-- ENDIF -->
 				<!-- IF U_REPORT -->
 					<li>
 						<a href="{U_REPORT}" title="{L_REPORT_PM}" class="button button-icon-only">
-							{{ Icon('iconify', 'fa:exclamation', lang('BUTTON_REPORT'), true, 'c-button-icon') }}
+							{{ Icon('font', 'exclamation', lang('BUTTON_REPORT'), true, 'fas c-button-icon') }}
 						</a>
 					</li>
 				<!-- ENDIF -->
 				<!-- IF U_QUOTE -->
 					<li>
 						<a href="{U_QUOTE}" title="{L_POST_QUOTE_PM}" class="button button-icon-only">
-							{{ Icon('iconify', 'fa:quote-left', lang('BUTTON_QUOTE'), true, 'c-button-icon') }}
+							{{ Icon('font', 'quote-left', lang('BUTTON_QUOTE'), true, 'fas c-button-icon') }}
 						</a>
 					</li>
 				<!-- ENDIF -->
@@ -178,7 +178,7 @@
 
 		<div class="back2top">
 			<a href="#top" class="top" title="{L_BACK_TO_TOP}">
-				{{ Icon('iconify', 'fa:chevron-circle-up', lang('BACK_TO_TOP'), true, 'c-top-icon') }}
+				{{ Icon('font', 'circle-chevron-up', lang('BACK_TO_TOP'), true, 'fas c-top-icon') }}
 			</a>
 		</div>
 
@@ -192,12 +192,12 @@
 	<!-- IF S_MARK_OPTIONS --><label for="mark_option"><select name="mark_option" id="mark_option">{S_MARK_OPTIONS}</select></label>&nbsp;<input class="button1 button button-form-bold" type="submit" name="submit_mark" value="{L_GO}" /><!-- ENDIF -->
 	<!-- IF U_PREVIOUS_PM -->
 		<a href="{U_PREVIOUS_PM}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}">
-			{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('VIEW_PREVIOUS_PM'), false, 'c-return-arrow-icon') }}
+			{{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_BEGIN, lang('VIEW_PREVIOUS_PM'), false, 'fas c-return-arrow-icon') }}
 		</a>
 	<!-- ENDIF -->
 	<!-- IF U_NEXT_PM -->
 		<a href="{U_NEXT_PM}" class="right-box arrow-{S_CONTENT_FLOW_END}">
-			{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_END, lang('VIEW_NEXT_PM'), false, 'c-return-arrow-icon') }}
+			{{ Icon('font', 'angle-' ~ S_CONTENT_FLOW_END, lang('VIEW_NEXT_PM'), false, 'fas c-return-arrow-icon') }}
 		</a>
 	<!-- ENDIF -->
 	<!-- IF not S_UNREAD and not S_SPECIAL_FOLDER --><label for="dest_folder"><!-- IF S_VIEW_MESSAGE -->{L_MOVE_TO_FOLDER}{L_COLON} <!-- ELSE -->{L_MOVE_MARKED_TO_FOLDER}<!-- ENDIF --> <select name="dest_folder" id="dest_folder">{S_TO_FOLDER_OPTIONS}</select></label> <input class="button1 button button-form-bold" type="submit" name="move_pm" value="{L_GO}" /><!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 27d1da6816..4c69838f89 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -186,12 +186,12 @@
 						{% endif %}
 						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
 							<a href="{topicrow.U_MCP_QUEUE}" title="<!-- IF topicrow.S_TOPIC_UNAPPROVED -->{L_TOPIC_UNAPPROVED}<!-- ELSE -->{L_POSTS_UNAPPROVED}<!-- ENDIF -->">
-								{{ Icon('font', 'circle-question', '', true, 'fas icon icon-blue c-unapproved-icon o-icon-baseline') }}<span class="sr-only"><!-- IF topicrow.S_TOPIC_UNAPPROVED -->{L_TOPIC_UNAPPROVED}<!-- ELSE -->{L_POSTS_UNAPPROVED}<!-- ENDIF --></span>
+								{{ Icon('font', 'circle-question', '', true, 'fas c-unapproved-icon o-icon-baseline') }}<span class="sr-only"><!-- IF topicrow.S_TOPIC_UNAPPROVED -->{L_TOPIC_UNAPPROVED}<!-- ELSE -->{L_POSTS_UNAPPROVED}<!-- ENDIF --></span>
 							</a>
 						<!-- ENDIF -->
 						<!-- IF topicrow.S_TOPIC_DELETED -->
 							<a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_DELETED}">
-								{{ Icon('font', 'recycle', lang('TOPIC_DELETED'), true, 'c-topic-deleted-icon') }}
+								{{ Icon('font', 'recycle', lang('TOPIC_DELETED'), true, 'fas c-topic-deleted-icon o-icon-baseline') }}
 							</a>
 						<!-- ENDIF -->
 						<!-- IF topicrow.S_TOPIC_REPORTED -->
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 4be2269cd9..03247bf412 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -33,9 +33,9 @@
 	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
 		<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> {{ Icon('iconify', 'fa:lock', '', true, 'c-button-icon') }}
+				<span>{L_BUTTON_TOPIC_LOCKED}</span> {{ Icon('font', 'lock', '', true, 'fas c-button-icon') }}
 			<!-- ELSE -->
-				<span>{L_BUTTON_POST_REPLY}</span> {{ Icon('iconify', 'fa:reply', '', true, 'c-button-icon') }}
+				<span>{L_BUTTON_POST_REPLY}</span> {{ Icon('font', 'reply', '', true, 'fas c-button-icon') }}
 			<!-- ENDIF -->
 		</a>
 	<!-- ENDIF -->
@@ -50,10 +50,10 @@
 			<fieldset>
 				<input class="inputbox search tiny"  type="search" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_TOPIC}" />
 				<button class="button button-search" type="submit" title="{L_SEARCH}">
-					{{ Icon('iconify', 'fa:search', lang('SEARCH'), true, 'c-button-icon') }}
+					{{ Icon('font', 'search', lang('SEARCH'), true, 'fas c-button-icon') }}
 				</button>
 				<a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}">
-					{{ Icon('iconify', 'fa:cog', lang('SEARCH_ADV'), true, 'c-button-icon') }}
+					{{ Icon('font', 'gear', lang('SEARCH_ADV'), true, 'fas c-button-icon') }}
 				</a>
 				{S_SEARCH_LOCAL_HIDDEN_FIELDS}
 			</fieldset>
@@ -149,7 +149,7 @@
 					<!-- EVENT viewtopic_body_avatar_after -->
 				</div>
 				<!-- EVENT viewtopic_body_post_author_before -->
-				<!-- IF not postrow.U_POST_AUTHOR --><strong>{postrow.POST_AUTHOR_FULL}</strong><!-- ELSE -->{postrow.POST_AUTHOR_FULL}<!-- ENDIF --><!-- IF postrow.S_ONLINE and not postrow.S_POST_HIDDEN --> {{ Icon('iconify', 'fa:circle', lang('ONLINE'), true, 'c-online-icon') }}<!-- ENDIF -->
+				<!-- IF not postrow.U_POST_AUTHOR --><strong>{postrow.POST_AUTHOR_FULL}</strong><!-- ELSE -->{postrow.POST_AUTHOR_FULL}<!-- ENDIF --><!-- IF postrow.S_ONLINE and not postrow.S_POST_HIDDEN --> {{ Icon('font', 'circle', lang('ONLINE'), true, 'fas c-online-icon') }}<!-- ENDIF -->
 				<!-- EVENT viewtopic_body_post_author_after -->
 			</dt>
 
@@ -261,42 +261,42 @@
 							{% if postrow.U_EDIT %}
 								<li>
 									<a href="{{ postrow.U_EDIT }}" title="{{ lang('EDIT_POST') }}" class="button button-icon-only">
-										{{ Icon('iconify', 'fa:pencil', lang('BUTTON_EDIT'), post_buttons_hide_text, 'c-button-icon') }}
+										{{ Icon('font', 'pencil', lang('BUTTON_EDIT'), post_buttons_hide_text, 'fas c-button-icon') }}
 									</a>
 								</li>
 							{% endif %}
 							{% if postrow.U_DELETE %}
 								<li>
 									<a href="{{ postrow.U_DELETE }}" title="{{ lang('DELETE_POST') }}" class="button button-icon-only">
-										{{ Icon('iconify', 'fa:times', lang('BUTTON_DELETE'), post_buttons_hide_text, 'c-button-icon') }}
+										{{ Icon('font', 'xmark', lang('BUTTON_DELETE'), post_buttons_hide_text, 'fas c-button-icon') }}
 									</a>
 								</li>
 							{% endif %}
 							{% if postrow.U_REPORT %}
 								<li>
 									<a href="{{ postrow.U_REPORT }}" title="{{ lang('REPORT_POST') }}" class="button button-icon-only">
-										{{ Icon('iconify', 'fa:exclamation', lang('BUTTON_REPORT'), post_buttons_hide_text, 'c-button-icon') }}
+										{{ Icon('font', 'exclamation', lang('BUTTON_REPORT'), post_buttons_hide_text, 'fas c-button-icon') }}
 									</a>
 								</li>
 							{% endif %}
 							{% if postrow.U_WARN %}
 								<li>
 									<a href="{{ postrow.U_WARN }}" title="{{ lang('WARN_USER') }}" class="button button-icon-only">
-										{{ Icon('iconify', 'fa:exclamation-triangle', lang('BUTTON_WARN'), post_buttons_hide_text, 'c-button-icon') }}
+										{{ Icon('font', 'triangle-exclamation', lang('BUTTON_WARN'), post_buttons_hide_text, 'fas c-button-icon') }}
 									</a>
 								</li>
 							{% endif %}
 							{% if postrow.U_INFO %}
 								<li>
 									<a href="{{ postrow.U_INFO }}" title="{{ lang('INFORMATION') }}" class="button button-icon-only">
-										{{ Icon('iconify', 'fa:info', lang('BUTTON_INFORMATION'), post_buttons_hide_text, 'c-button-icon') }}
+										{{ Icon('font', 'info', lang('BUTTON_INFORMATION'), post_buttons_hide_text, 'fas c-button-icon') }}
 									</a>
 								</li>
 							{% endif %}
 							{% if postrow.U_QUOTE %}
 								<li>
 									<a href="{{ postrow.U_QUOTE }}" title="{{ lang('REPLY_WITH_QUOTE') }}" class="button button-icon-only">
-										{{ Icon('iconify', 'fa:quote-left', lang('BUTTON_QUOTE'), post_buttons_hide_text, 'c-button-icon') }}
+										{{ Icon('font', 'quote-left', lang('BUTTON_QUOTE'), post_buttons_hide_text, 'fas c-button-icon') }}
 									</a>
 								</li>
 							{% endif %}
@@ -307,7 +307,7 @@
 
 					<li class="post-buttons-responsive-menu dropdown-container">
 						<a href="javascript:void(0);" class="button button-icon-only post-button-responsive dropdown-toggle">
-							{{ Icon('iconify', 'fa:bars', '', true, 'c-button-icon') }}
+							{{ Icon('font', 'bars', '', true, 'fas c-button-icon') }}
 						</a>
 						<div class="dropdown">
 							<div class="pointer">
@@ -330,9 +330,9 @@
 			<p class="author">
 				<a class="unread" href="{postrow.U_MINI_POST}" title="{postrow.MINI_POST}">
 					{% if postrow.S_UNREAD_POST %}
-						<span>{{ Icon('iconify', 'fa:file', postrow.MINI_POST, true, 'c-topic-unread-icon') }}</span>
+						<span>{{ Icon('font', 'file', postrow.MINI_POST, true, 'fas c-topic-unread-icon') }}</span>
 					{% else %}
-						<span>{{ Icon('iconify', 'fa:file', postrow.MINI_POST, true, 'c-topic-icon') }}</span>
+						<span>{{ Icon('font', 'file', postrow.MINI_POST, true, 'fas c-topic-icon') }}</span>
 					{% endif %}
 				</a>
 				<span class="responsive-hide">{L_POST_BY_AUTHOR} <strong>{postrow.POST_AUTHOR_FULL}</strong> &raquo; </span><time datetime="{postrow.POST_DATE_RFC3339}">{postrow.POST_DATE}</time>
@@ -343,7 +343,7 @@
 			<!-- IF postrow.S_CAN_APPROVE -->
 			<form method="post" class="mcp_approve" action="{postrow.U_APPROVE_ACTION}">
 				<p class="post-notice unapproved">
-					<span>{{ Icon('iconify', 'fa:question', '', true, 'c-reported-icon') }}</span>
+					<span>{{ Icon('font', 'circle-question', '', true, 'fas c-unapproved-icon') }}</span>
 					<strong>{L_POST_UNAPPROVED_ACTION}</strong>
 					<input class="button1 button button-form-bold" type="submit" value="{L_DISAPPROVE}" name="action[disapprove]" />
 					<input class="button1 button button-form" type="submit" value="{L_APPROVE}" name="action[approve]" />
@@ -353,7 +353,7 @@
 			</form>
 			<!-- ELSE -->
 				<p class="post-notice unapproved">
-					<span>{{ Icon('iconify', 'fa:exclamation', '', true, 'c-topic-reported-icon') }}</span>
+					<span>{{ Icon('font', 'triangle-exclamation', '', true, 'fas c-topic-reported-icon') }}</span>
 					<strong>{L_POST_UNAPPROVED_EXPLAIN}</strong>
 				</p>
 			<!-- ENDIF -->
@@ -373,7 +373,7 @@
 
 			<!-- IF postrow.S_POST_REPORTED -->
 			<p class="post-notice reported">
-				<a href="{postrow.U_MCP_REPORT}">{{ Icon('iconify', 'fa:exclamation', '', true, 'c-topic-reported-icon') }}<strong>{L_POST_REPORTED}</strong></a>
+				<a href="{postrow.U_MCP_REPORT}">{{ Icon('font', 'triangle-exclamation', '', true, 'fas c-topic-reported-icon') }}<strong>{L_POST_REPORTED}</strong></a>
 			</p>
 			<!-- ENDIF -->
 
@@ -424,7 +424,7 @@
 		<div class="back2top">
 			<!-- EVENT viewtopic_body_postrow_back2top_prepend -->
 			<a href="#top" class="top" title="{L_BACK_TO_TOP}">
-				{{ Icon('iconify', 'fa:chevron-circle-up', lang('BACK_TO_TOP'), false, 'c-top-icon') }}
+				{{ Icon('font', 'circle-chevron-up', lang('BACK_TO_TOP'), false, 'fas c-top-icon') }}
 			</a>
 			<!-- EVENT viewtopic_body_postrow_back2top_append -->
 		</div>
@@ -448,9 +448,9 @@
 	<!-- IF not S_IS_BOT and S_DISPLAY_REPLY_INFO -->
 		<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> {{ Icon('iconify', 'fa:lock', '', true, 'c-button-icon') }}
+				<span>{L_BUTTON_TOPIC_LOCKED}</span> {{ Icon('font', 'lock', '', true, 'fas c-button-icon') }}
 			<!-- ELSE -->
-				<span>{L_BUTTON_POST_REPLY}</span> {{ Icon('iconify', 'fa:reply', '', true, 'c-button-icon') }}
+				<span>{L_BUTTON_POST_REPLY}</span> {{ Icon('font', 'reply', '', true, 'fas c-button-icon') }}
 			<!-- ENDIF -->
 		</a>
 	<!-- ENDIF -->
@@ -467,8 +467,8 @@
 	<!-- IF .quickmod -->
 	<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 button-secondary dropdown-trigger dropdown-select">
-			{{ Icon('iconify', 'fa:gavel', lang('QUICK_MOD'), true, 'c-button-icon') }}
-			<span class="caret">{{ Icon('iconify', 'fa:caret-down', '', true, 'c-button-icon') }}</span>
+			{{ Icon('font', 'gavel', lang('QUICK_MOD'), true, 'fas c-button-icon') }}
+			<span class="caret">{{ Icon('font', 'caret-down', '', true, 'fas c-button-icon') }}</span>
 		</span>
 		<div class="dropdown">
 				<div class="pointer"><div class="pointer-inner"></div></div>
diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
index 6fbcd09dbf..5d76a73de7 100644
--- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
+++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
@@ -1,8 +1,8 @@
 <!-- IF not S_IS_BOT and (U_WATCH_TOPIC or U_BOOKMARK_TOPIC or U_BUMP_TOPIC or U_EMAIL_TOPIC or U_PRINT_TOPIC or S_DISPLAY_TOPIC_TOOLS) -->
 	<div class="dropdown-container dropdown-button-control topic-tools">
 		<span title="{L_TOPIC_TOOLS}" class="button button-secondary dropdown-trigger dropdown-select">
-			{{ Icon('iconify', 'fa:wrench', '', true, 'c-button-icon') }}
-			<span class="caret">{{ Icon('iconify', 'fa:caret-down', '', true, 'c-button-icon') }}</span>
+			{{ Icon('font', 'wrench', '', true, 'fas c-button-icon') }}
+			<span class="caret">{{ Icon('font', 'caret-down', '', true, 'fas c-button-icon') }}</span>
 		</span>
 		<div class="dropdown">
 			<div class="pointer"><div class="pointer-inner"></div></div>
diff --git a/phpBB/styles/prosilver/theme/content.css b/phpBB/styles/prosilver/theme/content.css
index f204803e20..d942e08b37 100644
--- a/phpBB/styles/prosilver/theme/content.css
+++ b/phpBB/styles/prosilver/theme/content.css
@@ -504,6 +504,7 @@ dd .signature {
 
 /* Jump to post link for now */
 ul.searchresults {
+	font-size: 12px;
 	text-align: right;
 	clear: both;
 	list-style: none;
diff --git a/phpBB/styles/prosilver/theme/icons.css b/phpBB/styles/prosilver/theme/icons.css
index 7d491b385a..ed9d25cca2 100644
--- a/phpBB/styles/prosilver/theme/icons.css
+++ b/phpBB/styles/prosilver/theme/icons.css
@@ -46,6 +46,10 @@ svg {
 	vertical-align: baseline !important;
 }
 
+.format-buttons .fa-fw {
+	width: 125%;
+}
+
 .o-icon + span,
 span + .o-icon {
 	padding-left: 4px;
@@ -68,6 +72,7 @@ blockquote cite:before,
 
 .c-forum-row-icon,
 .c-notification-check-icon {
+	font-size: 20px;
 	width: 20px;
 	height: 20px;
 	margin-top: 0;