diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index aa9dc9af82..ca62a5f649 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -549,13 +549,23 @@ phpbb.addAjaxCallback = function(id, callback) {
  * current text so that the process can be repeated.
  */
 phpbb.addAjaxCallback('alt_text', function() {
-	var el = $(this),
+	var el,
+		updateAll = $(this).data('update-all'),
 		altText;
 
-	altText = el.attr('data-alt-text');
-	el.attr('data-alt-text', el.text());
-	el.attr('title', altText);
-	el.text(altText);
+	if (updateAll !== undefined && updateAll.length) {
+		el = $(updateAll);
+	} else {
+		el = $(this);
+	}
+
+	el.each(function() {
+		var el = $(this);
+		altText = el.attr('data-alt-text');
+		el.attr('data-alt-text', el.text());
+		el.attr('title', $.trim(altText));
+		el.text(altText);
+	});
 });
 
 /**
@@ -568,27 +578,37 @@ phpbb.addAjaxCallback('alt_text', function() {
  * and changes the link itself.
  */
 phpbb.addAjaxCallback('toggle_link', function() {
-	var el = $(this),
+	var el,
+		updateAll = $(this).data('update-all') ,
 		toggleText,
 		toggleUrl,
 		toggleClass;
 
-	// Toggle link text
+	if (updateAll !== undefined && updateAll.length) {
+		el = $(updateAll);
+	} else {
+		el = $(this);
+	}
 
-	toggleText = el.attr('data-toggle-text');
-	el.attr('data-toggle-text', el.text());
-	el.attr('title', toggleText);
-	el.text(toggleText);
+	el.each(function() {
+		var el = $(this);
 
-	// Toggle link url
-	toggleUrl = el.attr('data-toggle-url');
-	el.attr('data-toggle-url', el.attr('href'));
-	el.attr('href', toggleUrl);
+		// Toggle link text
+		toggleText = el.attr('data-toggle-text');
+		el.attr('data-toggle-text', el.text());
+		el.attr('title', $.trim(toggleText));
+		el.text(toggleText);
 
-	// Toggle class of link parent
-	toggleClass = el.attr('data-toggle-class');
-	el.attr('data-toggle-class', el.parent().attr('class'));
-	el.parent().attr('class', toggleClass);
+		// Toggle link url
+		toggleUrl = el.attr('data-toggle-url');
+		el.attr('data-toggle-url', el.attr('href'));
+		el.attr('href', toggleUrl);
+
+		// Toggle class of link parent
+		toggleClass = el.attr('data-toggle-class');
+		el.attr('data-toggle-class', el.parent().attr('class'));
+		el.parent().attr('class', toggleClass);
+	});
 });
 
 /**
diff --git a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
index ec17185bae..fcce2267c4 100644
--- a/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
+++ b/phpBB/styles/prosilver/template/viewtopic_topic_tools.html
@@ -7,14 +7,14 @@
 				<!-- EVENT viewtopic_topic_tools_before -->
 				<!-- IF U_WATCH_TOPIC -->
 					<li class="small-icon icon-<!-- IF S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->">
-						<a href="{U_WATCH_TOPIC}" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}">
+						<a href="{U_WATCH_TOPIC}" class="watch-topic-link" title="{S_WATCH_TOPIC_TITLE}" data-ajax="toggle_link" data-toggle-class="small-icon icon-<!-- IF not S_WATCHING_TOPIC -->unsubscribe<!-- ELSE -->subscribe<!-- ENDIF -->" data-toggle-text="{S_WATCH_TOPIC_TOGGLE}" data-toggle-url="{U_WATCH_TOPIC_TOGGLE}" data-update-all=".watch-topic-link">
 							{S_WATCH_TOPIC_TITLE}
 						</a>
 					</li>
 				<!-- ENDIF -->
 				<!-- IF U_BOOKMARK_TOPIC -->
 					<li class="small-icon icon-bookmark">
-						<a href="{U_BOOKMARK_TOPIC}" title="{L_BOOKMARK_TOPIC}" data-ajax="alt_text" data-alt-text="{S_BOOKMARK_TOGGLE}">
+						<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">
 							{S_BOOKMARK_TOPIC}
 						</a>
 					</li>