When switching between these 2 modes, I think it would be beneficial if the cursor changed. For example, a crosshatch when in selection mode and a hand when in navigation mode. When working back and forth, it would be much easier to always know which mode is active rather than looking up at the toolbar.