Refactor Icon into own class.