Fix No or wrong App icons being displayed after Creators Update