Bug 1098168 - BaseIcon

It is a bug from my code, fixed and added test