diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html
index fd6b76905e..aa6a80cc4a 100644
--- a/phpBB/styles/prosilver/template/navbar_footer.html
+++ b/phpBB/styles/prosilver/template/navbar_footer.html
@@ -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', 'vaadin:sign-out', '', true, 'c-subscribe-icon') }}
-								{{ Icon('iconify', 'vaadin:sign-in', '', true, 'c-subscribe-icon is-active') }}
+								{{ Icon('iconify', 'mdi:bookmark-minus-outline', '', true, 'c-subscribe-icon') }}
+								{{ Icon('iconify', 'mdi:bookmark-plus-outline', '', true, 'c-subscribe-icon is-active') }}
 							{% else %}
-								{{ Icon('iconify', 'vaadin:sign-in', '', true, 'c-subscribe-icon is-active') }}
-								{{ Icon('iconify', 'vaadin:sign-out', '', true, 'c-subscribe-icon') }}
+								{{ Icon('iconify', 'mdi:bookmark-plus-outline', '', true, 'c-subscribe-icon is-active') }}
+								{{ Icon('iconify', 'mdi:bookmark-minus-outline', '', true, 'c-subscribe-icon') }}
 							{% endif %}
 							<span>{{ S_WATCH_FORUM_TITLE }}</span>
 						</a>
diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
index 60a35e616e..87c1b8629a 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', 'vaadin:sign-out', '', true, 'c-subscribe-icon') }}
-								{{ Icon('iconify', 'vaadin:sign-in', '', true, 'c-subscribe-icon is-active') }}
+								{{ Icon('iconify', 'mdi:bookmark-minus-outline', '', true, 'c-subscribe-icon') }}
+								{{ Icon('iconify', 'mdi:bookmark-plus-outline', '', true, 'c-subscribe-icon is-active') }}
 							{% else %}
-								{{ Icon('iconify', 'vaadin:sign-in', '', true, 'c-subscribe-icon is-active') }}
-								{{ Icon('iconify', 'vaadin:sign-out', '', true, 'c-subscribe-icon') }}
+								{{ Icon('iconify', 'mdi:bookmark-plus-outline', '', true, 'c-subscribe-icon is-active') }}
+								{{ Icon('iconify', 'mdi:bookmark-minus-outline', '', true, 'c-subscribe-icon') }}
 							{% endif %}
 							<span>{S_WATCH_TOPIC_TITLE}</span>
 						</a>
@@ -25,7 +25,7 @@
 				<!-- 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('iconify', 'mdi:star-outline', S_BOOKMARK_TOPIC, false) }}
 						</a>
 					</li>
 				<!-- ENDIF -->