Add icons and remove useless code