CB-5324 Windows8 build fails due to invalid image references