Hi Tim -
I agree with the accessibility issue. Unfortunately the issue is in core code. I could figure out what needs to be changed and propose it, but it won't help in the short run.
I'll check that issue to see if it reveals any solutions. In this case, both "link" and "icon" seem to be interchangeable, and have the same problems.