Icon fixes, more map features.