diff --git a/app-indexing/app/src/main/res/layout/activity_main.xml b/app-indexing/app/src/main/res/layout/activity_main.xml
index 1adc770ef..411374683 100644
--- a/app-indexing/app/src/main/res/layout/activity_main.xml
+++ b/app-indexing/app/src/main/res/layout/activity_main.xml
@@ -1,71 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout 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"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
     android:background="#fff2f2f2"
-    android:paddingLeft="16dp"
-    android:paddingTop="16dp"
-    android:paddingRight="16dp"
-    android:paddingBottom="16dp">
+    android:padding="16dp">
 
     <ImageView
         android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:src="@drawable/firebase_lockup_400" />
+        android:src="@drawable/firebase_lockup_400"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
         android:id="@+id/contentIndexLabel"
         style="@style/TextAppearance.AppCompat.Medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/icon"
-        android:layout_alignParentStart="true"
-        android:text="@string/content_label" />
+        android:text="@string/content_label"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/icon" />
 
     <TextView
         android:id="@+id/textView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/contentIndexLabel"
-        android:layout_alignParentStart="true"
-        android:text="@string/link_label" />
+        android:text="@string/link_label"
+        app:layout_constraintStart_toStartOf="@+id/contentIndexLabel"
+        app:layout_constraintTop_toBottomOf="@+id/contentIndexLabel" />
 
     <TextView
         android:id="@+id/link"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/contentIndexLabel"
-        android:layout_toEndOf="@+id/textView"
-        android:text="@string/none" />
+        android:text="@string/none"
+        app:layout_constraintBottom_toBottomOf="@+id/textView"
+        app:layout_constraintStart_toEndOf="@+id/textView"
+        app:layout_constraintTop_toTopOf="@+id/textView"/>
 
     <TextView
         android:id="@+id/stickerIndexLabel"
         style="@style/TextAppearance.AppCompat.Medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/textView"
-        android:layout_alignParentStart="true"
+        android:text="@string/stickers_label"
         android:layout_marginTop="20dp"
-        android:text="@string/stickers_label" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView" />
 
     <Button
         android:id="@+id/addStickersBtn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/stickerIndexLabel"
-        android:layout_alignEnd="@+id/clearStickersBtn"
-        android:layout_alignParentStart="true"
-        android:text="Add Stickers" />
+        android:text="Add Stickers"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/stickerIndexLabel" />
 
     <Button
         android:id="@+id/clearStickersBtn"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_below="@+id/addStickersBtn"
-        android:layout_alignParentStart="true"
-        android:text="Clear Stickers" />
+        android:text="Clear Stickers"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/addStickersBtn" />
 
-</RelativeLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>