diff --git a/core/ui/PageControls/advanced-search.tid b/core/ui/PageControls/advanced-search.tid
index 597395b5b..1549b07f4 100644
--- a/core/ui/PageControls/advanced-search.tid
+++ b/core/ui/PageControls/advanced-search.tid
@@ -5,6 +5,7 @@ description: {{$:/language/Buttons/AdvancedSearch/Hint}}
 
 \whitespace trim
 \define advanced-search-button(class)
+\whitespace trim
 <$button to="$:/AdvancedSearch" tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class="""$(tv-config-toolbar-class)$ $class$""">
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/advanced-search-button}}
diff --git a/core/ui/PageControls/closeall.tid b/core/ui/PageControls/closeall.tid
index 213c868df..2665fff0d 100644
--- a/core/ui/PageControls/closeall.tid
+++ b/core/ui/PageControls/closeall.tid
@@ -3,11 +3,14 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/close-all-button}} {{$:/language/Buttons/CloseAll/Caption}}
 description: {{$:/language/Buttons/CloseAll/Hint}}
 
+\whitespace trim
 <$button message="tm-close-all-tiddlers" tooltip={{$:/language/Buttons/CloseAll/Hint}} aria-label={{$:/language/Buttons/CloseAll/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/close-all-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/CloseAll/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/CloseAll/Caption}}/>
+</span>
 </$list>
 </$button>
\ No newline at end of file
diff --git a/core/ui/PageControls/controlpanel.tid b/core/ui/PageControls/controlpanel.tid
index 82fac7398..1f57b35bf 100644
--- a/core/ui/PageControls/controlpanel.tid
+++ b/core/ui/PageControls/controlpanel.tid
@@ -5,6 +5,7 @@ description: {{$:/language/Buttons/ControlPanel/Hint}}
 
 \whitespace trim
 \define control-panel-button(class)
+\whitespace trim
 <$button to="$:/ControlPanel" tooltip={{$:/language/Buttons/ControlPanel/Hint}} aria-label={{$:/language/Buttons/ControlPanel/Caption}} class="""$(tv-config-toolbar-class)$ $class$""">
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/options-button}}
diff --git a/core/ui/PageControls/encryption.tid b/core/ui/PageControls/encryption.tid
index b4b5e553f..9f8ae0bd6 100644
--- a/core/ui/PageControls/encryption.tid
+++ b/core/ui/PageControls/encryption.tid
@@ -10,7 +10,9 @@ description: {{$:/language/Buttons/Encryption/Hint}}
 {{$:/core/images/locked-padlock}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Encryption/ClearPassword/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/Encryption/ClearPassword/Caption}}/>
+</span>
 </$list>
 </$button>
 </$reveal>
@@ -20,7 +22,9 @@ description: {{$:/language/Buttons/Encryption/Hint}}
 {{$:/core/images/unlocked-padlock}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Encryption/SetPassword/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/Encryption/SetPassword/Caption}}/>
+</span>
 </$list>
 </$button>
 </$reveal>
diff --git a/core/ui/PageControls/fold-all.tid b/core/ui/PageControls/fold-all.tid
index 15dcca2df..46c3165b8 100644
--- a/core/ui/PageControls/fold-all.tid
+++ b/core/ui/PageControls/fold-all.tid
@@ -3,12 +3,15 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/fold-all-button}} {{$:/language/Buttons/FoldAll/Caption}}
 description: {{$:/language/Buttons/FoldAll/Hint}}
 
