[add] icons and exported icons, changes to lots of stuff