Added @icon attribute to TemplateChecker, couple of TODOs