Merge "Change thumbnail/icon to get the image rather than updating it" into main