refactoring for new icons