upgrading, working on icons