Fixes #84 partially reverts #82

When requests are not streamed, the icon images are corrupted.
This was introduced in #82 . I have tried to maintain the pipe while still listening to the response or errors. 

Not sure if there're bugs though. :baby: