font icon support, minor cleanup