Add support for icon font
Merge commit '9568993bea9b898b9512387c3b124c603aa9cc91' into eva