diff --git a/app/src/main/java/org/linphone/ui/main/calls/viewmodel/StartCallViewModel.kt b/app/src/main/java/org/linphone/ui/main/calls/viewmodel/StartCallViewModel.kt
index 244c3eca7..1f7da0a84 100644
--- a/app/src/main/java/org/linphone/ui/main/calls/viewmodel/StartCallViewModel.kt
+++ b/app/src/main/java/org/linphone/ui/main/calls/viewmodel/StartCallViewModel.kt
@@ -29,4 +29,9 @@ class StartCallViewModel @UiThread constructor() : ViewModel() {
     val emptyContactsList = MutableLiveData<Boolean>()
 
     val emptySuggestionsList = MutableLiveData<Boolean>()
+
+    @UiThread
+    fun clearFilter() {
+        searchFilter.value = ""
+    }
 }
diff --git a/app/src/main/res/drawable/edit_text_background.xml b/app/src/main/res/drawable/edit_text_background.xml
new file mode 100644
index 000000000..1aefdfbd7
--- /dev/null
+++ b/app/src/main/res/drawable/edit_text_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_focused="true"
+        android:drawable="@drawable/shape_edit_text_focused_background" />
+    <item android:state_enabled="false"
+        android:drawable="@drawable/shape_edit_text_disabled_background" />
+    <item
+        android:drawable="@drawable/shape_edit_text_background" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_edittext_white_background.xml b/app/src/main/res/drawable/shape_edit_text_disabled_background.xml
similarity index 61%
rename from app/src/main/res/drawable/shape_edittext_white_background.xml
rename to app/src/main/res/drawable/shape_edit_text_disabled_background.xml
index e54b22b94..ba0cc52fe 100644
--- a/app/src/main/res/drawable/shape_edittext_white_background.xml
+++ b/app/src/main/res/drawable/shape_edit_text_disabled_background.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="24dp" />
+    <corners android:radius="63dp" />
     <solid android:color="@color/white"/>
-    <size android:height="48dp" android:width="234dp" />
+    <stroke android:width="1dp" android:color="@color/gray_9" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_edit_text_focused_background.xml b/app/src/main/res/drawable/shape_edit_text_focused_background.xml
new file mode 100644
index 000000000..ef67db014
--- /dev/null
+++ b/app/src/main/res/drawable/shape_edit_text_focused_background.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <corners android:radius="63dp" />
+    <solid android:color="@color/white"/>
+    <stroke android:width="1dp" android:color="@color/primary_color" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_search_round_background.xml b/app/src/main/res/drawable/shape_search_round_background.xml
deleted file mode 100644
index 871ac5679..000000000
--- a/app/src/main/res/drawable/shape_search_round_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="28dp" />
-    <solid android:color="@color/gray_2"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_search_square_background.xml b/app/src/main/res/drawable/shape_search_square_background.xml
deleted file mode 100644
index 0b0cca3fe..000000000
--- a/app/src/main/res/drawable/shape_search_square_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="28dp" />
-    <solid android:color="@color/gray_6"/>
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/account_profile_fragment.xml b/app/src/main/res/layout/account_profile_fragment.xml
index 5c8567c69..eeb21efc3 100644
--- a/app/src/main/res/layout/account_profile_fragment.xml
+++ b/app/src/main/res/layout/account_profile_fragment.xml
@@ -113,7 +113,7 @@
             android:textSize="14sp"
             android:textColor="@color/gray_9"
             android:maxLines="1"
-            android:background="@drawable/shape_edit_text_background"
+            android:background="@drawable/edit_text_background"
             android:inputType="text|textPersonName"
             app:layout_constraintTop_toBottomOf="@id/first_name_label"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/assistant_login_fragment.xml b/app/src/main/res/layout/assistant_login_fragment.xml
index 2e78baac6..380ee5420 100644
--- a/app/src/main/res/layout/assistant_login_fragment.xml
+++ b/app/src/main/res/layout/assistant_login_fragment.xml
@@ -80,7 +80,7 @@
                 android:text="@={viewModel.username, default=`johndoe`}"
                 android:textSize="14sp"
                 android:textColor="@color/gray_9"
