New icons
Fix up icons, prepare for maps.