Adding icons to map view, #153