Reworked images and thumbnails