Tweak new gpx, add waypoint icon