add some icons
solve conflict