Progress on Icon Bar accessibility
Merge branch '5.4-accessibilty' into 5.4-accessibility