Added icon and reconciled naming