Fixed avatars in other screens