Bug 828888 - Dont revert icons when failing to load after update
Bug 829455 - Now setting the correct option
Merge pull request #7564 from lodr/bug-829455-missing-field

Bug 829455 - Now setting the correct option
Merge pull request #7561 from daleharvey/dont-revert-icons

Bug 828888 - Dont revert icons when failing to load after update
Auto-merge from branch 'master'