icon and map improvements