Add new icons, icon selector; cleanup