diff --git a/resources/skins.vector.styles/components/Icon.less b/resources/skins.vector.styles/components/Icon.less
index 3bcbd46c3..89b4bb936 100644
--- a/resources/skins.vector.styles/components/Icon.less
+++ b/resources/skins.vector.styles/components/Icon.less
@@ -52,10 +52,8 @@
 .vector-icon.mw-ui-icon-wikimedia-userGroup,
 .vector-icon.mw-ui-icon-wikimedia-listBullet,
 .vector-icon.mw-ui-icon-wikimedia-close {
-	@media screen {
-		html.skin-theme-clientpref-night & {
-			filter: invert( 1 );
-		}
+	html.skin-theme-clientpref-night & {
+		filter: invert( 1 );
 	}
 
 	/**
@@ -63,7 +61,7 @@
 	 *
 	 * Applies the night mode color palette only in response to system settings.
 	 */
-	@media screen and ( prefers-color-scheme: dark ) {
+	@media ( prefers-color-scheme: dark ) {
 		html.skin-theme-clientpref-os & {
 			filter: invert( 1 );
 		}
diff --git a/resources/skins.vector.styles/media.less b/resources/skins.vector.styles/media.less
index 565c19da2..55bc77bb3 100644
--- a/resources/skins.vector.styles/media.less
+++ b/resources/skins.vector.styles/media.less
@@ -22,13 +22,11 @@
 	}
 }
 
-@media screen {
-	html.skin-theme-clientpref-night {
-		.dark-mode-image-styles();
-	}
+html.skin-theme-clientpref-night {
+	.dark-mode-image-styles();
 }
 
-@media screen and ( prefers-color-scheme: dark ) {
+@media ( prefers-color-scheme: dark ) {
 	html.skin-theme-clientpref-os {
 		.dark-mode-image-styles();
 	}
diff --git a/resources/skins.vector.styles/mixins.less b/resources/skins.vector.styles/mixins.less
index c63ce6e2e..7a2fa0cc5 100644
--- a/resources/skins.vector.styles/mixins.less
+++ b/resources/skins.vector.styles/mixins.less
@@ -26,15 +26,13 @@
 		// https://phabricator.wikimedia.org/T319070#8284272
 		margin-left: 7px;
 
-		@media screen {
-			html.skin-theme-clientpref-night & {
-				// For night-mode, invert icons so they go from black to white.
-				// Since invert( 1 ) changes the hue (e.g. from blue to orange)
-				// hue-rotate( 180deg ) changes the hue back to that of the original color.
-				// This slightly corrects progressive/destructive colored icons
-				// (although their lightness & saturation are still different, e.g. language button).
-				filter: invert( 1 ) hue-rotate( 180deg );
-			}
+		html.skin-theme-clientpref-night & {
+			// For night-mode, invert icons so they go from black to white.
+			// Since invert( 1 ) changes the hue (e.g. from blue to orange)
+			// hue-rotate( 180deg ) changes the hue back to that of the original color.
+			// This slightly corrects progressive/destructive colored icons
+			// (although their lightness & saturation are still different, e.g. language button).
+			filter: invert( 1 ) hue-rotate( 180deg );
 		}
 
 		/**
@@ -42,7 +40,7 @@
 		*
 		* Applies the night mode color palette only in response to system settings.
 		*/
-		@media screen and ( prefers-color-scheme: dark ) {
+		@media ( prefers-color-scheme: dark ) {
 			html.skin-theme-clientpref-os & {
 				filter: invert( 1 ) hue-rotate( 180deg );
 			}
diff --git a/skinStyles/ext.visualEditor.less b/skinStyles/ext.visualEditor.less
index 8969938f8..5f03cf286 100644
--- a/skinStyles/ext.visualEditor.less
+++ b/skinStyles/ext.visualEditor.less
@@ -6,16 +6,14 @@ html.ve-activated {
 	}
 
 	// T367822
-	@media screen {
-		&.skin-theme-clientpref-night {
-			.ve-ce-branchNode-blockSlug,
-			body p.ve-ce-branchNode-newSlug {
-				background-color: rgba( 241, 247, 251, 0.1 );
-			}
+	&.skin-theme-clientpref-night {
+		.ve-ce-branchNode-blockSlug,
+		body p.ve-ce-branchNode-newSlug {
+			background-color: rgba( 241, 247, 251, 0.1 );
 		}
 	}
 
-	@media screen and ( prefers-color-scheme: dark ) {
+	@media ( prefers-color-scheme: dark ) {
 		&.skin-theme-clientpref-os {
 			.ve-ce-branchNode-blockSlug,
 			body p.ve-ce-branchNode-newSlug {