Toolbar: Minor fixes