Clean up
Change SChar to CharacterIcon