Memoize icons
Cleanup imports