+\whitespace trim
 <$button tooltip={{$:/language/Buttons/FoldAll/Hint}} aria-label={{$:/language/Buttons/FoldAll/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-fold-all-tiddlers" $param=<<currentTiddler>> foldedStatePrefix="$:/state/folded/"/>
 <$list filter="[<tv-config-toolbar-icons>match[yes]]" variable="listItem">
 {{$:/core/images/fold-all-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/FoldAll/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/FoldAll/Caption}}/>
+</span>
 </$list>
 </$button>
\ No newline at end of file
diff --git a/core/ui/PageControls/full-screen.tid b/core/ui/PageControls/full-screen.tid
index efaeadb2e..ada7d5a65 100644
--- a/core/ui/PageControls/full-screen.tid
+++ b/core/ui/PageControls/full-screen.tid
@@ -3,11 +3,14 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/full-screen-button}} {{$:/language/Buttons/FullScreen/Caption}}
 description: {{$:/language/Buttons/FullScreen/Hint}}
 
+\whitespace trim
 <$button message="tm-full-screen" tooltip={{$:/language/Buttons/FullScreen/Hint}} aria-label={{$:/language/Buttons/FullScreen/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/full-screen-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/FullScreen/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/FullScreen/Caption}}/>
+</span>
 </$list>
 </$button>
\ No newline at end of file
diff --git a/core/ui/PageControls/home.tid b/core/ui/PageControls/home.tid
index 946ac2361..f3a0b1787 100644
--- a/core/ui/PageControls/home.tid
+++ b/core/ui/PageControls/home.tid
@@ -3,11 +3,14 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/home-button}} {{$:/language/Buttons/Home/Caption}}
 description: {{$:/language/Buttons/Home/Hint}}
 
+\whitespace trim
 <$button message="tm-home" tooltip={{$:/language/Buttons/Home/Hint}} aria-label={{$:/language/Buttons/Home/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/home-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Home/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/Home/Caption}}/>
+</span>
 </$list>
 </$button>
\ No newline at end of file
diff --git a/core/ui/PageControls/import.tid b/core/ui/PageControls/import.tid
index dbf3121b7..39ca51eb6 100644
--- a/core/ui/PageControls/import.tid
+++ b/core/ui/PageControls/import.tid
@@ -3,13 +3,16 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/import-button}} {{$:/language/Buttons/Import/Caption}}
 description: {{$:/language/Buttons/Import/Hint}}
 
+\whitespace trim
 <div class="tc-file-input-wrapper">
 <$button tooltip={{$:/language/Buttons/Import/Hint}} aria-label={{$:/language/Buttons/Import/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/import-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Import/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/Import/Caption}}/>
+</span>
 </$list>
 </$button>
 <$browse tooltip={{$:/language/Buttons/Import/Hint}}/>
diff --git a/core/ui/PageControls/language.tid b/core/ui/PageControls/language.tid
index ffae7449a..623c71004 100644
--- a/core/ui/PageControls/language.tid
+++ b/core/ui/PageControls/language.tid
@@ -16,7 +16,6 @@ $(languagePluginTitle)$/icon
 </$set>
 </span>
 </$list>
-<$text text=" "/>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Language/Caption}}/></span>
 </$list>
diff --git a/core/ui/PageControls/manager.tid b/core/ui/PageControls/manager.tid
index 7255747f4..d2144c574 100644
--- a/core/ui/PageControls/manager.tid
+++ b/core/ui/PageControls/manager.tid
@@ -5,12 +5,15 @@ description: {{$:/language/Buttons/Manager/Hint}}
 
 \whitespace trim
 \define manager-button(class)
+\whitespace trim
 <$button to="$:/Manager" tooltip={{$:/language/Buttons/Manager/Hint}} aria-label={{$:/language/Buttons/Manager/Caption}} class="""$(tv-config-toolbar-class)$ $class$""">
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/list}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Manager/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/Manager/Caption}}/>
+</span>
 </$list>
 </$button>
 \end
diff --git a/core/ui/PageControls/more-page-actions.tid b/core/ui/PageControls/more-page-actions.tid
index e74185824..b52f99ec9 100644
--- a/core/ui/PageControls/more-page-actions.tid
+++ b/core/ui/PageControls/more-page-actions.tid
@@ -3,6 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/down-arrow}} {{$:/language/Buttons/More/Caption}}
 description: {{$:/language/Buttons/More/Hint}}
 
