Standardised icons to font awesome, some nav fixes