Refactors map to use marker manager

- Moves map icon management to its own module.
- Update marker icons to be more consistent with forks that have
differentiated map markers.