cleaning up and renaming the icon name