diff --git a/app/src/main/java/org/linphone/assistant/AssistantActivity.java b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
index 58ed5304e..c6e778fe5 100644
--- a/app/src/main/java/org/linphone/assistant/AssistantActivity.java
+++ b/app/src/main/java/org/linphone/assistant/AssistantActivity.java
@@ -47,6 +47,7 @@ import android.widget.BaseAdapter;
 import android.widget.Filter;
 import android.widget.Filterable;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 import androidx.core.app.ActivityCompat;
@@ -111,6 +112,7 @@ public class AssistantActivity extends ThemableActivity
     private boolean mEchoCancellerAlreadyDone;
     private AccountCreator mAccountCreator;
     private CountryListAdapter mCountryListAdapter;
+    private LinearLayout mTopBar;
 
     public static AssistantActivity instance() {
         return sInstance;
@@ -282,6 +284,11 @@ public class AssistantActivity extends ThemableActivity
         mBack.setOnClickListener(this);
         // mCancel = findViewById(R.id.assistant_cancel);
         // mCancel.setOnClickListener(this);
+
+        mTopBar = findViewById(R.id.topbar);
+        if (getResources().getBoolean(R.bool.assistant_hide_top_bar)) {
+            mTopBar.setVisibility(View.GONE);
+        }
     }
 
     private void changeFragment(Fragment newFragment) {
diff --git a/app/src/main/java/org/linphone/views/ContactAvatar.java b/app/src/main/java/org/linphone/views/ContactAvatar.java
index e3e5638ca..04fdc8d36 100644
--- a/app/src/main/java/org/linphone/views/ContactAvatar.java
+++ b/app/src/main/java/org/linphone/views/ContactAvatar.java
@@ -106,7 +106,9 @@ public class ContactAvatar {
         ContactAvatarHolder holder = new ContactAvatarHolder(v);
         holder.init();
 
-        if (displayName.startsWith("+")) {
+        boolean generated_avatars =
+                v.getContext().getResources().getBoolean(R.bool.generate_text_avatar);
+        if (displayName.startsWith("+") || !generated_avatars) {
             // If display name is a phone number, use default avatar because generated one will be
             // +...
             holder.generatedAvatar.setVisibility(View.GONE);
@@ -150,6 +152,9 @@ public class ContactAvatar {
         ContactAvatarHolder holder = new ContactAvatarHolder(v);
         holder.init();
 
+        boolean generated_avatars =
+                v.getContext().getResources().getBoolean(R.bool.generate_text_avatar);
+
         // Kepp the generated avatar ready in case of failure while loading picture
         holder.generatedAvatar.setText(
                 generateAvatar(
@@ -176,7 +181,7 @@ public class ContactAvatar {
             holder.contactPicture.setImageBitmap(bm);
             holder.contactPicture.setVisibility(View.VISIBLE);
             holder.generatedAvatar.setVisibility(View.GONE);
-        } else {
+        } else if (generated_avatars) {
             holder.generatedAvatar.setText(
                     generateAvatar(
                             contact.getFullName() == null
diff --git a/app/src/main/res/values/non_localizable_custom.xml b/app/src/main/res/values/non_localizable_custom.xml
index 5797343f7..01910447b 100644
--- a/app/src/main/res/values/non_localizable_custom.xml
+++ b/app/src/main/res/values/non_localizable_custom.xml
@@ -52,6 +52,7 @@
     <bool name="assistant_use_linphone_login_as_first_fragment">false</bool>
     <!-- Start Linphone creation account in loginFragment view instead of menu -->
     <bool name="assistant_use_create_linphone_account_as_first_fragment">false</bool>
+    <bool name="assistant_hide_top_bar">false</bool>
 
     <bool name="replace_assistant_with_old_interface">false</bool>
     <bool name="hide_assistant">false</bool>
@@ -114,6 +115,7 @@
     <bool name="hide_non_linphone_contacts">false</bool>
     <bool name="use_native_contact_editor">false</bool>
     <bool name="hide_invite_contact">false</bool>
+    <bool name="generate_text_avatar">true</bool>
 
     <!-- Side Menu -->
     <bool name="hide_assistant_from_side_menu">false</bool>