Merge pull request #5069 from uNiversaI/icons