Show tag-icons in tags edittemplate (#3447)

core/ui/EditTemplate/tags.tid

@@ -9,17 +9,17 @@ fill:$(foregroundColor)$;
 color:$(foregroundColor)$;
 \end
 
-\define tag-body-inner(colour,fallbackTarget,colourA,colourB)
+\define tag-body-inner(colour,fallbackTarget,colourA,colourB,icon)
 <$vars foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">> backgroundColor="""$colour$""">
 <span style=<<tag-styles>> class="tc-tag-label">
-<$view field="title" format="text" />
+<$transclude tiddler="""$icon$"""/> <$view field="title" format="text" />
 <$button message="tm-remove-tag" param={{!!title}} class="tc-btn-invisible tc-remove-tag-button">&times;</$button>
 </span>
 </$vars>
 \end
 
-\define tag-body(colour,palette)
-<$macrocall $name="tag-body-inner" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}}/>
+\define tag-body(colour,palette,icon)
+<$macrocall $name="tag-body-inner" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}} icon="""$icon$"""/>
 \end
 
 \define tag-picker-actions()
@@ -33,7 +33,7 @@ color:$(foregroundColor)$;
 <div class="tc-edit-tags">
 <$fieldmangler>
 <$list filter="[all[current]tags[]sort[title]]" storyview="pop">
-<$macrocall $name="tag-body" colour={{!!color}} palette={{$:/palette}}/>
+<$macrocall $name="tag-body" colour={{!!color}} palette={{$:/palette}} icon={{!!icon}}/>
 </$list>
 </$fieldmangler>
 <$macrocall $name="tag-picker" actions=<<tag-picker-actions>>/>