Merge "Fix issue where wrong icon would be shown"