diff --git a/core/ui/ViewToolbar/clone.tid b/core/ui/ViewToolbar/clone.tid
index 0a28769ac..5625c5a2a 100644
--- a/core/ui/ViewToolbar/clone.tid
+++ b/core/ui/ViewToolbar/clone.tid
@@ -3,11 +3,15 @@ tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/clone-button}} {{$:/language/Buttons/Clone/Caption}}
 description: {{$:/language/Buttons/Clone/Hint}}
 
+\whitespace trim
 <$button message="tm-new-tiddler" param=<<currentTiddler>> tooltip={{$:/language/Buttons/Clone/Hint}} aria-label={{$:/language/Buttons/Clone/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/clone-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Clone/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text=" "/>
+<$text text={{$:/language/Buttons/Clone/Caption}}/>
+</span>
 </$list>
 </$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/close-others.tid b/core/ui/ViewToolbar/close-others.tid
index 3038cafe1..55042d989 100644
--- a/core/ui/ViewToolbar/close-others.tid
+++ b/core/ui/ViewToolbar/close-others.tid
@@ -3,11 +3,15 @@ tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/close-others-button}} {{$:/language/Buttons/CloseOthers/Caption}}
 description: {{$:/language/Buttons/CloseOthers/Hint}}
 
+\whitespace trim
 <$button message="tm-close-other-tiddlers" param=<<currentTiddler>> tooltip={{$:/language/Buttons/CloseOthers/Hint}} aria-label={{$:/language/Buttons/CloseOthers/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/close-others-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/CloseOthers/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text=" "/>
+<$text text={{$:/language/Buttons/CloseOthers/Caption}}/>
+</span>
 </$list>
 </$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/close.tid b/core/ui/ViewToolbar/close.tid
index 3f90b68f1..49695a77a 100644
--- a/core/ui/ViewToolbar/close.tid
+++ b/core/ui/ViewToolbar/close.tid
@@ -3,11 +3,14 @@ tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/close-button}} {{$:/language/Buttons/Close/Caption}}
 description: {{$:/language/Buttons/Close/Hint}}
 
+\whitespace trim
 <$button message="tm-close-tiddler" tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/close-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Close/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/Close/Caption}}/>
+</span>
 </$list>
 </$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/edit.tid b/core/ui/ViewToolbar/edit.tid
index 5b8b83560..fd299c173 100644
--- a/core/ui/ViewToolbar/edit.tid
+++ b/core/ui/ViewToolbar/edit.tid
@@ -3,11 +3,15 @@ tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/edit-button}} {{$:/language/Buttons/Edit/Caption}}
 description: {{$:/language/Buttons/Edit/Hint}}
 
+\whitespace trim
 <$button message="tm-edit-tiddler" tooltip={{$:/language/Buttons/Edit/Hint}} aria-label={{$:/language/Buttons/Edit/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/edit-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Edit/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text=" "/>
+<$text text={{$:/language/Buttons/Edit/Caption}}/>
+</span>
 </$list>
 </$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/fold-others.tid b/core/ui/ViewToolbar/fold-others.tid
index c85a72bad..55c31c721 100644
--- a/core/ui/ViewToolbar/fold-others.tid
+++ b/core/ui/ViewToolbar/fold-others.tid
@@ -3,12 +3,16 @@ tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/fold-others-button}} {{$:/language/Buttons/FoldOthers/Caption}}
 description: {{$:/language/Buttons/FoldOthers/Hint}}
 
