diff --git a/core/ui/PageControls/advanced-search.tid b/core/ui/PageControls/advanced-search.tid
index c2962c9c4..caeaaebb8 100644
--- a/core/ui/PageControls/advanced-search.tid
+++ b/core/ui/PageControls/advanced-search.tid
@@ -3,6 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/advanced-search-button}} {{$:/language/Buttons/AdvancedSearch/Caption}}
 description: {{$:/language/Buttons/AdvancedSearch/Hint}}
 
+\whitespace trim
 \define control-panel-button(class)
 <$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]]">
diff --git a/core/ui/PageControls/controlpanel.tid b/core/ui/PageControls/controlpanel.tid
index 056f77263..82fac7398 100644
--- a/core/ui/PageControls/controlpanel.tid
+++ b/core/ui/PageControls/controlpanel.tid
@@ -3,6 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/options-button}} {{$:/language/Buttons/ControlPanel/Caption}}
 description: {{$:/language/Buttons/ControlPanel/Hint}}
 
+\whitespace trim
 \define control-panel-button(class)
 <$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]]">
diff --git a/core/ui/PageControls/encryption.tid b/core/ui/PageControls/encryption.tid
index 80d473152..b4b5e553f 100644
--- a/core/ui/PageControls/encryption.tid
+++ b/core/ui/PageControls/encryption.tid
@@ -3,6 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/locked-padlock}} {{$:/language/Buttons/Encryption/Caption}}
 description: {{$:/language/Buttons/Encryption/Hint}}
 
+\whitespace trim
 <$reveal type="match" state="$:/isEncrypted" text="yes">
 <$button message="tm-clear-password" tooltip={{$:/language/Buttons/Encryption/ClearPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/ClearPassword/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
@@ -22,4 +23,4 @@ description: {{$:/language/Buttons/Encryption/Hint}}
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Encryption/SetPassword/Caption}}/></span>
 </$list>
 </$button>
-</$reveal>
\ No newline at end of file
+</$reveal>
diff --git a/core/ui/PageControls/language.tid b/core/ui/PageControls/language.tid
index 5591a768b..623c71004 100644
--- a/core/ui/PageControls/language.tid
+++ b/core/ui/PageControls/language.tid
@@ -3,6 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/globe}} {{$:/language/Buttons/Language/Caption}}
 description: {{$:/language/Buttons/Language/Hint}}
 
+\whitespace trim
 \define flag-title()
 $(languagePluginTitle)$/icon
 \end
@@ -24,4 +25,4 @@ $(languagePluginTitle)$/icon
 <div class="tc-drop-down">
 {{$:/snippets/languageswitcher}}
 </div>
-</$reveal>
\ No newline at end of file
+</$reveal>
diff --git a/core/ui/PageControls/manager.tid b/core/ui/PageControls/manager.tid
index 09b3b05fc..7255747f4 100644
--- a/core/ui/PageControls/manager.tid
+++ b/core/ui/PageControls/manager.tid
@@ -3,6 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/list}} {{$:/language/Buttons/Manager/Caption}}
 description: {{$:/language/Buttons/Manager/Hint}}
 
+\whitespace trim
 \define manager-button(class)
 <$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]]">
diff --git a/core/ui/PageControls/new-image.tid b/core/ui/PageControls/new-image.tid
index 71b401ad8..fab7df573 100644
--- a/core/ui/PageControls/new-image.tid
+++ b/core/ui/PageControls/new-image.tid
@@ -3,6 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/new-image-button}} {{$:/language/Buttons/NewImage/Caption}}
 description: {{$:/language/Buttons/NewImage/Hint}}
 
+\whitespace trim
 <$button tooltip={{$:/language/Buttons/NewImage/Hint}} aria-label={{$:/language/Buttons/NewImage/Caption}} class=<<tv-config-toolbar-class>> actions={{$:/core/ui/Actions/new-image}}>
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/new-image-button}}
diff --git a/core/ui/PageControls/new-journal.tid b/core/ui/PageControls/new-journal.tid
index 797b65b49..914352e1b 100644
--- a/core/ui/PageControls/new-journal.tid
+++ b/core/ui/PageControls/new-journal.tid
@@ -3,6 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/new-journal-button}} {{$:/language/Buttons/NewJournal/Caption}}
 description: {{$:/language/Buttons/NewJournal/Hint}}
 
+\whitespace trim
 \define journalButton()
 <$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]]">
diff --git a/core/ui/PageControls/newtiddler.tid b/core/ui/PageControls/newtiddler.tid
index 1896d827f..7ea1994ff 100644
--- a/core/ui/PageControls/newtiddler.tid
+++ b/core/ui/PageControls/newtiddler.tid
@@ -3,6 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/new-button}} {{$:/language/Buttons/NewTiddler/Caption}}
 description: {{$:/language/Buttons/NewTiddler/Hint}}
 
