Icon, Name and code cleanup