Support keyboard shortcuts.  Revert disabling of buttons, as this
doesn't work properly when initiated from a keyboard shortcut.  Make
sure we don't explode when adding colour for which we don't have an
icon.