Make the toolbar button active state consistent with the menu, and simplify the code handling it a bunch.