Decrease dependence of SecondaryToolbar on UI buttons
Merge pull request #3821 from timvandermeij/secondary-toolbar-elements

Decrease dependence of SecondaryToolbar on UI buttons