Integrate icons and map;

no popup and audio yet; still one bug; if you go into the map, then go
back, and then go into the map again, it loads the icons twice