diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid
index 298120606d..a2bf6b4658 100644
--- a/core/ui/EditTemplate/tags.tid
+++ b/core/ui/EditTemplate/tags.tid
@@ -17,7 +17,7 @@ tags: $:/tags/EditTemplate
 	<$let backgroundColor=<<colour>> >
 		<span class="tc-tag-label tc-tag-list-item tc-small-gap-right"
 			data-tag-title=<<currentTiddler>>
-			style=`color:$(foregroundColor)$; background-color:$(backgroundColor)$;`
+			style=`color:$(foregroundColor)$; background-color:$(backgroundColor)$; --tp-remove-tag-button-color:$(foregroundColor)$`
 		>
 			<$transclude tiddler=<<icon>>/>
 			<$view field="title" format="text"/>
diff --git a/editions/tw5.com/tiddlers/releasenotes/5.4.0/#9316.tid b/editions/tw5.com/tiddlers/releasenotes/5.4.0/#9316.tid
index cb1b24d0f8..def69c2606 100644
--- a/editions/tw5.com/tiddlers/releasenotes/5.4.0/#9316.tid
+++ b/editions/tw5.com/tiddlers/releasenotes/5.4.0/#9316.tid
@@ -4,7 +4,7 @@ release: 5.4.0
 tags: $:/tags/ChangeNote
 change-type: enhancement
 change-category: theme
-github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9316
+github-links: https://github.com/TiddlyWiki/TiddlyWiki5/pull/9316 https://github.com/TiddlyWiki/TiddlyWiki5/pull/9568
 github-contributors: Leilei332
 
 Replaces hardcoded `fill` attributes with one `fill: currentColor` rule to solve the compatibility issues of migrating to lucide icons.
\ No newline at end of file
diff --git a/themes/tiddlywiki/seamless/base.tid b/themes/tiddlywiki/seamless/base.tid
index 0f07c35295..4fe2371186 100644
--- a/themes/tiddlywiki/seamless/base.tid
+++ b/themes/tiddlywiki/seamless/base.tid
@@ -9,7 +9,7 @@ Rules copied from Snow White
 */
 
 .tc-page-controls button svg, .tc-tiddler-controls button svg, .tc-topbar button svg {
-	<<transition "fill 150ms ease-in-out">>
+	transition: color 150ms ease-in-out;
 }
 
 .tc-tiddler-controls button.tc-selected svg {
diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid
index 051cc5e8db..ce9250e176 100644
--- a/themes/tiddlywiki/snowwhite/base.tid
+++ b/themes/tiddlywiki/snowwhite/base.tid
@@ -28,7 +28,7 @@ tags: [[$:/tags/Stylesheet]]
 }
 
 .tc-page-controls button svg, .tc-tiddler-controls button svg, .tc-topbar button svg {
-	transition: fill 150ms ease-in-out;
+	transition: color 150ms ease-in-out;
 }
 
 .tc-tiddler-controls button.tc-selected,
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index c20aa94abb..74a93c15bc 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -852,6 +852,7 @@ button.tc-untagged-label {
 .tc-edit-tags button.tc-remove-tag-button svg {
 	font-size: 0.7em;
 	vertical-align: middle;
+	color: var(--tp-remove-tag-button-color);
 }
 
 .tc-tag-manager-table .tc-tag-label {
@@ -2755,6 +2756,10 @@ a.tc-tiddlylink.tc-plugin-info:hover > .tc-plugin-info-chunk .tc-plugin-info-sta
 	padding: 3px;
 }
 
+.tc-install-plugin > svg {
+	color: white;
+}
+
 .tc-install-plugin.tc-reinstall-downgrade {
 	background: red;
 }