Maybe fixed memory leak, added icons