diff --git a/app/src/main/java/com/nextcloud/talk/openconversations/ListOpenConversationsActivity.kt b/app/src/main/java/com/nextcloud/talk/openconversations/ListOpenConversationsActivity.kt
index 949c5ee980..187e7ab4f8 100644
--- a/app/src/main/java/com/nextcloud/talk/openconversations/ListOpenConversationsActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/openconversations/ListOpenConversationsActivity.kt
@@ -58,7 +58,7 @@ class ListOpenConversationsActivity : BaseActivity() {
         setContentView(binding.root)
         setupSystemColors()
         viewThemeUtils.platform.colorImageView(binding.searchOpenConversations, ColorRole.ON_SURFACE)
-        viewThemeUtils.platform.colorEditText(binding.searchEdit)
+        viewThemeUtils.material.colorTextInputLayout(binding.textInputLayout)
 
         val user = currentUserProvider.currentUser.blockingGet()
 
@@ -68,7 +68,7 @@ class ListOpenConversationsActivity : BaseActivity() {
             searching = !searching
             handleSearchUI(searching)
         }
-        binding.searchEdit.doOnTextChanged { text, _, _, count ->
+        binding.editText.doOnTextChanged { text, _, _, count ->
             adapter.filter(text.toString())
         }
 
@@ -78,11 +78,11 @@ class ListOpenConversationsActivity : BaseActivity() {
     private fun handleSearchUI(show: Boolean) {
         if (show) {
             binding.searchOpenConversations.visibility = View.GONE
-            binding.searchEdit.visibility = View.VISIBLE
-            binding.searchEdit.showKeyboardAndFocus()
+            binding.textInputLayout.visibility = View.VISIBLE
+            binding.editText.showKeyboardAndFocus()
         } else {
             binding.searchOpenConversations.visibility = View.VISIBLE
-            binding.searchEdit.visibility = View.GONE
+            binding.textInputLayout.visibility = View.GONE
         }
     }
 
diff --git a/app/src/main/res/layout/activity_open_conversations.xml b/app/src/main/res/layout/activity_open_conversations.xml
index 06bae21720..13ebaf2a04 100644
--- a/app/src/main/res/layout/activity_open_conversations.xml
+++ b/app/src/main/res/layout/activity_open_conversations.xml
@@ -7,6 +7,7 @@
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -38,13 +39,28 @@
                 android:layout_marginHorizontal="@dimen/standard_margin"
                 android:src="@drawable/ic_search_white_24dp" />
 
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/search_edit"
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/textInputLayout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                app:endIconMode="clear_text"
+                app:boxBackgroundMode="none"
                 android:visibility="gone"
-                />
+                tools:visibility="visible"
+                app:hintEnabled="false"
+                app:endIconTint="@color/icon_on_bg_default"
+                android:layout_marginEnd = "8dp">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/editText"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="@string/nc_search"
+                    android:textColorHint="@color/low_emphasis_text"
+                    android:textColor = "@color/high_emphasis_text"/>
+            </com.google.android.material.textfield.TextInputLayout>
         </com.google.android.material.appbar.MaterialToolbar>
+
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.recyclerview.widget.RecyclerView