+\whitespace trim
 <$button tooltip={{$:/language/Buttons/FoldOthers/Hint}} aria-label={{$:/language/Buttons/FoldOthers/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-fold-other-tiddlers" $param=<<currentTiddler>> foldedStatePrefix="$:/state/folded/"/>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]" variable="listItem">
 {{$:/core/images/fold-others-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/FoldOthers/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text=" "/>
+<$text text={{$:/language/Buttons/FoldOthers/Caption}}/>
+</span>
 </$list>
 </$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/fold.tid b/core/ui/ViewToolbar/fold.tid
index 545114a82..902344224 100644
--- a/core/ui/ViewToolbar/fold.tid
+++ b/core/ui/ViewToolbar/fold.tid
@@ -3,24 +3,32 @@ tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/fold-button}} {{$:/language/Buttons/Fold/Caption}}
 description: {{$:/language/Buttons/Fold/Hint}}
 
-<$reveal type="nomatch" state=<<folded-state>> text="hide" default="show"><$button tooltip={{$:/language/Buttons/Fold/Hint}} aria-label={{$:/language/Buttons/Fold/Caption}} class=<<tv-config-toolbar-class>>>
+\whitespace trim
+<$reveal type="nomatch" state=<<folded-state>> text="hide" default="show">
+<$button tooltip={{$:/language/Buttons/Fold/Hint}} aria-label={{$:/language/Buttons/Fold/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-fold-tiddler" $param=<<currentTiddler>> foldedState=<<folded-state>>/>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]" variable="listItem">
 {{$:/core/images/fold-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text">
+<$text text=" "/>
 <$text text={{$:/language/Buttons/Fold/Caption}}/>
 </span>
 </$list>
-</$button></$reveal><$reveal type="match" state=<<folded-state>> text="hide" default="show"><$button tooltip={{$:/language/Buttons/Unfold/Hint}} aria-label={{$:/language/Buttons/Unfold/Caption}} class=<<tv-config-toolbar-class>>>
+</$button>
+</$reveal>
+<$reveal type="match" state=<<folded-state>> text="hide" default="show">
+<$button tooltip={{$:/language/Buttons/Unfold/Hint}} aria-label={{$:/language/Buttons/Unfold/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-fold-tiddler" $param=<<currentTiddler>> foldedState=<<folded-state>>/>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]" variable="listItem">
 {{$:/core/images/unfold-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text">
+<$text text=" "/>
 <$text text={{$:/language/Buttons/Unfold/Caption}}/>
 </span>
 </$list>
-</$button></$reveal>
\ No newline at end of file
+</$button>
+</$reveal>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/info.tid b/core/ui/ViewToolbar/info.tid
index 5eb6cd2d4..a5dd9afce 100644
--- a/core/ui/ViewToolbar/info.tid
+++ b/core/ui/ViewToolbar/info.tid
@@ -3,12 +3,15 @@ tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/info-button}} {{$:/language/Buttons/Info/Caption}}
 description: {{$:/language/Buttons/Info/Hint}}
 
+\whitespace trim
 \define button-content()
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/info-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Info/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/Info/Caption}}/>
+</span>
 </$list>
 \end
 <$reveal state="$:/config/TiddlerInfo/Mode" type="match" text="popup">
diff --git a/core/ui/ViewToolbar/more-tiddler-actions.tid b/core/ui/ViewToolbar/more-tiddler-actions.tid
index c20294250..a9ddcc7d4 100644
--- a/core/ui/ViewToolbar/more-tiddler-actions.tid
+++ b/core/ui/ViewToolbar/more-tiddler-actions.tid
@@ -3,6 +3,7 @@ tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/down-arrow}} {{$:/language/Buttons/More/Caption}}
 description: {{$:/language/Buttons/More/Hint}}
 
+\whitespace trim
 \define config-title()
 $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 \end
@@ -11,9 +12,13 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 {{$:/core/images/down-arrow}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/More/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text=" "/>
+<$text text={{$:/language/Buttons/More/Caption}}/>
+</span>
 </$list>
-</$button><$reveal state=<<qualify "$:/state/popup/more">> type="popup" position="below" animate="yes">
+</$button>
+<$reveal state=<<qualify "$:/state/popup/more">> type="popup" position="below" animate="yes">
 
 <div class="tc-drop-down">
 
diff --git a/core/ui/ViewToolbar/new-here.tid b/core/ui/ViewToolbar/new-here.tid
index 94a81b07f..5089bbf59 100644
--- a/core/ui/ViewToolbar/new-here.tid
+++ b/core/ui/ViewToolbar/new-here.tid
@@ -3,6 +3,7 @@ tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/new-here-button}} {{$:/language/Buttons/NewHere/Caption}}
 description: {{$:/language/Buttons/NewHere/Hint}}
 
+\whitespace trim
 \define newHereButtonTags()
 [[$(currentTiddler)$]]
 \end
@@ -13,7 +14,9 @@ description: {{$:/language/Buttons/NewHere/Hint}}
 {{$:/core/images/new-here-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/NewHere/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/NewHere/Caption}}/>
+</span>
 </$list>
 </$button>
 \end
diff --git a/core/ui/ViewToolbar/new-journal-here.tid b/core/ui/ViewToolbar/new-journal-here.tid
index 32f2db311..0f93bcbce 100644
--- a/core/ui/ViewToolbar/new-journal-here.tid
+++ b/core/ui/ViewToolbar/new-journal-here.tid
@@ -3,6 +3,7 @@ tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/new-journal-button}} {{$:/language/Buttons/NewJournalHere/Caption}}
 description: {{$:/language/Buttons/NewJournalHere/Hint}}
 
+\whitespace trim
 \define journalButtonTags()
 [[$(currentTiddlerTag)$]] $(journalTags)$
 \end
@@ -13,7 +14,9 @@ description: {{$:/language/Buttons/NewJournalHere/Hint}}
 {{$:/core/images/new-journal-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/NewJournalHere/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text={{$:/language/Buttons/NewJournalHere/Caption}}/>
+</span>
 </$list>
 </$button>
 \end
@@ -21,4 +24,6 @@ description: {{$:/language/Buttons/NewJournalHere/Hint}}
 <$set name="journalTags" value={{$:/config/NewJournal/Tags}}>
 <$set name="currentTiddlerTag" value=<<currentTiddler>>>
 <<journalButton>>
-</$set></$set></$set>
\ No newline at end of file
+</$set>
+</$set>
+</$set>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/open-window.tid b/core/ui/ViewToolbar/open-window.tid
index 6c885fc94..b3f982f26 100644
--- a/core/ui/ViewToolbar/open-window.tid
+++ b/core/ui/ViewToolbar/open-window.tid
@@ -3,11 +3,15 @@ tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/open-window}} {{$:/language/Buttons/OpenWindow/Caption}}
 description: {{$:/language/Buttons/OpenWindow/Hint}}
 
+\whitespace trim
 <$button message="tm-open-window" tooltip={{$:/language/Buttons/OpenWindow/Hint}} aria-label={{$:/language/Buttons/OpenWindow/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/open-window}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/OpenWindow/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text=" "/>
+<$text text={{$:/language/Buttons/OpenWindow/Caption}}/>
+</span>
 </$list>
 </$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/permalink.tid b/core/ui/ViewToolbar/permalink.tid
index 0867a3138..b6ea2c0c8 100644
--- a/core/ui/ViewToolbar/permalink.tid
+++ b/core/ui/ViewToolbar/permalink.tid
@@ -3,11 +3,15 @@ tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/permalink-button}} {{$:/language/Buttons/Permalink/Caption}}
 description: {{$:/language/Buttons/Permalink/Hint}}
 
