diff --git a/core/ui/PageControls/advanced-search.tid b/core/ui/PageControls/advanced-search.tid
index 11c716246..19254904e 100644
--- a/core/ui/PageControls/advanced-search.tid
+++ b/core/ui/PageControls/advanced-search.tid
@@ -10,4 +10,4 @@ description: {{$:/language/Buttons/AdvancedSearch/Hint}}
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/AdvancedSearch/Caption}}/></span>
 </$list>
-</$button>
+</$button>
\ No newline at end of file
diff --git a/core/ui/PageControls/closeall.tid b/core/ui/PageControls/closeall.tid
index a34eff5df..1aa4ba348 100644
--- a/core/ui/PageControls/closeall.tid
+++ b/core/ui/PageControls/closeall.tid
@@ -10,4 +10,4 @@ description: {{$:/language/Buttons/CloseAll/Hint}}
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/CloseAll/Caption}}/></span>
 </$list>
-</$button>
+</$button>
\ No newline at end of file
diff --git a/core/ui/PageControls/controlpanel.tid b/core/ui/PageControls/controlpanel.tid
index 8157c42cc..f838fd52d 100644
--- a/core/ui/PageControls/controlpanel.tid
+++ b/core/ui/PageControls/controlpanel.tid
@@ -10,4 +10,4 @@ description: {{$:/language/Buttons/ControlPanel/Hint}}
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/ControlPanel/Caption}}/></span>
 </$list>
-</$button>
+</$button>
\ No newline at end of file
diff --git a/core/ui/PageControls/encryption.tid b/core/ui/PageControls/encryption.tid
index cc06c82cd..d6dc59e53 100644
--- a/core/ui/PageControls/encryption.tid
+++ b/core/ui/PageControls/encryption.tid
@@ -22,4 +22,4 @@ description: {{$:/language/Buttons/Encryption/Hint}}
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Encryption/SetPassword/Caption}}/></span>
 </$list>
 </$button>
-</$reveal>
+</$reveal>
\ No newline at end of file
diff --git a/core/ui/PageControls/export-page.tid b/core/ui/PageControls/export-page.tid
index 53f06a4bc..fe036abf7 100644
--- a/core/ui/PageControls/export-page.tid
+++ b/core/ui/PageControls/export-page.tid
@@ -3,4 +3,4 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/export-button}} {{$:/language/Buttons/ExportPage/Caption}}
 description: {{$:/language/Buttons/ExportPage/Hint}}
 
-<$macrocall $name="exportButton" exportFilter="[!is[system]sort[title]]" lingoBase="$:/language/Buttons/ExportPage/"/>
+<$macrocall $name="exportButton" exportFilter="[!is[system]sort[title]]" lingoBase="$:/language/Buttons/ExportPage/"/>
\ No newline at end of file
diff --git a/core/ui/PageControls/full-screen.tid b/core/ui/PageControls/full-screen.tid
index d2ca1cbd3..548f96895 100644
--- a/core/ui/PageControls/full-screen.tid
+++ b/core/ui/PageControls/full-screen.tid
@@ -10,4 +10,4 @@ description: {{$:/language/Buttons/FullScreen/Hint}}
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/FullScreen/Caption}}/></span>
 </$list>
-</$button>
+</$button>
\ No newline at end of file
diff --git a/core/ui/PageControls/home.tid b/core/ui/PageControls/home.tid
index 8a06f6055..f06418ad2 100644
--- a/core/ui/PageControls/home.tid
+++ b/core/ui/PageControls/home.tid
@@ -10,4 +10,4 @@ description: {{$:/language/Buttons/Home/Hint}}
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Home/Caption}}/></span>
 </$list>
-</$button>
+</$button>
\ No newline at end of file
diff --git a/core/ui/PageControls/import.tid b/core/ui/PageControls/import.tid
index 654a77ccd..0b8ebe170 100644
--- a/core/ui/PageControls/import.tid
+++ b/core/ui/PageControls/import.tid
@@ -13,4 +13,4 @@ description: {{$:/language/Buttons/Import/Hint}}
 </$list>
 </$button>
 <$browse/>
