Splitting whatsapp and phonebook avatars, adding setting to choose