refactoring, new icons