Bug 1098168 - BaseIcon

I thought we should return a function?