From e8493f915931f60d46d0efffee7b6ae23b1c01c8 Mon Sep 17 00:00:00 2001
From: hanakin <midaym@gmail.com>
Date: Sat, 2 May 2020 18:43:55 -1000
Subject: [PATCH] [ticket/16237] use icon function title when poss

PHPBB3-16237
---
 .../all/template/macros/icons/font.twig       |  3 +-
 .../all/template/macros/icons/iconify.twig    |  3 +-
 .../styles/all/template/macros/icons/png.twig |  2 +-
 .../styles/all/template/macros/icons/svg.twig |  2 +-
 phpBB/styles/prosilver/template/faq_body.html |  2 +-
 .../prosilver/template/forumlist_body.html    |  9 ++--
 phpBB/styles/prosilver/template/jumpbox.html  |  8 ++--
 .../styles/prosilver/template/mcp_forum.html  |  6 +--
 phpBB/styles/prosilver/template/mcp_post.html | 12 +++---
 .../styles/prosilver/template/mcp_topic.html  |  4 +-
 .../styles/prosilver/template/mcp_whois.html  |  4 +-
 .../prosilver/template/memberlist_view.html   |  2 +-
 .../prosilver/template/message_body.html      |  2 +-
 .../prosilver/template/navbar_footer.html     | 12 +++---
 .../prosilver/template/navbar_header.html     | 42 +++++++++----------
 .../template/notification_dropdown.html       |  2 +-
 .../prosilver/template/overall_header.html    |  4 +-
 .../styles/prosilver/template/pagination.html |  6 +--
 .../prosilver/template/posting_review.html    |  4 +-
 .../template/posting_topic_review.html        |  8 ++--
 .../prosilver/template/search_results.html    | 20 ++++-----
 .../template/ucp_main_bookmarks.html          |  8 ++--
 .../prosilver/template/ucp_main_front.html    |  4 +-
 .../template/ucp_main_subscribed.html         | 10 ++---
 .../prosilver/template/ucp_pm_history.html    |  4 +-
 .../template/ucp_pm_message_header.html       |  4 +-
 .../prosilver/template/ucp_pm_viewfolder.html |  2 +-
 .../template/ucp_pm_viewmessage.html          | 20 ++++-----
 .../prosilver/template/viewforum_body.html    | 14 +++----
 .../prosilver/template/viewtopic_body.html    | 14 +++----
 30 files changed, 117 insertions(+), 120 deletions(-)

diff --git a/phpBB/styles/all/template/macros/icons/font.twig b/phpBB/styles/all/template/macros/icons/font.twig
index a882a25c40..f20bcc3a36 100644
--- a/phpBB/styles/all/template/macros/icons/font.twig
+++ b/phpBB/styles/all/template/macros/icons/font.twig
@@ -1,4 +1,3 @@
 {% spaceless %}
-	<i class="o-icon o-icon-font fa-{{ ICON ~ (CLASSES ? ' ' ~ CLASSES) }}"{% if S_HIDDEN %}{% if TITLE %} title="{{ lang(TITLE) }}"{% endif %} aria-hidden="true"{% endif %}{{ ATTRIBUTES }}></i>
-	{% if TITLE %}<span{% if S_HIDDEN %} class="sr-only"{% endif %}>{{ lang(TITLE) }}</span>{% endif %}
+	<i class="o-icon o-icon-font fa-{{ ICON ~ (CLASSES ? ' ' ~ CLASSES) }}"{% if S_HIDDEN %}{% if TITLE %} title="{{ TITLE }}"{% endif %} aria-hidden="true"{% endif %}{{ ATTRIBUTES }}></i>{% if TITLE %}<span{% if S_HIDDEN %} class="sr-only"{% endif %}>{{ lang(TITLE) }}</span>{% endif %}
 {% endspaceless %}
diff --git a/phpBB/styles/all/template/macros/icons/iconify.twig b/phpBB/styles/all/template/macros/icons/iconify.twig
index 43b8b88948..8ffcf7a4d3 100644
--- a/phpBB/styles/all/template/macros/icons/iconify.twig
+++ b/phpBB/styles/all/template/macros/icons/iconify.twig
@@ -1,4 +1,3 @@
 {% spaceless %}
-	<i class="iconify o-icon-src-{{ SOURCE }} o-icon{{ CLASSES ? ' ' ~ CLASSES }}"{% if S_HIDDEN %}{% if TITLE %} title="{{ lang(TITLE) }}"{% endif %} aria-hidden="true"{% endif %} data-icon="{{ ICON }}" data-inline="true"{{ ATTRIBUTES }}></i>
-	{% if TITLE %}<span{% if S_HIDDEN %} class="sr-only"{% endif %}>{{ lang(TITLE) }}</span>{% endif %}
+	<i class="iconify o-icon-src-{{ SOURCE }} o-icon{{ CLASSES ? ' ' ~ CLASSES }}"{% if S_HIDDEN %}{% if TITLE %} title="{{ TITLE }}"{% endif %} aria-hidden="true"{% endif %} data-icon="{{ ICON }}" data-inline="true"{{ ATTRIBUTES }}></i>{% if TITLE %}<span{% if S_HIDDEN %} class="sr-only"{% endif %}>{{ lang(TITLE) }}</span>{% endif %}
 {% endspaceless %}
diff --git a/phpBB/styles/all/template/macros/icons/png.twig b/phpBB/styles/all/template/macros/icons/png.twig
index 426f7a3a5e..f171d591b7 100644
--- a/phpBB/styles/all/template/macros/icons/png.twig
+++ b/phpBB/styles/all/template/macros/icons/png.twig
@@ -1,3 +1,3 @@
 {% spaceless %}
-	<img class="o-icon o-icon-png png-{{ ICON ~ (CLASSES ? ' ' ~ CLASSES) }}" src="{{ SOURCE }}" alt="{{ lang(TITLE) }}"{{ ATTRIBUTES }} />
+	<img class="o-icon o-icon-png png-{{ ICON ~ (CLASSES ? ' ' ~ CLASSES) }}" src="{{ SOURCE }}" alt="{{ TITLE }}"{{ ATTRIBUTES }} />
 {% endspaceless %}
diff --git a/phpBB/styles/all/template/macros/icons/svg.twig b/phpBB/styles/all/template/macros/icons/svg.twig
index e24777272e..601661dc35 100644
--- a/phpBB/styles/all/template/macros/icons/svg.twig
+++ b/phpBB/styles/all/template/macros/icons/svg.twig
@@ -2,7 +2,7 @@
 	{% set TITLE_ID = TITLE ? TITLE|lower|replace({' ': '_'}) ~ '-' ~ random() %}
 
 	<svg class="o-icon o-icon-svg svg-{{ ICON ~ (CLASSES ? ' ' ~ CLASSES) }}" xmlns="http://www.w3.org/2000/svg" viewBox="{{ VIEW_BOX }}"{% if TITLE %}{% if S_HIDDEN %} aria-hidden="true"{% endif %} aria-labelledby="{{ TITLE_ID }}"{% endif %} role="img"{{ ATTRIBUTES }}>
-		{% if TITLE %}<title id="{{ TITLE_ID }}">{{ lang(TITLE) }}</title>{% endif %}
+		{% if TITLE %}<title id="{{ TITLE_ID }}">{{ TITLE }}</title>{% endif %}
 
 		{{ SOURCE }}
 	</svg>
