changed icons, fixed map bug