Fixing Icon management