replace existing full fontawesome icons with custom

@rexk 
also snuck in some minor formatting changes.