Fixed the icons, including the case when no icon was provided for the app