Updates to init and icons