In 171-Chat add icon, refactor code