Merge pull request #11912 from pivanov/bug-911962

Bug 911962 - [HD] Followup bug for Settings Icons r=samjoch(cherry picked from commit 69856dd9ff0b546551a90ff617d324c9404400b0)