Fix name clashs in forms that made icons list fechted to early