Fix accessor to add-claim button after toolbar refactoring