small refactoring in controller.icons