hum, whatever we said on the ML, it now seems to be like we'd install all icons in the same directory under Windows, and then even override some icons.  So I think the fix here is not enough.