Toolbar fixed, closes #943.