Now using new icons for points and current location