+\whitespace trim
 <$button message="tm-permalink" tooltip={{$:/language/Buttons/Permalink/Hint}} aria-label={{$:/language/Buttons/Permalink/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/permalink-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Permalink/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text=" "/>
+<$text text={{$:/language/Buttons/Permalink/Caption}}/>
+</span>
 </$list>
 </$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/permaview.tid b/core/ui/ViewToolbar/permaview.tid
index 5797b5e00..523bac128 100644
--- a/core/ui/ViewToolbar/permaview.tid
+++ b/core/ui/ViewToolbar/permaview.tid
@@ -3,11 +3,15 @@ tags: $:/tags/ViewToolbar $:/tags/PageControls
 caption: {{$:/core/images/permaview-button}} {{$:/language/Buttons/Permaview/Caption}}
 description: {{$:/language/Buttons/Permaview/Hint}}
 
+\whitespace trim
 <$button message="tm-permaview" tooltip={{$:/language/Buttons/Permaview/Hint}} aria-label={{$:/language/Buttons/Permaview/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/permaview-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Permaview/Caption}}/></span>
+<span class="tc-btn-text">
+<$text text=" "/>
+<$text text={{$:/language/Buttons/Permaview/Caption}}/>
+</span>
 </$list>
 </$button>
\ No newline at end of file
diff --git a/core/wiki/macros/export.tid b/core/wiki/macros/export.tid
index 14f0df01f..089cc870e 100644
--- a/core/wiki/macros/export.tid
+++ b/core/wiki/macros/export.tid
@@ -6,17 +6,14 @@ $baseFilename$$(extension)$
 \end
 
 \define exportButton(exportFilter:"[!is[system]sort[title]]",lingoBase,baseFilename:"tiddlers")
-<span class="tc-popup-keep">
-<$button popup=<<qualify "$:/state/popup/export">> tooltip={{$lingoBase$Hint}} aria-label={{$lingoBase$Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
+<span class="tc-popup-keep"><$button popup=<<qualify "$:/state/popup/export">> tooltip={{$lingoBase$Hint}} aria-label={{$lingoBase$Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/core/images/export-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$lingoBase$Caption}}/></span>
 </$list>
-</$button>
-</span>
-<$reveal state=<<qualify "$:/state/popup/export">> type="popup" position="below" animate="yes">
+</$button></span><$reveal state=<<qualify "$:/state/popup/export">> type="popup" position="below" animate="yes">
 <div class="tc-drop-down">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/Exporter]]">
 <$set name="extension" value={{!!extension}}>
diff --git a/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid
index 6e2a3b25c..7b496d812 100644
--- a/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid
+++ b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid
@@ -5,13 +5,17 @@ caption: {{$:/plugins/tiddlywiki/qrcode/icon}}
 short-caption: QR code
 description: Generate QR code for this tiddler
 
+\whitespace trim
 <span class="tc-popup-keep">
 <$button popup=<<qualify "$:/state/popup/qrcode">> tooltip={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!description}} aria-label={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!short-caption}} class=<<tv-config-toolbar-class>> class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
 <$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
 {{$:/plugins/tiddlywiki/qrcode/icon}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
-<span class="tc-btn-text"><$text text={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!short-caption}}/></span>
+<span class="tc-btn-text">
+<$text text=" "/>
+<$text text={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!short-caption}}/>
+</span>
 </$list>
 </$button>
 </span>
diff --git a/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid b/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid
index b4566f5f9..16882cdfc 100644
--- a/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid
+++ b/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid
@@ -4,6 +4,8 @@ list-before: $:/core/ui/Buttons/edit
 caption: {{$:/plugins/tiddlywiki/text-slicer/images/text-slicer-icon}} Slice tiddler
 description: Slice this tiddler by headings and lists
 
+\whitespace trim
+
 \define hint()
 Slice this tiddler by headings and lists
 \end
@@ -13,6 +15,6 @@ Slice this tiddler by headings and lists
 {{$:/plugins/tiddlywiki/text-slicer/images/text-slicer-icon}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
-<span class="tc-btn-text">Slice tiddler</span>
+<span class="tc-btn-text"> Slice tiddler</span>
 </$list>
 </$button>
\ No newline at end of file