Small cleanups & consistency fixes
Set blank icon inside loop, otherwise it'll get overwritten
Remove some useless calls
Remove some unnecessary calls to static getter
Simplify some l10n calls