Refactor font icons code