diff --git a/phpBB/styles/prosilver/template/faq_body.html b/phpBB/styles/prosilver/template/faq_body.html
index f556fe7099..44d2767c69 100644
--- a/phpBB/styles/prosilver/template/faq_body.html
+++ b/phpBB/styles/prosilver/template/faq_body.html
@@ -36,7 +36,7 @@
 					<dd>{faq_block.faq_row.FAQ_ANSWER}</dd>
 				</dl>
 				<a href="#faqlinks" class="top">
-					{{ Icon('iconify', 'fa:chevron-circle-up', '', true) }}<span>{L_BACK_TO_TOP}</span>
+					{{ Icon('iconify', 'fa:chevron-circle-up', lang('BACK_TO_TOP'), false) }}
 				</a>
 				<!-- IF not faq_block.faq_row.S_LAST_ROW --><hr class="dashed" /><!-- ENDIF -->
 			<!-- END faq_row -->
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index eaac5afa5d..72ae4de0b7 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -69,8 +69,7 @@
 									{{ Icon('iconify', {
 										'fa:external-link' : forumrow.subforum.IS_LINK ,
 										'fa:file-o' : true,
-									}, '', true, 'c-subforum-icon') }}
-									<span>{forumrow.subforum.SUBFORUM_NAME}</span>
+									}, forumrow.subforum.SUBFORUM_NAME, false, 'c-subforum-icon') }}
 								</a>{% if not forumrow.subforum.S_LAST_ROW %}{L_COMMA_SEPARATOR}{% endif %}
 								<!-- EVENT forumlist_body_subforum_link_append -->
 							<!-- END subforum -->
@@ -98,11 +97,11 @@
 						<span>
 							<!-- IF forumrow.U_UNAPPROVED_TOPICS -->
 								<a href="{forumrow.U_UNAPPROVED_TOPICS}" title="{L_TOPICS_UNAPPROVED}">
-									{{ Icon('iconify', 'mdi:alert-decagram', '', true, 'c-unapproved-icon') }}<span class="sr-only">{L_TOPICS_UNAPPROVED}</span>
+									{{ Icon('iconify', 'mdi:alert-decagram', lang('TOPICS_UNAPPROVED'), true, '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', '', true, 'c-unapproved-icon') }}<span class="sr-only">{L_TOPICS_UNAPPROVED}</span>
+									{{ Icon('iconify', 'mdi:alert-decagram', lang('TOPICS_UNAPPROVED'), true, 'c-unapproved-icon') }}
 								</a>
 							<!-- ENDIF -->
 							<!-- IF forumrow.LAST_POST_TIME -->
@@ -114,7 +113,7 @@
 									{L_POST_BY_AUTHOR} <!-- EVENT forumlist_body_last_poster_username_prepend -->{forumrow.LAST_POSTER_FULL}<!-- EVENT forumlist_body_last_poster_username_append -->
 								<!-- IF not S_IS_BOT -->
 									<a href="{forumrow.U_LAST_POST}" title="{L_VIEW_LATEST_POST}">
-										{{ Icon('iconify', 'fa:external-link-square', '', true, 'c-last-post-icon') }}<span class="sr-only">{L_TOPICS_UNAPPROVED}</span>
+										{{ Icon('iconify', 'fa:external-link-square', lang('TOPICS_UNAPPROVED'), true, 'c-last-post-icon') }}
 									</a>
 								<!-- ENDIF -->
 								<br /><time datetime="{forumrow.LAST_POST_TIME_RFC3339}">{forumrow.LAST_POST_TIME}</time>
diff --git a/phpBB/styles/prosilver/template/jumpbox.html b/phpBB/styles/prosilver/template/jumpbox.html
index 86afd6e8a2..41185a7876 100644
--- a/phpBB/styles/prosilver/template/jumpbox.html
+++ b/phpBB/styles/prosilver/template/jumpbox.html
@@ -3,25 +3,25 @@
 	<!-- IF S_VIEWTOPIC -->
 	<p class="jumpbox-return">
 		<a href="{U_VIEW_FORUM}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">
-			{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, '', true, 'c-return-arrow-icon') }}<span>{L_RETURN_TO_FORUM}</span>
+			{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_TO_FORUM'), false, 'c-return-arrow-icon') }}
 		</a>
 	</p>
 	<!-- ELSEIF S_VIEWFORUM -->
 	<p class="jumpbox-return">
 		<a href="{U_INDEX}" class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" accesskey="r">
-			{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, '', true, 'c-return-arrow-icon') }}<span>{L_RETURN_TO_INDEX}</span>
+			{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_TO_INDEX'), false, 'c-return-arrow-icon') }}
 		</a>
 	</p>
 	<!-- ELSEIF SEARCH_TOPIC -->
 	<p class="jumpbox-return">
 		<a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH_TOPIC}" accesskey="r">
-			{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, '', true, 'c-return-arrow-icon') }}<span>{L_RETURN_TO_TOPIC}</span>
+			{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_TO_TOPIC'), false, 'c-return-arrow-icon') }}
 		</a>
 	</p>
 	<!-- ELSEIF S_SEARCH_ACTION -->
 	<p class="jumpbox-return">
 		<a class="left-box arrow-{S_CONTENT_FLOW_BEGIN}" href="{U_SEARCH}" title="{L_SEARCH_ADV}" accesskey="r">
-			{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, '', true, 'c-return-arrow-icon') }}<span>{L_GO_TO_SEARCH_ADV}</span>
+			{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('GO_TO_SEARCH_ADV'), false, 'c-return-arrow-icon') }}
 		</a>
 	</p>
 	<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index 8455ad4270..a87dbc05d4 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -63,17 +63,17 @@
 					<!-- 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', '', true, 'c-unapproved-icon') }}<span class="sr-only">{L_TOPIC_UNAPPROVED}</span>
+							{{ Icon('iconify', 'fa:question', lang('TOPIC_UNAPPROVED'), true, 'c-unapproved-icon') }}
 						</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', '', true, 'c-topic-deleted-icon') }}<span class="sr-only">{L_TOPIC_DELETED}</span>
+							{{ Icon('iconify', 'fa:recycle', lang('TOPIC_DELETED'), true, 'c-topic-deleted-icon') }}
 						</a>
 					<!-- ENDIF -->
 					<!-- IF topicrow.S_TOPIC_REPORTED -->
 						<a href="{topicrow.U_MCP_REPORT}" title="{L_TOPIC_REPORTED}">
-							{{ Icon('iconify', 'fa:exclamation', '', true, 'c-topic-reported-icon') }}<span class="sr-only">{L_TOPIC_REPORTED}</span>
+							{{ Icon('iconify', 'fa:exclamation', lang('TOPIC_REPORTED'), true, 'c-topic-reported-icon') }}
 						</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 -->
diff --git a/phpBB/styles/prosilver/template/mcp_post.html b/phpBB/styles/prosilver/template/mcp_post.html
index 96bb0a2852..0a37c151ed 100644
--- a/phpBB/styles/prosilver/template/mcp_post.html
+++ b/phpBB/styles/prosilver/template/mcp_post.html
@@ -61,7 +61,7 @@
 			<!-- IF U_EDIT -->
 				<li>
 					<a href="{U_EDIT}" title="{L_EDIT_POST}" class="button">
