Refactor for different types of font icons