diff --git a/app/src/main/res/layout/item_song.xml b/app/src/main/res/layout/item_song.xml
index 1ffccee7..2660872e 100755
--- a/app/src/main/res/layout/item_song.xml
+++ b/app/src/main/res/layout/item_song.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -14,66 +14,63 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_weight="0"
-        android:paddingLeft="16dp"
-        android:paddingEnd="0dp">
+        android:paddingEnd="8dp"
+        android:paddingStart="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/image_text"
-            android:layout_width="36dp"
+            android:layout_width="40dp"
             android:layout_height="match_parent"
             android:fontFeatureSettings="onum"
             android:gravity="center"
             android:maxLines="1"
             android:minHeight="40dp"
-            android:textColor="?colorOnSecondary"
-            android:textAppearance="@style/TextViewNormal" />
+            android:textAppearance="@style/TextViewNormal"
+            android:textColor="?colorOnSecondary" />
     </FrameLayout>
 
 
-    <FrameLayout
-        android:id="@+id/title_container"
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:maxLines="1"
+        android:textAppearance="@style/TextViewBody1"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/time"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/image_container"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="Song title" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_weight="1.0"
-        android:orientation="vertical">
+        android:layout_weight="0"
+        android:fontFeatureSettings="onum"
+        android:padding="4dp"
+        android:textColor="?colorOnSecondary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/menu"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="22:00" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingStart="6dp"
-            android:paddingEnd="0dp">
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:maxLines="1"
-                android:textAppearance="@style/TextViewBody1"
-                tools:text="Song title" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/time"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:textColor="?colorOnSecondary"
-                android:fontFeatureSettings="onum"
-                android:padding="4dp"
-                tools:text="22:00" />
-        </LinearLayout>
-    </FrameLayout>
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/menu"
         style="@style/OverFlowButton"
+        android:layout_gravity="center"
         android:layout_margin="0dp"
         android:layout_weight="0"
         android:rotation="90"
-        android:layout_gravity="center"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
         app:tint="?colorOnSecondary"
         tools:visibility="visible" />
-</LinearLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file