refactoring
refactoring for new icons
refactoring for new icons