Added support for icons and server data flows