A few small tweaks of the SecondaryToolbar code
Merge pull request #3824 from Snuffleupagus/tweak-SecondaryToolbar

A few small tweaks of the SecondaryToolbar code