Toolbar.less review and style optimisation. Some work still to be done