Fixed collision detection and icon movement for ship map