add some icons
merge