NR-630 : Avatar icon

Fixed
Merge remote-tracking branch 'origin/devel' into devel