Icon fixes

(cherry picked from commit 4c0a9d8c)
1 job for main in 15 minutes and 3 seconds (queued for 1 second)