Toolbar button persistency improved.