diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less
index 248dee7d330..614975f69b4 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less
@@ -49,6 +49,26 @@
 	margin-left: ~'calc( ( @{size-circle-result} + @{margin-circle-result} ) * 5 + @{margin-circle} )';
 }
 
+.background-color-with-dark-mode( @bgcolor ) {
+	background-color: @bgcolor;
+
+	html.skin-theme-clientpref-night & {
+		background-color: darken( @bgcolor, 60% );
+	}
+
+	/**
+	 * Auto night mode.
+	 *
+	 * Applies the night mode color palette only in response to system settings.
+	 */
+	/* stylelint-disable-next-line plugin/no-unsupported-browser-features */
+	@media ( prefers-color-scheme: dark ) {
+		html.skin-theme-clientpref-os & {
+			background-color: darken( @bgcolor, 60% );
+		}
+	}
+}
+
 // A mixin just for changesListWrapperWidget page, to output the scope of the widget
 // so it is before the rest of the rule; we need the li& to be in
 // between the wrapper scope and the color-cX class, which doesn't
@@ -58,7 +78,7 @@
 	.mw-rcfilters-ui-changesListWrapperWidget & tr:first-child,
 	.mw-rcfilters-ui-changesListWrapperWidget tr&.mw-rcfilters-ui-highlights-enhanced-toplevel:not( .mw-rcfilters-ui-changesListWrapperWidget-enhanced-grey ) td:not( :nth-child( -n+2 ) ),
 	.mw-rcfilters-ui-changesListWrapperWidget tr&.mw-rcfilters-ui-highlights-enhanced-nested:not( .mw-rcfilters-ui-changesListWrapperWidget-enhanced-grey ) td:not( :nth-child( -n+4 ) ) {
-		background-color: @bgcolor;
+		.background-color-with-dark-mode( @bgcolor );
 	}
 }
 
diff --git a/resources/src/mediawiki.rcfilters/ui/ChangesListWrapperWidget.js b/resources/src/mediawiki.rcfilters/ui/ChangesListWrapperWidget.js
index b40df4945e2..e36238c93a6 100644
--- a/resources/src/mediawiki.rcfilters/ui/ChangesListWrapperWidget.js
+++ b/resources/src/mediawiki.rcfilters/ui/ChangesListWrapperWidget.js
@@ -321,11 +321,10 @@ ChangesListWrapperWidget.prototype.applyHighlight = function () {
 		// * mw-rcfilters-highlight-color-c5
 		// * notheme - T366920 Makes highlighted list legible in dark-mode.
 		$elements
-			.addClass( [
-				'mw-rcfilters-highlighted',
-				'mw-rcfilters-highlight-color-' + filterItem.getHighlightColor(),
-				'notheme'
-			] );
+			.addClass(
+				'mw-rcfilters-highlighted ' +
+				'mw-rcfilters-highlight-color-' + filterItem.getHighlightColor()
+			);
 
 		// Track the filters for each item in .data( 'highlightedFilters' )
 		$elements.each( function () {
@@ -379,7 +378,7 @@ ChangesListWrapperWidget.prototype.clearHighlight = function () {
 	this.$element.find( '.mw-rcfilters-highlighted' )
 		.removeAttr( 'title' )
 		.removeData( 'highlightedFilters' )
-		.removeClass( [ 'mw-rcfilters-highlighted', 'notheme' ] );
+		.removeClass( 'mw-rcfilters-highlighted' );
 
 	// Remove grey from enhanced rows
 	this.$element.find( '.mw-rcfilters-ui-changesListWrapperWidget-enhanced-grey' )
diff --git a/resources/src/mediawiki.rcfilters/ui/FilterItemHighlightButton.js b/resources/src/mediawiki.rcfilters/ui/FilterItemHighlightButton.js
index 39686cfe384..0e1bc805738 100644
--- a/resources/src/mediawiki.rcfilters/ui/FilterItemHighlightButton.js
+++ b/resources/src/mediawiki.rcfilters/ui/FilterItemHighlightButton.js
@@ -73,9 +73,7 @@ FilterItemHighlightButton.prototype.updateUiBasedOnModel = function () {
 		currentColor !== null
 	);
 
-	let hasFilter = false;
 	HighlightColors.forEach( ( c ) => {
-		hasFilter = hasFilter || c === currentColor;
 		// The following classes are used here:
 		// * mw-rcfilters-ui-filterItemHighlightButton-circle-color-c1
 		// * mw-rcfilters-ui-filterItemHighlightButton-circle-color-c2
@@ -88,7 +86,6 @@ FilterItemHighlightButton.prototype.updateUiBasedOnModel = function () {
 				c === currentColor
 			);
 	} );
-	this.$icon.toggleClass( 'mw-no-invert', hasFilter );
 };
 
 module.exports = FilterItemHighlightButton;
diff --git a/resources/src/mediawiki.special.changeslist.enhanced.less b/resources/src/mediawiki.special.changeslist.enhanced.less
index 2e6bf380fd3..69a4cecd932 100644
--- a/resources/src/mediawiki.special.changeslist.enhanced.less
+++ b/resources/src/mediawiki.special.changeslist.enhanced.less
@@ -84,21 +84,6 @@ td.mw-enhanced-rc {
 	}
 }
 
-// TT366920 Make arrow visible in skins that support dark-mode.
-/* stylelint-disable-next-line selector-class-pattern */
-.skin-theme-clientpref-night .notheme .mw-enhancedchanges-arrow {
-	@media screen {
-		background-color: @color-inverted-fixed;
-	}
-}
-
-@media screen and ( prefers-color-scheme: dark ) {
-	/* stylelint-disable-next-line selector-class-pattern */
-	.skin-theme-clientpref-os .notheme .mw-enhancedchanges-arrow {
-		background-color: @color-inverted-fixed;
-	}
-}
-
 .mw-enhancedchanges-arrow-space {
 	display: inline-block;
 	width: @width-arrow-space;