-</div>
+</div>
\ No newline at end of file
diff --git a/core/ui/PageControls/language.tid b/core/ui/PageControls/language.tid
index 5a6ecd875..6419dffe8 100644
--- a/core/ui/PageControls/language.tid
+++ b/core/ui/PageControls/language.tid
@@ -51,4 +51,4 @@ $(languagePluginTitle)$/icon
 </$list>
 </$linkcatcher>
 </div>
-</$reveal>
+</$reveal>
\ No newline at end of file
diff --git a/core/ui/PageControls/more-page-actions.tid b/core/ui/PageControls/more-page-actions.tid
index 00b1c58b1..13964b880 100644
--- a/core/ui/PageControls/more-page-actions.tid
+++ b/core/ui/PageControls/more-page-actions.tid
@@ -42,5 +42,4 @@ $:/config/PageControlButtons/Visibility/$(listItem)$
 
 </div>
 
-</$reveal>
-
+</$reveal>
\ No newline at end of file
diff --git a/core/ui/PageControls/new-journal.tid b/core/ui/PageControls/new-journal.tid
index d1b5cae30..f8c7950a9 100644
--- a/core/ui/PageControls/new-journal.tid
+++ b/core/ui/PageControls/new-journal.tid
@@ -17,4 +17,4 @@ description: {{$:/language/Buttons/NewJournal/Hint}}
 <$set name="journalTitleTemplate" value={{$:/config/NewJournal/Title}}>
 <$set name="journalTags" value={{$:/config/NewJournal/Tags}}>
 <<journalButton>>
-</$set></$set>
+</$set></$set>
\ No newline at end of file
diff --git a/core/ui/PageControls/newtiddler.tid b/core/ui/PageControls/newtiddler.tid
index 9af1d49ee..d83c52acd 100644
--- a/core/ui/PageControls/newtiddler.tid
+++ b/core/ui/PageControls/newtiddler.tid
@@ -10,4 +10,4 @@ description: {{$:/language/Buttons/NewTiddler/Hint}}
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/NewTiddler/Caption}}/></span>
 </$list>
-</$button>
+</$button>
\ No newline at end of file
diff --git a/core/ui/PageControls/refresh.tid b/core/ui/PageControls/refresh.tid
index 18ef57b09..7ffd58936 100644
--- a/core/ui/PageControls/refresh.tid
+++ b/core/ui/PageControls/refresh.tid
@@ -10,4 +10,4 @@ description: {{$:/language/Buttons/Refresh/Hint}}
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Refresh/Caption}}/></span>
 </$list>
-</$button>
+</$button>
\ No newline at end of file
diff --git a/core/ui/PageControls/storyview.tid b/core/ui/PageControls/storyview.tid
index f81e5b84b..43076c639 100644
--- a/core/ui/PageControls/storyview.tid
+++ b/core/ui/PageControls/storyview.tid
@@ -36,4 +36,4 @@ $:/core/images/storyview-$(storyview)$
 </$list>
 </$linkcatcher>
 </div>
-</$reveal>
+</$reveal>
\ No newline at end of file
diff --git a/core/ui/PageControls/tag-button.tid b/core/ui/PageControls/tag-button.tid
index ac1c3524c..1557fd146 100644
--- a/core/ui/PageControls/tag-button.tid
+++ b/core/ui/PageControls/tag-button.tid
@@ -10,4 +10,4 @@ description: {{$:/language/Buttons/TagManager/Hint}}
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/TagManager/Caption}}/></span>
 </$list>
-</$button>
+</$button>
\ No newline at end of file
diff --git a/core/ui/PageControls/theme.tid b/core/ui/PageControls/theme.tid
index 91a92c561..bbe73e97b 100644
--- a/core/ui/PageControls/theme.tid
+++ b/core/ui/PageControls/theme.tid
@@ -31,4 +31,4 @@ description: {{$:/language/Buttons/Theme/Hint}}
 </$list>
 </$linkcatcher>
 </div>
-</$reveal>
+</$reveal>
\ No newline at end of file
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 a9822f50d..4efbf009a 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 {