Fix edge case in icon morphing handling