Issue #2348413 by Cottser, tim.plunkett: Fixed Fatal error at /admin/structure/book.
Issue #2329771 by davidhernandez, lauriii, pakmanlh: Move image classes from preprocess to templates.