Minor changes to locales and talk form
Merge remote branch 'upstream/develop' into develop
Added missing icons
Fixed minor typo