diff --git a/res/layout/storage_item.xml b/res/layout/storage_item.xml
index cefb399ec2b..6de2d510b17 100644
--- a/res/layout/storage_item.xml
+++ b/res/layout/storage_item.xml
@@ -15,6 +15,7 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:orientation="vertical"
@@ -51,20 +52,20 @@
                 android:maxHeight="24dp"/>
         </LinearLayout>
 
-        <RelativeLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical" >
+            android:layout_height="wrap_content">
 
             <TextView
                 android:id="@android:id/title"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
                 android:textAlignment="viewStart"
                 android:ellipsize="marquee"
-                android:fadingEdge="horizontal" />
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toStartOf="@android:id/summary"/>
 
             <TextView
                 android:id="@android:id/summary"
@@ -74,7 +75,8 @@
                 android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Body1"
                 android:textColor="?android:attr/textColorSecondary"
                 android:maxLines="10"
-                android:layout_alignParentEnd="true"/>
+                app:layout_constraintBaseline_toBaselineOf="@android:id/title"
+                app:layout_constraintEnd_toEndOf="parent"/>
 
             <ProgressBar
                 android:id="@android:id/progress"
@@ -84,8 +86,8 @@
                 android:layout_marginBottom="4dp"
                 android:max="100"
                 android:layout_below="@android:id/title"
-                android:layout_alignStart="@android:id/title"
+                app:layout_constraintTop_toBottomOf="@android:id/title"
                 style="?android:attr/progressBarStyleHorizontal" />
-        </RelativeLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
 </LinearLayout>