Improved handling of stream icons and Streams/image/preview