diff --git a/resources/skins.vector.styles/components/Icon.less b/resources/skins.vector.styles/components/Icon.less
new file mode 100644
index 00000000..a6ee556a
--- /dev/null
+++ b/resources/skins.vector.styles/components/Icon.less
@@ -0,0 +1,15 @@
+// Make sure all icons are the correct color https://phabricator.wikimedia.org/T317800
+.mw-ui-icon:before {
+	// `@opacity-icon-base` equals to `#222` on `background-color: #fff`, closest to `#202122`.
+	opacity: @opacity-icon-base;
+}
+
+.vector-feature-visual-enhancement-next-disabled {
+	.mw-ui-icon-element {
+		padding: 0.75em;
+	}
+
+	.mw-ui-icon + span:not( :empty ) {
+		margin-left: 8px;
+	}
+}
diff --git a/resources/skins.vector.styles/skin.less b/resources/skins.vector.styles/skin.less
index a5103e2e..3694f519 100644
--- a/resources/skins.vector.styles/skin.less
+++ b/resources/skins.vector.styles/skin.less
@@ -27,12 +27,7 @@
 	@import './components/TabWatchstarLink.less';
 	@import './components/TableOfContents.less';
 	@import './components/TableOfContentsCollapsed.less';
-
-	// Make sure all icons are the correct color https://phabricator.wikimedia.org/T317800
-	.mw-ui-icon:before {
-		// `@opacity-icon-base` equals to `#222` on `background-color: #fff`, closest to `#202122`.
-		opacity: @opacity-icon-base;
-	}
+	@import './components/Icon.less';
 }
 
 @media all {