diff --git a/resources/skins.vector.styles/components/Icon.less b/resources/skins.vector.styles/components/Icon.less
index d35f3918a..a7b2efb32 100644
--- a/resources/skins.vector.styles/components/Icon.less
+++ b/resources/skins.vector.styles/components/Icon.less
@@ -3,6 +3,11 @@
 	.cdx-mixin-css-icon-size( );
 	.cdx-mixin-css-icon-alignment( );
 	font-size: 14px;
+
+	// Temporary fix for https://phabricator.wikimedia.org/T356540
+	background-position: center;
+	background-repeat: no-repeat;
+	background-size: ~'calc( max( @{size-icon-medium}, @{min-size-icon-medium} ) )';
 }
 
 // Temporary generic small icon class
@@ -11,4 +16,7 @@
 	.cdx-mixin-css-icon-background( @size-icon-x-small );
 	.cdx-mixin-css-icon-size( @size-icon-x-small );
 	.cdx-mixin-css-icon-alignment( );
+
+	// Temporary fix for https://phabricator.wikimedia.org/T356540
+	background-size: ~'calc( max( @{size-icon-x-small}, @{min-size-icon-x-small} ) )';
 }
diff --git a/resources/skins.vector.styles/components/PageToolbar.less b/resources/skins.vector.styles/components/PageToolbar.less
index 1b9b787e9..d8b2659e2 100644
--- a/resources/skins.vector.styles/components/PageToolbar.less
+++ b/resources/skins.vector.styles/components/PageToolbar.less
@@ -23,6 +23,9 @@
 		.cdx-mixin-css-icon-background( @size-icon-small );
 		.cdx-mixin-css-icon-size( @size-icon-small );
 		.cdx-mixin-css-icon-alignment( );
+
+		// Temporary fix for https://phabricator.wikimedia.org/T356540
+		background-size: ~'calc( max( @{size-icon-small}, @{min-size-icon-small} ) )';
 	}
 }