chenge icon + refactor