-						{{ Icon('iconify', 'fa:pencil', '', true, 'c-button-icon') }}<span class="sr-only">{L_EDIT_POST}</span>
+						{{ Icon('iconify', 'fa:pencil', lang('EDIT_POST'), true, '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', '', true,  'c-topic-icon') }}<span class="sr-only">{MINI_POST_IMG}</span></span> {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} &raquo; {POST_DATE}</p>
+		<p class="author"><span>{{ Icon('iconify', 'fa:file', MINI_POST_IMG, true,  'c-topic-icon') }}</span> {L_POSTED} {L_POST_BY_AUTHOR} {POST_AUTHOR_FULL} &raquo; {POST_DATE}</p>
 		<!-- ENDIF -->
 
 		<!-- IF S_POST_UNAPPROVED -->
@@ -104,8 +104,8 @@
 
 		{% if S_POST_REPORTED and not S_MCP_REPORT %}
 			<p class="post-notice reported">
-				{{ Icon('iconify', 'fa:exclamation', '', true, 'c-topic-reported-icon') }}
-				<span class="sr-only">{L_TOPIC_REPORTED}</span> <a href="{U_MCP_REPORT}"><strong>{L_MESSAGE_REPORTED}</strong></a>
+				{{ Icon('iconify', 'fa:exclamation', lang('TOPIC_REPORTED'), true, 'c-topic-reported-icon') }}
+				<a href="{U_MCP_REPORT}"><strong>{L_MESSAGE_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, '', true, 'c-button-icon') }}<span class="sr-only">{L_PREVIOUS}</span></a></li>
+					<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>
 					<!-- 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_END, '', true, 'c-button-icon') }}<span class="sr-only">{L_NEXT}</span></a></li>
+					<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_END, lang('NEXT'), true, '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_topic.html b/phpBB/styles/prosilver/template/mcp_topic.html
index b3a62ddc99..fd6e794103 100644
--- a/phpBB/styles/prosilver/template/mcp_topic.html
+++ b/phpBB/styles/prosilver/template/mcp_topic.html
@@ -102,7 +102,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', '', true, 'c-button-icon') }}<span class="sr-only">{L_POST_DETAILS}</span>
+							{{ Icon('iconify', 'fa:info', lang('POST_DETAILS'), true, 'c-button-icon') }}
 						</a>
 					</li>
 					<li>
@@ -119,7 +119,7 @@
 				<!-- EVENT mcp_topic_postrow_post_details_before -->
 				<p class="author">
 					<a href="{postrow.U_MINI_POST}" title="{postrow.MINI_POST}">
-						{{ Icon('iconify', 'fa:file', '', true) }}<span class="sr-only">{postrow.MINI_POST}</span>
+						{{ Icon('iconify', 'fa: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 -->
diff --git a/phpBB/styles/prosilver/template/mcp_whois.html b/phpBB/styles/prosilver/template/mcp_whois.html
index dd935f7341..1aa626441d 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, '', true, 'c-return-arrow-icon') }}<span>{L_RETURN_POST}</span>
+				{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_POST'), false, '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, '', true, 'c-return-arrow-icon') }}<span>{L_RETURN_POST}</span>
+				{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_POST'), false, '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 1ecec49174..c6059e0873 100644
--- a/phpBB/styles/prosilver/template/memberlist_view.html
+++ b/phpBB/styles/prosilver/template/memberlist_view.html
@@ -23,7 +23,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('L_ONLINE'), true, 'c-online-icon') }}<span class="sr-only">{L_ONLINE}</span><!-- 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('iconify', 'fa:circle', lang('L_ONLINE'), true, '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 da7ab383d5..a0c38c7ee4 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, '', true, 'c-return-arrow-icon') }}<span>{L_GO_TO_SEARCH_ADV}</span>
+				{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('GO_TO_SEARCH_ADV'), true, '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 e4db8b9794..f87c7f1ce8 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', '', true) }}<span>{L_SITE_HOME}</span>
+						{{ Icon('iconify', 'fa:home', lang('SITE_HOME'), false) }}
 					</a>
 				</span>
 				{% endapply %}
@@ -16,7 +16,7 @@
 			{% apply spaceless %}
 			<span class="crumb">
 				<a href="{U_INDEX}" data-navbar-reference="index">
-					<!-- IF not U_SITE_HOME -->{{ Icon('iconify', 'fa:home', '', true) }}<!-- ENDIF --><span>{L_INDEX}</span>
+					<!-- IF not U_SITE_HOME -->{{ Icon('iconify', 'fa:home', lang(INDEX), false) }}<!-- ENDIF -->
 				</a>
 			</span>
 			{% endapply %}
@@ -43,13 +43,13 @@
 		<!-- IF not S_IS_BOT -->
 			<li class="rightside">
 				<a href="{U_DELETE_COOKIES}" data-ajax="true" data-refresh="true" role="menuitem">
-					{{ Icon('iconify', 'fa:trash', '', true) }}<span>{L_DELETE_COOKIES}</span>
+					{{ Icon('iconify', 'fa:trash', lang('DELETE_COOKIES'), false) }}
 				</a>
 			</li>
 			<!-- IF S_DISPLAY_MEMBERLIST -->
 				<li class="rightside" data-last-responsive="true">
 					<a href="{U_MEMBERLIST}" title="{L_MEMBERLIST_EXPLAIN}" role="menuitem">
-						{{ Icon('iconify', 'fa:group', '', true) }}<span>{L_MEMBERLIST}</span>
+						{{ Icon('iconify', 'fa:group', lang('MEMBERLIST'), false) }}
 					</a>
 				</li>
 			<!-- ENDIF -->
@@ -58,7 +58,7 @@
 		<!-- IF U_TEAM -->
 			<li class="rightside" data-last-responsive="true">
 				<a href="{U_TEAM}" role="menuitem">
-					{{ Icon('iconify', 'fa:shield', '', true) }}<span>{L_THE_TEAM}</span>
+					{{ Icon('iconify', 'fa:shield', lang('THE_TEAM'), false) }}
 				</a>
 			</li>
 		<!-- ENDIF -->
@@ -66,7 +66,7 @@
 		<!-- IF U_CONTACT_US -->
 			<li class="rightside" data-last-responsive="true">
 				<a href="{U_CONTACT_US}" role="menuitem">
-					{{ Icon('iconify', 'fa:envelope', '', true) }}<span>{L_CONTACT_US}</span>
+					{{ Icon('iconify', 'fa:envelope', lang('CONTACT_US'), false) }}
 				</a>
 			</li>
 		<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html
index 37b10a9b98..3dd673c51d 100644
--- a/phpBB/styles/prosilver/template/navbar_header.html
+++ b/phpBB/styles/prosilver/template/navbar_header.html
@@ -5,7 +5,7 @@
 
 		<li id="quick-links" class="quick-links dropdown-container responsive-menu<!-- IF not S_DISPLAY_QUICK_LINKS and not S_DISPLAY_SEARCH --> hidden<!-- ENDIF -->" data-skip-responsive="true">
 			<a href="#" class="dropdown-trigger">
-				{{ Icon('iconify', 'fa:bars', '', true) }}<span>{L_QUICK_LINKS}</span>
+				{{ Icon('iconify', 'fa:bars', lang('QUICK_LINKS'), false) }}
 			</a>
 			<div class="dropdown">
 				<div class="pointer"><div class="pointer-inner"></div></div>
@@ -17,38 +17,38 @@
 						<!-- IF S_REGISTERED_USER -->
 							<li>
 								<a href="{U_SEARCH_SELF}" role="menuitem">
