diff --git a/includes/menu/PageActions/ToolbarBuilder.php b/includes/menu/PageActions/ToolbarBuilder.php
index b336eb90c..584c9cdc4 100644
--- a/includes/menu/PageActions/ToolbarBuilder.php
+++ b/includes/menu/PageActions/ToolbarBuilder.php
@@ -213,12 +213,12 @@ class ToolbarBuilder {
 
 		if ( $isWatched ) {
 			$msg = $this->messageLocalizer->msg( 'unwatchthispage' );
-			$icon = 'watched';
+			$icon = 'unStar-progressive';
 		} else {
 			$msg = $this->messageLocalizer->msg( 'watchthispage' );
-			$icon = 'watch';
+			$icon = 'star-base20';
 		}
-		$iconClass = MinervaUI::iconClass( $icon, 'element', 'watch-this-article', 'mf' ) . ' jsonly';
+		$iconClass = MinervaUI::iconClass( $icon, 'element', 'watch-this-article', 'wikimedia' );
 		if ( $isWatched ) {
 			$iconClass .= ' watched';
 		}
diff --git a/resources/skins.minerva.base.styles/pageactions.less b/resources/skins.minerva.base.styles/pageactions.less
index 8837f9a1d..487bc3d22 100644
--- a/resources/skins.minerva.base.styles/pageactions.less
+++ b/resources/skins.minerva.base.styles/pageactions.less
@@ -69,11 +69,6 @@
 	right: -@icon-padding-md;
 }
 
-// overriding common.less `display:inherit` (which causes `display: flex;` in this instance).
-.client-js .jsonly#ca-watch {
-	display: list-item;
-}
-
 // Watchstar is hidden for anonymous no-js users
 // While we could link the icon to the login/signup form, this is not
 // a perfect experience and could be confusing.
diff --git a/resources/skins.minerva.icons.images/watch.svg b/resources/skins.minerva.icons.images/watch.svg
deleted file mode 100644
index 43591e868..000000000
--- a/resources/skins.minerva.icons.images/watch.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><title>star</title><path d="M20 7h-7L10 .5 7 7H0l5.46 5.47-1.64 7 6.18-3.7 6.18 3.73-1.63-7zm-10 6.9l-3.76 2.27 1-4.28L3.5 8.5h4.61L10 4.6l1.9 3.9h4.6l-3.73 3.4 1 4.28z"/></svg>
\ No newline at end of file
diff --git a/resources/skins.minerva.icons.images/watched.svg b/resources/skins.minerva.icons.images/watched.svg
deleted file mode 100644
index a5905e25c..000000000
--- a/resources/skins.minerva.icons.images/watched.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20"><title>un-star</title><path d="M20 7h-7L10 .5 7 7H0l5.46 5.47-1.64 7 6.18-3.7 6.18 3.73-1.63-7z"/></svg>
\ No newline at end of file
diff --git a/skin.json b/skin.json
index f82b5863e..cdaf0e446 100644
--- a/skin.json
+++ b/skin.json
@@ -304,11 +304,12 @@
 			]
 		},
 		"skins.minerva.icons.wikimedia": {
+			"selectorWithVariant": ".mw-ui-icon-wikimedia-{name}-{variant}:before",
 			"selectorWithoutVariant": ".mw-ui-icon-wikimedia-{name}-base20:before, .mw-ui-background-icon-{name}",
 			"useDataURI": false,
 			"defaultColor": "#54595d",
 			"class": "ResourceLoaderOOUIIconPackModule",
-			"icons": [ "search", "userAvatar" ]
+			"icons": [ "search", "userAvatar", "star", "unStar" ]
 		},
 		"skins.minerva.icons.images": {
 			"class": "ResourceLoaderImageModule",
@@ -333,8 +334,6 @@
 						"rtl": "resources/skins.minerva.icons.images/toc-rtl.svg"
 					}
 				},
-				"watch": "resources/skins.minerva.icons.images/watch.svg",
-				"watched": "resources/skins.minerva.icons.images/watched.svg",
 				"warning": "resources/skins.minerva.icons.images/warning.svg",
 				"mainmenu": "resources/skins.minerva.icons.images/hamburger.svg",
 				"edit": "resources/skins.minerva.icons.images/editLocked.svg",