-                android:background="@drawable/shape_edit_text_background"
+                android:background="@drawable/edit_text_background"
                 app:layout_constraintTop_toBottomOf="@id/username_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
@@ -111,7 +111,7 @@
                 android:text="@={viewModel.password, default=`johndoe`}"
                 android:textSize="14sp"
                 android:textColor="@color/gray_9"
-                android:background="@drawable/shape_edit_text_background"
+                android:background="@drawable/edit_text_background"
                 android:inputType="@{viewModel.showPassword ? InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD : InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD, default=textPassword}"
                 app:layout_constraintTop_toBottomOf="@id/password_label"
                 app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/assistant_register_fragment.xml b/app/src/main/res/layout/assistant_register_fragment.xml
index ea8ad16fe..dbbbf405b 100644
--- a/app/src/main/res/layout/assistant_register_fragment.xml
+++ b/app/src/main/res/layout/assistant_register_fragment.xml
@@ -73,7 +73,7 @@
                 android:text="John Doe"
                 android:textSize="14sp"
                 android:textColor="@color/gray_9"
-                android:background="@drawable/shape_edit_text_background"
+                android:background="@drawable/edit_text_background"
                 app:layout_constraintTop_toBottomOf="@id/username_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
@@ -104,7 +104,7 @@
                 android:text="+33 6 01 02 03 04 05"
                 android:textSize="14sp"
                 android:textColor="@color/gray_9"
-                android:background="@drawable/shape_edit_text_background"
+                android:background="@drawable/edit_text_background"
                 app:layout_constraintTop_toBottomOf="@id/phone_number_label"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"/>
@@ -135,7 +135,7 @@
                 android:text="John Doe"
                 android:textSize="14sp"
                 android:textColor="@color/gray_9"
-                android:background="@drawable/shape_edit_text_background"
+                android:background="@drawable/edit_text_background"
                 android:inputType="textPassword"
                 android:drawableEnd="@drawable/eye"
                 android:drawableTint="@color/gray_1"
diff --git a/app/src/main/res/layout/call_start_fragment.xml b/app/src/main/res/layout/call_start_fragment.xml
index 1f9c859ee..899de3da1 100644
--- a/app/src/main/res/layout/call_start_fragment.xml
+++ b/app/src/main/res/layout/call_start_fragment.xml
@@ -47,6 +47,16 @@
             app:layout_constraintStart_toEndOf="@id/back"
             app:layout_constraintTop_toTopOf="parent"/>
 
+        <View
+            android:id="@+id/background"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:background="@color/gray_7"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/title"
+            app:layout_constraintBottom_toBottomOf="parent" />
+
         <androidx.appcompat.widget.AppCompatEditText
             style="@style/default_text_style"
             android:id="@+id/search_bar"
@@ -62,7 +72,7 @@
             android:drawableStart="@drawable/magnifying_glass"
             android:drawablePadding="10dp"
             android:drawableTint="@color/gray_9"
-            android:background="@drawable/shape_search_square_background"
+            android:background="@drawable/edit_text_background"
             android:hint="Search contact or history call"
             android:text="@={viewModel.searchFilter}"
             android:textSize="14sp"
@@ -71,6 +81,20 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/title" />
 
+        <ImageView
+            android:onClick="@{() -> viewModel.clearFilter()}"
+            android:id="@+id/clear_field"
+            android:visibility="@{viewModel.searchFilter.length() > 0 ? View.VISIBLE : View.GONE, default=gone}"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="15dp"
+            android:src="@drawable/x"
+            app:tint="@color/gray_9"
+            app:layout_constraintTop_toTopOf="@id/search_bar"
+            app:layout_constraintBottom_toBottomOf="@id/search_bar"
+            app:layout_constraintEnd_toEndOf="@id/search_bar"/>
+
+
         <!-- margin start must be half the size of the group_call_icon below -->
         <View
             android:id="@+id/gradient_background"
