diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid
index 0fcee0507..91c5fafae 100644
--- a/core/ui/ViewTemplate/title.tid
+++ b/core/ui/ViewTemplate/title.tid
@@ -8,10 +8,10 @@ fill:$(foregroundColor)$;
 $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 \end
 <div class="tc-tiddler-title">
+<h2 class="tc-titlebar">
 <span class="tc-tiddler-controls">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list>
 </span>
-<h2 class="tc-titlebar">
 <$set name="foregroundColor" value={{!!color}}>
 <span style=<<title-styles>>>
 <$transclude tiddler={{!!icon}}/>
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 979df1105..c0fa69721 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -634,8 +634,6 @@ button.tc-untagged-label {
 
 .tc-tiddler-frame .tc-tiddler-controls {
 	float: right;
-	font-size: 2.35em;
-	line-height: 1.2em;
 }
 
 .tc-tiddler-controls .tc-drop-down {