Issue #8265 by tj: Added better filename for thumbnails