Re-add icon, use updated event handlers