Keep last app icon around

Merged username-removed-26331 requested to merge 152-keep-last-app-icon into master