"Main toolbar" shall now be "toolbar".