Refactor icons and add metatype to ComponentMetadata