toolbar button selection tweaks