+\whitespace trim
 \define config-title()
 $:/config/PageControlButtons/Visibility/$(listItem)$
 \end
@@ -11,7 +12,9 @@ $:/config/PageControlButtons/Visibility/$(listItem)$
 {{$:/core/images/down-arrow}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/More/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/More/Caption}}/>
+</span>
 </$list>
 </$button><$reveal state=<<qualify "$:/state/popup/more">> type="popup" position="below" animate="yes">
 
diff --git a/core/ui/PageControls/new-image.tid b/core/ui/PageControls/new-image.tid
index fab7df573..b37fba7c5 100644
--- a/core/ui/PageControls/new-image.tid
+++ b/core/ui/PageControls/new-image.tid
@@ -9,6 +9,8 @@ description: {{$:/language/Buttons/NewImage/Hint}}
 {{$:/core/images/new-image-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/NewImage/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/NewImage/Caption}}/>
+</span>
 </$list>
 </$button>
diff --git a/core/ui/PageControls/new-journal.tid b/core/ui/PageControls/new-journal.tid
index 914352e1b..8ae8ee78a 100644
--- a/core/ui/PageControls/new-journal.tid
+++ b/core/ui/PageControls/new-journal.tid
@@ -5,12 +5,15 @@ description: {{$:/language/Buttons/NewJournal/Hint}}
 
 \whitespace trim
 \define journalButton()
+\whitespace trim
 <$button tooltip={{$:/language/Buttons/NewJournal/Hint}} aria-label={{$:/language/Buttons/NewJournal/Caption}} class=<<tv-config-toolbar-class>> actions={{$:/core/ui/Actions/new-journal}}>
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/new-journal-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/NewJournal/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/NewJournal/Caption}}/>
+</span>
 </$list>
 </$button>
 \end
diff --git a/core/ui/PageControls/newtiddler.tid b/core/ui/PageControls/newtiddler.tid
index 7ea1994ff..cd2f56913 100644
--- a/core/ui/PageControls/newtiddler.tid
+++ b/core/ui/PageControls/newtiddler.tid
@@ -9,6 +9,8 @@ description: {{$:/language/Buttons/NewTiddler/Hint}}
 {{$:/core/images/new-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/NewTiddler/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/NewTiddler/Caption}}/>
+</span>
 </$list>
 </$button>
diff --git a/core/ui/PageControls/palette.tid b/core/ui/PageControls/palette.tid
index 569b7e8ca..6fdbdb439 100644
--- a/core/ui/PageControls/palette.tid
+++ b/core/ui/PageControls/palette.tid
@@ -9,7 +9,6 @@ description: {{$:/language/Buttons/Palette/Hint}}
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/palette}}
 </$list>
-<$text text=" "/>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Palette/Caption}}/></span>
 </$list>
diff --git a/core/ui/PageControls/print.tid b/core/ui/PageControls/print.tid
index c0782ff33..ef664b6e3 100644
--- a/core/ui/PageControls/print.tid
+++ b/core/ui/PageControls/print.tid
@@ -3,11 +3,14 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/print-button}} {{$:/language/Buttons/Print/Caption}}
 description: {{$:/language/Buttons/Print/Hint}}
 
+\whitespace trim
 <$button message="tm-print" tooltip={{$:/language/Buttons/Print/Hint}} aria-label={{$:/language/Buttons/Print/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/print-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Print/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/Print/Caption}}/>
+</span>
 </$list>
 </$button>
\ No newline at end of file
diff --git a/core/ui/PageControls/refresh.tid b/core/ui/PageControls/refresh.tid
index b8bc437f8..38692f817 100644
--- a/core/ui/PageControls/refresh.tid
+++ b/core/ui/PageControls/refresh.tid
@@ -3,11 +3,14 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/refresh-button}} {{$:/language/Buttons/Refresh/Caption}}
 description: {{$:/language/Buttons/Refresh/Hint}}
 
