Make tool selection more obvious

[#77436410]