Allow hand tool toggle button to be optional

Supersedes PR #4085