* Fix icon caching issue