Issue853b menu bar

Adjust order of toolbars, plus order of icons in toolbars.