New icons
Merge remote-tracking branch 'origin/develop' into develop
Merge conflict solved
New font #defines
Merge remote-tracking branch 'origin/develop' into develop