Moving the user location icon to the common folder, and changing the WP map control to use it for its icon.