Use fontawesome and improve some layouts