Icon restructuring. Ref #63