diff --git a/app/src/main/res/layout/component_tracking_protection_panel.xml b/app/src/main/res/layout/component_tracking_protection_panel.xml
index 24abffc91..1d95ed342 100644
--- a/app/src/main/res/layout/component_tracking_protection_panel.xml
+++ b/app/src/main/res/layout/component_tracking_protection_panel.xml
@@ -57,9 +57,9 @@
             style="@style/QuickSettingsText.Icon"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tracking_protection_item_height"
-            android:drawableStart="@drawable/ic_cookies"
             android:text="@string/etp_cookies_title"
             android:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_cookies"
             app:layout_constraintTop_toBottomOf="@id/blocking_header" />
 
         <TextView
@@ -67,9 +67,9 @@
             style="@style/QuickSettingsText.Icon"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tracking_protection_item_height"
-            android:drawableStart="@drawable/ic_fingerprinters"
             android:text="@string/etp_fingerprinters_title"
             android:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_fingerprinters"
             app:layout_constraintTop_toBottomOf="@id/cross_site_tracking" />
 
         <TextView
@@ -77,9 +77,9 @@
             style="@style/QuickSettingsText.Icon"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tracking_protection_item_height"
-            android:drawableStart="@drawable/ic_cryptominers"
             android:text="@string/etp_cryptominers_title"
             android:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_cryptominers"
             app:layout_constraintTop_toBottomOf="@id/fingerprinters" />
 
         <TextView
@@ -87,9 +87,9 @@
             style="@style/QuickSettingsText.Icon"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tracking_protection_item_height"
-            android:drawableStart="@drawable/ic_social_media_trackers"
             android:text="@string/etp_social_media_trackers_title"
             android:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_social_media_trackers"
             app:layout_constraintTop_toBottomOf="@id/cryptominers" />
 
         <TextView
@@ -97,9 +97,9 @@
             style="@style/QuickSettingsText.Icon"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tracking_protection_item_height"
-            android:drawableStart="@drawable/ic_tracking_content"
             android:text="@string/etp_tracking_content_title"
             android:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_tracking_content"
             app:layout_constraintTop_toBottomOf="@id/social_media_trackers" />
 
         <TextView
@@ -118,9 +118,9 @@
             style="@style/QuickSettingsText.Icon"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tracking_protection_item_height"
-            android:drawableStart="@drawable/ic_fingerprinters"
             android:text="@string/etp_fingerprinters_title"
             android:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_fingerprinters"
             app:layout_constraintTop_toBottomOf="@id/not_blocking_header" />
 
         <TextView
@@ -128,9 +128,9 @@
             style="@style/QuickSettingsText.Icon"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tracking_protection_item_height"
-            android:drawableStart="@drawable/ic_cryptominers"
             android:text="@string/etp_cryptominers_title"
             android:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_cryptominers"
             app:layout_constraintTop_toBottomOf="@id/fingerprinters_loaded" />
 
         <TextView
@@ -138,9 +138,9 @@
             style="@style/QuickSettingsText.Icon"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tracking_protection_item_height"
-            android:drawableStart="@drawable/ic_social_media_trackers"
             android:text="@string/etp_social_media_trackers_title"
             android:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_social_media_trackers"
             app:layout_constraintTop_toBottomOf="@id/cryptominers_loaded" />
 
         <TextView
@@ -148,9 +148,9 @@
             style="@style/QuickSettingsText.Icon"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tracking_protection_item_height"
-            android:drawableStart="@drawable/ic_tracking_content"
             android:text="@string/etp_tracking_content_title"
             android:visibility="gone"
+            app:drawableStartCompat="@drawable/ic_tracking_content"
             app:layout_constraintTop_toBottomOf="@id/social_media_trackers_loaded" />
 
         <View
@@ -185,11 +185,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
-            android:src="@drawable/mozac_ic_back"
             android:tint="?attr/primaryText"
             app:layout_constraintBottom_toBottomOf="@+id/category_description"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@id/category_title" />
+            app:layout_constraintTop_toTopOf="@id/category_title"
+            app:srcCompat="@drawable/mozac_ic_back" />
 
         <TextView
             android:id="@+id/category_title"