Hotkey usability and conflict resolution

* resolve hotkey conflicts, fixes #2883
* add/display existing in-game button hotkeys, fixes #2932