Move menu bar title attributes from icons to buttons.

This makes it easier for users to get the title texts to appear. It also
corrects one of the title texts.