diff --git a/resources/skins.minerva.base.styles/anonTalkMessage.less b/resources/skins.minerva.base.styles/anonTalkMessage.less
index 6c691a5d7..2656abddf 100644
--- a/resources/skins.minerva.base.styles/anonTalkMessage.less
+++ b/resources/skins.minerva.base.styles/anonTalkMessage.less
@@ -3,10 +3,6 @@ div.minerva-anon-talk-message {
 	margin-top: 16px;
 	margin-bottom: 0;
 
-	.mw-ui-icon {
-		color: #fc3;
-	}
-
 	.usermessage {
 		display: inline;
 		margin-left: 8px;
diff --git a/resources/skins.minerva.scripts/addPortletLink.js b/resources/skins.minerva.scripts/addPortletLink.js
index fa3dbfd03..0b1ab29cb 100644
--- a/resources/skins.minerva.scripts/addPortletLink.js
+++ b/resources/skins.minerva.scripts/addPortletLink.js
@@ -47,7 +47,10 @@ function insertIcon( $link, id ) {
 	var icon = document.createElement( 'span' ),
 		classes = 'minerva-icon';
 	if ( id ) {
-		classes += ' mw-ui-icon-portletlink-' + id;
+		classes += ` minerva-icon-portletlink-${id}`;
+		// FIXME: Please remove when following URL returns zero results:
+		// https://global-search.toolforge.org/?q=mw-ui-icon-portletlink&regex=1&namespaces=&title=
+		classes += ` mw-ui-icon-portletlink-${id}`;
 	}
 	icon.setAttribute( 'class', classes );
 	$link.prepend( icon );
diff --git a/tests/qunit/skins.minerva.scripts/page-issues/index.test.js b/tests/qunit/skins.minerva.scripts/page-issues/index.test.js
index 71f00e547..dbc38caca 100644
--- a/tests/qunit/skins.minerva.scripts/page-issues/index.test.js
+++ b/tests/qunit/skins.minerva.scripts/page-issues/index.test.js
@@ -30,7 +30,8 @@
 	} );
 
 	QUnit.test( 'insertBannersOrNotice() should add an icon', function ( assert ) {
-		assert.true( /mw-ui-icon/.test( processedAmbox.html() ) );
+		// FIXME: Remove mw-ui-icon when T346184 and/or T346162 has been resolved.
+		assert.true( /(mw-ui-icon|mf-icon)/.test( processedAmbox.html() ) );
 	} );
 	QUnit.test( 'clicking on the product of insertBannersOrNotice() should trigger a URL change', function ( assert ) {
 		processedAmbox.click();
diff --git a/tests/selenium/features/support/pages/article_page.js b/tests/selenium/features/support/pages/article_page.js
index 34ddca6f4..a24f18ff0 100644
--- a/tests/selenium/features/support/pages/article_page.js
+++ b/tests/selenium/features/support/pages/article_page.js
@@ -20,7 +20,7 @@ class ArticlePage extends MinervaPage {
 	get talk_tab_element() { return $( '.minerva__tab-container a[rel="discussion"]' ); }
 	get mask_element() { return $( '.mw-mf-page-center__mask' ); }
 	get drawer_mask_element() { return $( '.drawer-container__mask--visible' ); }
-	get watched_element() { return $( '.minerva-icon--unStar-progressive, .mw-ui-icon-mf-watched' ); }
+	get watched_element() { return $( '.minerva-icon--unStar-progressive' ); }
 	get menu_button_element() { return $( '#mw-mf-main-menu-button' ); }
 	get search_icon_element() { return $( '#searchIcon' ); }
 	get menu_element() { return $( 'nav' ); }
diff --git a/tests/selenium/pageobjects/edit.page.js b/tests/selenium/pageobjects/edit.page.js
index ddd878bc1..68ec9b780 100644
--- a/tests/selenium/pageobjects/edit.page.js
+++ b/tests/selenium/pageobjects/edit.page.js
@@ -6,7 +6,9 @@ class EditPage extends Page {
 	get content() { return $( '#wikitext-editor' ); }
 	get displayedContent() { return $( '#mw-content-text .mw-parser-output' ); }
 	get heading() { return $( 'h1.mw-first-heading' ); }
-	get next() { return $( '.mw-ui-icon-mf-next-invert' ); }
+	// Sync with src/mobile.editor.overlay/EditorOverlayBase.js in MobileFrontend
+	// FIXME: T346184
+	get next() { return $( '.mw-ui-icon-mf-next-invert, .mf-icon-next-invert' ); }
 	get save() { return $( 'button.cdx-button' ); }
 
 	openForEditing( title ) {