diff --git a/phpBB/styles/all/template/macros/icons/font.twig b/phpBB/styles/all/template/macros/icons/font.twig
index f20bcc3a36..9a350f8f03 100644
--- a/phpBB/styles/all/template/macros/icons/font.twig
+++ b/phpBB/styles/all/template/macros/icons/font.twig
@@ -1,3 +1,3 @@
-{% spaceless %}
+{% apply spaceless %}
 	<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 %}
+{% endapply %}
diff --git a/phpBB/styles/all/template/macros/icons/iconify.twig b/phpBB/styles/all/template/macros/icons/iconify.twig
index 8ffcf7a4d3..5a4387b497 100644
--- a/phpBB/styles/all/template/macros/icons/iconify.twig
+++ b/phpBB/styles/all/template/macros/icons/iconify.twig
@@ -1,3 +1,3 @@
-{% spaceless %}
+{% apply spaceless %}
 	<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 %}
+{% endapply %}
diff --git a/phpBB/styles/all/template/macros/icons/png.twig b/phpBB/styles/all/template/macros/icons/png.twig
index f171d591b7..38e36efe72 100644
--- a/phpBB/styles/all/template/macros/icons/png.twig
+++ b/phpBB/styles/all/template/macros/icons/png.twig
@@ -1,3 +1,3 @@
-{% spaceless %}
+{% apply spaceless %}
 	<img class="o-icon o-icon-png png-{{ ICON ~ (CLASSES ? ' ' ~ CLASSES) }}" src="{{ SOURCE }}" alt="{{ TITLE }}"{{ ATTRIBUTES }} />
-{% endspaceless %}
+{% endapply %}
diff --git a/phpBB/styles/all/template/macros/icons/svg.twig b/phpBB/styles/all/template/macros/icons/svg.twig
index 601661dc35..3a2128ff9f 100644
--- a/phpBB/styles/all/template/macros/icons/svg.twig
+++ b/phpBB/styles/all/template/macros/icons/svg.twig
@@ -1,4 +1,4 @@
-{% spaceless %}
+{% apply spaceless %}
 	{% 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 }}>
@@ -6,4 +6,4 @@
 
 		{{ SOURCE }}
 	</svg>
-{% endspaceless %}
+{% endapply %}
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 72ae4de0b7..44ad4ff2d2 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -113,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', lang('TOPICS_UNAPPROVED'), true, 'c-last-post-icon') }}
+										{{ Icon('iconify', 'fa:external-link-square', lang('VIEW_LATEST_POST'), 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/memberlist_view.html b/phpBB/styles/prosilver/template/memberlist_view.html
index c6059e0873..69988e57f2 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') }}<!-- 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('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/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html
index f87c7f1ce8..fc6cfca2db 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('iconify', 'fa:home', lang('L_SITE_HOME'), false) }}
 					</a>
 				</span>
 				{% endapply %}
diff --git a/phpBB/styles/prosilver/template/navbar_header.html b/phpBB/styles/prosilver/template/navbar_header.html
index 3dd673c51d..63e92eb1ab 100644
--- a/phpBB/styles/prosilver/template/navbar_header.html
+++ b/phpBB/styles/prosilver/template/navbar_header.html
@@ -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', lang('LOGIN_LOGOUT'), false) }}
+								{{ Icon('iconify', 'fa:power-off', lang('L_LOGIN_LOGOUT'), false) }}
 							</a>
 						</li>
 					</ul>
@@ -163,7 +163,7 @@
 	<!-- 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', lang('LOGIN_LOGOUT'), false) }}
+				{{ Icon('iconify', 'fa:power-off', lang('L_LOGIN_LOGOUT'), false) }}
 			</a>
 		</li>
 		<!-- IF S_REGISTER_ENABLED and not (S_SHOW_COPPA or S_REGISTRATION) -->
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index 19e274bd17..307471abab 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -55,7 +55,7 @@
 				<dd class="profile-contact">
 					<strong>{L_CONTACT}{L_COLON}</strong>
 					<div class="dropdown-container dropdown-left">
-						<a href="#" class="dropdown-trigger"  title="{CONTACT_USER}">{{ Icon('iconify', 'mdi:comment-processing-outline', '', true) }}<span class="sr-only">{CONTACT_USER}</span></a>
+						<a href="#" class="dropdown-trigger" title="{CONTACT_USER}">{{ Icon('iconify', 'mdi:comment-processing-outline', CONTACT_USER, true) }}</a>
 						<div class="dropdown">
 							<div class="pointer"><div class="pointer-inner"></div></div>
 							<div class="dropdown-contents contact-icons">