fix toolbar mako usage in prep for 1.5 mako removal