Clean Code and remove icon font