From 75b2579aa9c71a709356e2fb7a726dd9348d0a4a Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Thu, 4 Jan 2024 20:22:24 +0100
Subject: [PATCH] [ticket/17283] Remove last remaining uses of iconify

PHPBB3-17283
---
 .../prosilver/imgs/svg/arrow-right-bold.svg   |  1 +
 .../imgs/svg/comment-text-outline.svg         |  1 +
 .../file-document-box-multiple-outline.svg    |  1 +
 .../imgs/svg/file-document-box-outline.svg    |  1 +
 .../imgs/svg/file-document-outline.svg        |  1 +
 phpBB/styles/prosilver/imgs/svg/fire.svg      |  1 +
 .../prosilver/imgs/svg/info-variant.svg       |  1 +
 .../prosilver/imgs/svg/link-variant.svg       |  1 +
 phpBB/styles/prosilver/imgs/svg/lock.svg      |  1 +
 phpBB/styles/prosilver/imgs/svg/star.svg      |  1 +
 .../prosilver/template/forumlist_body.html    | 10 +++----
 .../styles/prosilver/template/mcp_forum.html  | 16 ++++++------
 .../prosilver/template/navbar_footer.html     | 12 ++++-----
 .../styles/prosilver/template/pagination.html |  2 +-
 .../prosilver/template/posting_buttons.html   |  2 +-
 .../prosilver/template/search_results.html    | 16 ++++++------
 .../template/ucp_main_bookmarks.html          | 16 ++++++------
 .../prosilver/template/ucp_main_front.html    | 16 ++++++------
 .../template/ucp_main_subscribed.html         | 26 +++++++++----------
 .../prosilver/template/ucp_pm_viewfolder.html |  2 +-
 .../template/ucp_pm_viewmessage.html          | 18 +++++++------
 .../prosilver/template/viewforum_body.html    | 16 ++++++------
 .../prosilver/template/viewtopic_body.html    | 16 ++++++------
 .../template/viewtopic_topic_tools.html       | 16 ++++++------
 phpBB/styles/prosilver/theme/colours.css      |  2 +-
 phpBB/styles/prosilver/theme/common.css       |  3 +--
 phpBB/styles/prosilver/theme/icons.css        |  4 +--
 27 files changed, 106 insertions(+), 97 deletions(-)
 create mode 100644 phpBB/styles/prosilver/imgs/svg/arrow-right-bold.svg
 create mode 100644 phpBB/styles/prosilver/imgs/svg/comment-text-outline.svg
 create mode 100644 phpBB/styles/prosilver/imgs/svg/file-document-box-multiple-outline.svg
 create mode 100644 phpBB/styles/prosilver/imgs/svg/file-document-box-outline.svg
 create mode 100644 phpBB/styles/prosilver/imgs/svg/file-document-outline.svg
 create mode 100644 phpBB/styles/prosilver/imgs/svg/fire.svg
 create mode 100644 phpBB/styles/prosilver/imgs/svg/info-variant.svg
 create mode 100644 phpBB/styles/prosilver/imgs/svg/link-variant.svg
 create mode 100644 phpBB/styles/prosilver/imgs/svg/lock.svg
 create mode 100644 phpBB/styles/prosilver/imgs/svg/star.svg

