cleanup and prepare faster ( small version of FAST ) - fix icon caching