Merge pull request #8110 from vingtetun/840627

Bug 840627 - Icons in the settings app takes 200ms in the startup time. ...(cherry picked from commit e324e749cfd7ccbf7b0345d3f171dba5c8c695e9)

Merge pull request #8185 from etiennesegonzac/bug-840627-followup

Bug 840627 followup - moving the icons 1px up, 1px to the right(cherry picked from commit b5ef5ba42d3f867138334e69037f1c569533a949)