Basecamp and GPS Map62S - Default Waypoint Icons out of Synch

I am using Basecamp 4.4.6 and the Map62S is up to date.
A lot of the Basecamp Waypoints I am transferring to the Map62S have their Icons turning to the Blue Flag.
Checking between creating a Waypoint in Basecamp and selecting an Icon from the Standard Icons supplied, and doing the same thing on the 62S shows that the standard Icon lists on the two systems are quite disparate.
How do I get them back to being the same?