diff --git a/core/ui/MissingTemplate.tid b/core/ui/MissingTemplate.tid
index d2a1bb71f..4e7980908 100644
--- a/core/ui/MissingTemplate.tid
+++ b/core/ui/MissingTemplate.tid
@@ -2,9 +2,7 @@ title: $:/core/ui/MissingTemplate
 
 <$button popup="$:/state/missingpopup" qualifyTiddlerTitles="yes" class="btn-invisible tw-missing-tiddler-label"><$view field="title" format="text" /></$button>
 <$reveal state="$:/state/missingpopup" type="popup" position="below" qualifyTiddlerTitles="yes" ><div class="tw-drop-down">
-<$view field="title" format="link" />
-----
-<$list filter="[is[current]backlinks[]sort[title]]">
-<$view field="title" format="link" />
-</$list>
+<$transclude title="$:/core/ui/ListItemTemplate"/>
+<hr>
+<$list filter="[is[current]backlinks[]sort[title]]" template="$:/core/ui/ListItemTemplate"/>
 </div></$reveal>
diff --git a/core/ui/TagTemplate.tid b/core/ui/TagTemplate.tid
index ab631f3d7..17a8849ef 100644
--- a/core/ui/TagTemplate.tid
+++ b/core/ui/TagTemplate.tid
@@ -3,11 +3,8 @@ title: $:/core/ui/TagTemplate
 \define tag-styles()
 background-color:$(backgroundColor)$;
 \end
-<$setvariable name="backgroundColor" value={{!!color}}><$button popup="$:/state/tagpopup" qualifyTiddlerTitles="yes" class="btn-invisible tw-tag-label" style=<<tag-styles>>><$transclude title={{!!icon}}/> <$view field="title" format="text" /></$button></$setvariable>
-<$reveal state="$:/state/tagpopup" type="popup" position="below" qualifyTiddlerTitles="yes" ><div class="tw-drop-down">
-<$view field="title" format="link" />
-----
-<$list filter="[is[current]tagging[]]">
-<$view field="title" format="link" />
-</$list>
-</div></$reveal>
+<span class="tw-tag-list-item"><$setvariable name="backgroundColor" value={{!!color}}><$button popup="$:/state/tagpopup" qualifyTiddlerTitles="yes" class="btn-invisible tw-tag-label" style=<<tag-styles>>><$transclude title={{!!icon}}/> <$view field="title" format="text" /></$button></$setvariable>
+<$reveal state="$:/state/tagpopup" type="popup" position="below" qualifyTiddlerTitles="yes"><div class="tw-drop-down"><$transclude title="$:/core/ui/ListItemTemplate"/>
+<hr>
+<$list filter="[is[current]tagging[]]" template="$:/core/ui/ListItemTemplate"/>
+</div></$reveal></span>