-									{{ Icon('iconify', 'mdi:file-account-outline', '', true) }}<span>{L_SEARCH_SELF}</span>
+									{{ Icon('iconify', 'mdi:file-account-outline', lang('SEARCH_SELF'), false) }}
 								</a>
 							</li>
 						<!-- ENDIF -->
 						<!-- IF S_USER_LOGGED_IN -->
 							<li>
 								<a href="{U_SEARCH_NEW}" role="menuitem">
-									{{ Icon('iconify', 'mdi:file-hidden', '', true) }}<span>{L_SEARCH_NEW}</span>
+									{{ Icon('iconify', 'mdi:file-hidden', lang('SEARCH_NEW'), false) }}
 								</a>
 							</li>
 						<!-- ENDIF -->
 						<!-- IF S_LOAD_UNREADS -->
 							<li>
 								<a href="{U_SEARCH_UNREAD}" role="menuitem">
-									{{ Icon('iconify', 'mdi:file', '', true) }}<span>{L_SEARCH_UNREAD}</span>
+									{{ Icon('iconify', 'mdi:file', lang('SEARCH_UNREAD'), false) }}
 								</a>
 							</li>
 						<!-- ENDIF -->
 							<li>
 								<a href="{U_SEARCH_UNANSWERED}" role="menuitem">
-									{{ Icon('iconify', 'mdi:file-question-outline', '', true) }}<span>{L_SEARCH_UNANSWERED}</span>
+									{{ Icon('iconify', 'mdi:file-question-outline', lang('SEARCH_UNANSWERED'), false) }}
 								</a>
 							</li>
 							<li>
 								<a href="{U_SEARCH_ACTIVE_TOPICS}" role="menuitem">
-									{{ Icon('iconify', 'mdi:file-upload-outline', '', true) }}<span>{L_SEARCH_ACTIVE_TOPICS}</span>
+									{{ Icon('iconify', 'mdi:file-upload-outline', lang('SEARCH_ACTIVE_TOPICS'), false) }}
 								</a>
 							</li>
 							<li class="separator"></li>
 							<li>
 								<a href="{U_SEARCH}" role="menuitem">
-									{{ Icon('iconify', 'fa:search', '', true) }}<span>{L_SEARCH}</span>
+									{{ Icon('iconify', 'fa:search', lang('SEARCH'), false) }}
 								</a>
 							</li>
 					<!-- ENDIF -->
@@ -58,14 +58,14 @@
 						<!-- IF S_DISPLAY_MEMBERLIST -->
 							<li>
 								<a href="{U_MEMBERLIST}" role="menuitem">
-									{{ Icon('iconify', 'fa:group', '', true) }}<span>{L_MEMBERLIST}</span>
+									{{ Icon('iconify', 'fa:group', lang('MEMBERLIST'), false) }}
 								</a>
 							</li>
 						<!-- ENDIF -->
 						<!-- IF U_TEAM -->
 							<li>
 								<a href="{U_TEAM}" role="menuitem">
-									{{ Icon('iconify', 'fa:shield', '', true) }}<span>{L_THE_TEAM}</span>
+									{{ Icon('iconify', 'fa:shield', lang('THE_TEAM'), false) }}
 								</a>
 							</li>
 						<!-- ENDIF -->
@@ -80,21 +80,21 @@
 		<!-- EVENT overall_header_navigation_prepend -->
 		<li <!-- IF not S_USER_LOGGED_IN -->data-skip-responsive="true"<!-- ELSE -->data-last-responsive="true"<!-- ENDIF -->>
 			<a href="{U_FAQ}" rel="help" title="{L_FAQ_EXPLAIN}" role="menuitem">
-				{{ Icon('iconify', 'fa:question-circle', '', true) }}<span>{L_FAQ}</span>
+				{{ Icon('iconify', 'fa:question-circle', lang('FAQ'), false) }}
 			</a>
 		</li>
 		<!-- EVENT overall_header_navigation_append -->
 		<!-- IF U_ACP -->
 			<li data-last-responsive="true">
 				<a href="{U_ACP}" title="{L_ACP}" role="menuitem">
-					{{ Icon('iconify', 'fa:cogs', '', true) }}<span>{L_ACP_SHORT}</span>
+					{{ Icon('iconify', 'fa:cogs', '', false) }}<span>{{ lang('ACP_SHORT') }}</span>
 				</a>
 			</li>
 		<!-- ENDIF -->
 		<!-- IF U_MCP -->
 			<li data-last-responsive="true">
 				<a href="{U_MCP}" title="{L_MCP}" role="menuitem">
-					{{ Icon('iconify', 'fa:gavel', '', true) }}<span>{L_MCP_SHORT}</span>
+					{{ Icon('iconify', 'fa:gavel', '', false) }}<span>{{ lang('MCP_SHORT') }}</span>
 				</a>
 			</li>
 		<!-- ENDIF -->
@@ -111,7 +111,7 @@
 						<!-- IF U_RESTORE_PERMISSIONS -->
 							<li>
 								<a href="{U_RESTORE_PERMISSIONS}">
-									{{ Icon('iconify', 'fa:refresh', '', true) }}<span>{L_RESTORE_PERMISSIONS}</span>
+									{{ Icon('iconify', 'fa:refresh', lang('RESTORE_PERMISSIONS'), false) }}
 								</a>
 							</li>
 						<!-- ENDIF -->
@@ -120,13 +120,13 @@
 
 						<li>
 							<a href="{U_PROFILE}" title="{L_PROFILE}" role="menuitem">
-								{{ Icon('iconify', 'fa:sliders', '', true) }}<span>{L_PROFILE}</span>
+								{{ Icon('iconify', 'fa:sliders', lang('PROFILE'), false) }}
 							</a>
 						</li>
 						<!-- IF U_USER_PROFILE -->
 							<li>
 								<a href="{U_USER_PROFILE}" title="{L_READ_PROFILE}" role="menuitem">
-									{{ Icon('iconify', 'fa:user', '', true) }}<span>{L_READ_PROFILE}</span>
+									{{ Icon('iconify', 'fa:user', lang('READ_PROFILE'), false) }}
 								</a>
 							</li>
 						<!-- ENDIF -->
@@ -136,7 +136,7 @@
 						<li class="separator"></li>
 						<li>
 							<a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x" role="menuitem">
-								{{ Icon('iconify', 'fa:power-off', '', true) }}<span>{L_LOGIN_LOGOUT}</span>
+								{{ Icon('iconify', 'fa:power-off', lang('LOGIN_LOGOUT'), false) }}
 							</a>
 						</li>
 					</ul>
@@ -147,14 +147,14 @@
 		<!-- IF S_DISPLAY_PM -->
 			<li class="rightside" data-skip-responsive="true">
 				<a href="{U_PRIVATEMSGS}" role="menuitem">
-					{{ Icon('iconify', 'fa:inbox', '', true) }}<span>{L_PRIVATE_MESSAGES} </span><strong class="badge<!-- IF not PRIVATE_MESSAGE_COUNT --> hidden<!-- ENDIF -->">{PRIVATE_MESSAGE_COUNT}</strong>
+					{{ Icon('iconify', 'fa:inbox', lang('PRIVATE_MESSAGES'), false) }}<strong class="badge<!-- IF not PRIVATE_MESSAGE_COUNT --> hidden<!-- ENDIF -->"> {PRIVATE_MESSAGE_COUNT}</strong>
 				</a>
 			</li>
 		<!-- ENDIF -->
 		<!-- IF S_NOTIFICATIONS_DISPLAY -->
 			<li class="dropdown-container dropdown-{S_CONTENT_FLOW_END} rightside" data-skip-responsive="true">
 				<a href="{U_VIEW_ALL_NOTIFICATIONS}" id="notification-button" class="dropdown-trigger">
