Updated icons checking and loading