Added IconType (declarations) + comments