icon code
Merge branch 'poi_icons'
quick fixing. a bug..
fixing icons..
fixed errors