Comment 20 for bug 564034

This isn't a complete branch right now, I still want to add the further *try and find a theme icon* strategy by splitting the filename that we get. Bare in mind, I consider these additions fall backs rather than API, I think it's best not to advertise the fact that we're hacking around some icon path problems.