icons and code refactoring