diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index 4d2544de58..dd53f1c83e 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -1052,11 +1052,11 @@ phpbb.addAjaxCallback('alt_text', function() {
  * and changes the link itself.
  */
 phpbb.addAjaxCallback('toggle_link', function() {
-	var $anchor,
-		updateAll = $(this).data('update-all') ,
-		toggleText,
-		toggleUrl,
-		toggleClass;
+	let $anchor;
+	let updateAll = $(this).data('update-all');
+	let toggleText;
+	let toggleUrl;
+	let toggleIcon;
 
 	if (updateAll !== undefined && updateAll.length) {
 		$anchor = $(updateAll);
@@ -1067,21 +1067,19 @@ phpbb.addAjaxCallback('toggle_link', function() {
 	$anchor.each(function() {
 		var $this = $(this);
 
+		// Toggle link text
+		toggleText = $.trim($this.attr('data-toggle-text'));
+		$this.attr('data-toggle-text', $.trim($this.children('span').text()));
+		$this.attr('title', toggleText);
+		$this.children('span').last().text(toggleText);
+
 		// Toggle link url
 		toggleUrl = $this.attr('data-toggle-url');
 		$this.attr('data-toggle-url', $this.attr('href'));
 		$this.attr('href', toggleUrl);
 
-		// Toggle class of link parent
-		toggleClass = $this.attr('data-toggle-class');
-		$this.attr('data-toggle-class', $this.children().attr('class'));
-		$this.children('.icon').attr('class', toggleClass);
-
-		// Toggle link text
-		toggleText = $this.attr('data-toggle-text');
-		$this.attr('data-toggle-text', $this.children('span').text());
-		$this.attr('title', $.trim(toggleText));
-		$this.children('span').text(toggleText);
+		// Toggle Icon
+		$this.children().first().toggleClass('is-active').next().toggleClass('is-active')
 	});
 });
 
diff --git a/phpBB/styles/prosilver/template/forumlist_body.html b/phpBB/styles/prosilver/template/forumlist_body.html
index dd6751d97d..eaac5afa5d 100644
--- a/phpBB/styles/prosilver/template/forumlist_body.html
+++ b/phpBB/styles/prosilver/template/forumlist_body.html
@@ -103,7 +103,6 @@
 							<!-- 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>
-									<span class="sr-only">{L_POSTS_UNAPPROVED_FORUM}</span>
 								</a>
 							<!-- ENDIF -->
 							<!-- IF forumrow.LAST_POST_TIME -->
@@ -116,7 +115,6 @@
 								<!-- 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>
-										<span class="sr-only">{L_VIEW_LATEST_POST}</span>
 									</a>
 								<!-- ENDIF -->
 								<br /><time datetime="{forumrow.LAST_POST_TIME_RFC3339}">{forumrow.LAST_POST_TIME}</time>
diff --git a/phpBB/styles/prosilver/template/navbar_footer.html b/phpBB/styles/prosilver/template/navbar_footer.html
index 1acc0adac9..e4db8b9794 100644
--- a/phpBB/styles/prosilver/template/navbar_footer.html
+++ b/phpBB/styles/prosilver/template/navbar_footer.html
@@ -24,11 +24,15 @@
 		</li>
 		<!-- IF U_WATCH_FORUM_LINK and not S_IS_BOT -->
 			<li data-last-responsive="true">
-		<a class="c-subscribe-action{% if not S_WATCHING_FORUM %} is-active {% endif %}" href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-swap="subscribe" data-swap-url="{U_WATCH_FORUM_TOGGLE}">
-					{{ Icon('iconify', 'mdi:checkbox-blank-outline', '', true, 'c-subscibe-icon') }}<span>{S_WATCH_FORUM_TITLE}</span>
-				</a>
-			<a class="c-subscribe-action{% if S_WATCHING_FORUM %} is-active {% endif %}" href="{U_WATCH_FORUM_LINK}" title="{S_WATCH_FORUM_TITLE}" data-swap="subscribe" data-swap-url="{U_WATCH_FORUM_TOGGLE}">
-					{{ Icon('iconify', 'mdi:checkbox-marked', '', true, 'c-subscibe-icon') }}<span>{S_WATCH_FORUM_TITLE}</span>
+				<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:checkbox-blank-outline', '', true, 'c-subscribe-icon') }}
+						{{ Icon('iconify', 'mdi:checkbox-marked', '', true, 'c-subscribe-icon is-active') }}
+					{% else %}
+						{{ Icon('iconify', 'mdi:checkbox-blank-outline', '', true, 'c-subscribe-icon is-active') }}
+						{{ Icon('iconify', 'mdi:checkbox-marked', '', true, 'c-subscribe-icon') }}
+					{% endif %}
+					<span>{S_WATCH_FORUM_TITLE}</span>
 				</a>
 			</li>
 		<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
index 4e0e8c9da3..37c3a37489 100644
--- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
+++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
@@ -10,11 +10,15 @@
 				<!-- EVENT viewtopic_topic_tools_before -->
 				<!-- IF U_WATCH_TOPIC -->
 					<li>
-						<a class="c-subscribe-action{% if not S_WATCHING_TOPIC %} is-active {% endif %}" href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="swap_subscribe" data-swap="subscribe" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}" data-update-all=".c-cubscribe-action">
-							{{ Icon('iconify', 'mdi:checkbox-blank-outline', '', true, 'c-subscibe-icon') }}<span>{S_WATCH_TOPIC_TITLE}</span>
-						</a>
-						<a class="c-subscribe-action{% if S_WATCHING_TOPIC %} is-active {% endif %}" href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="swap_subscribe" data-swap="subscribe" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}" data-update-all=".c-cubscribe-action">
-							{{ Icon('iconify', 'mdi:checkbox-marked', '', true, 'c-subscibe-icon') }}<span>{S_WATCH_TOPIC_TITLE}</span>
+						<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:checkbox-blank-outline', '', true, 'c-subscribe-icon') }}
+								{{ Icon('iconify', 'mdi:checkbox-marked', '', true, 'c-subscribe-icon is-active') }}
+							{% else %}
+								{{ Icon('iconify', 'mdi:checkbox-blank-outline', '', true, 'c-subscribe-icon is-active') }}
+								{{ Icon('iconify', 'mdi:checkbox-marked', '', true, 'c-subscribe-icon') }}
+							{% endif %}
+							<span>{S_WATCH_TOPIC_TITLE}</span>
 						</a>
 					</li>
 				<!-- ENDIF -->
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 203fb50ba6..7fba027761 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -280,6 +280,17 @@ a.rightside {
 	margin-left: 7px;
 }
 
+ul.linklist li a:hover,
+ul.linklist li a:focus,
+ul.linklist li a:active {
+	text-decoration: none;
+}
+
+ul.linklist li a:hover span,
+ul.linklist li a:focus span {
+	text-decoration: underline;
+}
+
 ul.navlinks {
 	border-top: 1px solid transparent;
 }
@@ -496,6 +507,17 @@ a.header-avatar img {
 	padding: 5px;
 }
 
+.dropdown-contents a:hover,
+.dropdown-contents a:active,
+.dropdown-contents a:focus {
+	text-decoration: none;
+}
+
+.dropdown-contents a:hover span,
+.dropdown-contents a:focus span {
+	text-decoration: underline;
+}
+
 .jumpbox {
 	margin: 5px 0;
 }
diff --git a/phpBB/styles/prosilver/theme/icons.css b/phpBB/styles/prosilver/theme/icons.css
index 1da9569664..6185a865c4 100644
--- a/phpBB/styles/prosilver/theme/icons.css
+++ b/phpBB/styles/prosilver/theme/icons.css
@@ -120,3 +120,11 @@ blockquote cite:before,
 .c-button-icon {
 	margin-top: 0;
 }
+
+.c-subscribe-icon {
+	display: none !important;
+}
+
+.c-subscribe-icon.is-active {
+	display: inline !important;
+}
diff --git a/phpBB/styles/prosilver/theme/links.css b/phpBB/styles/prosilver/theme/links.css
index 03cb50744e..7f803932a5 100644
--- a/phpBB/styles/prosilver/theme/links.css
+++ b/phpBB/styles/prosilver/theme/links.css
@@ -204,11 +204,3 @@ a.feed-icon-forum {
 a.anchor {
 	display: block;
 }
-
-.c-subscribe-action {
-	display: none !important;
-}
-
-.c-subscribe-action.is-active {
-	display: inline-block !important;
-}