SOS-1887 Adding more consistency with user avatars in Social Office