replace icons
refactor