diff --git a/core/ui/MoreSideBar/Tags.tid b/core/ui/MoreSideBar/Tags.tid
index 6eeb010be..0a4727bc3 100644
--- a/core/ui/MoreSideBar/Tags.tid
+++ b/core/ui/MoreSideBar/Tags.tid
@@ -2,26 +2,17 @@ title: $:/core/ui/MoreSideBar/Tags
 tags: $:/tags/MoreSideBar
 caption: {{$:/language/SideBar/Tags/Caption}}
 
-<$set name="tv-config-toolbar-icons" value="yes">
-
-<$set name="tv-config-toolbar-text" value="yes">
-
-<$set name="tv-config-toolbar-class" value="">
-
-{{$:/core/ui/Buttons/tag-manager}}
-
-</$set>
-
-</$set>
-
-</$set>
+\whitespace trim
 
+<$let tv-config-toolbar-icons="yes" tv-config-toolbar-text="yes" tv-config-toolbar-class="">
+	<div class="tc-tiny-v-gap-bottom">
+    	{{$:/core/ui/Buttons/tag-manager}}
+	</div>
+</$let>
 <$list filter={{$:/core/Filters/AllTags!!filter}}>
-
-<$transclude tiddler="$:/core/ui/TagTemplate"/>
-
+	<div class="tc-tiny-v-gap-bottom">
+    	<$transclude tiddler="$:/core/ui/TagTemplate"/>
+	</div>
 </$list>
-
 <hr class="tc-untagged-separator">
-
 {{$:/core/ui/UntaggedTemplate}}
diff --git a/core/ui/UntaggedTemplate.tid b/core/ui/UntaggedTemplate.tid
index 95ebcd695..d5cd97006 100644
--- a/core/ui/UntaggedTemplate.tid
+++ b/core/ui/UntaggedTemplate.tid
@@ -3,10 +3,8 @@ title: $:/core/ui/UntaggedTemplate
 \define lingo-base() $:/language/SideBar/
 \whitespace trim
 <$button popup=<<qualify "$:/state/popup/tag">> class="tc-btn-invisible tc-untagged-label tc-tag-label">
-<<lingo Tags/Untagged/Caption>>
+	<<lingo Tags/Untagged/Caption>>
 </$button>
-<$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below">
-<div class="tc-drop-down">
-<$list filter="[untagged[]!is[system]] -[tags[]] +[sort[title]]" template="$:/core/ui/ListItemTemplate"/>
-</div>
+<$reveal class="tc-drop-down" tag="div" state=<<qualify "$:/state/popup/tag">> type="popup" position="below">
+	<$list filter="[untagged[]!is[system]] -[tags[]] +[sort[title]]" template="$:/core/ui/ListItemTemplate"/>
 </$reveal>
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index baf195107..027541cc7 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -814,9 +814,6 @@ button.tc-tag-label, span.tc-tag-label {
 }
 
 .tc-untagged-separator {
-	width: 10em;
-	left: 0;
-	margin-left: 0;
 	border: 0;
 	height: 1px;
 	background: <<colour tab-divider>>;
@@ -3137,6 +3134,8 @@ select {
 ** Other utility classes
 */
 
+/* Horizontal gaps */
+
 .tc-tiny-gap {
 	margin-left: .25em;
 	margin-right: .25em;
@@ -3179,3 +3178,9 @@ select {
 .tc-word-break {
 	word-break: break-all;
 }
+
+/* Vertical gaps */
+
+.tc-tiny-v-gap-bottom {
+	margin-bottom: 3px;
+}
\ No newline at end of file