First version with icons on map