Use goto icon rather than map

Work on #4246.
Merge branch 'issue-4246' into upstream