Refactor icons code