diff --git a/core/ui/PageControls/advanced-search.tid b/core/ui/PageControls/advanced-search.tid
index 19254904e..cb2923407 100644
--- a/core/ui/PageControls/advanced-search.tid
+++ b/core/ui/PageControls/advanced-search.tid
@@ -3,11 +3,17 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/advanced-search-button}} {{$:/language/Buttons/AdvancedSearch/Caption}}
 description: {{$:/language/Buttons/AdvancedSearch/Hint}}
 
-<$button to="$:/AdvancedSearch" tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class=<<tv-config-toolbar-class>>>
+\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>prefix[yes]]">
 {{$:/core/images/advanced-search-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/AdvancedSearch/Caption}}/></span>
 </$list>
-</$button>
\ No newline at end of file
+</$button>
+\end
+
+<$list filter="[list[$:/StoryList]] +[field:title[$:/AdvancedSearch]]" emptyMessage=<<control-panel-button>>>
+<<control-panel-button "tc-selected">>
+</$list>
diff --git a/core/ui/PageControls/controlpanel.tid b/core/ui/PageControls/controlpanel.tid
index f838fd52d..c2a15a837 100644
--- a/core/ui/PageControls/controlpanel.tid
+++ b/core/ui/PageControls/controlpanel.tid
@@ -3,11 +3,17 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/options-button}} {{$:/language/Buttons/ControlPanel/Caption}}
 description: {{$:/language/Buttons/ControlPanel/Hint}}
 
-<$button to="$:/ControlPanel" tooltip={{$:/language/Buttons/ControlPanel/Hint}} aria-label={{$:/language/Buttons/ControlPanel/Caption}} class=<<tv-config-toolbar-class>>>
+\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>prefix[yes]]">
 {{$:/core/images/options-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/ControlPanel/Caption}}/></span>
 </$list>
-</$button>
\ No newline at end of file
+</$button>
+\end
+
+<$list filter="[list[$:/StoryList]] +[field:title[$:/ControlPanel]]" emptyMessage=<<control-panel-button>>>
+<<control-panel-button "tc-selected">>
+</$list>
diff --git a/core/ui/PageControls/tag-button.tid b/core/ui/PageControls/tag-button.tid
index 1557fd146..79615bdb2 100644
--- a/core/ui/PageControls/tag-button.tid
+++ b/core/ui/PageControls/tag-button.tid
@@ -3,11 +3,17 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/tag-button}} {{$:/language/Buttons/TagManager/Caption}}
 description: {{$:/language/Buttons/TagManager/Hint}}
 
-<$button to="$:/TagManager" tooltip={{$:/language/Buttons/TagManager/Hint}} aria-label={{$:/language/Buttons/TagManager/Caption}} class=<<tv-config-toolbar-class>>>
+\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>prefix[yes]]">
 {{$:/core/images/tag-button}}
 </$list>
 <$list filter="[<tv-config-toolbar-text>prefix[yes]]">
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/TagManager/Caption}}/></span>
 </$list>
-</$button>
\ No newline at end of file
+</$button>
+\end
+
+<$list filter="[list[$:/StoryList]] +[field:title[$:/TagManager]]" emptyMessage=<<control-panel-button>>>
+<<control-panel-button "tc-selected">>
+</$list>