Bug 868392 - [Building Blocks] Toolbars should be updated