The next version should finally get a new waypoint icon set. Here is a sample. What do you think – how readable are they?
Update: I threw a coin a few times and came up with 3 more icons to make it even. The last icon is my attempt at a diving flag in monochrome.