refactor Icon solution to 3