Refactored and changed to use common toolbar a11y utility.