Bug 911665 - [bb][refactor] Toolbars