diff --git a/app/src/main/java/audio/funkwhale/ffa/adapters/SearchAdapter.kt b/app/src/main/java/audio/funkwhale/ffa/adapters/SearchAdapter.kt
index 23a4d79..f7cd7ee 100644
--- a/app/src/main/java/audio/funkwhale/ffa/adapters/SearchAdapter.kt
+++ b/app/src/main/java/audio/funkwhale/ffa/adapters/SearchAdapter.kt
@@ -184,7 +184,7 @@ class SearchAdapter(
       .transform(RoundedCornersTransformation(16, 0))
       .into(rowTrackViewHolder?.cover)
 
-    searchHeaderViewHolder?.title?.text = item.title()
+    rowTrackViewHolder?.title?.text = item.title()
     rowTrackViewHolder?.artist?.text = item.subtitle()
 
     Build.VERSION_CODES.P.onApi(
@@ -312,6 +312,7 @@ class SearchAdapter(
 
   inner class RowTrackViewHolder(val binding: RowTrackBinding, context: Context?) :
     ViewHolder(binding.root, context), View.OnClickListener {
+    val title = binding.title
     val cover = binding.cover
     val artist = binding.artist
 
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index 2ce5bd3..06d4f5f 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -1,100 +1,100 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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">
-
-  <LinearLayout
+    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"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintLeft_toLeftOf="parent"
-    app:layout_constraintRight_toRightOf="parent"
-    app:layout_constraintTop_toTopOf="parent"
-    tools:context=".activities.SearchActivity">
+    android:layout_height="match_parent">
 
-    <androidx.cardview.widget.CardView
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginStart="8dp"
-      android:layout_marginTop="16dp"
-      android:layout_marginEnd="8dp"
-      android:layout_marginBottom="0dp"
-      android:elevation="4dp">
-
-      <LinearLayout
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:context=".activities.SearchActivity">
 
-        <androidx.appcompat.widget.SearchView
-          android:id="@+id/search"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          app:iconifiedByDefault="false"
-          app:queryBackground="@android:color/transparent"
-          app:queryHint="@string/search_placeholder" />
+        <androidx.cardview.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="0dp"
+            android:elevation="4dp">
 
-        <ProgressBar
-          android:id="@+id/search_spinner"
-          style="?android:attr/progressBarStyleHorizontal"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="-12dp"
-          android:layout_marginBottom="-12dp"
-          android:indeterminate="true"
-          android:visibility="invisible" />
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
 
-      </LinearLayout>
+                <androidx.appcompat.widget.SearchView
+                    android:id="@+id/search"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    app:iconifiedByDefault="false"
+                    app:queryBackground="@android:color/transparent"
+                    app:queryHint="@string/search_placeholder" />
 
-    </androidx.cardview.widget.CardView>
+                <ProgressBar
+                    android:id="@+id/search_spinner"
+                    style="?android:attr/progressBarStyleHorizontal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="-12dp"
+                    android:layout_marginBottom="-12dp"
+                    android:indeterminate="true"
+                    android:visibility="invisible" />
 
-    <TextView
-      android:id="@+id/search_empty"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginStart="16dp"
-      android:layout_marginTop="16dp"
-      android:layout_marginEnd="16dp"
-      android:drawableTop="@drawable/funkwhaleshape"
-      android:drawablePadding="16dp"
-      android:drawableTint="#525252"
-      android:text="@string/search_welcome"
-      android:textAlignment="center"
-      android:textSize="14sp" />
+            </LinearLayout>
 
-    <TextView
-      android:id="@+id/search_no_results"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_marginStart="16dp"
-      android:layout_marginTop="16dp"
-      android:layout_marginEnd="16dp"
-      android:drawableTop="@drawable/funkwhaleshape"
-      android:drawablePadding="16dp"
-      android:drawableTint="#525252"
-      android:text="@string/search_no_results"
-      android:textAlignment="center"
-      android:textSize="14sp"
-      android:visibility="gone" />
+        </androidx.cardview.widget.CardView>
 
-    <androidx.recyclerview.widget.RecyclerView
-      android:id="@+id/results"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      tools:itemCount="10"
-      tools:listitem="@layout/row_track" />
+        <TextView
+            android:id="@+id/search_empty"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:drawablePadding="16dp"
+            android:text="@string/search_welcome"
+            android:textAlignment="center"
+            android:textSize="14sp"
+            app:drawableTint="#525252"
+            app:drawableTopCompat="@drawable/funkwhaleshape" />
 
-  </LinearLayout>
+        <TextView
+            android:id="@+id/search_no_results"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            app:drawableTopCompat="@drawable/funkwhaleshape"
+            android:drawablePadding="16dp"
+            app:drawableTint="#525252"
+            android:text="@string/search_no_results"
+            android:textAlignment="center"
+            android:textSize="14sp"
+            android:visibility="gone" />
 
-  <FrameLayout
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintLeft_toLeftOf="parent"
-    app:layout_constraintRight_toRightOf="parent"
-    app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/results"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:itemCount="10"
+            tools:listitem="@layout/row_track" />
+
+    </LinearLayout>
+
+    <FrameLayout
+        android:id="@+id/container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/row_track.xml b/app/src/main/res/layout/row_track.xml
index 807e175..561ce9f 100644
--- a/app/src/main/res/layout/row_track.xml
+++ b/app/src/main/res/layout/row_track.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_marginHorizontal="8dp"
@@ -45,9 +46,9 @@
             style="@style/AppTheme.ItemTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableStart="@drawable/downloaded"
+            app:drawableStartCompat="@drawable/downloaded"
             android:drawablePadding="8dp"
-            android:drawableTint="@color/controlColor"
+            app:drawableTint="@color/controlColor"
             android:ellipsize="end"
             android:lines="1"
             tools:text="Absolution" />