add icon_uri
other small changes