Updating form, adding icons