Fix icon event assignment