clean up forms and add missing icons folder