#1034 More image optimalization