Code cleanup of general icon view