Bug 828888 - Dont revert icons when failing to load after update
Merge pull request #7561 from daleharvey/dont-revert-icons

Bug 828888 - Dont revert icons when failing to load after update