+\whitespace trim
 <$button actions={{$:/core/ui/Actions/new-tiddler}} tooltip={{$:/language/Buttons/NewTiddler/Hint}} aria-label={{$:/language/Buttons/NewTiddler/Caption}} class=<<tv-config-toolbar-class>>>
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
 {{$:/core/images/new-button}}
diff --git a/core/ui/PageControls/palette.tid b/core/ui/PageControls/palette.tid
index d0a2ca60b..6fdbdb439 100644
--- a/core/ui/PageControls/palette.tid
+++ b/core/ui/PageControls/palette.tid
@@ -3,6 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/palette}} {{$:/language/Buttons/Palette/Caption}}
 description: {{$:/language/Buttons/Palette/Hint}}
 
+\whitespace trim
 <span class="tc-popup-keep">
 <$button popup=<<qualify "$:/state/popup/palette">> tooltip={{$:/language/Buttons/Palette/Hint}} aria-label={{$:/language/Buttons/Palette/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
@@ -17,4 +18,4 @@ description: {{$:/language/Buttons/Palette/Hint}}
 <div class="tc-drop-down" style="font-size:0.7em;">
 {{$:/snippets/paletteswitcher}}
 </div>
-</$reveal>
\ No newline at end of file
+</$reveal>
diff --git a/core/ui/PageControls/storyview.tid b/core/ui/PageControls/storyview.tid
index f84c0d2f9..c4d0b7365 100644
--- a/core/ui/PageControls/storyview.tid
+++ b/core/ui/PageControls/storyview.tid
@@ -3,6 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/storyview-classic}} {{$:/language/Buttons/StoryView/Caption}}
 description: {{$:/language/Buttons/StoryView/Hint}}
 
+\whitespace trim
 \define icon()
 $:/core/images/storyview-$(storyview)$
 \end
@@ -22,4 +23,4 @@ $:/core/images/storyview-$(storyview)$
 <div class="tc-drop-down">
 {{$:/snippets/viewswitcher}}
 </div>
-</$reveal>
\ No newline at end of file
+</$reveal>
diff --git a/core/ui/PageControls/tag-button.tid b/core/ui/PageControls/tag-button.tid
index 808a3bfd6..e7e6bdc89 100644
--- a/core/ui/PageControls/tag-button.tid
+++ b/core/ui/PageControls/tag-button.tid
@@ -3,6 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/tag-button}} {{$:/language/Buttons/TagManager/Caption}}
 description: {{$:/language/Buttons/TagManager/Hint}}
 
+\whitespace trim
 \define control-panel-button(class)
 <$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]]">
diff --git a/core/ui/PageControls/theme.tid b/core/ui/PageControls/theme.tid
index b859beb68..2d8eadc7b 100644
--- a/core/ui/PageControls/theme.tid
+++ b/core/ui/PageControls/theme.tid
@@ -3,6 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/theme-button}} {{$:/language/Buttons/Theme/Caption}}
 description: {{$:/language/Buttons/Theme/Hint}}
 
+\whitespace trim
 <span class="tc-popup-keep">
 <$button popup=<<qualify "$:/state/popup/theme">> tooltip={{$:/language/Buttons/Theme/Hint}} aria-label={{$:/language/Buttons/Theme/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
 <$list filter="[<tv-config-toolbar-icons>match[yes]]">
@@ -19,4 +20,4 @@ description: {{$:/language/Buttons/Theme/Hint}}
 {{$:/snippets/themeswitcher}}
 </$linkcatcher>
 </div>
-</$reveal>
\ No newline at end of file
+</$reveal>
diff --git a/core/ui/PageControls/timestamp.tid b/core/ui/PageControls/timestamp.tid
index b25a1af05..abf89b70c 100644
--- a/core/ui/PageControls/timestamp.tid
+++ b/core/ui/PageControls/timestamp.tid
@@ -3,6 +3,7 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/timestamp-on}} {{$:/language/Buttons/Timestamp/Caption}}
 description: {{$:/language/Buttons/Timestamp/Hint}}
 
+\whitespace trim
 <$reveal type="nomatch" state="$:/config/TimestampDisable" text="yes">
 <$button tooltip={{$:/language/Buttons/Timestamp/On/Hint}} aria-label={{$:/language/Buttons/Timestamp/On/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-setfield $tiddler="$:/config/TimestampDisable" $value="yes"/>
@@ -24,4 +25,4 @@ description: {{$:/language/Buttons/Timestamp/Hint}}
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Timestamp/Off/Caption}}/></span>
 </$list>
 </$button>
-</$reveal>
\ No newline at end of file
+</$reveal>