Added icon and help attributes