Fix #1097
Fix #1144
Fix #1136
reenabling font awesome
Tweaks