Bug 1039311 - [Collection] HomeIcons Singleton (refactor)