Refactored out icon handling into a separate IconManager.