diff --git a/app/build.gradle b/app/build.gradle
index 5a8247f82c0..f686f723143 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,7 +8,6 @@ import com.android.build.OutputFile
 
 android {
     compileSdkVersion 29
-    buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "org.mozilla"
         minSdkVersion 21
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ad54c5d2ced..7bd9f66f35e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -86,9 +86,6 @@
             android:autoRemoveFromRecents="false"
             android:label="@string/app_name" />
 
-        <activity android:name=".activity.InfoActivity"
-            android:theme="@style/InfoTheme"/>
-
         <activity android:name=".activity.TextActionActivity"
             android:label="@string/text_selection_search_action"
             android:exported="true">
@@ -99,13 +96,6 @@
             </intent-filter>
         </activity>
 
-        <!-- SettingsActivity title is set dynamically for multilocale support -->
-        <activity android:name=".activity.SettingsActivity"
-            android:parentActivityName=".activity.MainActivity"
-            android:theme="@style/SettingsTheme"
-            android:configChanges="locale"
-            android:windowSoftInputMode="adjustPan"/>
-
         <activity android:name=".activity.InstallFirefoxActivity"
             android:theme="@style/Theme.AppCompat.NoActionBar" />
 
diff --git a/app/src/main/java/org/mozilla/focus/fragment/UrlInputFragment.kt b/app/src/main/java/org/mozilla/focus/fragment/UrlInputFragment.kt
index ffe9f313bfc..898dfebdc39 100644
--- a/app/src/main/java/org/mozilla/focus/fragment/UrlInputFragment.kt
+++ b/app/src/main/java/org/mozilla/focus/fragment/UrlInputFragment.kt
@@ -22,7 +22,7 @@ import android.webkit.URLUtil
 import android.widget.FrameLayout
 import android.widget.TextView
 import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProviders
+import androidx.lifecycle.ViewModelProvider
 import androidx.preference.PreferenceManager
 import kotlinx.android.synthetic.main.fragment_urlinput.*
 import kotlinx.android.synthetic.main.fragment_urlinput.view.*
@@ -170,7 +170,7 @@ class UrlInputFragment :
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        searchSuggestionsViewModel = ViewModelProviders.of(this).get(SearchSuggestionsViewModel::class.java)
+        searchSuggestionsViewModel = ViewModelProvider(this).get(SearchSuggestionsViewModel::class.java)
 
         PreferenceManager.getDefaultSharedPreferences(context)
             .registerOnSharedPreferenceChangeListener(this)
diff --git a/app/src/main/java/org/mozilla/focus/searchsuggestions/ui/SearchSuggestionsFragment.kt b/app/src/main/java/org/mozilla/focus/searchsuggestions/ui/SearchSuggestionsFragment.kt
index ffc1e477032..0b560baca57 100644
--- a/app/src/main/java/org/mozilla/focus/searchsuggestions/ui/SearchSuggestionsFragment.kt
+++ b/app/src/main/java/org/mozilla/focus/searchsuggestions/ui/SearchSuggestionsFragment.kt
@@ -5,7 +5,6 @@
 package org.mozilla.focus.searchsuggestions.ui
 
 import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProviders
 import android.graphics.Color
 import android.os.Bundle
 import androidx.fragment.app.Fragment
@@ -24,6 +23,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.lifecycle.ViewModelProvider
 import kotlinx.android.synthetic.main.fragment_search_suggestions.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -51,8 +51,7 @@ class SearchSuggestionsFragment : Fragment(), CoroutineScope {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        searchSuggestionsViewModel = ViewModelProviders
-            .of(requireParentFragment())
+        searchSuggestionsViewModel = ViewModelProvider(this)
             .get(SearchSuggestionsViewModel::class.java)
     }
 
diff --git a/app/src/main/res/layout-sw600dp/toolbar.xml b/app/src/main/res/layout-sw600dp/toolbar.xml
index 599e355b21c..0ee4116462f 100644
--- a/app/src/main/res/layout-sw600dp/toolbar.xml
+++ b/app/src/main/res/layout-sw600dp/toolbar.xml
@@ -3,6 +3,7 @@
    - 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/. -->
 <LinearLayout 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="match_parent"
@@ -160,7 +161,7 @@
                 android:layout_width="12dp"
                 android:layout_height="13.33dp"
                 android:layout_gravity="center"
-                android:tint="#FFFFFF" />
+                app:tint="#FFFFFF" />
         </FrameLayout>
 
     </FrameLayout>
diff --git a/app/src/main/res/layout/focus_preference.xml b/app/src/main/res/layout/focus_preference.xml
index 1e515928362..134b2ed1e6a 100644
--- a/app/src/main/res/layout/focus_preference.xml
+++ b/app/src/main/res/layout/focus_preference.xml
@@ -18,6 +18,7 @@
   ~ limitations under the License
   -->
 <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:minHeight="?android:attr/listPreferredItemHeightSmall"
@@ -36,9 +37,9 @@
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginEnd="16dp"
-            android:tint="@color/colorSettingsTint"
             android:alpha="0.8"
-            android:importantForAccessibility="no"/>
+            android:importantForAccessibility="no"
+            app:tint="@color/colorSettingsTint" />
     </LinearLayout>
 
     <RelativeLayout
diff --git a/app/src/main/res/layout/fragment_browser.xml b/app/src/main/res/layout/fragment_browser.xml
index 2a1d01aede8..c563489a8e4 100644
--- a/app/src/main/res/layout/fragment_browser.xml
+++ b/app/src/main/res/layout/fragment_browser.xml
@@ -6,7 +6,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:mozac="http://schemas.android.com/apk/res-auto">
+    xmlns:mozac="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
 
     <LinearLayout
         android:id="@+id/browser_container"
@@ -30,6 +31,7 @@
             android:clipChildren="false">
 
             <mozilla.components.concept.engine.EngineView
+                tools:ignore="Instantiatable"
                 android:id="@+id/webview"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml
index 4fde76d6087..0881a674ae1 100644
--- a/app/src/main/res/layout/toolbar.xml
+++ b/app/src/main/res/layout/toolbar.xml
@@ -3,6 +3,7 @@
    - 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/. -->
 <LinearLayout 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="match_parent"
@@ -95,7 +96,7 @@
                 android:layout_width="12dp"
                 android:layout_height="13.33dp"
                 android:layout_gravity="center"
-                android:tint="#FFFFFF" />
+                app:tint="#FFFFFF" />
         </FrameLayout>
 
     </FrameLayout>
diff --git a/build.gradle b/build.gradle
index d05bd7bcc9f..fb2cae1eaad 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:4.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle.properties b/gradle.properties
index 59e0c542f92..b02e7cbd89f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,6 @@
 # The setting is particularly useful for tweaking memory settings.
 android.useAndroidX=true
 org.gradle.jvmargs=-Xms1g -Xmx4g
-android.enableR8=true
 
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 70f684a9778..2ef9ac8a461 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip