Tweak icon loading and Performance improvements