add icon and emoji support