Bug 952445 - [Gallery] Update toolbars to use building blocks