Set the correct margin on avatars

Fix #478