update form icon-dev
merge