23.1, shorten equivalence table code
23.1, simplify, move images in order to use shorter "\\image" tag