Fixed names of variables, functions, members, methods related to icons
Changed naming so it is clear whether icon or icon name is used.