GIVEY-335 #comment update icon and id names