-					{{ Icon('iconify', 'fa:bell', '', true) }}<span>{L_NOTIFICATIONS} </span><strong class="badge<!-- IF not NOTIFICATIONS_COUNT --> hidden<!-- ENDIF -->">{NOTIFICATIONS_COUNT}</strong>
+					{{ Icon('iconify', 'fa:bell', lang('NOTIFICATIONS'), false) }}<strong class="badge<!-- IF not NOTIFICATIONS_COUNT --> hidden<!-- ENDIF -->"> {NOTIFICATIONS_COUNT}</strong>
 				</a>
 				<!-- INCLUDE notification_dropdown.html -->
 			</li>
@@ -163,13 +163,13 @@
 	<!-- ELSE IF not S_IS_BOT -->
 		<li class="rightside"  data-skip-responsive="true">
 			<a href="{U_LOGIN_LOGOUT}" title="{L_LOGIN_LOGOUT}" accesskey="x" role="menuitem">
-				{{ Icon('iconify', 'fa:power-off', '', true) }}<span>{L_LOGIN_LOGOUT}</span>
+				{{ Icon('iconify', 'fa:power-off', lang('LOGIN_LOGOUT'), false) }}
 			</a>
 		</li>
 		<!-- IF S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) -->
 			<li class="rightside" data-skip-responsive="true">
 				<a href="{U_REGISTER}" role="menuitem">
-					{{ Icon('iconify', 'fa:pencil-square-o', '', true) }}<span>{L_REGISTER}</span>
+					{{ Icon('iconify', 'fa:pencil-square-o', lang('REGISTER'), false) }}
 				</a>
 			</li>
 		<!-- ENDIF -->
@@ -208,7 +208,7 @@
 		{% if S_DISPLAY_SEARCH and not S_IN_SEARCH %}
 			<li class="rightside responsive-search">
 				<a href="{{ U_SEARCH }}" title="{{ lang('SEARCH_ADV_EXPLAIN') }}" role="menuitem">
-					{{ Icon('iconify', 'fa:search', '', true) }}<span class="sr-only">{L_SEARCH}</span>
+					{{ Icon('iconify', 'fa:search', lang('SEARCH'), true) }}
 				</a>
 			</li>
 		{% endif %}
diff --git a/phpBB/styles/prosilver/template/notification_dropdown.html b/phpBB/styles/prosilver/template/notification_dropdown.html
index 682cef7519..6b8779c5c4 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', '', true, 'c-notification-check-icon') }}<span class="sr-only">{L_MARK_READ}</span>
+							 {{ Icon('iconify', 'fa:check-circle', lang('MARK_READ'), true, 'c-notification-check-icon') }}
 						</a>
 					<!-- ENDIF -->
 				</li>
diff --git a/phpBB/styles/prosilver/template/overall_header.html b/phpBB/styles/prosilver/template/overall_header.html
index a1491752da..b2593ea8c6 100644
--- a/phpBB/styles/prosilver/template/overall_header.html
+++ b/phpBB/styles/prosilver/template/overall_header.html
@@ -93,10 +93,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', '', true, 'c-button-icon') }}<span class="sr-only">{L_SEARCH}</span>
+						{{ Icon('iconify', 'fa:search', lang('SEARCH'), true, 'c-button-icon') }}
 					</button>
 					<a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}">
-						{{ Icon('iconify', 'fa:cog', '', true, 'c-button-icon') }}<span class="sr-only">{L_SEARCH_ADV}</span>
+						{{ Icon('iconify', 'fa:cog', lang('SEARCH_ADV'), true, '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 9a5ebe7bb1..8c183a0e49 100644
--- a/phpBB/styles/prosilver/template/pagination.html
+++ b/phpBB/styles/prosilver/template/pagination.html
@@ -1,7 +1,7 @@
 <ul>
 <!-- IF BASE_URL and TOTAL_PAGES > 6 -->
 	<li class="dropdown-container dropdown-button-control dropdown-page-jump page-jump">
-		<a class="button button-icon-only dropdown-trigger" href="#" title="{L_JUMP_TO_PAGE_CLICK}" role="button">{{ Icon('iconify', 'ic:outline-directions', '', true, 'c-button-icon c-pagination-icon') }}<span class="sr-only">{PAGE_NUMBER}</span></a>
+		<a class="button button-icon-only dropdown-trigger" href="#" title="{L_JUMP_TO_PAGE_CLICK}" role="button">{{ Icon('iconify', 'ic:outline-directions', PAGE_NUMBER, true, 'c-button-icon c-pagination-icon') }}
 		<div class="dropdown">
 			<div class="pointer"><div class="pointer-inner"></div></div>
 			<ul class="dropdown-contents">
@@ -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, '', true, 'c-button-icon c-pagination-icon') }}<span class="sr-only">{L_PREVIOUS}</span></a></li>
+		<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>
 	<!-- 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, '', true, 'c-button-icon c-pagination-icon') }}<span class="sr-only">{L_NEXT}</span></a></li>
+		<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>
 	<!-- 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_review.html b/phpBB/styles/prosilver/template/posting_review.html
index ee8edb55d1..5813001247 100644
--- a/phpBB/styles/prosilver/template/posting_review.html
+++ b/phpBB/styles/prosilver/template/posting_review.html
@@ -16,10 +16,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', '', true, 'c-topic-icon') }}<span class="sr-only">{post_review_row.MINI_POST}</span></span>
+				<span title="{post_review_row.MINI_POST}">{{ Icon('iconify', 'fa:file', post_review_row.MINI_POST, true, 'c-topic-icon') }}</span>
 			<!-- ELSE -->
 				<a href="{post_review_row.U_MINI_POST}" title="{post_review_row.MINI_POST}">
-					{{ Icon('iconify', 'fa:file', '', true, 'c-topic-icon') }}<span class="sr-only">{post_review_row.MINI_POST}</span>
+					{{ Icon('iconify', 'fa:file', post_review_row.MINI_POST, true, '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 8ed387e146..22e09d3f47 100644
--- a/phpBB/styles/prosilver/template/posting_topic_review.html
+++ b/phpBB/styles/prosilver/template/posting_topic_review.html
@@ -31,7 +31,7 @@
 			<!-- 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', '', true, 'c-button-icon') }}<span class="sr-only">{L_POST_DETAILS}</span>
+						{{ Icon('iconify', 'fa:info', lang('POST_DETAILS'), true, 'c-button-icon') }}
 					</a>
 				<li>
 			<!-- ENDIF -->
@@ -48,10 +48,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', '', true, 'c-topic-icon') }}<span class="sr-only">{topic_review_row.MINI_POST}</span></span>
+					<span title="{topic_review_row.MINI_POST}">{{ Icon('iconify', 'fa:file', topic_review_row.MINI_POST, true, 'c-topic-icon') }}</span>
 				<!-- ELSE -->
 					<a href="{topic_review_row.U_MINI_POST}" title="{topic_review_row.MINI_POST}">
-						{{ Icon('iconify', 'fa:file', '', true, 'c-topic-icon') }}<span class="sr-only">{topic_review_row.MINI_POST}</span>
+						{{ Icon('iconify', 'fa:file', topic_review_row.MINI_POST, true, '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}
@@ -84,6 +84,6 @@
 
 <p>
 	<a href="<!-- IF S_MCP_REPORT -->#report<!-- ELSE -->#postingbox<!-- ENDIF -->" class="top">
-		{{ Icon('iconify', 'fa:chevron-circle-up', '', true, 'c-top-icon') }}<span>{L_BACK_TO_TOP}</span>
+		{{ Icon('iconify', 'fa:chevron-circle-up', lang('BACK_TO_TOP'), false, 'c-top-icon') }}<span>
 	</a>
 </p>
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index ad29740eb8..f526f0c33a 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, '', true, 'c-return-arrow-icon') }}<span>{L_RETURN_TO_TOPIC}</span>
+			{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_TO_TOPIC'), false, '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, '', true, 'c-return-arrow-icon') }}<span>{L_GO_TO_SEARCH_ADV}</span>
+			{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('GO_TO_SEARCH_ADV'), false, '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', '', true, 'c-button-icon') }}<span class="sr-only">{L_SEARCH}</span>
+					{{ Icon('iconify', 'fa:search', lang('SEARCH'), true, 'c-button-icon') }}
 				</button>
 				<a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}">
