Add friends' icons
Merge branch 'dev' into prod