diff --git a/phpBB/styles/prosilver/imgs/svg/arrow-right-bold.svg b/phpBB/styles/prosilver/imgs/svg/arrow-right-bold.svg
new file mode 100644
index 0000000000..6a11c99a46
--- /dev/null
+++ b/phpBB/styles/prosilver/imgs/svg/arrow-right-bold.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="currentColor" d="M4 15V9h8V4.16L19.84 12L12 19.84V15z"/></svg>
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/imgs/svg/comment-text-outline.svg b/phpBB/styles/prosilver/imgs/svg/comment-text-outline.svg
new file mode 100644
index 0000000000..3ef94094f3
--- /dev/null
+++ b/phpBB/styles/prosilver/imgs/svg/comment-text-outline.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="currentColor" d="M9 22a1 1 0 0 1-1-1v-3H4a2 2 0 0 1-2-2V4a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2h-6.1l-3.7 3.71c-.2.19-.45.29-.7.29zm1-6v3.08L13.08 16H20V4H4v12zM6 7h12v2H6zm0 4h9v2H6z"/></svg>
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/imgs/svg/file-document-box-multiple-outline.svg b/phpBB/styles/prosilver/imgs/svg/file-document-box-multiple-outline.svg
new file mode 100644
index 0000000000..be43e84158
--- /dev/null
+++ b/phpBB/styles/prosilver/imgs/svg/file-document-box-multiple-outline.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="currentColor" d="M16 15H9v-2h7zm3-4H9V9h10zm0-4H9V5h10zM3 5v16h16v2H3a2 2 0 0 1-2-2V5zm18-4a2 2 0 0 1 2 2v14c0 1.11-.89 2-2 2H7a2 2 0 0 1-2-2V3c0-1.11.89-2 2-2zM7 3v14h14V3z"/></svg>
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/imgs/svg/file-document-box-outline.svg b/phpBB/styles/prosilver/imgs/svg/file-document-box-outline.svg
new file mode 100644
index 0000000000..a4692770a8
--- /dev/null
+++ b/phpBB/styles/prosilver/imgs/svg/file-document-box-outline.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="currentColor" d="M5 3c-1.11 0-2 .89-2 2v14c0 1.11.89 2 2 2h14c1.11 0 2-.89 2-2V5c0-1.11-.89-2-2-2zm0 2h14v14H5zm2 2v2h10V7zm0 4v2h10v-2zm0 4v2h7v-2z"/></svg>
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/imgs/svg/file-document-outline.svg b/phpBB/styles/prosilver/imgs/svg/file-document-outline.svg
new file mode 100644
index 0000000000..deff442b30
--- /dev/null
+++ b/phpBB/styles/prosilver/imgs/svg/file-document-outline.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="currentColor" d="M6 2a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8l-6-6zm0 2h7v5h5v11H6zm2 8v2h8v-2zm0 4v2h5v-2z"/></svg>
diff --git a/phpBB/styles/prosilver/imgs/svg/fire.svg b/phpBB/styles/prosilver/imgs/svg/fire.svg
new file mode 100644
index 0000000000..c00b07f158
--- /dev/null
+++ b/phpBB/styles/prosilver/imgs/svg/fire.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="currentColor" d="M17.66 11.2c-.23-.3-.51-.56-.77-.82c-.67-.6-1.43-1.03-2.07-1.66C13.33 7.26 13 4.85 13.95 3c-.95.23-1.78.75-2.49 1.32c-2.59 2.08-3.61 5.75-2.39 8.9c.04.1.08.2.08.33c0 .22-.15.42-.35.5c-.23.1-.47.04-.66-.12a.58.58 0 0 1-.14-.17c-1.13-1.43-1.31-3.48-.55-5.12C5.78 10 4.87 12.3 5 14.47c.06.5.12 1 .29 1.5c.14.6.41 1.2.71 1.73c1.08 1.73 2.95 2.97 4.96 3.22c2.14.27 4.43-.12 6.07-1.6c1.83-1.66 2.47-4.32 1.53-6.6l-.13-.26c-.21-.46-.77-1.26-.77-1.26m-3.16 6.3c-.28.24-.74.5-1.1.6c-1.12.4-2.24-.16-2.9-.82c1.19-.28 1.9-1.16 2.11-2.05c.17-.8-.15-1.46-.28-2.23c-.12-.74-.1-1.37.17-2.06c.19.38.39.76.63 1.06c.77 1 1.98 1.44 2.24 2.8c.04.14.06.28.06.43c.03.82-.33 1.72-.93 2.27"/></svg>
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/imgs/svg/info-variant.svg b/phpBB/styles/prosilver/imgs/svg/info-variant.svg
new file mode 100644
index 0000000000..0d03fb2bbc
--- /dev/null
+++ b/phpBB/styles/prosilver/imgs/svg/info-variant.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="currentColor" d="M13.5 4A1.5 1.5 0 0 0 12 5.5A1.5 1.5 0 0 0 13.5 7A1.5 1.5 0 0 0 15 5.5A1.5 1.5 0 0 0 13.5 4m-.36 4.77c-1.19.1-4.44 2.69-4.44 2.69c-.2.15-.14.14.02.42c.16.27.14.29.33.16c.2-.13.53-.34 1.08-.68c2.12-1.36.34 1.78-.57 7.07c-.36 2.62 2 1.27 2.61.87c.6-.39 2.21-1.5 2.37-1.61c.22-.15.06-.27-.11-.52c-.12-.17-.24-.05-.24-.05c-.65.43-1.84 1.33-2 .76c-.19-.57 1.03-4.48 1.7-7.17c.11-.64.41-2.04-.75-1.94"/></svg>
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/imgs/svg/link-variant.svg b/phpBB/styles/prosilver/imgs/svg/link-variant.svg
new file mode 100644
index 0000000000..045cadd451
--- /dev/null
+++ b/phpBB/styles/prosilver/imgs/svg/link-variant.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="currentColor" d="M10.59 13.41c.41.39.41 1.03 0 1.42c-.39.39-1.03.39-1.42 0a5.003 5.003 0 0 1 0-7.07l3.54-3.54a5.003 5.003 0 0 1 7.07 0a5.003 5.003 0 0 1 0 7.07l-1.49 1.49c.01-.82-.12-1.64-.4-2.42l.47-.48a2.982 2.982 0 0 0 0-4.24a2.982 2.982 0 0 0-4.24 0l-3.53 3.53a2.982 2.982 0 0 0 0 4.24m2.82-4.24c.39-.39 1.03-.39 1.42 0a5.003 5.003 0 0 1 0 7.07l-3.54 3.54a5.003 5.003 0 0 1-7.07 0a5.003 5.003 0 0 1 0-7.07l1.49-1.49c-.01.82.12 1.64.4 2.43l-.47.47a2.982 2.982 0 0 0 0 4.24a2.982 2.982 0 0 0 4.24 0l3.53-3.53a2.982 2.982 0 0 0 0-4.24a.973.973 0 0 1 0-1.42"/></svg>
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/imgs/svg/lock.svg b/phpBB/styles/prosilver/imgs/svg/lock.svg
new file mode 100644
index 0000000000..9e7e85d131
--- /dev/null
+++ b/phpBB/styles/prosilver/imgs/svg/lock.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="currentColor" d="M12 17a2 2 0 0 0 2-2a2 2 0 0 0-2-2a2 2 0 0 0-2 2a2 2 0 0 0 2 2m6-9a2 2 0 0 1 2 2v10a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2V10a2 2 0 0 1 2-2h1V6a5 5 0 0 1 5-5a5 5 0 0 1 5 5v2zm-6-5a3 3 0 0 0-3 3v2h6V6a3 3 0 0 0-3-3"/></svg>
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/imgs/svg/star.svg b/phpBB/styles/prosilver/imgs/svg/star.svg
new file mode 100644
index 0000000000..07370e9a58
--- /dev/null
+++ b/phpBB/styles/prosilver/imgs/svg/star.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 24 24"><path fill="currentColor" d="M12 17.27L18.18 21l-1.64-7.03L22 9.24l-7.19-.62L12 2L9.19 8.62L2 9.24l5.45 4.73L5.82 21z"/></svg>
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index 43f276faf0..f9232d6dc4 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -34,11 +34,11 @@
 			<dl class="row-item">
 				<dt title="{% if forumrow.S_IS_LINK %}{{ lang('FORUM_LINK') }}{% else %}{{ forumrow.FORUM_FOLDER_IMG_ALT }}{% endif %}">
 					<a class="row-item-link{% if forumrow.S_UNREAD_FORUM %} unread{% else %} read{% endif %}" href="{forumrow.U_VIEWFORUM}">
