PLF-6066: Add Remove icons for acme's Product & wai templates