Move a couple of tool icons in the toolbox, and fix a couple of keyboard shortcuts.