Fixes #6746
Merge pull request #6888 from mwerezak/atmos-icon-cache

Fixes #6746