[BUGFIX] Update icon markup in form to 3.0
[BUGFIX] Update icon macro markup to 3.0
Merge pull request #581 from MisatoTremor/master

[BUGFIX] Update icon markup in form to 3.0