diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid
index 6abacf18c..e2f874387 100644
--- a/core/ui/ViewTemplate/title.tid
+++ b/core/ui/ViewTemplate/title.tid
@@ -16,11 +16,13 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 <$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}>
 <$link>
 <$set name="foregroundColor" value={{!!color}}>
+<$list filter="[all[current]has[icon]]~[[$:/config/DefaultTiddlerIcon]has[text]]">
 <span class="tc-tiddler-title-icon" style=<<title-styles>>>
 <$transclude tiddler={{!!icon}}>
 <$transclude tiddler={{$:/config/DefaultTiddlerIcon}}/>
 </$transclude>
 </span>
+</$list>
 </$set>
 <$list filter="[all[current]removeprefix[$:/]]">
 <h2 class="tc-title" title={{$:/language/SystemTiddler/Tooltip}}>
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 0d1ebc360..51ea4d503 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -986,7 +986,7 @@ button.tc-btn-invisible.tc-remove-tag-button {
 .tc-titlebar {
 	font-weight: 300;
 	font-size: 2.35em;
-	line-height: 1.2em;
+	line-height: 1.3em;
 	color: <<colour tiddler-title-foreground>>;
 	margin: 0;
 }