diff --git a/app/src/main/res/color/outlined_icon_tint.xml b/app/src/main/res/color/outlined_icon_tint.xml
new file mode 100644
index 000000000..0bd27f3e8
--- /dev/null
+++ b/app/src/main/res/color/outlined_icon_tint.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="?attr/colorPrimary" android:state_activated="true"/>
+    <item android:alpha="0.38" android:color="?attr/colorOnSurface" android:state_enabled="false"/>
+    <item android:alpha="0.6" android:color="?attr/colorOnSurface"/>
+</selector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 1ddd96bde..4ba1312e4 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -30,7 +30,7 @@
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBar"
         android:layout_width="match_parent"
-        android:layout_height="56dp"
+        android:layout_height="wrap_content"
         android:background="@color/transparent"
         android:elevation="0dp"
         android:windowContentOverlay="@null"
diff --git a/app/src/main/res/layout/search_layout.xml b/app/src/main/res/layout/search_layout.xml
index 98d4636f6..e5255f9ee 100644
--- a/app/src/main/res/layout/search_layout.xml
+++ b/app/src/main/res/layout/search_layout.xml
@@ -24,22 +24,20 @@
     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:layout_height="wrap_content"
     android:clipChildren="false"
     android:clipToPadding="false">
 
-    <com.google.android.material.card.MaterialCardView
+    <androidx.cardview.widget.CardView
         android:id="@+id/searchCardView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="64dp"
         android:layout_marginHorizontal="12dp"
         android:background="@color/transparent"
-        android:elevation="2dp"
-        android:visibility="gone"
-        app:cardBackgroundColor="@color/transparent"
-        app:cardElevation="2dp"
-        app:contentPaddingLeft="16dp"
-        app:contentPaddingRight="16dp">
+        app:cardCornerRadius="8dp"
+        android:clipChildren="true"
+        android:clipToPadding="false"
+        app:cardUseCompatPadding="true">
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -48,93 +46,109 @@
             <FrameLayout
                 android:id="@+id/leftContainer"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_alignParentStart="true"
+                android:minWidth="48dp"
                 android:layout_centerVertical="true">
 
                 <ImageButton
                     android:id="@+id/leftButton"
-                    android:layout_width="wrap_content"
-                    android:layout_height="32dp"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:padding="3dp"
                     android:layout_gravity="center"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:scaleType="fitCenter"
                     android:src="@drawable/ic_arrow_back_black_24dp"
-                    android:tint="@color/fg_default"
-                    android:visibility="visible"
-                    tools:src="@drawable/ic_arrow_back_black_24dp" />
+                    android:tint="@color/outlined_icon_tint"
+                    android:visibility="gone"
+                    tools:src="@drawable/ic_arrow_back_black_24dp"/>
 
             </FrameLayout>
 
-            <EditText
-                android:id="@+id/inputEditText"
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/searchTextInputLayout"
+                style="@style/Base.Widget.MaterialComponents.TextInputLayout"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignWithParentIfMissing="true"
+                android:layout_height="match_parent"
                 android:layout_centerVertical="true"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_toStartOf="@id/rightContainer"
                 android:layout_toEndOf="@id/leftContainer"
-                android:background="@null"
+                android:layout_toStartOf="@id/rightContainer"
                 android:focusedByDefault="false"
                 android:imeOptions="actionSearch|flagNoExtractUi"
                 android:inputType="textNoSuggestions"
-                android:lines="1"
-                android:maxLines="1"
-                android:singleLine="true"
                 android:textColor="@color/conversation_item_header"
                 android:textCursorDrawable="@null"
-                android:textSize="16sp"
-                tools:hint="Search"
-                tools:ignore="UnusedAttribute" />
+                app:boxBackgroundMode="none"
+                app:boxStrokeColor="@color/transparent"
+                app:errorEnabled="true"
+                app:helperTextEnabled="false"
+                app:hintEnabled="false"
+                tools:ignore="UnusedAttribute">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/inputEditText"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center_vertical"
+                    android:lines="1"
+                    android:maxLines="1"
+                    android:singleLine="true"
+                    android:background="@android:color/transparent"
+                    android:focusedByDefault="false"
+                    android:textSize="16sp" />
+            </com.google.android.material.textfield.TextInputLayout>
 
 
             <FrameLayout
                 android:id="@+id/rightContainer"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_alignParentEnd="true"
+                android:minWidth="48dp"
                 android:layout_centerVertical="true">
 
-                <ImageView
+                <ImageButton
                     android:id="@+id/clearButton"
-                    android:layout_width="32dp"
-                    android:layout_height="32dp"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:padding="3dp"
                     android:layout_gravity="center"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:scaleType="fitCenter"
-                    android:src="@drawable/ic_baseline_clear_24"
-                    android:tint="@color/fg_default"
+                    android:src="@drawable/ic_cancel_black_24dp"
+                    android:tint="@color/outlined_icon_tint"
                     android:transitionName="userAvatar.transitionTag"
                     android:visibility="gone"
                     tools:src="@tools:sample/avatars[0]" />
 
-                <ImageView
+                <ImageButton
                     android:id="@+id/settingsButton"
-                    android:layout_width="32dp"
-                    android:layout_height="32dp"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:padding="3dp"
                     android:layout_gravity="center"
                     android:background="?attr/selectableItemBackgroundBorderless"
                     android:scaleType="fitCenter"
                     android:src="@drawable/ic_settings_white_24dp"
-                    android:tint="@color/fg_default"
+                    android:tint="@color/outlined_icon_tint"
                     android:transitionName="userAvatar.transitionTag"
                     android:visibility="gone"
                     tools:src="@tools:sample/avatars[0]" />
 
                 <ProgressBar
                     android:id="@+id/searchProgressBar"
-                    android:layout_width="32dp"
-                    android:layout_height="32dp"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:padding="3dp"
                     android:layout_gravity="center"
                     android:indeterminate="true"
-                    android:visibility="gone"
                     android:indeterminateTint="@color/colorPrimary"
-                    android:scaleType="fitCenter" />
+                    android:scaleType="fitCenter"
+                    android:visibility="gone" />
 
             </FrameLayout>
         </RelativeLayout>
 
-    </com.google.android.material.card.MaterialCardView>
+    </androidx.cardview.widget.CardView>
 </merge>
\ No newline at end of file