Decorate buttons with matching keystrokes.
s/resolve-current/accept-current/ for consistency.