Excessive waypoint icons

[antipole2]

Under OCPN v5.8.4 I have reduced the extremely long list of mark icon to something manageable - those I might use plus my own plus less likely of use.
Under v5.9 I get a whole load not wanted back again and my useful ones are there but lost in the crowd.
If I revert to 5.8.4 I get my chosen selection back.

What's the best way of managing this? And might it be better if the user's choice is preserved across version updates?

(I am afloat with limited resources to investigate in depth.)

[nohal]

There is no supported mechanism for "user's choice" in the icon set, except adding the user defined icons, deleting or renaming part of the files installed with the application really is not that.
The best way is implementing #3193