The shortcuts introduced in #1755 are broken since #1714. It relies on css class but those have been replaced by the same class.
I think we should rethink #1714 for the nav bar generation. Or find a better way to match the buttons.