Bug 936018 - Change the way the icons are loaded to allow reentrant calls
Merge pull request #13881 from AntonioMA/bug936018

Bug 936018 - Change the way the icons are loaded to allow reentrant calls