Refactored icon, moved modifiers to subkind