Updated icon handling