@John: How is this "Fix Committed"? I can see a few possible resolutions here:
a) Wont fix/Invalid - We accept to be in the mercy of upstream here and do nothing
b) Create a variant for one of the icons which we distro patch in
Under all circumstances I think we need to hear the upstream voice on this...