A ton of new icons and POIs thanks to Greg