diff --git a/core/ui/Components/tag-link.tid b/core/ui/Components/tag-link.tid
index 088210d48..88b39f852 100644
--- a/core/ui/Components/tag-link.tid
+++ b/core/ui/Components/tag-link.tid
@@ -1,7 +1,7 @@
 title: $:/core/ui/Components/tag-link
 
 <$link>
-<$set name="backgroundColor" value={{!!color}}>
+<$set name="backgroundColor" value={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]get[text]] }}}>
 <span style=<<tag-styles>> class="tc-tag-label">
 <$view field="title" format="text"/>
 </span>
diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid
index f01bcb4ac..2ceced5b8 100644
--- a/core/ui/EditTemplate/tags.tid
+++ b/core/ui/EditTemplate/tags.tid
@@ -29,7 +29,7 @@ color:$(foregroundColor)$;
 \whitespace trim
 <div class="tc-edit-tags">
 <$list filter="[list[!!$tagField$]sort[title]]" storyview="pop">
-<$macrocall $name="tag-body" colour={{!!color}} palette={{$:/palette}} icon={{!!icon}} tagField=<<__tagField__>>/>
+<$macrocall $name="tag-body" colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]get[text]] }}} palette={{$:/palette}} icon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]get[text]] }}} tagField=<<__tagField__>>/>
 </$list>
 <$vars tabIndex={{$:/config/EditTabIndex}} cancelPopups="yes">
 <$macrocall $name="tag-picker" tagField=<<__tagField__>>/>