Waypoints are disappearing when I try to change the icon used.

 I create a waypoint, then change the icon, poof! It's gone. If I recreate the waypoint with the same name, it says it already exists, but it's not listed anywhere.