Refactoring + font awesome