Better icon-handeling.

And enumerate through ICON instead of GROUP_ICON