Bug 33, Improve Toolbar button persistency