Update icons
Fix selectors to find the right form.