VID-1963, VID-1969 Integrate new thumbnailer and add borders for small images