updated icons and nav bar
fixing merge conflicts in the constants file