Finish switch toolbar functionality - refs BT#8968