map icon and option changes
merge
upping version pin