diff --git a/apps/accessibility/lib/Controller/AccessibilityController.php b/apps/accessibility/lib/Controller/AccessibilityController.php
index 91c110de86823a2f226e2ac61d230b52c9eb908d..e17b206cdfde0debd8fb4783781e717fa218cd3b 100644
--- a/apps/accessibility/lib/Controller/AccessibilityController.php
+++ b/apps/accessibility/lib/Controller/AccessibilityController.php
@@ -260,7 +260,15 @@ class AccessibilityController extends Controller {
 	 * @return string
 	 */
 	private function invertSvgIconsColor(string $css) {
-		return str_replace(['color=000', 'color=fff', 'color=***'], ['color=***', 'color=000', 'color=fff'], $css);
+		return str_replace(
+			['color=000&', 'color=fff&', 'color=***&'],
+			['color=***&', 'color=000&', 'color=fff&'],
+			str_replace(
+				['color=000000&', 'color=ffffff&', 'color=******&'],
+				['color=******&', 'color=000000&', 'color=ffffff&'],
+				$css
+			)
+		);
 	}
 
 	/**