[#70023036 #70103368]: update witch spritesheet to version which matches spec, adjust code to match PNG