diff --git a/core/ui/PageControls/advanced-search.tid b/core/ui/PageControls/advanced-search.tid
index 4aa49e6e5..4d13d16e3 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
 \procedure 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)$`>
 <%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/advanced-search-button}}
diff --git a/core/ui/PageControls/controlpanel.tid b/core/ui/PageControls/controlpanel.tid
index 8b9db8d9a..6413db21d 100644
--- a/core/ui/PageControls/controlpanel.tid
+++ b/core/ui/PageControls/controlpanel.tid
@@ -5,6 +5,7 @@ description: {{$:/language/Buttons/ControlPanel/Hint}}
 
 \whitespace trim
 \procedure 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)$`>
 <%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/options-button}}
diff --git a/core/ui/PageControls/manager.tid b/core/ui/PageControls/manager.tid
index 3cc364f80..1b966a214 100644
--- a/core/ui/PageControls/manager.tid
+++ b/core/ui/PageControls/manager.tid
@@ -5,6 +5,7 @@ description: {{$:/language/Buttons/Manager/Hint}}
 
 \whitespace trim
 \procedure 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)$`>
 <%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/list}}
diff --git a/core/ui/PageControls/tag-button.tid b/core/ui/PageControls/tag-button.tid
index 6c04804ce..8b1a45226 100644
--- a/core/ui/PageControls/tag-button.tid
+++ b/core/ui/PageControls/tag-button.tid
@@ -5,6 +5,7 @@ description: {{$:/language/Buttons/TagManager/Hint}}
 
 \whitespace trim
 \procedure 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)$`>
 <%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/tag-button}}