[BUGFIX] Update icon markup in form to 3.0