diff --git a/core/ui/MoreSideBar/Tags.tid b/core/ui/MoreSideBar/Tags.tid
index 0a4727bc3..b1b67bb67 100644
--- a/core/ui/MoreSideBar/Tags.tid
+++ b/core/ui/MoreSideBar/Tags.tid
@@ -3,15 +3,14 @@ tags: $:/tags/MoreSideBar
caption: {{$:/language/SideBar/Tags/Caption}}
\whitespace trim
-
<$let tv-config-toolbar-icons="yes" tv-config-toolbar-text="yes" tv-config-toolbar-class="">
- {{$:/core/ui/Buttons/tag-manager}}
+ {{$:/core/ui/Buttons/tag-manager}}
$let>
<$list filter={{$:/core/Filters/AllTags!!filter}}>
- <$transclude tiddler="$:/core/ui/TagTemplate"/>
+ <$transclude tiddler="$:/core/ui/TagTemplate"/>
$list>
diff --git a/core/ui/TagPickerTagTemplate.tid b/core/ui/TagPickerTagTemplate.tid
index 6329f86ae..9e8689153 100644
--- a/core/ui/TagPickerTagTemplate.tid
+++ b/core/ui/TagPickerTagTemplate.tid
@@ -2,22 +2,29 @@ title: $:/core/ui/TagPickerTagTemplate
\whitespace trim
<$button class=<> tag="a" tooltip={{$:/language/EditTemplate/Tags/Add/Button/Hint}}>
-<$list filter="[minlength[1]]">
-<$action-listops $tiddler=<> $field=<> $subfilter="[]"/>
-$list>
-<$set name="currentTiddlerCSSEscaped" value={{{ [escapecss[]] }}}>
-<$action-sendmessage $message="tm-focus-selector" $param=<> preventScroll="true"/>
-$set>
-<>
-<$list filter="[minlength[1]]">
-<$action-setfield $tiddler=<> text="yes"/>
-$list>
-<>
-<$set name="backgroundColor" value={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}>
-<$wikify name="foregroundColor" text="""<$macrocall $name="contrastcolour" target=<> fallbackTarget=<> colourA=<> colourB=<>/>""">
-> data-tag-title=<> >
-{{||$:/core/ui/TiddlerIcon}}<$view field="title" format="text"/>
-
-$wikify>
-$set>
+ <$list filter="[minlength[1]]">
+ <$action-listops $tiddler=<> $field=<> $subfilter="[]"/>
+ $list>
+ <$set name="currentTiddlerCSSEscaped" value={{{ [escapecss[]] }}}>
+ <$action-sendmessage $message="tm-focus-selector" $param=<> preventScroll="true"/>
+ $set>
+ <>
+ <$list filter="[minlength[1]]">
+ <$action-setfield $tiddler=<> text="yes"/>
+ $list>
+ <>
+ <$set name="backgroundColor"
+ value={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}
+ >
+ <$wikify name="foregroundColor"
+ text="""<$macrocall $name="contrastcolour" target=<> fallbackTarget=<> colourA=<> colourB=<>/>"""
+ >
+ >
+ data-tag-title=<>
+ >
+ {{||$:/core/ui/TiddlerIcon}}<$view field="title" format="text"/>
+
+ $wikify>
+ $set>
$button>
diff --git a/core/ui/TagTemplate.tid b/core/ui/TagTemplate.tid
index f137f22a0..49e836671 100644
--- a/core/ui/TagTemplate.tid
+++ b/core/ui/TagTemplate.tid
@@ -3,16 +3,23 @@ title: $:/core/ui/TagTemplate
\whitespace trim
>>
<$set name="transclusion" value=<>>
-<$macrocall $name="tag-pill-body" tag=<> icon={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}} colour={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} palette={{$:/palette}} element-tag="""$button""" element-attributes="""popup=<> dragFilter='[all[current]tagging[]]' tag='span'"""/>
-<$reveal state=<> type="popup" position="below" animate="yes" class="tc-drop-down">
-<$set name="tv-show-missing-links" value="yes">
-<$transclude tiddler="$:/core/ui/ListItemTemplate"/>
-$set>
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/TagDropdown]!has[draft.of]]" variable="listItem">
-<$transclude tiddler=<>/>
-$list>
-
-<$macrocall $name="list-tagged-draggable" tag=<>/>
-$reveal>
+ <$macrocall $name="tag-pill-body"
+ tag=<>
+ icon={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}}
+ colour={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}
+ palette={{$:/palette}}
+ element-tag="$button"
+ element-attributes="""popup=<> dragFilter="[all[current]tagging[]]" tag='span'"""
+ />
+ <$reveal state=<> type="popup" position="below" animate="yes" class="tc-drop-down">
+ <$set name="tv-show-missing-links" value="yes">
+ <$transclude tiddler="$:/core/ui/ListItemTemplate"/>
+ $set>
+ <$list filter="[all[shadows+tiddlers]tag[$:/tags/TagDropdown]!has[draft.of]]" variable="listItem">
+ <$transclude tiddler=<>/>
+ $list>
+
+ <$macrocall $name="list-tagged-draggable" tag=<>/>
+ $reveal>
$set>
diff --git a/core/wiki/macros/tag.tid b/core/wiki/macros/tag.tid
index 3616fb97d..03dd8cb98 100644
--- a/core/wiki/macros/tag.tid
+++ b/core/wiki/macros/tag.tid
@@ -9,26 +9,50 @@ color:$(foregroundColor)$;
\define tag-pill-inner(tag,icon,colour,fallbackTarget,colourA,colourB,element-tag,element-attributes,actions)
+\whitespace trim
<$vars
foregroundColor=<>
- backgroundColor="""$colour$"""
-><$element-tag$
+ backgroundColor=<<__colour__>>
+>
+<$element-tag$
$element-attributes$
class="tc-tag-label tc-btn-invisible"
style=<>
->$actions$<$transclude tiddler="""$icon$"""/><$view tiddler=<<__tag__>> field="title" format="text" />$element-tag$>
+>
+ <<__actions__>>
+ <$transclude tiddler=<<__icon__>>/>
+ <$view tiddler=<<__tag__>> field="title" format="text" />
+$element-tag$>
\end
\define tag-pill-body(tag,icon,colour,palette,element-tag,element-attributes,actions)
-<$macrocall $name="tag-pill-inner" tag=<<__tag__>> icon="""$icon$""" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}} element-tag="""$element-tag$""" element-attributes="""$element-attributes$""" actions="""$actions$"""/>
+\whitespace trim
+<$macrocall $name="tag-pill-inner"
+ tag=<<__tag__>>
+ icon=<<__icon__>>
+ colour=<<__colour__>>
+ fallbackTarget={{$palette$##tag-background}}
+ colourA={{$palette$##foreground}}
+ colourB={{$palette$##background}}
+ element-tag=<<__element-tag__>>
+ element-attributes=<<__element-attributes__>>
+ actions=<<__actions__>>
+/>
\end
\define tag-pill(tag,element-tag:"span",element-attributes:"",actions:"")
\whitespace trim
>>
-<$let currentTiddler=<<__tag__>>>
-<$macrocall $name="tag-pill-body" tag=<<__tag__>> icon={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}} colour={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} palette={{$:/palette}} element-tag="""$element-tag$""" element-attributes="""$element-attributes$""" actions="""$actions$"""/>
-$let>
+ <$let currentTiddler=<<__tag__>>>
+ <$macrocall $name="tag-pill-body"
+ tag=<<__tag__>>
+ icon={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}}
+ colour={{{ [] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}
+ palette={{$:/palette}}
+ element-tag=<<__element-tag__>>
+ element-attributes=<<__element-attributes__>>
+ actions=<<__actions__>>/>
+ $let>
\end