refactored icon usage