Post template render populate for toolbars

fixes #2563
fixes #2534