Uploaded icon resolve url changes fixes #83832
Merge pull request #181 from alediator/83832-upload-icon-fix-url

Minor fixes (#84630, #83832)