Issue #2329771 by davidhernandez, lauriii, pakmanlh: Move image classes from preprocess to templates.