Updated the icons and the map