Designer changes to support re-templating and new icons for toolbox