diff --git a/core/ui/TagManager.tid b/core/ui/TagManager.tid
index 28457d0ab..9e56fd011 100644
--- a/core/ui/TagManager.tid
+++ b/core/ui/TagManager.tid
@@ -1,17 +1,22 @@
title: $:/TagManager
\define lingo-base() $:/language/TagManager/
+\define iconEditorTab(type)
+<$list filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] -[type[application/pdf]] +[sort[title]] +[$type$is[system]]">
+<$link to={{!!title}}>
+<$transclude/> <$view field="title"/>
+$link>
+$list>
+\end
\define iconEditor(title)
<$edit-text field="icon" tag="input" size="20"/> <$button popup=<
> class="btn-invisible btn-dropdown">{{$:/core/images/down-arrow}}$button>
<$reveal state=<> type="popup" position="belowleft" text="" default="">
<$linkcatcher to="$title$!!icon">
-<$list filter="[all[shadows+tiddlers]is[image]] [all[shadows+tiddlers]tag[$:/tags/Image]] -[type[application/pdf]] +[sort[title]]">
-<$link to={{!!title}}>
-<$transclude/> <$view field="title"/>
-$link>
-$list>
+<>
+
+<>
$linkcatcher>
$reveal>
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 6732b9162..a6720403e 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -952,6 +952,7 @@ canvas.tw-edit-bitmapeditor {
padding: 4px 14px 4px 14px;
}
+.tw-drop-down .tw-dropdown-item,
.tw-block-dropdown .tw-dropdown-item {
padding: 4px 14px 4px 7px;
color: <>;