Refactored IconId property