Scala Collector: Correct the return type to 'image/gif'.
Scala Collector: Clean imports and add legacy support for '/ice'.