+\whitespace trim
 <$button message="tm-browser-refresh" tooltip={{$:/language/Buttons/Refresh/Hint}} aria-label={{$:/language/Buttons/Refresh/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/refresh-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Refresh/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/Refresh/Caption}}/>
+</span>
 </$list>
 </$button>
\ No newline at end of file
diff --git a/core/ui/PageControls/savewiki.tid b/core/ui/PageControls/savewiki.tid
index e44c99276..9e4a345ac 100644
--- a/core/ui/PageControls/savewiki.tid
+++ b/core/ui/PageControls/savewiki.tid
@@ -3,6 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/save-button}} {{$:/language/Buttons/SaveWiki/Caption}}
 description: {{$:/language/Buttons/SaveWiki/Hint}}
 
+\whitespace trim
 <$button tooltip={{$:/language/Buttons/SaveWiki/Hint}} aria-label={{$:/language/Buttons/SaveWiki/Caption}} class=<<tv-config-toolbar-class>>>
 <$wikify name="site-title" text={{$:/config/SaveWikiButton/Filename}}>
 <$action-sendmessage $message="tm-save-wiki" $param={{$:/config/SaveWikiButton/Template}} filename=<<site-title>>/>
@@ -12,7 +13,9 @@ description: {{$:/language/Buttons/SaveWiki/Hint}}
 {{$:/core/images/save-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/SaveWiki/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/SaveWiki/Caption}}/>
+</span>
 </$list>
 </span>
 </$button>
\ No newline at end of file
diff --git a/core/ui/PageControls/storyview.tid b/core/ui/PageControls/storyview.tid
index a426b91aa..c4d0b7365 100644
--- a/core/ui/PageControls/storyview.tid
+++ b/core/ui/PageControls/storyview.tid
@@ -14,7 +14,6 @@ $:/core/images/storyview-$(storyview)$
 <$transclude tiddler=<<icon>>/>
 </$set>
 </$list>
-<$text text=" "/>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/StoryView/Caption}}/></span>
 </$list>
diff --git a/core/ui/PageControls/tag-button.tid b/core/ui/PageControls/tag-button.tid
index e7e6bdc89..e2b5c9277 100644
--- a/core/ui/PageControls/tag-button.tid
+++ b/core/ui/PageControls/tag-button.tid
@@ -5,12 +5,15 @@ description: {{$:/language/Buttons/TagManager/Hint}}
 
 \whitespace trim
 \define control-panel-button(class)
+\whitespace trim
 <$button to="$:/TagManager" tooltip={{$:/language/Buttons/TagManager/Hint}} aria-label={{$:/language/Buttons/TagManager/Caption}} class="""$(tv-config-toolbar-class)$ $class$""">
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/tag-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/TagManager/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/TagManager/Caption}}/>
+</span>
 </$list>
 </$button>
 \end
diff --git a/core/ui/PageControls/theme.tid b/core/ui/PageControls/theme.tid
index be3dbb0f9..2d8eadc7b 100644
--- a/core/ui/PageControls/theme.tid
+++ b/core/ui/PageControls/theme.tid
@@ -9,7 +9,6 @@ description: {{$:/language/Buttons/Theme/Hint}}
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/theme-button}}
 </$list>
-<$text text=" "/>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Theme/Caption}}/></span>
 </$list>
diff --git a/core/ui/PageControls/timestamp.tid b/core/ui/PageControls/timestamp.tid
index abf89b70c..a54b3f2ca 100644
--- a/core/ui/PageControls/timestamp.tid
+++ b/core/ui/PageControls/timestamp.tid
@@ -11,7 +11,9 @@ description: {{$:/language/Buttons/Timestamp/Hint}}
 {{$:/core/images/timestamp-on}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Timestamp/On/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/Timestamp/On/Caption}}/>
