Suggestion 1) and 2), some cleanup and add IconBenchmarkApp