Chnaged icon logic. Saving component per arch-type.