+</span>
 </$list>
 </$button>
 </$reveal>
@@ -22,7 +24,9 @@ description: {{$:/language/Buttons/Timestamp/Hint}}
 {{$:/core/images/timestamp-off}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Timestamp/Off/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/Timestamp/Off/Caption}}/>
+</span>
 </$list>
 </$button>
 </$reveal>
diff --git a/core/ui/PageControls/unfold-all.tid b/core/ui/PageControls/unfold-all.tid
index 9f91bc288..6e8357a3b 100644
--- a/core/ui/PageControls/unfold-all.tid
+++ b/core/ui/PageControls/unfold-all.tid
@@ -3,12 +3,15 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/unfold-all-button}} {{$:/language/Buttons/UnfoldAll/Caption}}
 description: {{$:/language/Buttons/UnfoldAll/Hint}}
 
+\whitespace trim
 <$button tooltip={{$:/language/Buttons/UnfoldAll/Hint}} aria-label={{$:/language/Buttons/UnfoldAll/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-unfold-all-tiddlers" $param=<<currentTiddler>> foldedStatePrefix="$:/state/folded/"/>
 <$list filter="[<tv-config-toolbar-icons>match[yes]]" variable="listItem">
 {{$:/core/images/unfold-all-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/UnfoldAll/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/UnfoldAll/Caption}}/>
+</span>
 </$list>
 </$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/clone.tid b/core/ui/ViewToolbar/clone.tid
index dcba64486..434418106 100644
--- a/core/ui/ViewToolbar/clone.tid
+++ b/core/ui/ViewToolbar/clone.tid
@@ -10,7 +10,6 @@ description: {{$:/language/Buttons/Clone/Hint}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
 <span class="tc-btn-text">
-<$text text=" "/>
 <$text text={{$:/language/Buttons/Clone/Caption}}/>
 </span>
 </$list>
diff --git a/core/ui/ViewToolbar/close-others.tid b/core/ui/ViewToolbar/close-others.tid
index 47bde5fdc..57fbf222c 100644
--- a/core/ui/ViewToolbar/close-others.tid
+++ b/core/ui/ViewToolbar/close-others.tid
@@ -10,7 +10,6 @@ description: {{$:/language/Buttons/CloseOthers/Hint}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
 <span class="tc-btn-text">
-<$text text=" "/>
 <$text text={{$:/language/Buttons/CloseOthers/Caption}}/>
 </span>
 </$list>
diff --git a/core/ui/ViewToolbar/edit.tid b/core/ui/ViewToolbar/edit.tid
index 9d12243b2..f0ab31e4e 100644
--- a/core/ui/ViewToolbar/edit.tid
+++ b/core/ui/ViewToolbar/edit.tid
@@ -10,7 +10,6 @@ description: {{$:/language/Buttons/Edit/Hint}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
 <span class="tc-btn-text">
-<$text text=" "/>
 <$text text={{$:/language/Buttons/Edit/Caption}}/>
 </span>
 </$list>
diff --git a/core/ui/ViewToolbar/fold-others.tid b/core/ui/ViewToolbar/fold-others.tid
index 290a03ac3..244977509 100644
--- a/core/ui/ViewToolbar/fold-others.tid
+++ b/core/ui/ViewToolbar/fold-others.tid
@@ -11,7 +11,6 @@ description: {{$:/language/Buttons/FoldOthers/Hint}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
 <span class="tc-btn-text">
-<$text text=" "/>
 <$text text={{$:/language/Buttons/FoldOthers/Caption}}/>
 </span>
 </$list>
diff --git a/core/ui/ViewToolbar/fold.tid b/core/ui/ViewToolbar/fold.tid
index a392b4a77..fd3363688 100644
--- a/core/ui/ViewToolbar/fold.tid
+++ b/core/ui/ViewToolbar/fold.tid
@@ -12,7 +12,6 @@ description: {{$:/language/Buttons/Fold/Hint}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
 <span class="tc-btn-text">
-<$text text=" "/>
 <$text text={{$:/language/Buttons/Fold/Caption}}/>
 </span>
 </$list>
@@ -26,7 +25,6 @@ description: {{$:/language/Buttons/Fold/Hint}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
 <span class="tc-btn-text">
-<$text text=" "/>
 <$text text={{$:/language/Buttons/Unfold/Caption}}/>
 </span>
 </$list>
diff --git a/core/ui/ViewToolbar/info.tid b/core/ui/ViewToolbar/info.tid
index 3639aac09..02fd9abd7 100644
--- a/core/ui/ViewToolbar/info.tid
+++ b/core/ui/ViewToolbar/info.tid
@@ -5,6 +5,7 @@ description: {{$:/language/Buttons/Info/Hint}}
 
 \whitespace trim
 \define button-content()
+\whitespace trim
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/info-button}}
 </$list>
diff --git a/core/ui/ViewToolbar/more-tiddler-actions.tid b/core/ui/ViewToolbar/more-tiddler-actions.tid
index 9e9bd4528..6b24db362 100644
--- a/core/ui/ViewToolbar/more-tiddler-actions.tid
+++ b/core/ui/ViewToolbar/more-tiddler-actions.tid
@@ -13,7 +13,6 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
 <span class="tc-btn-text">
-<$text text=" "/>
 <$text text={{$:/language/Buttons/More/Caption}}/>
 </span>
 </$list>
diff --git a/core/ui/ViewToolbar/new-here.tid b/core/ui/ViewToolbar/new-here.tid
index 72bd7c3e3..dd4a969e1 100644
--- a/core/ui/ViewToolbar/new-here.tid
+++ b/core/ui/ViewToolbar/new-here.tid
@@ -10,6 +10,7 @@ description: {{$:/language/Buttons/NewHere/Hint}}
 </$set>
 \end
 \define newHereButton()
+\whitespace trim
 <$button actions=<<newHereActions>> tooltip={{$:/language/Buttons/NewHere/Hint}} aria-label={{$:/language/Buttons/NewHere/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/new-here-button}}
diff --git a/core/ui/ViewToolbar/new-journal-here.tid b/core/ui/ViewToolbar/new-journal-here.tid
index 0fc55b19f..b64ba7ed7 100644
--- a/core/ui/ViewToolbar/new-journal-here.tid
+++ b/core/ui/ViewToolbar/new-journal-here.tid
@@ -8,6 +8,7 @@ description: {{$:/language/Buttons/NewJournalHere/Hint}}
 [[$(currentTiddlerTag)$]] $(journalTags)$
 \end
 \define journalButton()
+\whitespace trim
 <$button tooltip={{$:/language/Buttons/NewJournalHere/Hint}} aria-label={{$:/language/Buttons/NewJournalHere/Caption}} class=<<tv-config-toolbar-class>>>
 <$wikify name="journalTitle" text="""<$macrocall $name="now" format=<<journalTitleTemplate>>/>""">
 <$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<journalButtonTags>>/>
diff --git a/core/ui/ViewToolbar/open-window.tid b/core/ui/ViewToolbar/open-window.tid
index b1eb46f9b..d8ef85c83 100644
--- a/core/ui/ViewToolbar/open-window.tid
+++ b/core/ui/ViewToolbar/open-window.tid
@@ -10,7 +10,6 @@ description: {{$:/language/Buttons/OpenWindow/Hint}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
 <span class="tc-btn-text">
-<$text text=" "/>
 <$text text={{$:/language/Buttons/OpenWindow/Caption}}/>
 </span>
 </$list>
diff --git a/core/ui/ViewToolbar/permalink.tid b/core/ui/ViewToolbar/permalink.tid
index 8a53ce11f..5d0677eed 100644
--- a/core/ui/ViewToolbar/permalink.tid
+++ b/core/ui/ViewToolbar/permalink.tid
@@ -10,7 +10,6 @@ description: {{$:/language/Buttons/Permalink/Hint}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
 <span class="tc-btn-text">
-<$text text=" "/>
 <$text text={{$:/language/Buttons/Permalink/Caption}}/>
 </span>
 </$list>
diff --git a/core/ui/ViewToolbar/permaview.tid b/core/ui/ViewToolbar/permaview.tid
index ee95963b1..4a655b970 100644
--- a/core/ui/ViewToolbar/permaview.tid
+++ b/core/ui/ViewToolbar/permaview.tid
@@ -10,7 +10,6 @@ description: {{$:/language/Buttons/Permaview/Hint}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
 <span class="tc-btn-text">
-<$text text=" "/>
 <$text text={{$:/language/Buttons/Permaview/Caption}}/>
 </span>
 </$list>
diff --git a/core/wiki/macros/export.tid b/core/wiki/macros/export.tid
index c3256c431..3d0d14760 100644
--- a/core/wiki/macros/export.tid
+++ b/core/wiki/macros/export.tid
@@ -6,6 +6,7 @@ $baseFilename$$(extension)$
 \end
 
 \define exportButton(exportFilter:"[!is[system]sort[title]]",lingoBase,baseFilename:"tiddlers")
+\whitespace trim
 <$vars hint={{{ [<__lingoBase__>addsuffix[Hint]get[text]] }}} caption={{{  [<__lingoBase__>addsuffix[Caption]get[text]] }}}>
 <span class="tc-popup-keep"><$button popup=<<qualify "$:/state/popup/export">> tooltip=<<hint>> aria-label=<<caption>> class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
diff --git a/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid
index 20339b22e..e066b51f6 100644
--- a/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid
+++ b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid
@@ -13,7 +13,6 @@ description: Generate QR code for this tiddler
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
 <span class="tc-btn-text">
-<$text text=" "/>
 <$text text={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!short-caption}}/>
 </span>
 </$list>
diff --git a/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid b/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid
index 42ef547b1..ef53223d2 100644
--- a/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid
+++ b/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid
@@ -17,7 +17,7 @@ Slice this text tiddler into chunks
 {{$:/plugins/tiddlywiki/text-slicer/images/text-slicer-icon}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"> Slice tiddler</span>
+<span class="tc-btn-text">Slice tiddler</span>
 </$list>
 </$button>
 </$list>
diff --git a/plugins/tiddlywiki/tiddlyweb/syncer-actions-refresh.tid b/plugins/tiddlywiki/tiddlyweb/syncer-actions-refresh.tid
index 46f8a95db..c397badc5 100644
--- a/plugins/tiddlywiki/tiddlyweb/syncer-actions-refresh.tid
+++ b/plugins/tiddlywiki/tiddlyweb/syncer-actions-refresh.tid
@@ -4,6 +4,6 @@ tags: $:/tags/SyncerDropdown
 <$reveal state="$:/status/IsLoggedIn" type="match" text="yes">
 <$button tooltip="Get latest changes from the server" aria-label="Refresh from server" class="tc-btn-invisible">
 <$action-sendmessage $message="tm-server-refresh"/>
-{{$:/core/images/refresh-button}} <span class="tc-btn-text"><$text text="Get latest changes from the server"/></span>
+{{$:/core/images/refresh-button}}<span class="tc-btn-text"><$text text="Get latest changes from the server"/></span>
 </$button>
 </$reveal>
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index d5454a32d..7ed449afb 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -564,9 +564,9 @@ html body.tc-body .tc-btn-rounded:hover svg {
 	fill: <<colour muted-foreground>>;
 }
 
+
 .tc-btn-text {
-	padding: 0;
-	margin: 0;
+	margin-left: 7px;
 }
 
 /* used for documentation "fake" buttons */