Backport VIP image optimization

Applies to https://github.com/GigaOM/legacy-pro/issues/3393