diff --git a/core/ui/ViewToolbar/clone.tid b/core/ui/ViewToolbar/clone.tid
index a1f97e6d6..0a28769ac 100644
--- a/core/ui/ViewToolbar/clone.tid
+++ b/core/ui/ViewToolbar/clone.tid
@@ -10,4 +10,4 @@ description: {{$:/language/Buttons/Clone/Hint}}
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Clone/Caption}}/></span>
 </$list>
-</$button>
+</$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/close-others.tid b/core/ui/ViewToolbar/close-others.tid
index 63bc4da80..3038cafe1 100644
--- a/core/ui/ViewToolbar/close-others.tid
+++ b/core/ui/ViewToolbar/close-others.tid
@@ -10,4 +10,4 @@ description: {{$:/language/Buttons/CloseOthers/Hint}}
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/CloseOthers/Caption}}/></span>
 </$list>
-</$button>
+</$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/edit.tid b/core/ui/ViewToolbar/edit.tid
index 20e0aa79f..5b8b83560 100644
--- a/core/ui/ViewToolbar/edit.tid
+++ b/core/ui/ViewToolbar/edit.tid
@@ -10,4 +10,4 @@ description: {{$:/language/Buttons/Edit/Hint}}
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Edit/Caption}}/></span>
 </$list>
-</$button>
+</$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/export-tiddler.tid b/core/ui/ViewToolbar/export-tiddler.tid
index 702a96f6e..8c39de856 100644
--- a/core/ui/ViewToolbar/export-tiddler.tid
+++ b/core/ui/ViewToolbar/export-tiddler.tid
@@ -6,4 +6,4 @@ description: {{$:/language/Buttons/ExportTiddler/Hint}}
 \define makeExportFilter()
 [[$(currentTiddler)$]]
 \end
-<$macrocall $name="exportButton" exportFilter=<<makeExportFilter>> lingoBase="$:/language/Buttons/ExportTiddler/" baseFilename=<<currentTiddler>>/>
+<$macrocall $name="exportButton" exportFilter=<<makeExportFilter>> lingoBase="$:/language/Buttons/ExportTiddler/" baseFilename=<<currentTiddler>>/>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/info.tid b/core/ui/ViewToolbar/info.tid
index 22ef4f0b6..f6f40860f 100644
--- a/core/ui/ViewToolbar/info.tid
+++ b/core/ui/ViewToolbar/info.tid
@@ -10,4 +10,4 @@ description: {{$:/language/Buttons/Info/Hint}}
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Info/Caption}}/></span>
 </$list>
-</$button>
+</$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/more-tiddler-actions.tid b/core/ui/ViewToolbar/more-tiddler-actions.tid
index ff852f617..08e4c11d0 100644
--- a/core/ui/ViewToolbar/more-tiddler-actions.tid
+++ b/core/ui/ViewToolbar/more-tiddler-actions.tid
@@ -26,5 +26,4 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 </$set>
 </$set>
 </div>
-</$reveal>
-
+</$reveal>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/new-journal-here.tid b/core/ui/ViewToolbar/new-journal-here.tid
index f93a10a1a..32f2db311 100644
--- a/core/ui/ViewToolbar/new-journal-here.tid
+++ b/core/ui/ViewToolbar/new-journal-here.tid
@@ -21,4 +21,4 @@ description: {{$:/language/Buttons/NewJournalHere/Hint}}
 <$set name="journalTags" value={{$:/config/NewJournal/Tags}}>
 <$set name="currentTiddlerTag" value=<<currentTiddler>>>
 <<journalButton>>
-</$set></$set></$set>
+</$set></$set></$set>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/permalink.tid b/core/ui/ViewToolbar/permalink.tid
index d19c1db1b..0867a3138 100644
--- a/core/ui/ViewToolbar/permalink.tid
+++ b/core/ui/ViewToolbar/permalink.tid
@@ -10,4 +10,4 @@ description: {{$:/language/Buttons/Permalink/Hint}}
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Permalink/Caption}}/></span>
 </$list>
-</$button>
+</$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/permaview.tid b/core/ui/ViewToolbar/permaview.tid
index 699fce949..5797b5e00 100644
--- a/core/ui/ViewToolbar/permaview.tid
+++ b/core/ui/ViewToolbar/permaview.tid
@@ -10,4 +10,4 @@ description: {{$:/language/Buttons/Permaview/Hint}}
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Permaview/Caption}}/></span>
 </$list>
-</$button>
+</$button>
\ No newline at end of file
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 7d52753b4..b97a0084b 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -661,6 +661,7 @@ button.tc-untagged-label {
 
 .tc-tiddler-controls button {
 	vertical-align: baseline;
+	margin-left:5px;
 }
 
 .tc-tiddler-controls button svg, .tc-tiddler-controls button img {