diff --git a/app/src/main/res/layout/fragment_add_on_permissions.xml b/app/src/main/res/layout/fragment_add_on_permissions.xml
index 70f72538c..0e9655c23 100644
--- a/app/src/main/res/layout/fragment_add_on_permissions.xml
+++ b/app/src/main/res/layout/fragment_add_on_permissions.xml
@@ -19,10 +19,10 @@
         android:layout_height="wrap_content"
         android:layout_below="@+id/add_ons_permissions"
         android:background="?attr/selectableItemBackground"
-        android:drawableEnd="@drawable/mozac_ic_link"
         android:padding="16dp"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:text="@string/mozac_feature_addons_learn_more"
+        app:drawableEndCompat="@drawable/mozac_ic_link"
         app:drawableTint="?android:attr/textColorPrimary" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/overlay_add_on_progress.xml b/app/src/main/res/layout/overlay_add_on_progress.xml
index 1f0d17c8b..8ee51c617 100644
--- a/app/src/main/res/layout/overlay_add_on_progress.xml
+++ b/app/src/main/res/layout/overlay_add_on_progress.xml
@@ -4,6 +4,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <androidx.cardview.widget.CardView 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:elevation="1dp">
@@ -11,12 +12,12 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:gravity="start|center_vertical"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
-        android:drawableStart="@drawable/mozac_ic_extensions_black"
         android:drawablePadding="8dp"
-        android:text="@string/mozac_add_on_install_progress_caption"/>
+        android:gravity="start|center_vertical"
+        android:padding="16dp"
+        android:text="@string/mozac_add_on_install_progress_caption"
+        app:drawableStartCompat="@drawable/mozac_ic_extensions_black" />
 
 </androidx.cardview.widget.CardView>