Issue #130: Use icon current location.