The new icon theme code is on the road, and there is edelib-new-icon-theme branch (I haven't commited changes yet). This change will break a lot of things, but it is better to do that now, than later.

Reasons for these changes will be, hopefully, typed soon :)