Toolbar buttons fix