-						{{ Icon('iconify', {
-							'mdi:link-variant' : forumrow.S_IS_LINK,
-							'mdi:lock' : forumrow.S_LOCKED_FORUM,
-							'mdi:file-document-box-multiple-outline' : forumrow.S_SUBFORUMS,
-							'mdi:file-document-box-outline' : true,
+						{{ Icon('svg', {
+							'link-variant' : forumrow.S_IS_LINK,
+							'lock' : forumrow.S_LOCKED_FORUM,
+							'file-document-box-multiple-outline' : forumrow.S_SUBFORUMS,
+							'file-document-box-outline' : true,
 						}, '', true, 'c-forum-row-icon') }}
 					</a>
 					<div class="list-inner">
diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html
index c0318712a1..cff04e89bc 100644
--- a/phpBB/styles/prosilver/template/mcp_forum.html
+++ b/phpBB/styles/prosilver/template/mcp_forum.html
@@ -39,14 +39,14 @@
 			<dl class="row-item">
 				<dt>
 					<a class="row-item-link{% if topicrow.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{topicrow.U_VIEW_TOPIC}" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
-						{{ Icon('iconify', {
-							'mdi:info-variant' : topicrow.S_POST_GLOBAL,
-							'mdi:info-variant' : topicrow.S_POST_ANNOUNCE,
-							'mdi:star' : topicrow.S_POST_STICKY,
-							'mdi:lock' : topicrow.S_TOPIC_LOCKED,
-							'mdi:arrow-right-bold' : topicrow.S_TOPIC_MOVED,
-							'mdi:fire' : topicrow.S_TOPIC_HOT,
-							'mdi:file-document-outline' : true,
+						{{ Icon('svg', {
+							'info-variant' : topicrow.S_POST_GLOBAL,
+							'info-variant' : topicrow.S_POST_ANNOUNCE,
+							'star' : topicrow.S_POST_STICKY,
+							'lock' : topicrow.S_TOPIC_LOCKED,
+							'arrow-right-bold' : topicrow.S_TOPIC_MOVED,
+							'fire' : topicrow.S_TOPIC_HOT,
+							'file-document-outline' : true,
 						}, '', true, 'c-forum-row-icon') }}
 					</a>
 					{% if lang(topicrow.TOPIC_AUTHOR) == S_USERNAME %}
diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html
index 18026e384d..cb71e2f434 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('font', 'home', lang('SITE_HOME'), false) }}
+								{{ Icon('font', 'home', lang('SITE_HOME'), false, 'fas o-icon-baseline') }}
 							</a>
 						</span>
 					{% endapply %}
@@ -21,7 +21,7 @@
 							{% if U_SITE_HOME %}
 								<span>{{ lang('INDEX') }}</span>
 							{% else %}
-								{{ Icon('font', 'home', lang('INDEX'), false) }}
+								{{ Icon('font', 'home', lang('INDEX'), false, 'fas o-icon-baseline') }}
 							{% endif %}
 						</a>
 					</span>
@@ -35,11 +35,11 @@
 					<li class="in-menu">
 						<a href="{{ U_WATCH_FORUM_LINK }}" title="{{ S_WATCH_FORUM_TITLE }}" data-ajax="toggle_link" data-toggle-text="{{ S_WATCH_FORUM_TOGGLE }}" data-toggle-url="{{ U_WATCH_FORUM_TOGGLE }}">
 							{% if S_WATCHING_FORUM %}
-								{{ Icon('iconify', 'mdi:eye-minus-outline', '', true, 'c-watch-icon is-active') }}
-								{{ Icon('iconify', 'mdi:eye-plus-outline', '', true, 'c-watch-icon') }}
+								{{ Icon('font', 'bell-slash', '', true, 'far c-watch-icon is-active') }}
+								{{ Icon('font', 'bell', '', true, 'far c-watch-icon') }}
 							{% else %}
-								{{ Icon('iconify', 'mdi:eye-plus-outline', '', true, 'c-watch-icon is-active') }}
-								{{ Icon('iconify', 'mdi:eye-minus-outline', '', true, 'c-watch-icon') }}
+								{{ Icon('font', 'bell', '', true, 'far c-watch-icon is-active') }}
+								{{ Icon('font', 'bell-slash', '', true, 'far c-watch-icon') }}
 							{% endif %}
 							<span>{{ S_WATCH_FORUM_TITLE }}</span>
 						</a>
diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html
index f5f3eb5752..db1251caa3 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', PAGE_NUMBER, true, 'c-button-icon c-pagination-icon') }}</a>
+		<a class="button button-icon-only dropdown-trigger" href="#" title="{L_JUMP_TO_PAGE_CLICK}" role="button">{{ Icon('font', 'turn-down', PAGE_NUMBER, true, 'fas fa-rotate-270 c-button-icon c-pagination-icon') }}</a>
 		<div class="dropdown">
 			<div class="pointer"><div class="pointer-inner"></div></div>
 			<ul class="dropdown-contents">
diff --git a/phpBB/styles/prosilver/template/posting_buttons.html b/phpBB/styles/prosilver/template/posting_buttons.html
index ec5e73762b..096dbbe8fa 100644
--- a/phpBB/styles/prosilver/template/posting_buttons.html
+++ b/phpBB/styles/prosilver/template/posting_buttons.html
@@ -66,7 +66,7 @@
 		{{ 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') }}
+		{{ Icon('font', 'asterisk', '', true, 'fas 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}">
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index 34597e5158..8ea1bd0518 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -81,14 +81,14 @@
 				<dl class="row-item">
 					<dt>
 						<a class="row-item-link{% if searchresults.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{searchresults.U_NEWEST_POST}" title="{searchresults.TOPIC_FOLDER_IMG_ALT}">
-							{{ Icon('iconify', {
-								'mdi:info-variant' : searchresults.S_POST_GLOBAL,
-								'mdi:info-variant' : searchresults.S_POST_ANNOUNCE,
-								'mdi:star' : searchresults.S_POST_STICKY,
-								'mdi:lock' : searchresults.S_TOPIC_LOCKED,
-								'mdi:arrow-right-bold' : searchresults.S_TOPIC_MOVED,
-								'mdi:fire' : searchresults.S_TOPIC_HOT,
-								'mdi:file-document-outline' : true,
+							{{ Icon('svg', {
+								'info-variant' : searchresults.S_POST_GLOBAL,
+								'info-variant' : searchresults.S_POST_ANNOUNCE,
+								'star' : searchresults.S_POST_STICKY,
+								'lock' : searchresults.S_TOPIC_LOCKED,
+								'arrow-right-bold' : searchresults.S_TOPIC_MOVED,
+								'fire' : searchresults.S_TOPIC_HOT,
+								'file-document-outline' : true,
 							}, '', true, 'c-forum-row-icon') }}
 						</a>
 						{% if lang(searchresults.TOPIC_AUTHOR) == S_USERNAME %}
diff --git a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
index 1be97ecb1d..98616732f9 100644
--- a/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
+++ b/phpBB/styles/prosilver/template/ucp_main_bookmarks.html
@@ -37,14 +37,14 @@
 			<dl class="row-item">
 				<dt>
 					<a class="row-item-link{% if topicrow.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{topicrow.U_NEWEST_POST}" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
-						{{ Icon('iconify', {
-							'mdi:info-variant' : topicrow.S_POST_GLOBAL,
-							'mdi:info-variant' : topicrow.S_POST_ANNOUNCE,
-							'mdi:star' : topicrow.S_POST_STICKY,
-							'mdi:lock' : topicrow.S_TOPIC_LOCKED,
-							'mdi:arrow-right-bold' : topicrow.S_TOPIC_MOVED,
-							'mdi:fire' : topicrow.S_TOPIC_HOT,
-							'mdi:file-document-outline' : true,
+						{{ Icon('svg', {
+							'info-variant' : topicrow.S_POST_GLOBAL,
+							'info-variant' : topicrow.S_POST_ANNOUNCE,
+							'star' : topicrow.S_POST_STICKY,
+							'lock' : topicrow.S_TOPIC_LOCKED,
+							'arrow-right-bold' : topicrow.S_TOPIC_MOVED,
+							'fire' : topicrow.S_TOPIC_HOT,
+							'file-document-outline' : true,
 						}, '', true, 'c-forum-row-icon') }}
 					</a>
 					{% if lang(topicrow.TOPIC_AUTHOR) == S_USERNAME %}
diff --git a/phpBB/styles/prosilver/template/ucp_main_front.html b/phpBB/styles/prosilver/template/ucp_main_front.html
index 8892fe9a36..c8b5093e81 100644
--- a/phpBB/styles/prosilver/template/ucp_main_front.html
+++ b/phpBB/styles/prosilver/template/ucp_main_front.html
@@ -16,14 +16,14 @@
 			<dl class="row-item">
 				<dt>
 					<a class="row-item-link{% if topicrow.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{topicrow.U_NEWEST_POST}" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
-						{{ Icon('iconify', {
-							'mdi:info-variant' : topicrow.S_POST_GLOBAL,
-							'mdi:info-variant' : topicrow.S_POST_ANNOUNCE,
-							'mdi:star' : topicrow.S_POST_STICKY,
-							'mdi:lock' : topicrow.S_TOPIC_LOCKED,
-							'mdi:arrow-right-bold' : topicrow.S_TOPIC_MOVED,
-							'mdi:fire' : topicrow.S_TOPIC_HOT,
-							'mdi:file-document-outline' : true,
+						{{ Icon('svg', {
+							'info-variant' : topicrow.S_POST_GLOBAL,
+							'info-variant' : topicrow.S_POST_ANNOUNCE,
+							'star' : topicrow.S_POST_STICKY,
+							'lock' : topicrow.S_TOPIC_LOCKED,
+							'arrow-right-bold' : topicrow.S_TOPIC_MOVED,
+							'fire' : topicrow.S_TOPIC_HOT,
+							'file-document-outline' : true,
 						}, '', true, 'c-forum-row-icon') }}
 					</a>
 					{% if lang(topicrow.TOPIC_AUTHOR) == S_USERNAME %}
diff --git a/phpBB/styles/prosilver/template/ucp_main_subscribed.html b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
index dfe31e3713..6f365bfd9e 100644
--- a/phpBB/styles/prosilver/template/ucp_main_subscribed.html
+++ b/phpBB/styles/prosilver/template/ucp_main_subscribed.html
@@ -25,11 +25,11 @@
 			<dl class="row-item">
 				<dt>
 					<a class="row-item-link{% if forumrow.S_UNREAD_FORUM %} unread{% else %} read{% endif %}" href="{forumrow.U_VIEWFORUM}">
-						{{ Icon('iconify', {
-							'mdi:link-variant' : forumrow.S_IS_LINK,
-							'mdi:lock' : forumrow.S_LOCKED_FORUM,
-							'mdi:file-document-box-multiple-outline' : forumrow.S_SUBFORUMS,
-							'mdi:file-document-box-outline' : true,
+						{{ Icon('svg', {
+							'link-variant' : forumrow.S_IS_LINK,
+							'lock' : forumrow.S_LOCKED_FORUM,
+							'file-document-box-multiple-outline' : forumrow.S_SUBFORUMS,
+							'file-document-box-outline' : true,
 						}, '', true, 'c-forum-row-icon') }}
 					</a>
 					<div class="list-inner">
@@ -87,14 +87,14 @@
 			<dl class="row-item">
 				<dt>
 					<a class="row-item-link{% if topicrow.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{topicrow.U_NEWEST_POST}" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
-						{{ Icon('iconify', {
-							'mdi:info-variant' : topicrow.S_POST_GLOBAL,
-							'mdi:info-variant' : topicrow.S_POST_ANNOUNCE,
-							'mdi:star' : topicrow.S_POST_STICKY,
-							'mdi:lock' : topicrow.S_TOPIC_LOCKED,
-							'mdi:arrow-right-bold' : topicrow.S_TOPIC_MOVED,
-							'mdi:fire' : topicrow.S_TOPIC_HOT,
-							'mdi:file-document-outline' : true,
+						{{ Icon('svg', {
+							'info-variant' : topicrow.S_POST_GLOBAL,
+							'info-variant' : topicrow.S_POST_ANNOUNCE,
+							'star' : topicrow.S_POST_STICKY,
+							'lock' : topicrow.S_TOPIC_LOCKED,
+							'arrow-right-bold' : topicrow.S_TOPIC_MOVED,
+							'fire' : topicrow.S_TOPIC_HOT,
+							'file-document-outline' : true,
 						}, '', true, 'c-forum-row-icon') }}
 					</a>
 					{% if lang(topicrow.TOPIC_AUTHOR) == S_USERNAME %}
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
index 01c1c7f866..233e1b1658 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewfolder.html
@@ -60,7 +60,7 @@
 				<dl class="row-item">
 					<dt>
 						<a class="row-item-link{% if messagerow.S_PM_UNREAD %} unread{% else %} read{% endif %}" href="{messagerow.U_VIEW_PM}">
-							{{ Icon('iconify', 'mdi:comment-text-outline', '', true, 'c-forum-row-icon') }}
+							{{ Icon('svg', 'comment-text-outline', '', true, 'c-forum-row-icon') }}
 						</a>
 						{% if messagerow.PM_ICON_URL and S_PM_ICONS %}
 							<img class="row-item-sub" src="{messagerow.PM_ICON_URL}" alt="">
diff --git a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
index 70d005335b..37b2a1c0b1 100644
--- a/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
+++ b/phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
@@ -60,7 +60,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', CONTACT_USER, true) }}</a>
+						<a href="#" class="dropdown-trigger" title="{CONTACT_USER}">{{ Icon('font', 'comment-dots', CONTACT_USER, true, 'far') }}</a>
 						<div class="dropdown">
 							<div class="pointer"><div class="pointer-inner"></div></div>
 							<div class="dropdown-contents contact-icons">
@@ -72,19 +72,21 @@
 									<!-- ENDIF -->
 										<a href="<!-- IF contact.U_CONTACT -->{contact.U_CONTACT}<!-- ELSE -->{contact.U_PROFILE_AUTHOR}<!-- ENDIF -->" title="{contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF contact.ID eq 'jabber' --> onclick="popup(this.href, 750, 320); return false;"<!-- ENDIF -->>
 											{% if contact.ID == 'pm' %}
-												{{ Icon('iconify', 'mdi:comment-account-outline', '', true, 'contact-icon') }}
+												{{ Icon('font', 'message', '', true, 'far contact-icon') }}
 											{% elseif contact.ID == 'email' %}
-												{{ Icon('iconify', 'mdi:at', '', true, 'contact-icon') }}
+												{{ Icon('font', 'at', '', true, 'fas contact-icon') }}
 											{% elseif contact.ID == 'phpbb_website' %}
-												{{ Icon('iconify', 'mdi:earth', '', true, 'contact-icon') }}
+												{{ Icon('font', 'earth-americas', '', true, 'fas contact-icon') }}
 											{% elseif contact.ID == 'phpbb_facebook' %}
-												{{ Icon('iconify', 'mdi:facebook-box', '', true, 'contact-icon c-facebook-icon') }}
+												{{ Icon('font', 'square-facebook', '', true, 'fab contact-icon c-facebook-icon') }}
 											{% elseif contact.ID == 'phpbb_twitter' %}
-												{{ Icon('iconify', 'mdi:twitter', '', true, 'contact-icon c-twitter-icon') }}
+												{{ Icon('font', 'square-x-twitter', '', true, 'fab contact-icon c-twitter-icon') }}
 											{% elseif contact.ID == 'phpbb_skype' %}
-												{{ Icon('iconify', 'mdi:skype', '', true, 'contact-icon c-skype-icon') }}
+												{{ Icon('font', 'skype', '', true, 'fab contact-icon c-skype-icon') }}
 											{% elseif contact.ID == 'phpbb_youtube' %}
-												{{ Icon('iconify', 'mdi:youtube', '', true, 'contact-icon c-youtube-icon') }}
+												{{ Icon('font', 'youtube', '', true, 'fab contact-icon c-youtube-icon') }}
+											{% else %}
+												{{ Icon('svg', contact.ID, '', true, 'contact-icon') }}
 											{% endif %}
 										</a>
 									<!-- IF REMAINDER eq 3 or contact.S_LAST_ROW -->
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 4c69838f89..024be04a2b 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -159,14 +159,14 @@
 			<dl class="row-item">
 				<dt>
 					<a class="row-item-link{% if topicrow.S_UNREAD_TOPIC %} unread{% else %} read{% endif %}" href="{topicrow.U_NEWEST_POST}" title="{topicrow.TOPIC_FOLDER_IMG_ALT}">
-						{{ Icon('iconify', {
-							'mdi:info-variant' : topicrow.S_POST_GLOBAL,
-							'mdi:info-variant' : topicrow.S_POST_ANNOUNCE,
-							'mdi:star' : topicrow.S_POST_STICKY,
-							'mdi:lock' : topicrow.S_TOPIC_LOCKED,
-							'mdi:arrow-right-bold' : topicrow.S_TOPIC_MOVED,
-							'mdi:fire' : topicrow.S_TOPIC_HOT,
-							'mdi:file-document-outline' : true,
+						{{ Icon('svg', {
+							'info-variant' : topicrow.S_POST_GLOBAL,
+							'info-variant' : topicrow.S_POST_ANNOUNCE,
+							'star' : topicrow.S_POST_STICKY,
+							'lock' : topicrow.S_TOPIC_LOCKED,
+							'arrow-right-bold' : topicrow.S_TOPIC_MOVED,
+							'fire' : topicrow.S_TOPIC_HOT,
+							'file-document-outline' : true,
 						}, '', true, 'c-forum-row-icon') }}
 					</a>
 					{% if lang(topicrow.TOPIC_AUTHOR) == S_USERNAME %}
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 03247bf412..b8342382c6 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -180,7 +180,7 @@
 				<strong>{L_CONTACT}{L_COLON}</strong>
 				<div class="dropdown-container dropdown-left">
 					<a href="#" class="dropdown-trigger" title="{postrow.CONTACT_USER}">
-						{{ Icon('iconify', 'mdi:comment-processing-outline', postrow.CONTACT_USER, true) }}
+						{{ Icon('font', 'comment-dots', postrow.CONTACT_USER, true, 'far') }}
 					</a>
 					<div class="dropdown">
 						<div class="pointer"><div class="pointer-inner"></div></div>
@@ -194,19 +194,19 @@
 									<a href="<!-- IF postrow.contact.U_CONTACT -->{postrow.contact.U_CONTACT}<!-- ELSE -->{postrow.U_POST_AUTHOR}<!-- ENDIF -->" title="{postrow.contact.NAME}"<!-- IF $S_LAST_CELL --> class="last-cell"<!-- ENDIF --><!-- IF postrow.contact.ID eq 'jabber' --> onclick="popup(this.href, 750, 320); return false;"<!-- ENDIF -->>
 										{% EVENT viewtopic_body_contact_icon_prepend %}
 										{% if postrow.contact.ID == 'pm' %}
-											{{ Icon('iconify', 'mdi:comment-account-outline', '', true, 'contact-icon') }}
+											{{ Icon('font', 'message', '', true, 'far contact-icon') }}
 										{% elseif postrow.contact.ID == 'email' %}
-											{{ Icon('iconify', 'mdi:at', '', true, 'contact-icon') }}
+											{{ Icon('font', 'at', '', true, 'fas contact-icon') }}
 										{% elseif postrow.contact.ID == 'phpbb_website' %}
-											{{ Icon('iconify', 'mdi:earth', '', true, 'contact-icon') }}
+											{{ Icon('font', 'earth-americas', '', true, 'fas contact-icon') }}
 										{% elseif postrow.contact.ID == 'phpbb_facebook' %}
-											{{ Icon('iconify', 'mdi:facebook-box', '', true, 'contact-icon c-facebook-icon') }}
+											{{ Icon('font', 'square-facebook', '', true, 'fab contact-icon c-facebook-icon') }}
 										{% elseif postrow.contact.ID == 'phpbb_twitter' %}
-											{{ Icon('iconify', 'mdi:twitter', '', true, 'contact-icon c-twitter-icon') }}
+											{{ Icon('font', 'square-x-twitter', '', true, 'fab contact-icon c-twitter-icon') }}
 										{% elseif postrow.contact.ID == 'phpbb_skype' %}
-											{{ Icon('iconify', 'mdi:skype', '', true, 'contact-icon c-skype-icon') }}
+											{{ Icon('font', 'skype', '', true, 'fab contact-icon c-skype-icon') }}
 										{% elseif postrow.contact.ID == 'phpbb_youtube' %}
-											{{ Icon('iconify', 'mdi:youtube', '', true, 'contact-icon c-youtube-icon') }}
+											{{ Icon('font', 'youtube', '', true, 'fab contact-icon c-youtube-icon') }}
 										{% else %}
 											{{ Icon('svg', contact.ID, '', true, 'contact-icon') }}
 										{% endif %}
diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
index 5d76a73de7..55acdabd88 100644
--- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
+++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
@@ -12,11 +12,11 @@
 					<li>
 						<a href="{U_WATCH_TOPIC}" class="watch-topic-link" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}" data-update-all=".watch-topic-link">
 							{% if S_WATCHING_TOPIC %}
-								{{ Icon('iconify', 'mdi:eye-minus-outline', '', true, 'c-watch-icon is-active') }}
-								{{ Icon('iconify', 'mdi:eye-plus-outline', '', true, 'c-watch-icon') }}
+								{{ Icon('font', 'bell-slash', '', true, 'far c-watch-icon is-active') }}
+								{{ Icon('font', 'bell', '', true, 'far c-watch-icon') }}
 							{% else %}
-								{{ Icon('iconify', 'mdi:eye-plus-outline', '', true, 'c-watch-icon is-active') }}
-								{{ Icon('iconify', 'mdi:eye-minus-outline', '', true, 'c-watch-icon') }}
+								{{ Icon('font', 'bell', '', true, 'far c-watch-icon is-active') }}
+								{{ Icon('font', 'bell-slash', '', true, 'far c-watch-icon') }}
 							{% endif %}
 							<span>{S_WATCH_TOPIC_TITLE}</span>
 						</a>
@@ -25,28 +25,28 @@
 				<!-- IF U_BOOKMARK_TOPIC -->
 					<li>
 						<a href="{U_BOOKMARK_TOPIC}" class="bookmark-link" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}" data-update-all=".bookmark-link">
-							{{ Icon('iconify', 'mdi:bookmark-plus-outline', S_BOOKMARK_TOPIC, false) }}
+							{{ Icon('font', 'bookmark', S_BOOKMARK_TOPIC, false, 'far') }}
 						</a>
 					</li>
 				<!-- ENDIF -->
 				<!-- IF U_BUMP_TOPIC -->
 				<li>
 					<a href="{U_BUMP_TOPIC}" title="{L_BUMP_TOPIC}" data-ajax="true">
-						{{ Icon('iconify', 'mdi:update', lang('BUMP_TOPIC'), false) }}
+						{{ Icon('font', 'turn-up', lang('BUMP_TOPIC'), false) }}
 					</a>
 				</li>
 				<!-- ENDIF -->
 				<!-- IF U_EMAIL_TOPIC -->
 				<li>
 					<a href="{U_EMAIL_TOPIC}" title="{L_EMAIL_TOPIC}">
-						{{ Icon('iconify', 'mdi:send-circle-outline', lang('EMAIL_TOPIC'), false) }}
+						{{ Icon('font', 'envelope', lang('EMAIL_TOPIC'), false, 'far') }}
 					</a>
 				</li>
 				<!-- ENDIF -->
 				<!-- IF U_PRINT_TOPIC -->
 				<li>
 					<a href="{U_PRINT_TOPIC}" title="{L_PRINT_TOPIC}" accesskey="p">
-						{{ Icon('iconify', 'ic:outline-print', lang('PRINT_TOPIC'), false) }}
+						{{ Icon('font', 'print', lang('PRINT_TOPIC'), false) }}
 					</a>
 				</li>
 				<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index 50a4f9fce6..7bdd5f4b87 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -283,7 +283,7 @@ a:hover .icon.icon-black, /* DEPRECATED 4.0 */
 }
 
 .c-twitter-icon {
-	color: #1da1f2;
+	color: #000000;
 }
 
 .c-skype-icon {
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 2fc7be624d..d99eeaebcf 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -964,8 +964,7 @@ fieldset.fields1 dl.pmlist dd.recipients {
 }
 
 .pagination li.page-jump a i {
-	font-size: 21px;
-	line-height: 21px;
+	font-size: 16px;
 }
 
 .pagination .arrow a {
diff --git a/phpBB/styles/prosilver/theme/icons.css b/phpBB/styles/prosilver/theme/icons.css
index ed9d25cca2..a6ad36d22a 100644
--- a/phpBB/styles/prosilver/theme/icons.css
+++ b/phpBB/styles/prosilver/theme/icons.css
@@ -127,9 +127,7 @@ blockquote cite:before,
 ---------------------------------------- */
 .contact-icon {
 	background-repeat: no-repeat;
-	display: block;
-	width: 24px;
-	height: 24px;
+	display: inline-block;
 }
 
 .c-button-icon {