Cleaned up code and added functionality to ApplicationIcon class