issue #19295: more robust image paths
Merge pull request #465 from shackbarth/19295

issue #19295: more robust image paths