Accessibility fixes for HWPI themes

From #2648.