Fix issue that font awesome is not shown
Polish UI of problem
Merge branch 'develop'