-					{{ Icon('iconify', 'fa:cog', '', true, 'c-button-icon') }}<span class="sr-only">{L_SEARCH_ADV}</span>
+					{{ Icon('iconify', 'fa:cog', lang('SEARCH_ADV'), true, 'c-button-icon') }}
 				</a>
 			</fieldset>
 			</form>
@@ -100,23 +100,23 @@
 							<!-- EVENT topiclist_row_prepend -->
 							<!-- IF searchresults.S_UNREAD_TOPIC and not S_IS_BOT -->
 								<a class="unread" href="{searchresults.U_NEWEST_POST}">
-									{{ Icon('iconify', 'fa:file', '', true, 'c-topic-unread-icon') }}<span class="sr-only">{L_NEW_POST}</span>
+									{{ Icon('iconify', 'fa:file', lang('NEW_POST'), true, 'c-topic-unread-icon') }}
 								</a>
 							<!-- ENDIF -->
 							<a href="{searchresults.U_VIEW_TOPIC}" class="topictitle">{searchresults.TOPIC_TITLE}</a>
 							<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED -->
 								<a href="{searchresults.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}">
-									{{ Icon('iconify', 'fa:question', '', true, 'c-uapproved-icon') }}<span class="sr-only">{L_TOPIC_UNAPPROVED}</span>
+									{{ Icon('iconify', 'fa:question', lang('TOPIC_UNAPPROVED'), true, 'c-uapproved-icon') }}
 								</a>
 							<!-- ENDIF -->
 							<!-- IF searchresults.S_TOPIC_DELETED -->
 								<a href="{searchresults.U_MCP_QUEUE}" title="{L_TOPIC_DELETED}">
-									{{ Icon('iconify', 'fa:recycle', '', true, 'c-topic-deleted-icon') }}<span class="sr-only">{L_TOPIC_DELETED}</span>
+									{{ Icon('iconify', 'fa:recycle', lang('TOPIC_DELETED'), true, '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', '', true, 'c-topic-reported-icon') }}<span class="sr-only">{L_TOPIC_REPORTED}</span>
+									{{ Icon('iconify', 'fa:exclamation', lang('TOPIC_REPORTED'), true, 'c-topic-reported-icon') }}
 								</a>
 							<!-- ENDIF -->
 							<br />
@@ -161,7 +161,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', '', true, 'c-last-post-icon') }}<span class="sr-only">{VIEW_LATEST_POST}</span>
+									{{ Icon('iconify', 'fa:external-link-square', VIEW_LATEST_POST, true, 'c-last-post-icon') }}
 								</a>
 							<!-- ENDIF -->
 							<br /><time datetime="{searchresults.LAST_POST_TIME_RFC3339}">{searchresults.LAST_POST_TIME}</time>
@@ -218,7 +218,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, '', true, 'c-return-arrow-icon') }}<span>{L_JUMP_TO_POST}</span>
+					{{ Icon('iconify', 'fa:angle'-S_CONTENT_FLOW_END, lang('JUMP_TO_POST'), false, 'c-return-arrow-icon') }}
 				</a>
 			</li>
 		</ul>
diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
index 568a5f05bd..95bd9d61b6 100644
--- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
+++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
@@ -56,17 +56,17 @@
 					<div class="list-inner">
 						<!-- IF topicrow.S_UNREAD_TOPIC -->
 							<a class="unread" href="{topicrow.U_NEWEST_POST}">
-								{{ Icon('iconify', 'fa:file', '', true, 'c-topic-unread-icon') }}<span class="sr-only">{NEW_POST}</span>
+								{{ Icon('iconify', 'fa:file', NEW_POST, true, 'c-topic-unread-icon') }}
 							</a>
 						<!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
 						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
 							<a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}">
-								{{ Icon('iconify', 'fa:question', '', true, 'c-unapproved-icon') }}<span class="sr-only">{L_TOPIC_UNAPPROVED}</span>
+								{{ Icon('iconify', 'fa:question', lang('TOPIC_UNAPPROVED'), true, 'c-unapproved-icon') }}
 							</a>
 						<!-- ENDIF -->
 						<!-- IF topicrow.S_TOPIC_REPORTED -->
 							<a href="{topicrow.U_MCP_REPORT}" title="{L_TOPIC_REPORTED}">
-								{{ Icon('iconify', 'fa:exclamation', '', true, 'c-topic-reported-icon') }}<span class="sr-only">{L_TOPIC_REPORTED}</span>
+								{{ Icon('iconify', 'fa:exclamation', lang('TOPIC_REPORTED'), true, 'c-topic-reported-icon') }}
 							</a>
 						<!-- ENDIF -->
 						<br />
