Refactored: Better icon usage.