Change icon; Refactor code