Attribute and fix up icons