Allow for different spawn images

Fixes #1878