diff --git a/app/build.gradle b/app/build.gradle
index 2f9f9b769..48a5fa8fa 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,6 +18,7 @@ android {
         targetSdkVersion Config.targetSdkVersion
         versionCode 1
         versionName Config.generateDebugVersionName()
+        vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'
         manifestPlaceholders.isRaptorEnabled = "false"
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingFirefoxAccountViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingFirefoxAccountViewHolder.kt
index 46439e178..1525175e9 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingFirefoxAccountViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingFirefoxAccountViewHolder.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding
 
 import android.view.View
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.navigation.Navigation
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.onboarding_firefox_account.view.*
@@ -12,6 +13,13 @@ import org.mozilla.fenix.R
 import org.mozilla.fenix.home.HomeFragmentDirections
 
 class OnboardingFirefoxAccountViewHolder(private val view: View) : RecyclerView.ViewHolder(view) {
+    private val avatarAnonymousDrawable by lazy {
+        AppCompatResources.getDrawable(view.context, R.drawable.ic_onboarding_avatar_anonymous)
+    }
+    private val firefoxAccountsDrawable by lazy {
+        AppCompatResources.getDrawable(view.context, R.drawable.ic_onboarding_firefox_accounts)
+    }
+
     init {
         view.turn_on_sync_button.setOnClickListener {
             val directions = HomeFragmentDirections.actionHomeFragmentToTurnOnSyncFragment()
@@ -31,13 +39,10 @@ class OnboardingFirefoxAccountViewHolder(private val view: View) : RecyclerView.
     }
 
     private fun updateHeaderText(autoSignedIn: Boolean) {
-        val appName = view.context.getString(R.string.app_name)
-
-        val icon =
-            if (autoSignedIn) view.context.getDrawable(R.drawable.ic_onboarding_avatar_anonymous)
-            else view.context.getDrawable(R.drawable.ic_onboarding_firefox_accounts)
-
+        val icon = if (autoSignedIn) avatarAnonymousDrawable else firefoxAccountsDrawable
         view.header_text.setCompoundDrawablesRelativeWithIntrinsicBounds(icon, null, null, null)
+
+        val appName = view.context.getString(R.string.app_name)
         view.header_text.text =
             if (autoSignedIn) view.context.getString(R.string.onboarding_firefox_account_auto_signin_header)
             else view.context.getString(R.string.onboarding_firefox_account_header, appName)
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivacyNoticeViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivacyNoticeViewHolder.kt
index 3fbd5f44a..95148a003 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivacyNoticeViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivacyNoticeViewHolder.kt
@@ -5,10 +5,9 @@
 package org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding
 
 import android.view.View
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.onboarding_privacy_notice.view.*
-import kotlinx.android.synthetic.main.onboarding_privacy_notice.view.description_text
-import kotlinx.android.synthetic.main.onboarding_privacy_notice.view.header_text
 import org.jetbrains.anko.dimen
 import org.mozilla.fenix.R
 import org.mozilla.fenix.settings.SupportUtils
@@ -16,7 +15,7 @@ import org.mozilla.fenix.settings.SupportUtils
 class OnboardingPrivacyNoticeViewHolder(view: View) : RecyclerView.ViewHolder(view) {
 
     init {
-        val icon = view.context.getDrawable(R.drawable.ic_onboarding_privacy_notice)
+        val icon = AppCompatResources.getDrawable(view.context, R.drawable.ic_onboarding_privacy_notice)
         val size = view.context.dimen(R.dimen.onboarding_header_icon_height_width)
         icon?.setBounds(0, 0, size, size)
 
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivateBrowsingViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivateBrowsingViewHolder.kt
index 3220ff5a3..1a309a6b7 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivateBrowsingViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivateBrowsingViewHolder.kt
@@ -10,6 +10,7 @@ import android.text.SpannableString
 import android.text.Spanned
 import android.text.style.ImageSpan
 import android.view.View
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.onboarding_private_browsing.view.*
 import org.mozilla.fenix.R
@@ -17,7 +18,7 @@ import org.mozilla.fenix.R
 class OnboardingPrivateBrowsingViewHolder(view: View) : RecyclerView.ViewHolder(view) {
 
     init {
-        val iconDrawable = view.context.getDrawable(R.drawable.ic_private_browsing)!!
+        val iconDrawable = AppCompatResources.getDrawable(view.context, R.drawable.ic_private_browsing)!!
         iconDrawable.setBounds(0, 0, view.description_text.lineHeight, view.description_text.lineHeight)
 
         val icon = object : ImageSpan(iconDrawable) {
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingTrackingProtectionViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingTrackingProtectionViewHolder.kt
index 3e2092949..e46b654a8 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingTrackingProtectionViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingTrackingProtectionViewHolder.kt
@@ -5,6 +5,7 @@
 package org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding
 
 import android.view.View
+import androidx.appcompat.content.res.AppCompatResources
 import androidx.recyclerview.widget.RecyclerView
 import kotlinx.android.synthetic.main.onboarding_tracking_protection.view.*
 import org.jetbrains.anko.dimen
@@ -15,7 +16,7 @@ import org.mozilla.fenix.utils.Settings
 class OnboardingTrackingProtectionViewHolder(val view: View) : RecyclerView.ViewHolder(view) {
 
     init {
-        val icon = view.context.getDrawable(R.drawable.ic_onboarding_tracking_protection)
+        val icon = AppCompatResources.getDrawable(view.context, R.drawable.ic_onboarding_tracking_protection)
         val size = view.context.dimen(R.dimen.onboarding_header_icon_height_width)
         icon?.setBounds(0, 0, size, size)
 
diff --git a/app/src/main/res/drawable/ic_fx_accounts_avatar.xml b/app/src/main/res/drawable/ic_fx_accounts_avatar.xml
index 267152d05..f839750a5 100644
--- a/app/src/main/res/drawable/ic_fx_accounts_avatar.xml
+++ b/app/src/main/res/drawable/ic_fx_accounts_avatar.xml
@@ -1,7 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:aapt="http://schemas.android.com/aapt"
     android:width="72dp"
@@ -11,7 +11,7 @@
   <path
       android:pathData="M343,20.2c0,3.8 -3.1,6.9 -6.8,6.9h-27.5c-2.9,0 -5.2,-2.4 -5.2,-5.3s2.3,-5.3 5.2,-5.3c0.4,0 0.9,0.1 1.3,0.2c-0.1,-0.4 -0.1,-0.8 -0.1,-1.2c0,-3 2.4,-5.4 5.4,-5.4c1.1,0 2.2,0.4 3.1,0.9c1,-3.9 4.6,-6.8 8.8,-6.8c5,0 9.1,4.1 9.1,9.1C339.9,13.3 343,16.4 343,20.2zM283,34.2c-0.7,0 -1.3,0.1 -1.9,0.2c0.1,-0.6 0.2,-1.2 0.2,-1.8c0,-4.5 -3.7,-8.2 -8.2,-8.2c-1.7,0 -3.3,0.5 -4.6,1.4c-1.5,-5.9 -6.9,-10.2 -13.3,-10.2c-7.6,0 -13.7,6.1 -13.7,13.7c-5.7,0 -10.3,4.6 -10.3,10.3s4.6,10.3 10.3,10.3H283c4.3,0 7.9,-3.5 7.9,-7.9C290.9,37.7 287.3,34.2 283,34.2z">
     <aapt:attr name="android:fillColor">
-      <gradient 
+      <gradient
           android:gradientRadius="65.8039"
           android:centerX="287.1183"
           android:centerY="27.0893"
@@ -22,10 +22,10 @@
     </aapt:attr>
   </path>
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#000000"
       android:pathData="M289.8,31.5m-49,0a49,49 0,1 1,98 0a49,49 0,1 1,-98 0"/>
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#000000"
       android:pathData="M289.8,-4.7c-20,0 -36.2,16.2 -36.2,36.2c0,20 16.2,36.2 36.2,36.2c20,0 36.2,-16.2 36.2,-36.2C326,11.5 309.8,-4.7 289.8,-4.7zM289.8,5.7c8.6,0 15.5,6.9 15.5,15.5c0,8.6 -6.9,15.5 -15.5,15.5c-8.6,0 -15.5,-6.9 -15.5,-15.5C274.3,12.6 281.3,5.7 289.8,5.7zM311.1,46c-4.6,6.8 -12.4,11.3 -21.3,11.3s-16.6,-4.5 -21.3,-11.3c-1.3,-2 -1.2,-4.6 0.3,-6.3c5.5,-6.3 13,2.2 20.9,2.2c7.9,0 15.5,-8.5 20.9,-2.2C312.3,41.5 312.4,44.1 311.1,46z"/>
   <group>
     <clip-path android:pathData="M289.8,-4.7c-20,0 -36.2,16.2 -36.2,36.2c0,20 16.2,36.2 36.2,36.2c20,0 36.2,-16.2 36.2,-36.2C326,11.5 309.8,-4.7 289.8,-4.7zM289.8,5.7c8.6,0 15.5,6.9 15.5,15.5c0,8.6 -6.9,15.5 -15.5,15.5c-8.6,0 -15.5,-6.9 -15.5,-15.5C274.3,12.6 281.3,5.7 289.8,5.7zM311.1,46c-4.6,6.8 -12.4,11.3 -21.3,11.3s-16.6,-4.5 -21.3,-11.3c-1.3,-2 -1.2,-4.6 0.3,-6.3c5.5,-6.3 13,2.2 20.9,2.2c7.9,0 15.5,-8.5 20.9,-2.2C312.3,41.5 312.4,44.1 311.1,46z M 0,0"/>
@@ -34,20 +34,20 @@
         android:strokeAlpha="0.3"
         android:fillAlpha="0.3">
       <aapt:attr name="android:fillColor">
-        <gradient 
+        <gradient
             android:gradientRadius="85.3299"
             android:centerX="311.5509"
             android:centerY="-2.3418"
             android:type="radial">
-          <item android:offset="0.1494" android:color="#FF00DDFF"/>
-          <item android:offset="0.5173" android:color="#FF70BAFF"/>
-          <item android:offset="0.8279" android:color="#FFCB9EFF"/>
+          <item android:offset="0.1494" android:color="#00DDFF"/>
+          <item android:offset="0.5173" android:color="#70BAFF"/>
+          <item android:offset="0.8279" android:color="#CB9EFF"/>
         </gradient>
       </aapt:attr>
     </path>
   </group>
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#000000"
       android:pathData="M274.3,21.2c0,-8.6 6.9,-15.5 15.5,-15.5c8.6,0 15.5,6.9 15.5,15.5s-6.9,15.5 -15.5,15.5C281.3,36.7 274.3,29.8 274.3,21.2zM289.8,41.9c-7.9,0 -15.5,-8.5 -20.9,-2.2c-1.5,1.8 -1.7,4.4 -0.3,6.3c4.6,6.8 12.4,11.3 21.3,11.3c8.9,0 16.6,-4.5 21.3,-11.3c1.3,-2 1.2,-4.6 -0.3,-6.3C305.3,33.4 297.7,41.9 289.8,41.9z"/>
   <group>
     <clip-path android:pathData="M274.3,21.2c0,-8.6 6.9,-15.5 15.5,-15.5c8.6,0 15.5,6.9 15.5,15.5s-6.9,15.5 -15.5,15.5C281.3,36.7 274.3,29.8 274.3,21.2zM289.8,41.9c-7.9,0 -15.5,-8.5 -20.9,-2.2c-1.5,1.8 -1.7,4.4 -0.3,6.3c4.6,6.8 12.4,11.3 21.3,11.3c8.9,0 16.6,-4.5 21.3,-11.3c1.3,-2 1.2,-4.6 -0.3,-6.3C305.3,33.4 297.7,41.9 289.8,41.9z M 0,0"/>
@@ -56,7 +56,7 @@
         android:fillColor="#FBFBFE"/>
   </group>
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#000000"
       android:pathData="M145.3,-4.1c-20,0 -36.2,16.2 -36.2,36.2c0,20 16.2,36.2 36.2,36.2c20,0 36.2,-16.2 36.2,-36.2C181.5,12.1 165.3,-4.1 145.3,-4.1zM145.3,6.3c8.6,0 15.5,6.9 15.5,15.5c0,8.6 -6.9,15.5 -15.5,15.5c-8.6,0 -15.5,-6.9 -15.5,-15.5C129.8,13.2 136.8,6.3 145.3,6.3zM166.6,46.6C162,53.5 154.2,58 145.3,58c-8.9,0 -16.6,-4.5 -21.3,-11.3c-1.3,-2 -1.2,-4.6 0.3,-6.3c5.5,-6.3 13,2.2 20.9,2.2c7.9,0 15.5,-8.5 20.9,-2.2C167.8,42.1 167.9,44.7 166.6,46.6z"/>
   <group>
     <clip-path android:pathData="M145.3,-4.1c-20,0 -36.2,16.2 -36.2,36.2c0,20 16.2,36.2 36.2,36.2c20,0 36.2,-16.2 36.2,-36.2C181.5,12.1 165.3,-4.1 145.3,-4.1zM145.3,6.3c8.6,0 15.5,6.9 15.5,15.5c0,8.6 -6.9,15.5 -15.5,15.5c-8.6,0 -15.5,-6.9 -15.5,-15.5C129.8,13.2 136.8,6.3 145.3,6.3zM166.6,46.6C162,53.5 154.2,58 145.3,58c-8.9,0 -16.6,-4.5 -21.3,-11.3c-1.3,-2 -1.2,-4.6 0.3,-6.3c5.5,-6.3 13,2.2 20.9,2.2c7.9,0 15.5,-8.5 20.9,-2.2C167.8,42.1 167.9,44.7 166.6,46.6z M 0,0"/>
@@ -65,20 +65,20 @@
         android:strokeAlpha="0.3"
         android:fillAlpha="0.3">
       <aapt:attr name="android:fillColor">
-        <gradient 
+        <gradient
             android:gradientRadius="85.3299"
             android:centerX="167.0467"
             android:centerY="-1.7465"
             android:type="radial">
-          <item android:offset="0.1494" android:color="#FF00DDFF"/>
-          <item android:offset="0.5173" android:color="#FF70BAFF"/>
-          <item android:offset="0.8279" android:color="#FFCB9EFF"/>
+          <item android:offset="0.1494" android:color="#00DDFF"/>
+          <item android:offset="0.5173" android:color="#70BAFF"/>
+          <item android:offset="0.8279" android:color="#CB9EFF"/>
         </gradient>
       </aapt:attr>
     </path>
   </group>
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="#000000"
       android:pathData="M129.8,21.8c0,-8.6 6.9,-15.5 15.5,-15.5c8.6,0 15.5,6.9 15.5,15.5s-6.9,15.5 -15.5,15.5C136.8,37.3 129.8,30.4 129.8,21.8zM145.3,42.5c-7.9,0 -15.5,-8.5 -20.9,-2.2c-1.5,1.8 -1.7,4.4 -0.3,6.3c4.6,6.8 12.4,11.3 21.3,11.3s16.6,-4.5 21.3,-11.3c1.3,-2 1.2,-4.6 -0.3,-6.3C160.8,34 153.2,42.5 145.3,42.5z"/>
   <group>
     <clip-path android:pathData="M129.8,21.8c0,-8.6 6.9,-15.5 15.5,-15.5c8.6,0 15.5,6.9 15.5,15.5s-6.9,15.5 -15.5,15.5C136.8,37.3 129.8,30.4 129.8,21.8zM145.3,42.5c-7.9,0 -15.5,-8.5 -20.9,-2.2c-1.5,1.8 -1.7,4.4 -0.3,6.3c4.6,6.8 12.4,11.3 21.3,11.3s16.6,-4.5 21.3,-11.3c1.3,-2 1.2,-4.6 -0.3,-6.3C160.8,34 153.2,42.5 145.3,42.5z M 0,0"/>
@@ -92,14 +92,14 @@
   <path
       android:pathData="M36,7.2C20.1,7.2 7.2,20.1 7.2,36c0,15.9 12.9,28.8 28.8,28.8c15.9,0 28.8,-12.9 28.8,-28.8C64.8,20.1 51.9,7.2 36,7.2zM36,15.4c6.8,0 12.3,5.5 12.3,12.3c0,6.8 -5.5,12.3 -12.3,12.3c-6.8,0 -12.3,-5.5 -12.3,-12.3C23.7,21 29.2,15.4 36,15.4zM52.9,47.5c-3.7,5.4 -9.9,9 -16.9,9s-13.2,-3.6 -16.9,-9c-1.1,-1.6 -1,-3.6 0.3,-5.1c4.3,-5 10.4,1.7 16.6,1.7c6.3,0 12.3,-6.8 16.6,-1.7C53.9,43.9 54,46 52.9,47.5z">
     <aapt:attr name="android:fillColor">
-      <gradient 
+      <gradient
           android:startY="70.8581"
           android:startX="3.3842"
           android:endY="6.5572"
           android:endX="63.5488"
           android:type="linear">
-        <item android:offset="0.2552" android:color="#FF9059FF"/>
-        <item android:offset="0.9618" android:color="#FF00B3F4"/>
+        <item android:offset="0.2552" android:color="#9059FF"/>
+        <item android:offset="0.9618" android:color="#00B3F4"/>
       </gradient>
     </aapt:attr>
   </path>
diff --git a/app/src/main/res/drawable/ic_onboarding_avatar_anonymous.xml b/app/src/main/res/drawable/ic_onboarding_avatar_anonymous.xml
index 56e804fb8..5d4bd8248 100644
--- a/app/src/main/res/drawable/ic_onboarding_avatar_anonymous.xml
+++ b/app/src/main/res/drawable/ic_onboarding_avatar_anonymous.xml
@@ -17,11 +17,11 @@
           android:endY="-6.155523"
           android:endX="18.457676"
           android:type="linear">
-        <item android:offset="0" android:color="#FF00B3F4"/>
-        <item android:offset="0.16" android:color="#FF07B8ED"/>
-        <item android:offset="0.41" android:color="#FF1AC6D8"/>
-        <item android:offset="0.7" android:color="#FF39DCB7"/>
-        <item android:offset="0.76" android:color="#FF3FE1B0"/>
+        <item android:offset="0" android:color="#00B3F4"/>
+        <item android:offset="0.16" android:color="#07B8ED"/>
+        <item android:offset="0.41" android:color="#1AC6D8"/>
+        <item android:offset="0.7" android:color="#39DCB7"/>
+        <item android:offset="0.76" android:color="#3FE1B0"/>
       </gradient>
     </aapt:attr>
   </path>
@@ -34,11 +34,11 @@
           android:endY="-13.936461"
           android:endX="26.325832"
           android:type="linear">
-        <item android:offset="0" android:color="#FF00B3F4"/>
-        <item android:offset="0.16" android:color="#FF07B8ED"/>
-        <item android:offset="0.41" android:color="#FF1AC6D8"/>
-        <item android:offset="0.7" android:color="#FF39DCB7"/>
-        <item android:offset="0.76" android:color="#FF3FE1B0"/>
+        <item android:offset="0" android:color="#00B3F4"/>
+        <item android:offset="0.16" android:color="#07B8ED"/>
+        <item android:offset="0.41" android:color="#1AC6D8"/>
+        <item android:offset="0.7" android:color="#39DCB7"/>
+        <item android:offset="0.76" android:color="#3FE1B0"/>
       </gradient>
     </aapt:attr>
   </path>
diff --git a/app/src/main/res/drawable/ic_onboarding_firefox_accounts.xml b/app/src/main/res/drawable/ic_onboarding_firefox_accounts.xml
index 14ccf67a0..935ff22eb 100644
--- a/app/src/main/res/drawable/ic_onboarding_firefox_accounts.xml
+++ b/app/src/main/res/drawable/ic_onboarding_firefox_accounts.xml
@@ -5,33 +5,29 @@
 <vector android:height="24dp" android:viewportHeight="64"
     android:viewportWidth="64" android:width="24dp"
     xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillType="nonZero"
-        android:pathData="M57,3.41C55.9029,3.41 54.8509,3.8465 54.0761,4.6232C53.3013,5.3999 52.8673,6.4529 52.87,7.55L52.87,12.28C45.6154,4.6969 34.8024,1.6745 24.6673,4.3967C14.5321,7.119 6.6888,15.1526 4.21,25.35C3.6618,27.5585 5.0033,29.7944 7.21,30.35C7.5364,30.436 7.8725,30.4797 8.21,30.48C10.1036,30.4685 11.7492,29.1767 12.21,27.34C14.475,18.1357 22.7311,11.667 32.21,11.67C38.6913,11.6766 44.7818,14.7701 48.61,20L40.48,20C38.9542,19.9249 37.511,20.6962 36.7256,22.0065C35.9402,23.3168 35.9402,24.9532 36.7256,26.2635C37.511,27.5738 38.9542,28.3451 40.48,28.27L57,28.27C59.2865,28.27 61.14,26.4165 61.14,24.13L61.14,7.55C61.14,5.2635 59.2865,3.41 57,3.41Z"
-        android:strokeColor="#00000000" android:strokeWidth="1">
+    <path android:pathData="M57,3.41C55.9029,3.41 54.8509,3.8465 54.0761,4.6232C53.3013,5.3999 52.8673,6.4529 52.87,7.55L52.87,12.28C45.6154,4.6969 34.8024,1.6745 24.6673,4.3967C14.5321,7.119 6.6888,15.1526 4.21,25.35C3.6618,27.5585 5.0033,29.7944 7.21,30.35C7.5364,30.436 7.8725,30.4797 8.21,30.48C10.1036,30.4685 11.7492,29.1767 12.21,27.34C14.475,18.1357 22.7311,11.667 32.21,11.67C38.6913,11.6766 44.7818,14.7701 48.61,20L40.48,20C38.9542,19.9249 37.511,20.6962 36.7256,22.0065C35.9402,23.3168 35.9402,24.9532 36.7256,26.2635C37.511,27.5738 38.9542,28.3451 40.48,28.27L57,28.27C59.2865,28.27 61.14,26.4165 61.14,24.13L61.14,7.55C61.14,5.2635 59.2865,3.41 57,3.41Z">
         <aapt:attr name="android:fillColor">
             <gradient android:endX="73.57205" android:endY="7.6675277"
                 android:startX="20.146467" android:startY="20.368952" android:type="linear">
-                <item android:color="#FF00B3F4" android:offset="0"/>
-                <item android:color="#FF07B8ED" android:offset="0.16"/>
-                <item android:color="#FF1AC6D8" android:offset="0.41"/>
-                <item android:color="#FF39DCB7" android:offset="0.7"/>
-                <item android:color="#FF3FE1B0" android:offset="0.76"/>
+                <item android:color="#00B3F4" android:offset="0"/>
+                <item android:color="#07B8ED" android:offset="0.16"/>
+                <item android:color="#1AC6D8" android:offset="0.41"/>
+                <item android:color="#39DCB7" android:offset="0.7"/>
+                <item android:color="#3FE1B0" android:offset="0.76"/>
             </gradient>
         </aapt:attr>
     </path>
-    <path android:fillType="nonZero"
-        android:pathData="M57.18,34.19C54.9715,33.6418 52.7356,34.9833 52.18,37.19C49.9086,46.3901 41.6564,52.8558 32.18,52.86C25.7094,52.8674 19.621,49.7972 15.78,44.59L23.91,44.59C26.1147,44.4815 27.8466,42.6624 27.8466,40.455C27.8466,38.2476 26.1147,36.4285 23.91,36.32L7.38,36.32C6.2829,36.32 5.2309,36.7565 4.4561,37.5332C3.6813,38.3099 3.2473,39.3629 3.25,40.46L3.25,57C3.1749,58.5258 3.9462,59.969 5.2565,60.7544C6.5668,61.5398 8.2032,61.5398 9.5135,60.7544C10.8238,59.969 11.5951,58.5258 11.52,57L11.52,52.26C18.7726,59.8486 29.5875,62.8759 39.7259,60.1554C49.8642,57.4349 57.7108,49.4 60.19,39.2C60.738,36.986 59.3921,34.7457 57.18,34.19Z"
-        android:strokeColor="#00000000" android:strokeWidth="1">
+    <path android:pathData="M57.18,34.19C54.9715,33.6418 52.7356,34.9833 52.18,37.19C49.9086,46.3901 41.6564,52.8558 32.18,52.86C25.7094,52.8674 19.621,49.7972 15.78,44.59L23.91,44.59C26.1147,44.4815 27.8466,42.6624 27.8466,40.455C27.8466,38.2476 26.1147,36.4285 23.91,36.32L7.38,36.32C6.2829,36.32 5.2309,36.7565 4.4561,37.5332C3.6813,38.3099 3.2473,39.3629 3.25,40.46L3.25,57C3.1749,58.5258 3.9462,59.969 5.2565,60.7544C6.5668,61.5398 8.2032,61.5398 9.5135,60.7544C10.8238,59.969 11.5951,58.5258 11.52,57L11.52,52.26C18.7726,59.8486 29.5875,62.8759 39.7259,60.1554C49.8642,57.4349 57.7108,49.4 60.19,39.2C60.738,36.986 59.3921,34.7457 57.18,34.19Z">
         <aapt:attr name="android:fillColor">
             <gradient android:endX="1.0314565" android:endY="52.72845"
                 android:startX="71.77078" android:startY="39.75396" android:type="linear">
-                <item android:color="#FF00B3F4" android:offset="0.13"/>
-                <item android:color="#FF32A0F7" android:offset="0.29"/>
-                <item android:color="#FF5D8FFA" android:offset="0.45"/>
-                <item android:color="#FF7F82FC" android:offset="0.61"/>
-                <item android:color="#FF9779FE" android:offset="0.75"/>
-                <item android:color="#FFA673FF" android:offset="0.89"/>
-                <item android:color="#FFAB71FF" android:offset="1"/>
+                <item android:color="#00B3F4" android:offset="0.13"/>
+                <item android:color="#32A0F7" android:offset="0.29"/>
+                <item android:color="#5D8FFA" android:offset="0.45"/>
+                <item android:color="#7F82FC" android:offset="0.61"/>
+                <item android:color="#9779FE" android:offset="0.75"/>
+                <item android:color="#A673FF" android:offset="0.89"/>
+                <item android:color="#AB71FF" android:offset="1"/>
             </gradient>
         </aapt:attr>
     </path>
diff --git a/app/src/main/res/drawable/ic_onboarding_privacy_notice.xml b/app/src/main/res/drawable/ic_onboarding_privacy_notice.xml
index 236f06f97..e836da928 100644
--- a/app/src/main/res/drawable/ic_onboarding_privacy_notice.xml
+++ b/app/src/main/res/drawable/ic_onboarding_privacy_notice.xml
@@ -8,11 +8,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:pathData="M12 22a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm0-18a8 8 0 1 0 0 16 8 8 0 0 0 0-16zm0 7c0.6 0 1 0.4 1 1v4a1 1 0 0 1-2 0v-4c0-0.6 0.4-1 1-1zm0-4a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"
-      android:strokeWidth="1"
-      android:fillType="evenOdd"
-      android:strokeColor="#00000000">
+  <path android:pathData="M12 22a10 10 0 1 1 0-20 10 10 0 0 1 0 20zm0-18a8 8 0 1 0 0 16 8 8 0 0 0 0-16zm0 7c0.6 0 1 0.4 1 1v4a1 1 0 0 1-2 0v-4c0-0.6 0.4-1 1-1zm0-4a1 1 0 1 1 0 2 1 1 0 0 1 0-2z">
     <aapt:attr name="android:fillColor">
       <gradient 
           android:startY="3.2727787"
@@ -20,8 +16,8 @@
           android:endY="15.679591"
           android:endX="6.9187684"
           android:type="linear">
-        <item android:offset="0" android:color="#FF6A11CB"/>
-        <item android:offset="1" android:color="#FF2575FC"/>
+        <item android:offset="0" android:color="#6A11CB"/>
+        <item android:offset="1" android:color="#2575FC"/>
       </gradient>
     </aapt:attr>
   </path>
diff --git a/app/src/main/res/drawable/ic_onboarding_private_browsing.xml b/app/src/main/res/drawable/ic_onboarding_private_browsing.xml
index 7f5915082..8a0376e96 100644
--- a/app/src/main/res/drawable/ic_onboarding_private_browsing.xml
+++ b/app/src/main/res/drawable/ic_onboarding_private_browsing.xml
@@ -19,8 +19,8 @@
                 android:startY="-0.94"
                 android:endX="1.81"
                 android:endY="16.33">
-                <item android:color="#FF5C29CC" android:offset="0" />
-                <item android:color="#FF7A145C" android:offset="1" />
+                <item android:color="#5C29CC" android:offset="0" />
+                <item android:color="#7A145C" android:offset="1" />
             </gradient>
         </aapt:attr>
     </path>
diff --git a/app/src/main/res/layout/onboarding_firefox_account.xml b/app/src/main/res/layout/onboarding_firefox_account.xml
index 6633f5870..e388e53d7 100644
--- a/app/src/main/res/layout/onboarding_firefox_account.xml
+++ b/app/src/main/res/layout/onboarding_firefox_account.xml
@@ -10,12 +10,12 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/header_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="14dp"
-        android:drawableStart="@drawable/ic_onboarding_firefox_accounts"
+        app:drawableStartCompat="@drawable/ic_onboarding_firefox_accounts"
         android:drawablePadding="12dp"
         android:text="@string/onboarding_firefox_account_header"
         android:textAppearance="@style/Header16TextStyle"
diff --git a/app/src/main/res/layout/onboarding_privacy_notice.xml b/app/src/main/res/layout/onboarding_privacy_notice.xml
index 28bb7e893..36a0dbe6a 100644
--- a/app/src/main/res/layout/onboarding_privacy_notice.xml
+++ b/app/src/main/res/layout/onboarding_privacy_notice.xml
@@ -4,6 +4,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/onboarding_card"
     style="@style/OnboardingCardLight"
     android:layout_width="match_parent"
@@ -11,7 +12,7 @@
     android:orientation="vertical">
     <TextView
         android:id="@+id/header_text"
-        android:drawableStart="@drawable/ic_onboarding_privacy_notice"
+        app:drawableStartCompat="@drawable/ic_onboarding_privacy_notice"
         android:drawablePadding="12dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -47,4 +48,4 @@
             android:textColor="?primaryText"
             android:textSize="14sp" />
     </FrameLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/onboarding_private_browsing.xml b/app/src/main/res/layout/onboarding_private_browsing.xml
index c93bc8401..b71ff7ba4 100644
--- a/app/src/main/res/layout/onboarding_private_browsing.xml
+++ b/app/src/main/res/layout/onboarding_private_browsing.xml
@@ -9,11 +9,12 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
     <ImageView
+        android:importantForAccessibility="no"
         android:id="@+id/private_browsing_icon"
         android:layout_width="30dp"
         android:layout_height="0dp"
         app:layout_constraintDimensionRatio="H,1:1"
-        android:src="@drawable/ic_onboarding_private_browsing"
+        app:srcCompat="@drawable/ic_onboarding_private_browsing"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
     <TextView
@@ -40,4 +41,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/onboarding_theme_picker.xml b/app/src/main/res/layout/onboarding_theme_picker.xml
index 35f0a4ce7..cbed61406 100644
--- a/app/src/main/res/layout/onboarding_theme_picker.xml
+++ b/app/src/main/res/layout/onboarding_theme_picker.xml
@@ -144,6 +144,7 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:layout_marginBottom="16dp"
+        android:paddingStart="0dp"
         android:paddingEnd="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/onboarding_tracking_protection.xml b/app/src/main/res/layout/onboarding_tracking_protection.xml
index e0ab8ba94..67a8b8554 100644
--- a/app/src/main/res/layout/onboarding_tracking_protection.xml
+++ b/app/src/main/res/layout/onboarding_tracking_protection.xml
@@ -13,7 +13,7 @@
         android:id="@+id/header_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:drawableStart="@drawable/ic_onboarding_tracking_protection"
+        app:drawableStartCompat="@drawable/ic_onboarding_tracking_protection"
         android:drawablePadding="12dp"
         android:text="@string/onboarding_tracking_protection_header"
         android:textAppearance="@style/HeaderTextStyle"
@@ -36,4 +36,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/header_text"
         app:layout_constraintBottom_toBottomOf="parent"/>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/sign_in_preference.xml b/app/src/main/res/layout/sign_in_preference.xml
index 454e8414d..fa2777afb 100644
--- a/app/src/main/res/layout/sign_in_preference.xml
+++ b/app/src/main/res/layout/sign_in_preference.xml
@@ -4,6 +4,7 @@
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <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"
     android:layout_height="wrap_content"
     android:layout_margin="8dp"
@@ -17,7 +18,7 @@
         android:id="@+id/imageView"
         android:layout_width="72dp"
         android:layout_height="72dp"
-        android:src="@drawable/ic_fx_accounts_avatar"
+        app:srcCompat="@drawable/ic_fx_accounts_avatar"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -31,7 +32,7 @@
         android:ellipsize="none"
         android:scrollHorizontally="false"
         android:singleLine="true"
-        android:text="Title"
+        tools:text="Title"
         android:textAppearance="@style/Header16TextStyle"
         app:layout_constraintBottom_toTopOf="@android:id/summary"
         app:layout_constraintEnd_toEndOf="parent"
@@ -47,11 +48,11 @@
         android:layout_marginBottom="8dp"
         android:ellipsize="none"
         android:scrollHorizontally="false"
-        android:text="Summary"
+        tools:text="Summary"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="?android:attr/textColorSecondary"
         android:textSize="16sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/imageView" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>