Minor refactoring #icon