VID-1904 adding specificity to image and video classes
VID-1904 better solution for image display bug