ChoosePlayerIcon class refactored