Icons fix and Cache fix