Merge pull request #9417 from lodr/bug-863778-l10n-issues-solved

Bug 863778 - L10n issues solved and missing icon recovered
Cause r+(cherry picked from commit e9ddc19b350c11349914f0241357780fe884cc73)