Replace images with glyphs
Fix more undefined variable warnings