diff --git a/app/src/main/res/layout/contact_new_or_edit_cell.xml b/app/src/main/res/layout/contact_new_or_edit_cell.xml
index c59030747..999a8f764 100644
--- a/app/src/main/res/layout/contact_new_or_edit_cell.xml
+++ b/app/src/main/res/layout/contact_new_or_edit_cell.xml
@@ -44,7 +44,7 @@
             android:text="@={model.value}"
             android:textSize="14sp"
             android:textColor="@color/gray_9"
-            android:background="@drawable/shape_edit_text_background"
+            android:background="@drawable/edit_text_background"
             android:maxLines="1"
             android:inputType="@{model.isSip ? InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS : InputType.TYPE_CLASS_PHONE}"
             app:layout_constraintTop_toBottomOf="@id/label"
diff --git a/app/src/main/res/layout/contact_new_or_edit_fragment.xml b/app/src/main/res/layout/contact_new_or_edit_fragment.xml
index e0afd9641..fc1166843 100644
--- a/app/src/main/res/layout/contact_new_or_edit_fragment.xml
+++ b/app/src/main/res/layout/contact_new_or_edit_fragment.xml
@@ -141,7 +141,7 @@
                     android:textSize="14sp"
                     android:textColor="@color/gray_9"
                     android:maxLines="1"
-                    android:background="@drawable/shape_edit_text_background"
+                    android:background="@drawable/edit_text_background"
                     android:inputType="text|textPersonName"
                     app:layout_constraintTop_toBottomOf="@id/first_name_label"
                     app:layout_constraintStart_toStartOf="parent"
@@ -175,7 +175,7 @@
                     android:textSize="14sp"
                     android:textColor="@color/gray_9"
                     android:maxLines="1"
-                    android:background="@drawable/shape_edit_text_background"
+                    android:background="@drawable/edit_text_background"
                     android:inputType="text|textPersonName"
                     app:layout_constraintTop_toBottomOf="@id/last_name_label"
                     app:layout_constraintStart_toStartOf="parent"
@@ -229,7 +229,7 @@
                     android:textSize="14sp"
                     android:textColor="@color/gray_9"
                     android:maxLines="1"
-                    android:background="@drawable/shape_edit_text_background"
+                    android:background="@drawable/edit_text_background"
                     android:inputType="text"
                     app:layout_constraintTop_toBottomOf="@id/company_label"
                     app:layout_constraintStart_toStartOf="parent"
@@ -264,7 +264,7 @@
                     android:textSize="14sp"
                     android:textColor="@color/gray_9"
                     android:maxLines="1"
-                    android:background="@drawable/shape_edit_text_background"
+                    android:background="@drawable/edit_text_background"
                     android:inputType="text"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/job_title_label"
diff --git a/app/src/main/res/layout/conversation_fragment.xml b/app/src/main/res/layout/conversation_fragment.xml
index 65cc2a245..cec8676b7 100644
--- a/app/src/main/res/layout/conversation_fragment.xml
+++ b/app/src/main/res/layout/conversation_fragment.xml
@@ -181,7 +181,7 @@
             android:paddingBottom="5dp"
             android:maxLines="5"
             android:textSize="14sp"
-            android:background="@drawable/shape_edittext_white_background"
+            android:background="@drawable/edit_text_background"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toEndOf="@id/attach_file"
             app:layout_constraintEnd_toStartOf="@id/voice_message"/>
diff --git a/app/src/main/res/layout/conversation_start_fragment.xml b/app/src/main/res/layout/conversation_start_fragment.xml
index a71494b79..15f8b52a0 100644
--- a/app/src/main/res/layout/conversation_start_fragment.xml
+++ b/app/src/main/res/layout/conversation_start_fragment.xml
@@ -90,7 +90,7 @@
             android:padding="10dp"
             android:drawableStart="@drawable/magnifying_glass"
             android:drawablePadding="10dp"
-            android:background="@drawable/shape_search_square_background"
+            android:background="@drawable/edit_text_background"
             android:hint="Rechercher des contacts"
             android:text="@={viewModel.filter}"
             android:textSize="14sp"