Adding more icons and renaming some