@@ -97,7 +97,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', '', true, 'c-last-post-icon') }}<span class="sr-only">{VIEW_LATEST_POST}</span>
+						{{ Icon('iconify', 'fa:external-link-square', VIEW_LATEST_POST, true, '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 c545152261..cbe49354de 100644
--- a/phpBB/styles/prosilver/template/ucp_main_front.html
+++ b/phpBB/styles/prosilver/template/ucp_main_front.html
@@ -35,7 +35,7 @@
 					<div class="list-inner">
 						<!-- IF topicrow.S_UNREAD -->
 							<a class="unread" href="{topicrow.U_NEWEST_POST}">
-								{{ Icon('iconify', 'fa:file', '', true, 'c-topic-unread-icon') }}<span class="sr-only">{NEW_POST}</span>
+								{{ Icon('iconify', 'fa:file', NEW_POST, true, 'c-topic-unread-icon') }}
 							</a>
 						<!-- ENDIF -->
 						<a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><br />
@@ -66,7 +66,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', '', true, 'c-last-post-icon') }}<span class="sr-only">{VIEW_LATEST_POST}</span>
+							{{ Icon('iconify', 'fa:external-link-square', VIEW_LATEST_POST, true, 'c-last-post-icon') }}
 						</a>
 						<br />{topicrow.LAST_POST_TIME}
 					</span>
diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
index 23de04ae12..9f68fb0f7f 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 -->
 						<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', '', true, 'c-last-post-icon') }}<span class="sr-only">{VIEW_LATEST_POST}</span>
+								{{ Icon('iconify', 'fa:external-link-square', VIEW_LATEST_POST, true, 'c-last-post-icon') }}
 							</a>
 							<br />{forumrow.LAST_POST_TIME}</span>
 					<!-- ELSE -->
@@ -106,17 +106,17 @@
 					<div class="list-inner">
 						<!-- IF topicrow.S_UNREAD_TOPIC -->
 							<a class="unread" href="{topicrow.U_NEWEST_POST}">
-								{{ Icon('iconify', 'fa:file', '', true, 'c-topic-unread-icon') }}<span class="sr-only">{NEW_POST}</span>
+								{{ Icon('iconify', 'fa:file', NEW_POST, true, 'c-topic-unread-icon') }}
 							</a>
 						<!-- ENDIF --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a>
 						<!-- IF topicrow.S_TOPIC_UNAPPROVED or topicrow.S_POSTS_UNAPPROVED -->
 							<a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_UNAPPROVED}">
-								{{ Icon('iconify', 'fa:question', '', true, 'c-unapproved-icon') }}<span class="sr-only">{L_TOPIC_UNAPPROVED}</span>
+								{{ Icon('iconify', 'fa:question', lang('TOPIC_UNAPPROVED'), true, 'c-unapproved-icon') }}
 							</a>
 						<!-- ENDIF -->
 						<!-- IF topicrow.S_TOPIC_REPORTED -->
 							<a href="{topicrow.U_MCP_REPORT}" title="{L_TOPIC_REPORTED}">
-								{{ Icon('iconify', 'fa:exclamation', '', true, 'c-topic-reported-icon') }}<span class="sr-only">{L_TOPIC_REPORTED}</span>
+								{{ Icon('iconify', 'fa:exclamation', lang('TOPIC_REPORTED'), true, 'c-topic-reported-icon') }}
 							</a>
 						<!-- ENDIF -->
 						<br />
@@ -146,7 +146,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', '', true, 'c-last-post-icon') }}<span class="sr-only">{VIEW_LATEST_POST}</span>
+						{{ Icon('iconify', 'fa:external-link-square', VIEW_LATEST_POST, true, '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 99cd96c11d..415562cb49 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_history.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_history.html
@@ -34,7 +34,7 @@
 			<!-- EVENT ucp_pm_history_post_buttons_list_after -->
 
 			<p class="author">
-				<span title="{history_row.MINI_POST}">{{ Icon('iconify', 'fa:file', '', true, 'c-topic-icon') }}<span class="sr-only">{history_row.MINI_POST}</span></span> {L_SENT_AT}{L_COLON} <strong>{history_row.SENT_DATE}</strong>
+				<span title="{history_row.MINI_POST}">{{ Icon('iconify', 'fa:file', history_row.MINI_POST, true, 'c-topic-icon') }}</span> {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>
@@ -51,6 +51,6 @@
 <hr />
 <p>
 	<a href="#cp-main" class="top">
-		{{ Icon('iconify', 'fa:chevron-circle-up', '', true, 'c-top-icon') }}<span>{L_BACK_TO_TOP}</span>
+		{{ Icon('iconify', 'fa:chevron-circle-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 8357abba28..d345d5da53 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_message_header.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_message_header.html
@@ -41,7 +41,7 @@
 					<!-- IF U_PRINT_PM -->
 						<li>
 							<a href="{U_PRINT_PM}" title="{L_PRINT_PM}" accesskey="p">
-								{{ Icon('iconify', 'fa:print', '', true) }}<span>{L_PRINT_PM}</span>
+								{{ Icon('iconify', 'fa:print', lang('PRINT_PM'), false) }}<span>{L_}</span>
 							</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, '', true, 'c-return-arrow-icon') }}<span>{L_RETURN_TO_FOLDER}</span>
+					{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('RETURN_TO_FOLDER'), false, '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 ef74360d5e..8cf8231b2e 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
@@ -78,7 +78,7 @@
 						<!-- ENDIF -->
 						<!-- IF messagerow.S_PM_REPORTED -->
 							<a href="{messagerow.U_MCP_REPORT}">
-								{{ Icon('iconify', 'fa:exclamation', '', true, 'c-topic-reported-icon') }}<span class="sr-only">{PM_REPORTED}</span>
+								{{ Icon('iconify', 'fa:exclamation', PM_REPORTED, true, 'c-topic-reported-icon') }}
 							</a>
 						<!-- ENDIF --> <!-- IF messagerow.ATTACH_ICON_IMG -->{{ Icon('iconify', 'fa: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 -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index e380696d88..19e274bd17 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, '', true, 'c-return-arrow-icon') }}<span>{L_VIEW_PREVIOUS_HISTORY}</span>
+				{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN, lang('VIEW_PREVIOUS_HISTORY'), false, '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, '', true, 'c-return-arrow-icon') }}<span>{L_VIEW_NEXT_HISTORY}</span>
+				{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_END, lang('VIEW_NEXT_HISTORY'), false, 'c-return-arrow-icon') }}
 			</a>
 		<!-- ENDIF -->
 	</fieldset>
@@ -32,7 +32,7 @@
 					<!-- IF AUTHOR_AVATAR --><a href="{U_MESSAGE_AUTHOR}" class="avatar">{AUTHOR_AVATAR}</a><!-- ENDIF -->
 					<!-- EVENT ucp_pm_viewmessage_avatar_after -->
 				</div>
-				{MESSAGE_AUTHOR_FULL}<!-- IF S_ONLINE -->  {{ Icon('iconify', 'fa:circle', lang('L_ONLINE'), true, 'c-online-icon') }}<span class="sr-only">{L_ONLINE}</span><!-- ENDIF -->
+				{MESSAGE_AUTHOR_FULL}<!-- IF S_ONLINE -->  {{ Icon('iconify', 'fa:circle', lang('L_ONLINE'), true, 'c-online-icon') }}<!-- ENDIF -->
 			</dt>
 
 			<!-- EVENT ucp_pm_viewmessage_rank_before -->
@@ -105,28 +105,28 @@
 				<!-- IF U_EDIT -->
 					<li>
 						<a href="{U_EDIT}" title="{L_POST_EDIT_PM}" class="button button-icon-only">
-							{{ Icon('iconify', 'fa:pencil', '', true, 'c-button-icon') }}<span class="sr-only">{L_BUTTON_EDIT}</span>
+							{{ Icon('iconify', 'fa:pencil', lang('BUTTON_EDIT'), true, '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', '', true, 'c-button-icon') }}span class="sr-only">{L_BUTTON_DELETE}</span>
+							{{ Icon('iconify', 'fa:times', lang('BUTTON_DELETE'), true, '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', '', true, 'c-button-icon') }}<span class="sr-only">{L_BUTTON_REPORT}</span>
+							{{ Icon('iconify', 'fa:exclamation', lang('BUTTON_REPORT'), true, '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', '', true, 'c-button-icon') }}<span class="sr-only">{L_BUTTON_QUOTE}</span>
+							{{ Icon('iconify', 'fa:quote-left', lang('BUTTON_QUOTE'), true, 'c-button-icon') }}
 						</a>
 					</li>
 				<!-- ENDIF -->
@@ -173,7 +173,7 @@
 
 		<div class="back2top">
 			<a href="#top" class="top" title="{L_BACK_TO_TOP}">
-				{{ Icon('iconify', 'fa:chevron-circle-up', '', true, 'c-top-icon') }}<span class="sr-only">{L_BACK_TO_TOP}</span>
+				{{ Icon('iconify', 'fa:chevron-circle-up', lang('BACK_TO_TOP'), true, 'c-top-icon') }}
 			</a>
 		</div>
 
@@ -187,12 +187,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', '', true, 'c-return-arrow-icon') }}<span>{L_VIEW_PREVIOUS_PM}</span>
+			{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_BEGIN', lang('VIEW_PREVIOUS_PM'), false, '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', '', true, 'c-return-arrow-icon') }}<span>{L_VIEW_NEXT_PM}</span>
+			{{ Icon('iconify', 'fa:angle-' ~ S_CONTENT_FLOW_END', lang('VIEW_NEXT_PM'), false, '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 66fe2a25e1..aa46af1abc 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -56,10 +56,10 @@
 			<fieldset>
 				<input class="inputbox search tiny" type="search" name="keywords" id="search_keywords" size="20" placeholder="{L_SEARCH_FORUM}" />
 				<button class="button button-search" type="submit" title="{L_SEARCH}">
-					{{ Icon('iconify', 'fa:search', '', true, 'c-button-icon') }}<span class="sr-only">{L_SEARCH}</span>
+					{{ Icon('iconify', 'fa:search', lang('SEARCH'), true, 'c-button-icon') }}
 				</button>
-				<a href="{{ U_SEARCH_FORUM }}" class="button button-search-end" title="lang('SEARCH_ADV)">
-					{{ Icon('iconify', 'fa:cog', '', true, 'c-button-icon') }}<span class="sr-only">lang('SEARCH_ADV')</span>
+				<a href="{{ U_SEARCH_FORUM }}" class="button button-search-end" title="lang('SEARCH_ADV')">
+					{{ Icon('iconify', 'fa:cog', lang('SEARCH_ADV'), true, 'c-button-icon') }}
 				</a>
 				{S_SEARCH_LOCAL_HIDDEN_FIELDS}
 			</fieldset>
@@ -179,7 +179,7 @@
 						<!-- EVENT topiclist_row_prepend -->
 						<!-- IF topicrow.S_UNREAD_TOPIC and not S_IS_BOT -->
 							<a class="unread" href="{topicrow.U_NEWEST_POST}">
-								{{ Icon('iconify', 'fa:file', '', true, 'c-topic-unread-icon') }}<span class="sr-only">{NEW_POST}</span>
+								{{ Icon('iconify', 'fa:file', NEW_POST, true, 'c-topic-unread-icon') }}
 							</a>
 						<!-- ENDIF -->
 						<!-- IF topicrow.U_VIEW_TOPIC --><a href="{topicrow.U_VIEW_TOPIC}" class="topictitle">{topicrow.TOPIC_TITLE}</a><!-- ELSE -->{topicrow.TOPIC_TITLE}<!-- ENDIF -->
@@ -190,12 +190,12 @@
 						<!-- ENDIF -->
 						<!-- IF topicrow.S_TOPIC_DELETED -->
 							<a href="{topicrow.U_MCP_QUEUE}" title="{L_TOPIC_DELETED}">
-								{{ Icon('iconify', 'fa:recycle', '', true, 'c-topic-deleted-icon') }}<span class="sr-only">{L_TOPIC_DELETED}</span>
+								{{ Icon('iconify', 'fa:recycle', lang('TOPIC_DELETED'), true, 'c-topic-deleted-icon') }}
 							</a>
 						<!-- ENDIF -->
 						<!-- IF topicrow.S_TOPIC_REPORTED -->
 							<a href="{topicrow.U_MCP_REPORT}" title="{L_TOPIC_REPORTED}">
-								{{ Icon('iconify', 'fa:exclamation', '', true, 'c-topic-reported-icon') }}<span class="sr-only">{L_TOPIC_REPORTED}</span>
+								{{ Icon('iconify', 'fa:exclamation', lang('TOPIC_REPORTED'), true, 'c-topic-reported-icon') }}
 							</a>
 						<!-- ENDIF -->
 						<br />
@@ -245,7 +245,7 @@
 					<span><dfn>{L_LAST_POST} </dfn>{L_POST_BY_AUTHOR} <!-- EVENT viewforum_body_last_post_author_username_prepend -->{topicrow.LAST_POST_AUTHOR_FULL}<!-- EVENT viewforum_body_last_post_author_username_append -->
 						<!-- IF not S_IS_BOT and topicrow.U_LAST_POST -->
 							<a href="{topicrow.U_LAST_POST}" title="{L_GOTO_LAST_POST}">
-								{{ Icon('iconify', 'fa:external-link-square', '', true, 'c-last-post-icon') }}<span class="sr-only">{VIEW_LATEST_POST}</span>
+								{{ Icon('iconify', 'fa:external-link-square', VIEW_LATEST_POST, true, 'c-last-post-icon') }}
 							</a>
 						<!-- ENDIF -->
 						<br /><time datetime="{topicrow.LAST_POST_TIME_RFC3339}">{topicrow.LAST_POST_TIME}</time>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 00fa9a750d..90affd6baa 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -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', '', true, 'c-button-icon') }}<span class="sr-only">{L_SEARCH}</span>
+					{{ Icon('iconify', 'fa:search', lang('SEARCH'), true, 'c-button-icon') }}
 				</button>
 				<a href="{U_SEARCH}" class="button button-search-end" title="{L_SEARCH_ADV}">
-					{{ Icon('iconify', 'fa:cog', '', true, 'c-button-icon') }}<span class="sr-only">{L_SEARCH_ADV}</span>
+					{{ Icon('iconify', 'fa:cog', lang('SEARCH_ADV'), true, '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('L_ONLINE'), true, 'c-online-icon') }}<span class="sr-only">{L_ONLINE}</span><!-- 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('iconify', 'fa:circle', lang('L_ONLINE'), true, 'c-online-icon') }}<!-- ENDIF -->
 				<!-- EVENT viewtopic_body_post_author_after -->
 			</dt>
 
@@ -280,9 +280,9 @@
 			<!-- EVENT viewtopic_body_postrow_post_details_before -->
 			<p class="author">
 				{% if postrow.S_UNREAD_POST %}
-					<span title="{postrow.MINI_POST}">{{ Icon('iconify', 'fa:file', '', true, 'c-topic-unread-icon') }}<span class="sr-only">{postrow.MINI_POST}</span></span>
+					<span title="{postrow.MINI_POST}">{{ Icon('iconify', 'fa:file', postrow.MINI_POST, true, 'c-topic-unread-icon') }}</span>
 				{% else %}
-					<span title="{postrow.MINI_POST}">{{ Icon('iconify', 'fa:file', '', true, 'c-topic-icon') }}<span class="sr-only">{postrow.MINI_POST}</span></span>
+					<span title="{postrow.MINI_POST}">{{ Icon('iconify', 'fa:file', postrow.MINI_POST, true, 'c-topic-icon') }}</span>
 				{% endif %}
 				<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>
 			</p>
@@ -368,7 +368,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', '', true, 'c-top-icon') }}<span class="sr-only">{L_BACK_TO_TOP}</span>
+				{{ Icon('iconify', 'fa:chevron-circle-up', false('BACK_TO_TOP'), true, 'c-top-icon') }}
 			</a>
 			<!-- EVENT viewtopic_body_postrow_back2top_append -->
 		</div>
@@ -411,7 +411,7 @@
 	<!-- 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', '', true, 'c-button-icon') }}<span class="sr-only">{L_QUICK_MOD}</span>
+			{{ Icon('iconify', 'fa:gavel', lang('QUICK_MOD'), true, 'c-button-icon') }}
 			<span class="caret">{{ Icon('iconify', 'fa:caret-down', '', true, 'c-button-icon') }}</span>
 		</span>
 		<div class="dropdown">