3.6 map annotation

Use new artwork in Maps #491