diff --git a/resources/skins.vector.styles/components/LanguageButton.less b/resources/skins.vector.styles/components/LanguageButton.less
index 04305d6c..2fa15a59 100644
--- a/resources/skins.vector.styles/components/LanguageButton.less
+++ b/resources/skins.vector.styles/components/LanguageButton.less
@@ -14,11 +14,6 @@
 	height: @height-button-lang;
 	flex-shrink: 0;
 
-	.mw-ui-icon:before {
-		// Put icon on correct standard normal state color.
-		opacity: 0.87;
-	}
-
 	// If there are no languages and JavaScript is not enabled there is no fallback so we hide
 	// the button altogether.
 	.mw-portlet-lang-heading-0 {
diff --git a/resources/skins.vector.styles/components/Sidebar.less b/resources/skins.vector.styles/components/Sidebar.less
index 387033c8..abab231e 100644
--- a/resources/skins.vector.styles/components/Sidebar.less
+++ b/resources/skins.vector.styles/components/Sidebar.less
@@ -87,8 +87,6 @@
 
 #mw-sidebar-button {
 	&:before {
-		// Equals `#555`, closest to `#54595d` on background-color `#fff`.
-		opacity: 0.67;
 		/* @embed */
 		background-image: url( images/chevronHorizontal-ltr.svg );
 
diff --git a/resources/skins.vector.styles/components/VueEnhancedSearchBox.less b/resources/skins.vector.styles/components/VueEnhancedSearchBox.less
index 142d345f..797a31d3 100644
--- a/resources/skins.vector.styles/components/VueEnhancedSearchBox.less
+++ b/resources/skins.vector.styles/components/VueEnhancedSearchBox.less
@@ -138,12 +138,12 @@
 		// Increase size to match Codex.
 		width: @padding-left-start-icon;
 		// Set opacity to match icon color from Codex (0.51 approximates #72777d)
-		opacity: 0.51;
+		opacity: @opacity-base--disabled;
 	}
 
 	.vector-search-box-input:focus ~ .searchButton {
 		// When the input is focused, change icon color to match Codex (0.87 approximates #202122)
-		opacity: 0.87;
+		opacity: @opacity-icon-base;
 	}
 
 	&.vector-search-box-show-thumbnail {
diff --git a/resources/skins.vector.styles/skin.less b/resources/skins.vector.styles/skin.less
index 70ac452e..a5103e2e 100644
--- a/resources/skins.vector.styles/skin.less
+++ b/resources/skins.vector.styles/skin.less
@@ -27,6 +27,12 @@
 	@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;
+	}
 }
 
 @media all {