Add icons, delete useless code, improve some function