From 048418346435515eb37a0bb2dda0d933b73d9db0 Mon Sep 17 00:00:00 2001
From: Arturo Mejia <arturomejiamarmol@gmail.com>
Date: Thu, 15 Apr 2021 00:23:38 -0400
Subject: [PATCH] Uplift proton icons

For issue #18132 update to proton icons first batch

(cherry picked from commit 21cf0b31a456f9d9af1d8b7329ed750bcfaed54f)

For issue #19290 update to proton icons second batch

(cherry picked from commit 9bfb31519a0defe9ff4d317a6772dc155ded5c61)

For issue AC#10231 update proton icons third batch

(cherry picked from commit bf42a1786e33d9ce89356783587d243c9c769f35)

Remove feature flag for proton icons re-design #18132

(cherry picked from commit 52587753a5fe11752a466df915382888edf3e522)

For #19357: Remove bookmarks experiment and keep star-with-line icon.

(cherry picked from commit 93c64038829f4df4932dfcdfaf87302c5d4b56b8)
---
 .../java/org/mozilla/fenix/FeatureFlags.kt    |   5 -
 .../components/toolbar/DefaultToolbarMenu.kt  |   7 +-
 .../mozilla/fenix/experiments/Experiments.kt  |   1 -
 .../java/org/mozilla/fenix/home/HomeMenu.kt   |  17 +-
 .../OnboardingPrivacyNoticeViewHolder.kt      |   2 +-
 .../fenix/settings/SettingsFragment.kt        |  22 +-
 app/src/main/res/animator/fill_disable.xml    |  13 --
 app/src/main/res/animator/fill_enable.xml     |  13 --
 .../res/animator/strike_thru_mask_disable.xml |  13 --
 .../res/animator/strike_thru_mask_enable.xml  |  13 --
 .../res/animator/strike_thru_path_disable.xml |  22 --
 .../res/animator/strike_thru_path_enable.xml  |  22 --
 app/src/main/res/drawable-v24/shield_dark.xml |  36 +--
 .../main/res/drawable-v24/shield_light.xml    |  34 +--
 .../res/drawable/ic_add_to_homescreen.xml     |   7 +-
 .../res/drawable/ic_addons_extensions.xml     |   2 +-
 app/src/main/res/drawable/ic_alert.xml        |  12 +-
 .../main/res/drawable/ic_arrowhead_right.xml  |   6 +-
 .../res/drawable/ic_autoplay_disabled.xml     |   7 +-
 .../main/res/drawable/ic_autoplay_enabled.xml |   7 +-
 .../main/res/drawable/ic_bookmark_filled.xml  |   2 +-
 .../main/res/drawable/ic_bookmark_list.xml    |   7 +-
 .../main/res/drawable/ic_bookmark_outline.xml |   2 +-
 .../main/res/drawable/ic_bookmarks_menu.xml   |   7 +-
 app/src/main/res/drawable/ic_camera.xml       |   9 -
 .../res/drawable/ic_camera_anim_disable.xml   |  11 -
 .../res/drawable/ic_camera_anim_enable.xml    |  11 -
 .../main/res/drawable/ic_camera_disabled.xml  |  29 +--
 .../main/res/drawable/ic_camera_enabled.xml   |  21 +-
 app/src/main/res/drawable/ic_chevron_down.xml |  10 +-
 app/src/main/res/drawable/ic_chevron_up.xml   |  10 +-
 app/src/main/res/drawable/ic_clear.xml        |   6 +-
 app/src/main/res/drawable/ic_close.xml        |   2 +-
 .../main/res/drawable/ic_confirm_email.xml    |  16 ++
 app/src/main/res/drawable/ic_cookies.xml      |   2 +-
 app/src/main/res/drawable/ic_cryptominers.xml |   3 +-
 app/src/main/res/drawable/ic_delete.xml       |   7 +-
 app/src/main/res/drawable/ic_desktop.xml      |   2 +-
 app/src/main/res/drawable/ic_download.xml     |   5 +-
 app/src/main/res/drawable/ic_edit.xml         |   2 +-
 app/src/main/res/drawable/ic_fab_sync.xml     |  25 +--
 .../main/res/drawable/ic_fingerprinters.xml   |  10 +-
 app/src/main/res/drawable/ic_folder_icon.xml  |   6 +-
 app/src/main/res/drawable/ic_folder_new.xml   |   6 +-
 app/src/main/res/drawable/ic_help.xml         |   5 +-
 app/src/main/res/drawable/ic_history.xml      |   5 +-
 app/src/main/res/drawable/ic_info.xml         |   7 +-
 app/src/main/res/drawable/ic_internet.xml     |   2 +-
 .../main/res/drawable/ic_link_disabled.xml    |   9 +-
 app/src/main/res/drawable/ic_link_enabled.xml |   8 +-
 app/src/main/res/drawable/ic_location.xml     |   9 -
 .../res/drawable/ic_location_anim_disable.xml |  11 -
 .../res/drawable/ic_location_anim_enable.xml  |  11 -
 .../res/drawable/ic_location_disabled.xml     |  31 +--
 .../main/res/drawable/ic_location_enabled.xml |  31 +--
 app/src/main/res/drawable/ic_login.xml        |  10 +-
 app/src/main/res/drawable/ic_microphone.xml   |  10 +-
 .../drawable/ic_microphone_anim_disable.xml   |  11 -
 .../drawable/ic_microphone_anim_enable.xml    |  11 -
 .../res/drawable/ic_microphone_disabled.xml   |  28 +--
 .../res/drawable/ic_microphone_enabled.xml    |  23 +-
 .../main/res/drawable/ic_multiple_tabs.xml    |   2 +-
 app/src/main/res/drawable/ic_new.xml          |   2 +-
 .../main/res/drawable/ic_notifications.xml    |   9 -
 .../ic_notifications_anim_disable.xml         |  11 -
 .../drawable/ic_notifications_anim_enable.xml |  11 -
 .../drawable/ic_notifications_disabled.xml    |  25 +--
 .../res/drawable/ic_notifications_enabled.xml |  23 +-
 .../ic_onboarding_avatar_anonymous_large.xml  |  11 +-
 .../drawable/ic_onboarding_privacy_notice.xml |  24 --
 .../ic_onboarding_tracking_protection.xml     |  34 +--
 .../main/res/drawable/ic_private_browsing.xml |   2 +-
 app/src/main/res/drawable/ic_qr.xml           |   2 +-
 app/src/main/res/drawable/ic_readermode.xml   |   5 +-
 .../res/drawable/ic_readermode_selected.xml   |  15 +-
 app/src/main/res/drawable/ic_search.xml       |   2 +-
 app/src/main/res/drawable/ic_settings.xml     |   7 +-
 app/src/main/res/drawable/ic_share.xml        |  13 ++
 app/src/main/res/drawable/ic_share_filled.xml |  12 -
 app/src/main/res/drawable/ic_sign_in.xml      |   2 +-
 app/src/main/res/drawable/ic_signed_out.xml   |  20 ++
 .../res/drawable/ic_social_media_trackers.xml |   2 +-
 ...static_shortcut_private_tab_foreground.xml |   2 +-
 .../ic_static_shortcut_tab_foreground.xml     |   2 +-
 .../main/res/drawable/ic_storage_disabled.xml |   9 +-
 .../main/res/drawable/ic_storage_enabled.xml  |   7 +-
 .../res/drawable/ic_sync_disconnected.xml     |  17 +-
 app/src/main/res/drawable/ic_synced_tabs.xml  |   4 +-
 .../main/res/drawable/ic_tab_collection.xml   |   6 +-
 app/src/main/res/drawable/ic_tabs.xml         |   2 +-
 app/src/main/res/drawable/ic_top_sites.xml    |   2 +-
 .../res/drawable/ic_tracking_protection.xml   |   8 -
 .../ic_tracking_protection_anim_disable.xml   |  11 -
 .../ic_tracking_protection_anim_enable.xml    |  11 -
 .../ic_tracking_protection_disabled.xml       |  23 +-
 .../ic_tracking_protection_enabled.xml        |  28 +--
 app/src/main/res/drawable/ic_whats_new.xml    |   2 +-
 .../drawable/mozac_ic_extensions_black.xml    |   6 +-
 .../res/drawable/private_browsing_button.xml  |   2 +-
 app/src/main/res/drawable/shield_dark.xml     |   7 +-
 app/src/main/res/drawable/shield_light.xml    |   5 +-
 .../res/layout/collection_home_list_row.xml   |   6 +-
 .../layout/component_collection_creation.xml  |   2 +-
 ...nt_collection_creation_name_collection.xml |   2 +-
 .../res/layout/download_dialog_layout.xml     |   2 +-
 .../res/layout/onboarding_privacy_notice.xml  |   2 +-
 .../quicksettings_tracking_protection.xml     |  38 ----
 app/src/main/res/layout/share_close.xml       |   2 +-
 app/src/main/res/layout/tab_header.xml        |   2 +-
 .../main/res/layout/tab_tray_grid_item.xml    |   2 +-
 app/src/main/res/layout/tab_tray_item.xml     |   2 +-
 .../res/layout/tabstray_multiselect_items.xml |   2 +-
 .../main/res/menu/bookmarks_select_multi.xml  |   2 +-
 .../main/res/menu/history_select_multi.xml    |   2 +-
 app/src/main/res/values/dimens.xml            |   4 +-
 app/src/main/res/values/strings.xml           |   3 -
 app/src/main/res/xml/preferences.xml          |  74 +++---
 ...preferences_default_browser_experiment.xml | 129 +++++------
 .../res/xml/preferences_without_icons.xml     | 206 -----------------
 ...thout_icons_default_browser_experiment.xml | 211 ------------------
 120 files changed, 504 insertions(+), 1271 deletions(-)
 delete mode 100644 app/src/main/res/animator/fill_disable.xml
 delete mode 100644 app/src/main/res/animator/fill_enable.xml
 delete mode 100644 app/src/main/res/animator/strike_thru_mask_disable.xml
 delete mode 100644 app/src/main/res/animator/strike_thru_mask_enable.xml
 delete mode 100644 app/src/main/res/animator/strike_thru_path_disable.xml
 delete mode 100644 app/src/main/res/animator/strike_thru_path_enable.xml
 delete mode 100644 app/src/main/res/drawable/ic_camera_anim_disable.xml
 delete mode 100644 app/src/main/res/drawable/ic_camera_anim_enable.xml
 create mode 100644 app/src/main/res/drawable/ic_confirm_email.xml
 delete mode 100644 app/src/main/res/drawable/ic_location_anim_disable.xml
 delete mode 100644 app/src/main/res/drawable/ic_location_anim_enable.xml
 delete mode 100644 app/src/main/res/drawable/ic_microphone_anim_disable.xml
 delete mode 100644 app/src/main/res/drawable/ic_microphone_anim_enable.xml
 delete mode 100644 app/src/main/res/drawable/ic_notifications_anim_disable.xml
 delete mode 100644 app/src/main/res/drawable/ic_notifications_anim_enable.xml
 delete mode 100644 app/src/main/res/drawable/ic_onboarding_privacy_notice.xml
 create mode 100644 app/src/main/res/drawable/ic_share.xml
 delete mode 100644 app/src/main/res/drawable/ic_share_filled.xml
 create mode 100644 app/src/main/res/drawable/ic_signed_out.xml
 delete mode 100644 app/src/main/res/drawable/ic_tracking_protection_anim_disable.xml
 delete mode 100644 app/src/main/res/drawable/ic_tracking_protection_anim_enable.xml
 delete mode 100644 app/src/main/res/layout/quicksettings_tracking_protection.xml
 delete mode 100644 app/src/main/res/xml/preferences_without_icons.xml
 delete mode 100644 app/src/main/res/xml/preferences_without_icons_default_browser_experiment.xml

diff --git a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
index 205761689..33c723df1 100644
--- a/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
+++ b/app/src/main/java/org/mozilla/fenix/FeatureFlags.kt
@@ -43,9 +43,4 @@ object FeatureFlags {
      * Enables the tabs tray re-write with Synced Tabs.
      */
     const val tabsTrayRewrite = true
-
-    /**
-     * Enables the updated icon set look and feel.
-     */
-    val newIconSet = Config.channel.isNightlyOrDebug
 }
diff --git a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
index 985644685..a4b4737b8 100644
--- a/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt
@@ -91,7 +91,8 @@ open class DefaultToolbarMenu(
             endOfMenuAlwaysVisible = shouldUseBottomToolbar,
             store = store,
             style = WebExtensionBrowserMenuBuilder.Style(
-                webExtIconTintColorResource = primaryTextColor()
+                webExtIconTintColorResource = primaryTextColor(),
+                addonsManagerMenuItemDrawableRes = R.drawable.ic_addons_extensions
             ),
             onAddonsManagerTapped = {
                 onItemTapped.invoke(ToolbarMenu.Item.AddonsManager)
@@ -150,7 +151,7 @@ open class DefaultToolbarMenu(
         }
 
         val share = BrowserMenuItemToolbar.Button(
-            imageResource = R.drawable.ic_share_filled,
+            imageResource = R.drawable.ic_share,
             contentDescription = context.getString(R.string.browser_menu_share),
             iconTintColorResource = primaryTextColor(),
             listener = {
@@ -546,7 +547,7 @@ open class DefaultToolbarMenu(
 
     val syncMenuItem = BrowserMenuImageText(
         getSyncItemTitle(),
-        R.drawable.ic_synced_tabs,
+        R.drawable.ic_signed_out,
         primaryTextColor()
     ) {
         onItemTapped.invoke(ToolbarMenu.Item.SyncAccount(accountManager.signedInToFxa()))
diff --git a/app/src/main/java/org/mozilla/fenix/experiments/Experiments.kt b/app/src/main/java/org/mozilla/fenix/experiments/Experiments.kt
index b6f5ac4cb..92808c5ff 100644
--- a/app/src/main/java/org/mozilla/fenix/experiments/Experiments.kt
+++ b/app/src/main/java/org/mozilla/fenix/experiments/Experiments.kt
@@ -7,7 +7,6 @@ package org.mozilla.fenix.experiments
 class Experiments {
     companion object {
         const val A_A_NIMBUS_VALIDATION = "fenix-nimbus-validation-v3"
-        const val BOOKMARK_ICON = "fenix-bookmark-list-icon"
         const val ANDROID_KEYSTORE = "fenix-android-keystore"
         const val DEFAULT_BROWSER = "fenix-default-browser"
     }
diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
index 4c22f21d8..cf89bd2bb 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
@@ -133,17 +133,10 @@ class HomeMenu(
         ) {
             onItemTapped.invoke(Item.WhatsNew)
         }
-
         val experiments = context.components.analytics.experiments
-        val bookmarksIcon = experiments.withExperiment(Experiments.BOOKMARK_ICON) {
-            when (it) {
-                ExperimentBranch.TREATMENT -> R.drawable.ic_bookmark_list
-                else -> R.drawable.ic_bookmark_filled
-            }
-        }
         val bookmarksItem = BrowserMenuImageText(
             context.getString(R.string.library_bookmarks),
-            bookmarksIcon,
+            R.drawable.ic_bookmark_list,
             primaryTextColor
         ) {
             onItemTapped.invoke(Item.Bookmarks)
@@ -251,15 +244,9 @@ class HomeMenu(
         val experiments = context.components.analytics.experiments
         val settings = context.components.settings
 
-        val bookmarksIcon = experiments.withExperiment(Experiments.BOOKMARK_ICON) {
-            when (it) {
-                ExperimentBranch.TREATMENT -> R.drawable.ic_bookmark_list
-                else -> R.drawable.ic_bookmark_filled
-            }
-        }
         val bookmarksItem = BrowserMenuImageText(
             context.getString(R.string.library_bookmarks),
-            bookmarksIcon,
+            R.drawable.ic_bookmark_list,
             primaryTextColor
         ) {
             onItemTapped.invoke(Item.Bookmarks)
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 668c17cee..9f4d752c7 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
@@ -18,7 +18,7 @@ class OnboardingPrivacyNoticeViewHolder(
 ) : RecyclerView.ViewHolder(view) {
 
     init {
-        view.header_text.setOnboardingIcon(R.drawable.ic_onboarding_privacy_notice)
+        view.header_text.setOnboardingIcon(R.drawable.ic_info)
 
         val appName = view.context.getString(R.string.app_name)
         view.description_text.text = view.context.getString(R.string.onboarding_privacy_notice_description2, appName)
diff --git a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
index 8f03b0146..518bc3f4f 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt
@@ -34,13 +34,11 @@ import mozilla.components.concept.sync.AccountObserver
 import mozilla.components.concept.sync.AuthType
 import mozilla.components.concept.sync.OAuthAccount
 import mozilla.components.concept.sync.Profile
-import mozilla.components.support.ktx.android.content.getColorFromAttr
 import mozilla.components.support.ktx.android.view.showKeyboard
 import org.mozilla.fenix.BrowserDirection
 import org.mozilla.fenix.Config
 import org.mozilla.fenix.HomeActivity
 import org.mozilla.fenix.R
-import org.mozilla.fenix.FeatureFlags
 import org.mozilla.fenix.components.metrics.Event
 import org.mozilla.fenix.experiments.ExperimentBranch
 import org.mozilla.fenix.experiments.Experiments
@@ -153,17 +151,9 @@ class SettingsFragment : PreferenceFragmentCompat() {
      */
     private fun getPreferenceLayoutId() =
         if (isDefaultBrowserExperimentBranch() && !isFirefoxDefaultBrowser()) {
-            if (FeatureFlags.newIconSet) {
-                R.xml.preferences_without_icons_default_browser_experiment
-            } else {
-                R.xml.preferences_default_browser_experiment
-            }
+            R.xml.preferences_default_browser_experiment
         } else {
-            if (FeatureFlags.newIconSet) {
-                R.xml.preferences_without_icons
-            } else {
-                R.xml.preferences
-            }
+            R.xml.preferences
         }
 
     @SuppressLint("RestrictedApi")
@@ -395,8 +385,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
     private fun setupPreferences() {
         val leakKey = getPreferenceKey(R.string.pref_key_leakcanary)
         val debuggingKey = getPreferenceKey(R.string.pref_key_remote_debugging)
-        val preferencePrivateBrowsing =
-            requirePreference<Preference>(R.string.pref_key_private_browsing)
         val preferenceLeakCanary = findPreference<Preference>(leakKey)
         val preferenceRemoteDebugging = findPreference<Preference>(debuggingKey)
         val preferenceMakeDefaultBrowser =
@@ -404,12 +392,6 @@ class SettingsFragment : PreferenceFragmentCompat() {
         val preferenceOpenLinksInExternalApp =
             findPreference<Preference>(getPreferenceKey(R.string.pref_key_open_links_in_external_app))
 
-        if (!FeatureFlags.newIconSet) {
-            preferencePrivateBrowsing.icon.mutate().apply {
-                setTint(requireContext().getColorFromAttr(R.attr.primaryText))
-            }
-        }
-
         if (!Config.channel.isReleased) {
             preferenceLeakCanary?.setOnPreferenceChangeListener { _, newValue ->
                 val isEnabled = newValue == true
diff --git a/app/src/main/res/animator/fill_disable.xml b/app/src/main/res/animator/fill_disable.xml
deleted file mode 100644
index c0887a6ac..000000000
--- a/app/src/main/res/animator/fill_disable.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/. -->
-<objectAnimator
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:propertyName="fillColor"
-        android:startOffset="@integer/strike_thru_start_offset"
-        android:duration="@integer/strike_thru_duration"
-        android:valueFrom="?primaryText"
-        android:valueTo="@color/disabled_text"
-        android:valueType="colorType"
-        android:interpolator="@android:interpolator/fast_out_slow_in" />
diff --git a/app/src/main/res/animator/fill_enable.xml b/app/src/main/res/animator/fill_enable.xml
deleted file mode 100644
index 52d745f77..000000000
--- a/app/src/main/res/animator/fill_enable.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/. -->
-<objectAnimator
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:propertyName="fillColor"
-        android:startOffset="@integer/strike_thru_start_offset"
-        android:duration="@integer/strike_thru_duration"
-        android:valueFrom="@color/disabled_text"
-        android:valueTo="?primaryText"
-        android:valueType="colorType"
-        android:interpolator="@android:interpolator/fast_out_slow_in" />
diff --git a/app/src/main/res/animator/strike_thru_mask_disable.xml b/app/src/main/res/animator/strike_thru_mask_disable.xml
deleted file mode 100644
index 09049a7b6..000000000
--- a/app/src/main/res/animator/strike_thru_mask_disable.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/. -->
-<objectAnimator
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:propertyName="pathData"
-        android:startOffset="@integer/strike_thru_start_offset"
-        android:duration="@integer/strike_thru_duration"
-        android:valueFrom="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 23 4 L 21 2 L 21 2 Z"
-        android:valueTo="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 6 21 L 4 19 L 21 2 Z"
-        android:valueType="pathType"
-        android:interpolator="@android:interpolator/fast_out_slow_in" />
diff --git a/app/src/main/res/animator/strike_thru_mask_enable.xml b/app/src/main/res/animator/strike_thru_mask_enable.xml
deleted file mode 100644
index e45b8c676..000000000
--- a/app/src/main/res/animator/strike_thru_mask_enable.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/. -->
-<objectAnimator
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:propertyName="pathData"
-        android:startOffset="@integer/strike_thru_start_offset"
-        android:duration="@integer/strike_thru_duration"
-        android:valueFrom="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 6 21 L 4 19 L 21 2 Z"
-        android:valueTo="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 23 4 L 21 2 L 21 2 Z"
-        android:valueType="pathType"
-        android:interpolator="@android:interpolator/fast_out_slow_in" />
diff --git a/app/src/main/res/animator/strike_thru_path_disable.xml b/app/src/main/res/animator/strike_thru_path_disable.xml
deleted file mode 100644
index b56cca0e2..000000000
--- a/app/src/main/res/animator/strike_thru_path_disable.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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/. -->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <objectAnimator
-            android:propertyName="pathData"
-            android:startOffset="@integer/strike_thru_start_offset"
-            android:duration="@integer/strike_thru_duration"
-            android:valueFrom="M 20 1.6 L 21.4 3 L 21.9 2.5 C 20.9 3.5 19.5 2 20.5 1.1 L 20 1.6 Z"
-            android:valueTo="M 20 1.6 L 21.4 3 L 5.2 19.2 C 4.2 20.2 2.8 18.8 3.8 17.8 L 20 1.6 Z"
-            android:valueType="pathType"
-            android:interpolator="@android:interpolator/fast_out_slow_in" />
-    <objectAnimator
-            android:propertyName="fillColor"
-            android:startOffset="@integer/strike_thru_start_offset"
-            android:duration="@integer/strike_thru_duration"
-            android:valueFrom="?primaryText"
-            android:valueTo="@color/disabled_text"
-            android:valueType="colorType"
-            android:interpolator="@android:interpolator/fast_out_slow_in" />
-</set>
diff --git a/app/src/main/res/animator/strike_thru_path_enable.xml b/app/src/main/res/animator/strike_thru_path_enable.xml
deleted file mode 100644
index 8ea41146c..000000000
--- a/app/src/main/res/animator/strike_thru_path_enable.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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/. -->
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <objectAnimator
-            android:propertyName="pathData"
-            android:startOffset="@integer/strike_thru_start_offset"
-            android:duration="@integer/strike_thru_duration"
-            android:valueFrom="M 20 1.6 L 21.4 3 L 5.2 19.2 C 4.2 20.2 2.8 18.8 3.8 17.8 L 20 1.6 Z"
-            android:valueTo="M 20 1.6 L 21.4 3 L 21.9 2.5 C 20.9 3.5 19.5 2 20.5 1.1 L 20 1.6 Z"
-            android:valueType="pathType"
-            android:interpolator="@android:interpolator/fast_out_slow_in" />
-    <objectAnimator
-            android:propertyName="fillColor"
-            android:startOffset="@integer/strike_thru_start_offset"
-            android:duration="@integer/strike_thru_duration"
-            android:valueFrom="@color/disabled_text"
-            android:valueTo="?primaryText"
-            android:valueType="colorType"
-            android:interpolator="@android:interpolator/fast_out_slow_in" />
-</set>
diff --git a/app/src/main/res/drawable-v24/shield_dark.xml b/app/src/main/res/drawable-v24/shield_dark.xml
index a40e505f4..0e322f569 100644
--- a/app/src/main/res/drawable-v24/shield_dark.xml
+++ b/app/src/main/res/drawable-v24/shield_dark.xml
@@ -13,23 +13,27 @@
             android:viewportHeight="24">
             <path
                 android:name="path"
-                android:fillColor="#fbfbfe"
-                android:pathData="M 20 6 C 20 5 19.2 4.1 18.2 4 L 12 3 L 5.8 4 C 4.8 4 4 5 4 6 L 4.1 11 C 4.4 14.2 5.1 16 6.6 18 C 7.929 19.627 9.821 20.698 11.9 21 L 12.1 21 C 14.2 20.7 16.1 19.6 17.4 18 C 19 16 19.6 14.2 19.9 11 L 20 6 Z M 17.9 10.8 C 17.9 12.963 17.198 15.069 15.9 16.8 C 14.9 17.9 13.5 18.8 12 19.1 C 10.452 18.8 9.066 17.946 8.1 16.7 C 6.816 15 6.114 12.93 6.1 10.8 C 6.041 9.167 6.041 7.533 6.1 5.9 L 12 5 L 17.9 6 L 18 6.2 L 17.9 10.9 Z M 8 7.6 L 8 10.6 C 8.3 13.3 8.8 14.3 9.7 15.6 C 10.3 16.2 11.1 16.8 12 17 L 12 7 L 8 7.6 Z"
+                android:fillColor="#20123a"
+                android:pathData="M12.0002,22C11.5342,22 11.0662,21.885 10.6462,21.668C8.4962,20.547 6.5242,18.735 5.0942,16.566C4.3852,15.493 3.8882,14.198 3.6162,12.716L2.9092,8.872C2.6692,7.563 3.2942,6.259 4.4632,5.625L10.5652,2.363C11.4632,1.88 12.5362,1.88 13.4322,2.359L19.5342,5.682C20.7082,6.313 21.3352,7.621 21.0912,8.936L20.3862,12.728C20.1152,14.201 19.6172,15.49 18.9112,16.56C17.4822,18.729 15.5102,20.542 13.3562,21.666C12.9372,21.885 12.4682,22 12.0002,22ZM11.5152,3.556L4.8452,7.13L4.3382,8.368L5.0922,12.445C5.3272,13.727 5.7502,14.836 6.3472,15.74C7.6392,17.7 9.4122,19.332 11.3392,20.337H12.6632C14.5932,19.329 16.3672,17.694 17.6582,15.735C18.2532,14.833 18.6752,13.729 18.9102,12.455L19.6632,8.368L19.0532,7.129L12.4942,3.557H11.5152V3.556Z"
                 android:strokeWidth="1" />
+
             <path
                 android:name="path_1"
-                android:pathData="M 20 6 C 20 5 19.2 4.1 18.2 4 L 12 3 L 5.8 4 C 4.8 4 4 5 4 6 L 4.1 11 C 4.4 14.2 5.1 16 6.6 18 C 7.929 19.627 9.821 20.698 11.9 21 L 12.1 21 C 14.2 20.7 16.1 19.6 17.4 18 C 19 16 19.6 14.2 19.9 11 L 20 6 Z M 17.9 10.8 C 17.9 12.963 17.198 15.069 15.9 16.8 C 14.9 17.9 13.5 18.8 12 19.1 C 10.452 18.8 9.066 17.946 8.1 16.7 C 6.816 15 6.114 12.93 6.1 10.8 C 6.041 9.167 6.041 7.533 6.1 5.9 L 12 5 L 17.9 6 L 18 6.2 L 17.9 10.9 Z M 8 7.6 L 8 10.6 C 8.3 13.3 8.8 14.3 9.7 15.6 C 10.3 16.2 11.1 16.8 12 17 L 12 7 L 8 7.6 Z"
-                android:strokeWidth="1">
+                android:pathData="M12.0002,22C11.5342,22 11.0662,21.885 10.6462,21.668C8.4962,20.547 6.5242,18.735 5.0942,16.566C4.3852,15.493 3.8882,14.198 3.6162,12.716L2.9092,8.872C2.6692,7.563 3.2942,6.259 4.4632,5.625L10.5652,2.363C11.4632,1.88 12.5362,1.88 13.4322,2.359L19.5342,5.682C20.7082,6.313 21.3352,7.621 21.0912,8.936L20.3862,12.728C20.1152,14.201 19.6172,15.49 18.9112,16.56C17.4822,18.729 15.5102,20.542 13.3562,21.666C12.9372,21.885 12.4682,22 12.0002,22ZM11.5152,3.556L4.8452,7.13L4.3382,8.368L5.0922,12.445C5.3272,13.727 5.7502,14.836 6.3472,15.74C7.6392,17.7 9.4122,19.332 11.3392,20.337H12.6632C14.5932,19.329 16.3672,17.694 17.6582,15.735C18.2532,14.833 18.6752,13.729 18.9102,12.455L19.6632,8.368L19.0532,7.129L12.4942,3.557H11.5152V3.556Z">
                 <aapt:attr name="android:fillColor">
                     <gradient
-                        android:angle="45"
-                        android:endColor="#00b3f4"
-                        android:endX="0.0"
-                        android:endY="20.0"
-                        android:startColor="#C689FF"
-                        android:startX="24.0"
-                        android:startY="10.0"
-                        android:type="linear" />
+                        android:endX="3"
+                        android:endY="22"
+                        android:startX="21"
+                        android:startY="2"
+                        android:type="linear">
+                        <item
+                            android:color="#FFAB71FF"
+                            android:offset="0" />
+                        <item
+                            android:color="#FF0250BB"
+                            android:offset="1" />
+                    </gradient>
                 </aapt:attr>
             </path>
         </vector>
@@ -41,8 +45,8 @@
                     android:duration="330"
                     android:interpolator="@android:interpolator/fast_out_slow_in"
                     android:propertyName="pathData"
-                    android:valueFrom="M 20 6 C 20 5 19.2 4.1 18.2 4 L 12 3 L 5.8 4 C 4.8 4 4 5 4 6 L 4.1 11 C 4.4 14.2 5.1 16 6.6 18 C 7.929 19.627 9.821 20.698 11.9 21 L 12.1 21 C 14.2 20.7 16.1 19.6 17.4 18 C 19 16 19.6 14.2 19.9 11 L 20 6 Z M 17.9 10.8 C 17.9 12.963 17.198 15.069 15.9 16.8 C 14.9 17.9 13.5 18.8 12 19.1 C 10.452 18.8 9.066 17.946 8.1 16.7 C 6.816 15 6.114 12.93 6.1 10.8 C 6.041 9.167 6.041 7.533 6.1 5.9 L 12 5 L 17.9 6 L 18 6.2 L 17.9 10.9 Z M 8 7.6 L 8 10.6 C 8.3 13.3 8.8 14.3 9.7 15.6 C 10.3 16.2 11.1 16.8 12 17 L 12 7 L 8 7.6 Z"
-                    android:valueTo="M 20 6 C 20 5 19.2 4.1 18.2 4 L 12 3 L 5.8 4 C 4.8 4 4 5 4 6 L 4.1 11 C 4.4 14.2 5.1 16 6.6 18 C 7.929 19.627 9.821 20.698 11.9 21 L 12.1 21 C 14.2 20.7 16.1 19.6 17.4 18 C 19 16 19.6 14.2 19.9 11 L 20 6 Z M 17.9 10.8 C 17.9 12.963 17.198 15.069 15.9 16.8 C 14.9 17.9 13.5 18.8 12 19.1 C 10.452 18.8 9.066 17.946 8.1 16.7 C 6.816 15 6.114 12.93 6.1 10.8 C 6.041 9.167 6.041 7.533 6.1 5.9 L 12 5 L 17.9 6 L 18 6.2 L 17.9 10.9 Z M 8 7.6 L 8 10.6 C 8.3 13.3 8.8 14.3 9.7 15.6 C 10.3 16.2 11.1 16.8 12 17 L 12 7 L 8 7.6 Z"
+                    android:valueFrom="M12.0002,22C11.5342,22 11.0662,21.885 10.6462,21.668C8.4962,20.547 6.5242,18.735 5.0942,16.566C4.3852,15.493 3.8882,14.198 3.6162,12.716L2.9092,8.872C2.6692,7.563 3.2942,6.259 4.4632,5.625L10.5652,2.363C11.4632,1.88 12.5362,1.88 13.4322,2.359L19.5342,5.682C20.7082,6.313 21.3352,7.621 21.0912,8.936L20.3862,12.728C20.1152,14.201 19.6172,15.49 18.9112,16.56C17.4822,18.729 15.5102,20.542 13.3562,21.666C12.9372,21.885 12.4682,22 12.0002,22ZM11.5152,3.556L4.8452,7.13L4.3382,8.368L5.0922,12.445C5.3272,13.727 5.7502,14.836 6.3472,15.74C7.6392,17.7 9.4122,19.332 11.3392,20.337H12.6632C14.5932,19.329 16.3672,17.694 17.6582,15.735C18.2532,14.833 18.6752,13.729 18.9102,12.455L19.6632,8.368L19.0532,7.129L12.4942,3.557H11.5152V3.556Z"
+                    android:valueTo="M12.0002,22C11.5342,22 11.0662,21.885 10.6462,21.668C8.4962,20.547 6.5242,18.735 5.0942,16.566C4.3852,15.493 3.8882,14.198 3.6162,12.716L2.9092,8.872C2.6692,7.563 3.2942,6.259 4.4632,5.625L10.5652,2.363C11.4632,1.88 12.5362,1.88 13.4322,2.359L19.5342,5.682C20.7082,6.313 21.3352,7.621 21.0912,8.936L20.3862,12.728C20.1152,14.201 19.6172,15.49 18.9112,16.56C17.4822,18.729 15.5102,20.542 13.3562,21.666C12.9372,21.885 12.4682,22 12.0002,22ZM11.5152,3.556L4.8452,7.13L4.3382,8.368L5.0922,12.445C5.3272,13.727 5.7502,14.836 6.3472,15.74C7.6392,17.7 9.4122,19.332 11.3392,20.337H12.6632C14.5932,19.329 16.3672,17.694 17.6582,15.735C18.2532,14.833 18.6752,13.729 18.9102,12.455L19.6632,8.368L19.0532,7.129L12.4942,3.557H11.5152V3.556Z"
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="330"
@@ -61,8 +65,8 @@
                     android:duration="330"
                     android:interpolator="@android:interpolator/fast_out_slow_in"
                     android:propertyName="pathData"
-                    android:valueFrom="M 20 6 C 20 5 19.2 4.1 18.2 4 L 12 3 L 5.8 4 C 4.8 4 4 5 4 6 L 4.1 11 C 4.4 14.2 5.1 16 6.6 18 C 7.929 19.627 9.821 20.698 11.9 21 L 12.1 21 C 14.2 20.7 16.1 19.6 17.4 18 C 19 16 19.6 14.2 19.9 11 L 20 6 Z M 17.9 10.8 C 17.9 12.963 17.198 15.069 15.9 16.8 C 14.9 17.9 13.5 18.8 12 19.1 C 10.452 18.8 9.066 17.946 8.1 16.7 C 6.816 15 6.114 12.93 6.1 10.8 C 6.041 9.167 6.041 7.533 6.1 5.9 L 12 5 L 17.9 6 L 18 6.2 L 17.9 10.9 Z M 8 7.6 L 8 10.6 C 8.3 13.3 8.8 14.3 9.7 15.6 C 10.3 16.2 11.1 16.8 12 17 L 12 7 L 8 7.6 Z"
-                    android:valueTo="M 20 6 C 20 5 19.2 4.1 18.2 4 L 12 3 L 5.8 4 C 4.8 4 4 5 4 6 L 4.1 11 C 4.4 14.2 5.1 16 6.6 18 C 7.929 19.627 9.821 20.698 11.9 21 L 12.1 21 C 14.2 20.7 16.1 19.6 17.4 18 C 19 16 19.6 14.2 19.9 11 L 20 6 Z M 17.9 10.8 C 17.9 12.963 17.198 15.069 15.9 16.8 C 14.9 17.9 13.5 18.8 12 19.1 C 10.452 18.8 9.066 17.946 8.1 16.7 C 6.816 15 6.114 12.93 6.1 10.8 C 6.041 9.167 6.041 7.533 6.1 5.9 L 12 5 L 17.9 6 L 18 6.2 L 17.9 10.9 Z M 8 7.6 L 8 10.6 C 8.3 13.3 8.8 14.3 9.7 15.6 C 10.3 16.2 11.1 16.8 12 17 L 12 7 L 8 7.6 Z"
+                    android:valueFrom="M12.0002,22C11.5342,22 11.0662,21.885 10.6462,21.668C8.4962,20.547 6.5242,18.735 5.0942,16.566C4.3852,15.493 3.8882,14.198 3.6162,12.716L2.9092,8.872C2.6692,7.563 3.2942,6.259 4.4632,5.625L10.5652,2.363C11.4632,1.88 12.5362,1.88 13.4322,2.359L19.5342,5.682C20.7082,6.313 21.3352,7.621 21.0912,8.936L20.3862,12.728C20.1152,14.201 19.6172,15.49 18.9112,16.56C17.4822,18.729 15.5102,20.542 13.3562,21.666C12.9372,21.885 12.4682,22 12.0002,22ZM11.5152,3.556L4.8452,7.13L4.3382,8.368L5.0922,12.445C5.3272,13.727 5.7502,14.836 6.3472,15.74C7.6392,17.7 9.4122,19.332 11.3392,20.337H12.6632C14.5932,19.329 16.3672,17.694 17.6582,15.735C18.2532,14.833 18.6752,13.729 18.9102,12.455L19.6632,8.368L19.0532,7.129L12.4942,3.557H11.5152V3.556Z"
+                    android:valueTo="M12.0002,22C11.5342,22 11.0662,21.885 10.6462,21.668C8.4962,20.547 6.5242,18.735 5.0942,16.566C4.3852,15.493 3.8882,14.198 3.6162,12.716L2.9092,8.872C2.6692,7.563 3.2942,6.259 4.4632,5.625L10.5652,2.363C11.4632,1.88 12.5362,1.88 13.4322,2.359L19.5342,5.682C20.7082,6.313 21.3352,7.621 21.0912,8.936L20.3862,12.728C20.1152,14.201 19.6172,15.49 18.9112,16.56C17.4822,18.729 15.5102,20.542 13.3562,21.666C12.9372,21.885 12.4682,22 12.0002,22ZM11.5152,3.556L4.8452,7.13L4.3382,8.368L5.0922,12.445C5.3272,13.727 5.7502,14.836 6.3472,15.74C7.6392,17.7 9.4122,19.332 11.3392,20.337H12.6632C14.5932,19.329 16.3672,17.694 17.6582,15.735C18.2532,14.833 18.6752,13.729 18.9102,12.455L19.6632,8.368L19.0532,7.129L12.4942,3.557H11.5152V3.556Z"
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="330"
diff --git a/app/src/main/res/drawable-v24/shield_light.xml b/app/src/main/res/drawable-v24/shield_light.xml
index 617db89eb..e04aca611 100644
--- a/app/src/main/res/drawable-v24/shield_light.xml
+++ b/app/src/main/res/drawable-v24/shield_light.xml
@@ -14,22 +14,26 @@
             <path
                 android:name="path"
                 android:fillColor="#20123a"
-                android:pathData="M 20 6 C 20 5 19.2 4.1 18.2 4 L 12 3 L 5.8 4 C 4.8 4 4 5 4 6 L 4.1 11 C 4.4 14.2 5.1 16 6.6 18 C 7.929 19.627 9.821 20.698 11.9 21 L 12.1 21 C 14.2 20.7 16.1 19.6 17.4 18 C 19 16 19.6 14.2 19.9 11 L 20 6 Z M 17.9 10.8 C 17.9 12.963 17.198 15.069 15.9 16.8 C 14.9 17.9 13.5 18.8 12 19.1 C 10.452 18.8 9.066 17.946 8.1 16.7 C 6.816 15 6.114 12.93 6.1 10.8 C 6.041 9.167 6.041 7.533 6.1 5.9 L 12 5 L 17.9 6 L 18 6.2 L 17.9 10.9 Z M 8 7.6 L 8 10.6 C 8.3 13.3 8.8 14.3 9.7 15.6 C 10.3 16.2 11.1 16.8 12 17 L 12 7 L 8 7.6 Z"
+                android:pathData="M12.0002,22C11.5342,22 11.0662,21.885 10.6462,21.668C8.4962,20.547 6.5242,18.735 5.0942,16.566C4.3852,15.493 3.8882,14.198 3.6162,12.716L2.9092,8.872C2.6692,7.563 3.2942,6.259 4.4632,5.625L10.5652,2.363C11.4632,1.88 12.5362,1.88 13.4322,2.359L19.5342,5.682C20.7082,6.313 21.3352,7.621 21.0912,8.936L20.3862,12.728C20.1152,14.201 19.6172,15.49 18.9112,16.56C17.4822,18.729 15.5102,20.542 13.3562,21.666C12.9372,21.885 12.4682,22 12.0002,22ZM11.5152,3.556L4.8452,7.13L4.3382,8.368L5.0922,12.445C5.3272,13.727 5.7502,14.836 6.3472,15.74C7.6392,17.7 9.4122,19.332 11.3392,20.337H12.6632C14.5932,19.329 16.3672,17.694 17.6582,15.735C18.2532,14.833 18.6752,13.729 18.9102,12.455L19.6632,8.368L19.0532,7.129L12.4942,3.557H11.5152V3.556Z"
                 android:strokeWidth="1" />
+
             <path
                 android:name="path_1"
-                android:pathData="M 20 6 C 20 5 19.2 4.1 18.2 4 L 12 3 L 5.8 4 C 4.8 4 4 5 4 6 L 4.1 11 C 4.4 14.2 5.1 16 6.6 18 C 7.929 19.627 9.821 20.698 11.9 21 L 12.1 21 C 14.2 20.7 16.1 19.6 17.4 18 C 19 16 19.6 14.2 19.9 11 L 20 6 Z M 17.9 10.8 C 17.9 12.963 17.198 15.069 15.9 16.8 C 14.9 17.9 13.5 18.8 12 19.1 C 10.452 18.8 9.066 17.946 8.1 16.7 C 6.816 15 6.114 12.93 6.1 10.8 C 6.041 9.167 6.041 7.533 6.1 5.9 L 12 5 L 17.9 6 L 18 6.2 L 17.9 10.9 Z M 8 7.6 L 8 10.6 C 8.3 13.3 8.8 14.3 9.7 15.6 C 10.3 16.2 11.1 16.8 12 17 L 12 7 L 8 7.6 Z"
-                android:strokeWidth="1">
+                android:pathData="M12.0002,22C11.5342,22 11.0662,21.885 10.6462,21.668C8.4962,20.547 6.5242,18.735 5.0942,16.566C4.3852,15.493 3.8882,14.198 3.6162,12.716L2.9092,8.872C2.6692,7.563 3.2942,6.259 4.4632,5.625L10.5652,2.363C11.4632,1.88 12.5362,1.88 13.4322,2.359L19.5342,5.682C20.7082,6.313 21.3352,7.621 21.0912,8.936L20.3862,12.728C20.1152,14.201 19.6172,15.49 18.9112,16.56C17.4822,18.729 15.5102,20.542 13.3562,21.666C12.9372,21.885 12.4682,22 12.0002,22ZM11.5152,3.556L4.8452,7.13L4.3382,8.368L5.0922,12.445C5.3272,13.727 5.7502,14.836 6.3472,15.74C7.6392,17.7 9.4122,19.332 11.3392,20.337H12.6632C14.5932,19.329 16.3672,17.694 17.6582,15.735C18.2532,14.833 18.6752,13.729 18.9102,12.455L19.6632,8.368L19.0532,7.129L12.4942,3.557H11.5152V3.556Z">
                 <aapt:attr name="android:fillColor">
                     <gradient
-                        android:angle="45"
-                        android:endColor="#0250BB"
-                        android:endX="0.0"
-                        android:endY="20.0"
-                        android:startColor="#9059FF"
-                        android:startX="24.0"
-                        android:startY="10.0"
-                        android:type="linear" />
+                        android:endX="3"
+                        android:endY="22"
+                        android:startX="21"
+                        android:startY="2"
+                        android:type="linear">
+                        <item
+                            android:color="#FFAB71FF"
+                            android:offset="0" />
+                        <item
+                            android:color="#FF0250BB"
+                            android:offset="1" />
+                    </gradient>
                 </aapt:attr>
             </path>
         </vector>
@@ -41,8 +45,8 @@
                     android:duration="330"
                     android:interpolator="@android:interpolator/fast_out_slow_in"
                     android:propertyName="pathData"
-                    android:valueFrom="M 20 6 C 20 5 19.2 4.1 18.2 4 L 12 3 L 5.8 4 C 4.8 4 4 5 4 6 L 4.1 11 C 4.4 14.2 5.1 16 6.6 18 C 7.929 19.627 9.821 20.698 11.9 21 L 12.1 21 C 14.2 20.7 16.1 19.6 17.4 18 C 19 16 19.6 14.2 19.9 11 L 20 6 Z M 17.9 10.8 C 17.9 12.963 17.198 15.069 15.9 16.8 C 14.9 17.9 13.5 18.8 12 19.1 C 10.452 18.8 9.066 17.946 8.1 16.7 C 6.816 15 6.114 12.93 6.1 10.8 C 6.041 9.167 6.041 7.533 6.1 5.9 L 12 5 L 17.9 6 L 18 6.2 L 17.9 10.9 Z M 8 7.6 L 8 10.6 C 8.3 13.3 8.8 14.3 9.7 15.6 C 10.3 16.2 11.1 16.8 12 17 L 12 7 L 8 7.6 Z"
-                    android:valueTo="M 20 6 C 20 5 19.2 4.1 18.2 4 L 12 3 L 5.8 4 C 4.8 4 4 5 4 6 L 4.1 11 C 4.4 14.2 5.1 16 6.6 18 C 7.929 19.627 9.821 20.698 11.9 21 L 12.1 21 C 14.2 20.7 16.1 19.6 17.4 18 C 19 16 19.6 14.2 19.9 11 L 20 6 Z M 17.9 10.8 C 17.9 12.963 17.198 15.069 15.9 16.8 C 14.9 17.9 13.5 18.8 12 19.1 C 10.452 18.8 9.066 17.946 8.1 16.7 C 6.816 15 6.114 12.93 6.1 10.8 C 6.041 9.167 6.041 7.533 6.1 5.9 L 12 5 L 17.9 6 L 18 6.2 L 17.9 10.9 Z M 8 7.6 L 8 10.6 C 8.3 13.3 8.8 14.3 9.7 15.6 C 10.3 16.2 11.1 16.8 12 17 L 12 7 L 8 7.6 Z"
+                    android:valueFrom="M12.0002,22C11.5342,22 11.0662,21.885 10.6462,21.668C8.4962,20.547 6.5242,18.735 5.0942,16.566C4.3852,15.493 3.8882,14.198 3.6162,12.716L2.9092,8.872C2.6692,7.563 3.2942,6.259 4.4632,5.625L10.5652,2.363C11.4632,1.88 12.5362,1.88 13.4322,2.359L19.5342,5.682C20.7082,6.313 21.3352,7.621 21.0912,8.936L20.3862,12.728C20.1152,14.201 19.6172,15.49 18.9112,16.56C17.4822,18.729 15.5102,20.542 13.3562,21.666C12.9372,21.885 12.4682,22 12.0002,22ZM11.5152,3.556L4.8452,7.13L4.3382,8.368L5.0922,12.445C5.3272,13.727 5.7502,14.836 6.3472,15.74C7.6392,17.7 9.4122,19.332 11.3392,20.337H12.6632C14.5932,19.329 16.3672,17.694 17.6582,15.735C18.2532,14.833 18.6752,13.729 18.9102,12.455L19.6632,8.368L19.0532,7.129L12.4942,3.557H11.5152V3.556Z"
+                    android:valueTo="M12.0002,22C11.5342,22 11.0662,21.885 10.6462,21.668C8.4962,20.547 6.5242,18.735 5.0942,16.566C4.3852,15.493 3.8882,14.198 3.6162,12.716L2.9092,8.872C2.6692,7.563 3.2942,6.259 4.4632,5.625L10.5652,2.363C11.4632,1.88 12.5362,1.88 13.4322,2.359L19.5342,5.682C20.7082,6.313 21.3352,7.621 21.0912,8.936L20.3862,12.728C20.1152,14.201 19.6172,15.49 18.9112,16.56C17.4822,18.729 15.5102,20.542 13.3562,21.666C12.9372,21.885 12.4682,22 12.0002,22ZM11.5152,3.556L4.8452,7.13L4.3382,8.368L5.0922,12.445C5.3272,13.727 5.7502,14.836 6.3472,15.74C7.6392,17.7 9.4122,19.332 11.3392,20.337H12.6632C14.5932,19.329 16.3672,17.694 17.6582,15.735C18.2532,14.833 18.6752,13.729 18.9102,12.455L19.6632,8.368L19.0532,7.129L12.4942,3.557H11.5152V3.556Z"
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="330"
@@ -61,8 +65,8 @@
                     android:duration="330"
                     android:interpolator="@android:interpolator/fast_out_slow_in"
                     android:propertyName="pathData"
-                    android:valueFrom="M 20 6 C 20 5 19.2 4.1 18.2 4 L 12 3 L 5.8 4 C 4.8 4 4 5 4 6 L 4.1 11 C 4.4 14.2 5.1 16 6.6 18 C 7.929 19.627 9.821 20.698 11.9 21 L 12.1 21 C 14.2 20.7 16.1 19.6 17.4 18 C 19 16 19.6 14.2 19.9 11 L 20 6 Z M 17.9 10.8 C 17.9 12.963 17.198 15.069 15.9 16.8 C 14.9 17.9 13.5 18.8 12 19.1 C 10.452 18.8 9.066 17.946 8.1 16.7 C 6.816 15 6.114 12.93 6.1 10.8 C 6.041 9.167 6.041 7.533 6.1 5.9 L 12 5 L 17.9 6 L 18 6.2 L 17.9 10.9 Z M 8 7.6 L 8 10.6 C 8.3 13.3 8.8 14.3 9.7 15.6 C 10.3 16.2 11.1 16.8 12 17 L 12 7 L 8 7.6 Z"
-                    android:valueTo="M 20 6 C 20 5 19.2 4.1 18.2 4 L 12 3 L 5.8 4 C 4.8 4 4 5 4 6 L 4.1 11 C 4.4 14.2 5.1 16 6.6 18 C 7.929 19.627 9.821 20.698 11.9 21 L 12.1 21 C 14.2 20.7 16.1 19.6 17.4 18 C 19 16 19.6 14.2 19.9 11 L 20 6 Z M 17.9 10.8 C 17.9 12.963 17.198 15.069 15.9 16.8 C 14.9 17.9 13.5 18.8 12 19.1 C 10.452 18.8 9.066 17.946 8.1 16.7 C 6.816 15 6.114 12.93 6.1 10.8 C 6.041 9.167 6.041 7.533 6.1 5.9 L 12 5 L 17.9 6 L 18 6.2 L 17.9 10.9 Z M 8 7.6 L 8 10.6 C 8.3 13.3 8.8 14.3 9.7 15.6 C 10.3 16.2 11.1 16.8 12 17 L 12 7 L 8 7.6 Z"
+                    android:valueFrom="M12.0002,22C11.5342,22 11.0662,21.885 10.6462,21.668C8.4962,20.547 6.5242,18.735 5.0942,16.566C4.3852,15.493 3.8882,14.198 3.6162,12.716L2.9092,8.872C2.6692,7.563 3.2942,6.259 4.4632,5.625L10.5652,2.363C11.4632,1.88 12.5362,1.88 13.4322,2.359L19.5342,5.682C20.7082,6.313 21.3352,7.621 21.0912,8.936L20.3862,12.728C20.1152,14.201 19.6172,15.49 18.9112,16.56C17.4822,18.729 15.5102,20.542 13.3562,21.666C12.9372,21.885 12.4682,22 12.0002,22ZM11.5152,3.556L4.8452,7.13L4.3382,8.368L5.0922,12.445C5.3272,13.727 5.7502,14.836 6.3472,15.74C7.6392,17.7 9.4122,19.332 11.3392,20.337H12.6632C14.5932,19.329 16.3672,17.694 17.6582,15.735C18.2532,14.833 18.6752,13.729 18.9102,12.455L19.6632,8.368L19.0532,7.129L12.4942,3.557H11.5152V3.556Z"
+                    android:valueTo="M12.0002,22C11.5342,22 11.0662,21.885 10.6462,21.668C8.4962,20.547 6.5242,18.735 5.0942,16.566C4.3852,15.493 3.8882,14.198 3.6162,12.716L2.9092,8.872C2.6692,7.563 3.2942,6.259 4.4632,5.625L10.5652,2.363C11.4632,1.88 12.5362,1.88 13.4322,2.359L19.5342,5.682C20.7082,6.313 21.3352,7.621 21.0912,8.936L20.3862,12.728C20.1152,14.201 19.6172,15.49 18.9112,16.56C17.4822,18.729 15.5102,20.542 13.3562,21.666C12.9372,21.885 12.4682,22 12.0002,22ZM11.5152,3.556L4.8452,7.13L4.3382,8.368L5.0922,12.445C5.3272,13.727 5.7502,14.836 6.3472,15.74C7.6392,17.7 9.4122,19.332 11.3392,20.337H12.6632C14.5932,19.329 16.3672,17.694 17.6582,15.735C18.2532,14.833 18.6752,13.729 18.9102,12.455L19.6632,8.368L19.0532,7.129L12.4942,3.557H11.5152V3.556Z"
                     android:valueType="pathType" />
                 <objectAnimator
                     android:duration="330"
diff --git a/app/src/main/res/drawable/ic_add_to_homescreen.xml b/app/src/main/res/drawable/ic_add_to_homescreen.xml
index 282453f17..2d07502bf 100644
--- a/app/src/main/res/drawable/ic_add_to_homescreen.xml
+++ b/app/src/main/res/drawable/ic_add_to_homescreen.xml
@@ -8,6 +8,9 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-            android:pathData="M20.3 4.3L15 9.59V8a1 1 0 0 0-2 0v4a1 1 0 0 0 1 1h4a1 1 0 0 0 0-2h-1.6l5.3-5.3a1 1 0 1 0-1.42-1.42zM16 18a1 1 0 1 0-2 0 1 1 0 0 0 2 0zm1 2H7V4h11.44a0.5 0.5 0 0 0 0.5-0.6A3 3 0 0 0 16 1H8a3 3 0 0 0-3 3v16a3 3 0 0 0 3 3h8a3 3 0 0 0 3-3v-5a1 1 0 0 0-2 0v5zm-3.5 2h-3a0.5 0.5 0 1 1 0-1h3a0.5 0.5 0 1 1 0 1zm-0.5-4a1 1 0 1 0-2 0 1 1 0 0 0 2 0zm-4-1a1 1 0 1 0 0 2 1 1 0 0 0 0-2zm3-3a1 1 0 1 0 0 2 1 1 0 0 0 0-2z"
-            android:fillColor="?primaryText"/>
+        android:pathData="m15.535,10.526 l1.6,1.6a0.5,0.5 0,0 1,-0.351 0.854l-4.233,0.02 -0.551,-0.551 0.021,-4.232a0.5,0.5 0,0 1,0.854 -0.351l1.596,1.596L19.72,4.22a0.75,0.75 0,1 1,1.061 1.061l-5.246,5.245zM7.6,14H6.4l-0.4,0.4v1.2l0.4,0.4h1.2l0.4,-0.4v-1.2l-0.4,-0.4zM10.6,14H9.4l-0.4,0.4v1.2l0.4,0.4h1.2l0.4,-0.4v-1.2l-0.4,-0.4zM13.6,14h-1.2l-0.4,0.4v1.2l0.4,0.4h1.2l0.4,-0.4v-1.2l-0.4,-0.4zM10.6,11H9.4l-0.4,0.4v1.2l0.4,0.4h1.2l0.4,-0.4v-1.2l-0.4,-0.4z"
+        android:fillColor="?primaryText"/>
+    <path
+        android:pathData="M14.5,2h-9A2.5,2.5 0,0 0,3 4.5v15A2.5,2.5 0,0 0,5.5 22h9a2.5,2.5 0,0 0,2.5 -2.5v-4.275a0.75,0.75 0,0 0,-1.5 0V17h-11V4.3l0.8,-0.8h9.4l0.8,0.8V5A0.75,0.75 0,0 0,17 5v-0.5A2.5,2.5 0,0 0,14.5 2zM8.75,19h2.5a0.75,0.75 0,0 1,0 1.5h-2.5a0.75,0.75 0,0 1,0 -1.5z"
+        android:fillColor="?primaryText"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_addons_extensions.xml b/app/src/main/res/drawable/ic_addons_extensions.xml
index 5fabf10b2..efe803ba3 100644
--- a/app/src/main/res/drawable/ic_addons_extensions.xml
+++ b/app/src/main/res/drawable/ic_addons_extensions.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:pathData="M20.125 12c-1.2 0-1.25 1.25-2.2 1.25-0.5-0-0.9-0.424-0.94-0.94V8.25C17 7.56 16.44 7 15.75 7h-4.062c-0.5-0-0.928-0.424-0.94-0.94 0-0.937 1.25-0.974 1.25-2.187C12 2.794 11 2 9.5 2S7 2.794 7 3.875c0 1.213 1.25 1.25 1.25 2.187C8.24 6.576 7.826 7 7.312 7H3.25C2.918 7 2.6 7.132 2.366 7.366 2.132 7.601 2 7.92 2 8.25v2.812C2.01 11.576 2.424 12 3 12c1 0 1-1.25 2.187-1.25C6.206 10.75 7 11.869 7 13.25s-0.794 2.5-1.875 2.5c-1.213 0-1.25-1.25-2.187-1.25C2.424 14.51 2.01 14.924 2 15.438v5.312C2 21.44 2.56 22 3.25 22h4.062c0.514-0 1-0.4 0.94-0.94 0-1-1.25-1-1.25-2.2C7 17.794 8.119 17 9.5 17s2.5 0.8 2.5 1.875c0 1.213-1.25 1.25-1.25 2.2 0 0.514 0.424 0.928 0.938 0.938h4.062c0.69 0 1.25-0.56 1.25-1.25v-4.062c0-0.514 0.424-1 1-0.9 0.9 0 0.9 1.25 2.2 1.25C21.2 17 22 16 22 14.5S21.2 12 20.125 12z"
+        android:pathData="M17.5,7H15.5V5.127C15.5,3.533 14.317,2.166 12.807,2.015C11.958,1.931 11.116,2.206 10.488,2.775C9.86,3.342 9.5,4.154 9.5,4.999V7H6.5C5.119,7 4,8.119 4,9.5V11.75C4,12.44 4.56,13 5.25,13H6.873C7.706,13 8.417,13.59 8.493,14.343C8.536,14.775 8.402,15.188 8.114,15.506C7.829,15.82 7.424,16 7.001,16H5.25C4.56,16 4,16.56 4,17.25V19.5C4,20.881 5.119,22 6.5,22H17.5C18.881,22 20,20.881 20,19.5V9.5C20,8.119 18.881,7 17.5,7ZM18.5,19.7L17.7,20.5H6.3L5.5,19.7V17.5H7.001C7.847,17.5 8.658,17.14 9.226,16.512C9.794,15.885 10.07,15.039 9.985,14.194C9.834,12.683 8.467,11.5 6.873,11.5H5.5V9.3L6.3,8.5H10C10.552,8.5 11,8.052 11,7.5V4.999C11,4.576 11.18,4.171 11.494,3.887C11.812,3.599 12.227,3.466 12.657,3.507C13.41,3.582 14,4.294 14,5.127V7.5C14,8.052 14.448,8.5 15,8.5H17.7L18.5,9.3V19.7Z"
         android:fillColor="?primaryText" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_alert.xml b/app/src/main/res/drawable/ic_alert.xml
index 1546d32e6..94ab8c95e 100644
--- a/app/src/main/res/drawable/ic_alert.xml
+++ b/app/src/main/res/drawable/ic_alert.xml
@@ -8,6 +8,12 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M12 2a10 10 0 1 0 0 20 10 10 0 0 0 0-20zm0 18a8 8 0 1 1 0-16 8 8 0 0 1 0 16zm0-7c0.6 0 1-0.4 1-1V8a1 1 0 0 0-2 0v4c0 0.6 0.4 1 1 1zm0 4a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"
-      android:fillColor="@color/sync_error_text_color"/>
-</vector>
+      android:fillColor="@color/sync_error_text_color"
+      android:pathData="M11.75,7C11.336,7 11,7.336 11,7.75V13.25C11,13.664 11.336,14 11.75,14C12.164,14 12.5,13.664 12.5,13.25V7.75C12.5,7.336 12.164,7 11.75,7Z" />
+  <path
+      android:fillColor="@color/sync_error_text_color"
+      android:pathData="M12.2,17H11.3L11,16.7V15.8L11.3,15.5H12.2L12.5,15.8V16.7L12.2,17Z" />
+  <path
+      android:fillColor="@color/sync_error_text_color"
+      android:pathData="M11.75,4C16.161,4 19.75,7.589 19.75,12C19.75,16.411 16.161,20 11.75,20C7.339,20 3.75,16.411 3.75,12C3.75,7.589 7.339,4 11.75,4ZM11.75,2.5C6.503,2.5 2.25,6.753 2.25,12C2.25,17.247 6.503,21.5 11.75,21.5C16.997,21.5 21.25,17.247 21.25,12C21.25,6.753 16.997,2.5 11.75,2.5Z" />
+ </vector>
diff --git a/app/src/main/res/drawable/ic_arrowhead_right.xml b/app/src/main/res/drawable/ic_arrowhead_right.xml
index c899ca92f..268da1cce 100644
--- a/app/src/main/res/drawable/ic_arrowhead_right.xml
+++ b/app/src/main/res/drawable/ic_arrowhead_right.xml
@@ -5,9 +5,9 @@
     android:width="24dp"
     android:height="24dp"
     android:autoMirrored="true"
-    android:viewportWidth="7"
-    android:viewportHeight="13">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M0.9998,12.4877C0.5954,12.4877 0.2309,12.244 0.0761,11.8704C-0.0786,11.4967 0.0069,11.0667 0.2928,10.7807L4.5858,6.4877L0.2928,2.1947C-0.0862,1.8023 -0.0807,1.1786 0.305,0.7929C0.6907,0.4072 1.3144,0.4017 1.7068,0.7807L6.7068,5.7807C7.0972,6.1712 7.0972,6.8042 6.7068,7.1947L1.7068,12.1947C1.5193,12.3823 1.265,12.4877 0.9998,12.4877Z" />
+        android:pathData="M14.289,12 L7.57,5.28a0.75,0.75 0,1 1,1.061 -1.061l7.37,7.37v0.821l-7.37,7.37a0.748,0.748 0,0 1,-1.061 0,0.75 0.75,0 0,1 0,-1.061L14.289,12z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_autoplay_disabled.xml b/app/src/main/res/drawable/ic_autoplay_disabled.xml
index d4416eefb..4d069cf50 100644
--- a/app/src/main/res/drawable/ic_autoplay_disabled.xml
+++ b/app/src/main/res/drawable/ic_autoplay_disabled.xml
@@ -9,11 +9,8 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@color/disabled_text"
-        android:pathData="M19.168,8.458A7.985,7.985 0,0 1,8.462 19.164L6.987,20.639A9.986,9.986 0,0 0,20.643 6.984Z" />
+        android:pathData="M3.326 4.265A0.83 0.83 0 0 1 3.225 4h-0.36C2.842 4 2.822 4.008 2.8 4.01a0.737 0.737 0 0 0-0.58 0.21 0.75 0.75 0 0 0 0 1.061l1.847 1.847A9.441 9.441 0 0 0 2.7 12c0 5.238 4.262 9.5 9.5 9.5a9.42 9.42 0 0 0 4.879-1.36l1.64 1.64a0.748 0.748 0 0 0 1.06 0 0.75 0.75 0 0 0 0-1.061L3.326 4.265zM12.2 20c-4.411 0-8-3.589-8-8 0-1.328 0.352-2.609 0.975-3.764l4.301 4.301v3.026a0.89 0.89 0 0 0 1.333 0.773l1.569-0.897 3.601 3.601A7.918 7.918 0 0 1 12.2 20zM8 4.364L7.636 4H5.14L8 6.86V4.364zM12.2 4c2.137 0 4.146 0.832 5.657 2.343A7.948 7.948 0 0 1 20.2 12a7.964 7.964 0 0 1-1.898 5.162l1.06 1.06A9.45 9.45 0 0 0 21.7 12a9.442 9.442 0 0 0-2.782-6.718A9.442 9.442 0 0 0 12.2 2.5a0.75 0.75 0 0 0 0 1.5z" />
     <path
         android:fillColor="@color/disabled_text"
-        android:pathData="M21.707,2.293a1,1 0,0 0,-1.414 0l-1.97,1.97a9.915,9.915 0,0 0,-2.991 -1.694,1 1,0 1,0 -0.666,1.885 7.88,7.88 0,0 1,2.227 1.239L13.311,9.275 10.5,7.643A1,1 0,0 0,9 8.508v5.078l-3.3,3.3A7.922,7.922 0,0 1,4 12,8 8,0 0,1 7,5.773V9.5a0.5,0.5 0,0 0,1 0v-6A0.5,0.5 0,0 0,7.5 3h-5a0.5,0.5 0,0 0,0 1H6.024A9.939,9.939 0,0 0,4.273 18.313l-1.98,1.98a1,1 0,1 0,1.414 1.414l18,-18A1,1 0,0 0,21.707 2.293Z" />
-    <path
-        android:fillColor="@color/disabled_text"
-        android:pathData="M16.5,11.128l-4.166,4.165 4.179,-2.428a1,1 0,0 0,0 -1.73Z" />
+        android:pathData="M17.046 12.773a0.89 0.89 0 0 0 0-1.547L10.81 7.664a0.887 0.887 0 0 0-1.322 0.685l5.564 5.564 1.994-1.14z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_autoplay_enabled.xml b/app/src/main/res/drawable/ic_autoplay_enabled.xml
index 424118209..fa534a57c 100644
--- a/app/src/main/res/drawable/ic_autoplay_enabled.xml
+++ b/app/src/main/res/drawable/ic_autoplay_enabled.xml
@@ -5,5 +5,10 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?primaryText" android:pathData="M10.5,16.357l6.01,-3.492a1,1 0,0 0,0 -1.73L10.5,7.643A1,1 0,0 0,9 8.508v6.984a1,1 0,0 0,1.5 0.865zM15.33,2.569a1,1 0,1 0,-0.666 1.885A8.023,8.023 0,1 1,7 5.773L7,9.5a0.5,0.5 0,0 0,1 0v-6A0.5,0.5 0,0 0,7.5 3h-5a0.5,0.5 0,0 0,0 1h3.524a9.984,9.984 0,1 0,9.308 -1.431z"/>
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M18.918 5.282A9.442 9.442 0 0 0 12.2 2.5a0.75 0.75 0 0 0 0 1.5c2.137 0 4.146 0.832 5.657 2.343A7.948 7.948 0 0 1 20.2 12c0 4.411-3.589 8-8 8s-8-3.589-8-8c0-1.427 0.393-2.806 1.107-4.026l1.61 1.61A0.635 0.635 0 0 0 8 9.135V4.364L7.636 4H2.865a0.635 0.635 0 0 0-0.449 1.083l1.789 1.789A9.472 9.472 0 0 0 2.7 12c0 5.238 4.262 9.5 9.5 9.5s9.5-4.262 9.5-9.5a9.442 9.442 0 0 0-2.782-6.718z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M9.5 15.554V8.446a0.89 0.89 0 0 1 1.33-0.772l6.222 3.554a0.889 0.889 0 0 1 0 1.543l-6.222 3.554a0.888 0.888 0 0 1-1.33-0.771z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_bookmark_filled.xml b/app/src/main/res/drawable/ic_bookmark_filled.xml
index 090a843c0..8989f5484 100644
--- a/app/src/main/res/drawable/ic_bookmark_filled.xml
+++ b/app/src/main/res/drawable/ic_bookmark_filled.xml
@@ -9,6 +9,6 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M6.749,21.248C6.4234,21.2471 6.1142,21.1054 5.9008,20.8595C5.6875,20.6136 5.5909,20.2874 5.636,19.965L6.414,14.4L2.674,10.38C2.3928,10.0785 2.2991,9.6474 2.4296,9.2564C2.5601,8.8654 2.8941,8.5771 3.3,8.505L8.529,7.57L10.993,2.624C11.1833,2.242 11.5733,2.0006 12,2.0006C12.4267,2.0006 12.8167,2.242 13.007,2.624L15.471,7.57L20.7,8.5C21.1057,8.5724 21.4394,8.8608 21.5697,9.2518C21.7,9.6427 21.6062,10.0737 21.325,10.375L17.586,14.4L18.364,19.968C18.4229,20.3853 18.2434,20.8005 17.8991,21.0434C17.5547,21.2864 17.1034,21.3164 16.73,21.121L12,18.654L7.269,21.119C7.1087,21.2035 6.9302,21.2478 6.749,21.248Z"
+        android:pathData="M6.505 14.215L3.033 11.33a1.465 1.465 0 0 1-0.46-1.59c0.187-0.576 0.7-0.974 1.305-1.013l4.489-0.29 0.609-0.455 1.656-4.161A1.467 1.467 0 0 1 12 2.892c0.606 0 1.143 0.366 1.368 0.927l1.656 4.162 0.608 0.455 4.489 0.29a1.464 1.464 0 0 1 1.305 1.014 1.465 1.465 0 0 1-0.46 1.589L17.5 14.208l-0.218 0.719 1.105 4.34a1.462 1.462 0 0 1-0.562 1.555 1.472 1.472 0 0 1-1.652 0.055l-3.797-2.4h-0.755l-3.796 2.4a1.473 1.473 0 0 1-1.653-0.055 1.462 1.462 0 0 1-0.562-1.554l1.103-4.33-0.208-0.723z"
         android:strokeWidth="1" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_bookmark_list.xml b/app/src/main/res/drawable/ic_bookmark_list.xml
index eec7c8ffe..9937d1a68 100644
--- a/app/src/main/res/drawable/ic_bookmark_list.xml
+++ b/app/src/main/res/drawable/ic_bookmark_list.xml
@@ -10,6 +10,9 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-            android:fillColor="?primaryText"
-            android:pathData="M7,15L7.7,11.2L4.8,8.5C4.4,8 4.4,7.3 4.8,6.9C5,6.7 5.2,6.6 5.5,6.6L9.3,6L11,2.6C11.3,2 12.1,1.8 12.6,2.2C12.8,2.3 12.9,2.4 13,2.6L14.7,6L18.5,6.6C19.1,6.7 19.5,7.3 19.4,7.9C19.4,8.1 19.3,8.4 19.1,8.5L16.3,11.2L17,15C17.1,15.4 16.9,15.8 16.6,16.1C16.4,16.2 16.2,16.3 15.9,16.3C15.7,16.3 15.5,16.3 15.4,16.2L12,14.4L8.6,16.2C8,16.5 7.4,16.2 7.1,15.7C7,15.4 7,15.2 7,15ZM5,16.9C4.4,16.9 4,17.3 4,17.9V18.9C4,20.6 5.3,21.9 7,21.9H17C18.7,21.9 20,20.6 20,18.9V17.9C20,17.3 19.6,16.9 19,16.9C18.4,16.9 18,17.3 18,17.9V18.9C18,19.5 17.6,19.9 17,19.9H7C6.4,19.9 6,19.5 6,18.9V17.9C6,17.3 5.6,16.9 5,16.9Z" />
+        android:pathData="m7.225,11.324 l-2.86,-2.375a1.207,1.207 0,0 1,-0.378 -1.309,1.205 1.205,0 0,1 1.074,-0.835l3.697,-0.239 0.501,-0.375 1.364,-3.427A1.209,1.209 0,0 1,11.75 2c0.499,0 0.941,0.3 1.127,0.763v0.001l1.364,3.427 0.501,0.375 3.697,0.239c0.498,0.032 0.92,0.36 1.074,0.835 0.155,0.476 0.006,0.99 -0.378,1.309L16.28,11.32l-0.18,0.592 0.91,3.575c0.123,0.485 -0.059,0.986 -0.463,1.279a1.202,1.202 0,0 1,-1.359 0.046l-3.127,-1.977h-0.621l-3.126,1.977c-0.426,0.266 -0.96,0.247 -1.361,-0.045a1.205,1.205 0,0 1,-0.463 -1.279l0.908,-3.566 -0.173,-0.598z"
+        android:fillColor="?primaryText"/>
+    <path
+        android:pathData="m5.782,20.5 l-0.8,-0.8v-1.95a0.75,0.75 0,0 0,-1.5 0v1.75a2.5,2.5 0,0 0,2.5 2.5h11.535a2.5,2.5 0,0 0,2.5 -2.5v-1.75a0.75,0.75 0,0 0,-1.5 0v1.95l-0.8,0.8H5.782z"
+        android:fillColor="?primaryText"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_bookmark_outline.xml b/app/src/main/res/drawable/ic_bookmark_outline.xml
index da59f26a6..67c872b2b 100644
--- a/app/src/main/res/drawable/ic_bookmark_outline.xml
+++ b/app/src/main/res/drawable/ic_bookmark_outline.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M12,2a1,1 0,0 1,0.87 0.507l2.768,4.884 5.536,0.977a1,1 0,0 1,0.624 1.588l-3.744,4.955 0.934,5.934a1,1 0,0 1,-1.456 1.039L12,18.955l-5.532,2.929a1,1 0,0 1,-1.456 -1.04l0.934,-5.933 -3.744,-4.955a1,1 0,0 1,0.624 -1.588l5.536,-0.977 2.768,-4.884A1,1 0,0 1,12 2zM12,5.028l-2.13,3.76a1,1 0,0 1,-0.696 0.49l-4.391,0.776 3.015,3.99a1,1 0,0 1,0.19 0.759l-0.69,4.378 4.234,-2.241a1,1 0,0 1,0.936 0l4.232,2.24 -0.689,-4.378a1,1 0,0 1,0.19 -0.759l3.015,-3.99 -4.39,-0.775a1,1 0,0 1,-0.697 -0.492L12,5.028z" />
+        android:pathData="M16.6,21.1a2,2 0,0 1,-1.2 -0.3l-3.3,-2H12l-3.3,2c-0.8,0.5 -1.7,0.4 -2.4,0a2,2 0,0 1,-0.8 -2.3l1,-3.8 -0.1,-0.2 -3,-2.5a2,2 0,0 1,-0.7 -2.3,2 2,0 0,1 1.9,-1.5L8.4,8l0.2,-0.2L10,4.2a2.1,2.1 0,0 1,2 -1.3c0.9,0 1.6,0.5 2,1.3l1.4,3.6 0.2,0.2 4,0.2a2,2 0,0 1,1.8 1.5,2 2,0 0,1 -0.7,2.3l-3,2.5v0.2l1,3.8a2,2 0,0 1,-0.9 2.2,2 2,0 0,1 -1.2,0.4zM12,4.4a0.6,0.6 0,0 0,-0.6 0.3l-1.6,4 -0.9,0.8 -4.3,0.2a0.6,0.6 0,0 0,-0.6 0.5,0.6 0.6,0 0,0 0.2,0.6l3.4,2.8 0.3,1L7,19a0.6,0.6 0,0 0,0.2 0.6,0.6 0.6,0 0,0 0.7,0l3.6,-2.3h1.2l3.6,2.3c0.2,0.2 0.5,0.2 0.7,0a0.6,0.6 0,0 0,0.3 -0.6L16,14.7l0.3,-1.1 3.4,-2.8a0.6,0.6 0,0 0,0.2 -0.6,0.6 0.6,0 0,0 -0.6,-0.5l-4.3,-0.2 -1,-0.7 -1.5,-4a0.6,0.6 0,0 0,-0.6 -0.4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_bookmarks_menu.xml b/app/src/main/res/drawable/ic_bookmarks_menu.xml
index b0ef0537a..fce6d6829 100644
--- a/app/src/main/res/drawable/ic_bookmarks_menu.xml
+++ b/app/src/main/res/drawable/ic_bookmarks_menu.xml
@@ -8,6 +8,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#20123A"
-        android:pathData="M7,15L7.7,11.2L4.8,8.5C4.4,8 4.4,7.3 4.8,6.9001C5,6.7 5.2,6.6 5.5,6.6L9.3,6.0001L11,2.6C11.3,2.0001 12.1,1.8001 12.6,2.2001C12.8,2.3001 12.9,2.4 13,2.6L14.7,6.0001L18.5,6.6C19.1,6.7 19.5,7.3 19.4,7.9001C19.4,8.1 19.3,8.4001 19.1,8.5L16.3,11.2L17,15C17.1,15.4 16.9,15.8 16.6,16.1C16.4,16.2 16.2,16.3 15.9,16.3C15.7,16.3 15.5,16.3 15.4,16.2L12,14.4L8.6,16.2C8,16.5 7.4,16.2 7.1,15.7C7,15.4 7,15.2 7,15ZM5,16.9C4.4,16.9 4,17.3 4,17.9V18.9C4,20.6 5.3,21.9 7,21.9H17C18.7,21.9 20,20.6 20,18.9V17.9C20,17.3 19.6,16.9 19,16.9C18.4,16.9 18,17.3 18,17.9V18.9C18,19.5 17.6,19.9 17,19.9H7C6.4,19.9 6,19.5 6,18.9V17.9C6,17.3 5.6,16.9 5,16.9Z" />
+        android:pathData="m7.225,11.324 l-2.86,-2.375a1.207,1.207 0,0 1,-0.378 -1.309,1.205 1.205,0 0,1 1.074,-0.835l3.697,-0.239 0.501,-0.375 1.364,-3.427A1.209,1.209 0,0 1,11.75 2c0.499,0 0.941,0.3 1.127,0.763v0.001l1.364,3.427 0.501,0.375 3.697,0.239c0.498,0.032 0.92,0.36 1.074,0.835 0.155,0.476 0.006,0.99 -0.378,1.309L16.28,11.32l-0.18,0.592 0.91,3.575c0.123,0.485 -0.059,0.986 -0.463,1.279a1.202,1.202 0,0 1,-1.359 0.046l-3.127,-1.977h-0.621l-3.126,1.977c-0.426,0.266 -0.96,0.247 -1.361,-0.045a1.205,1.205 0,0 1,-0.463 -1.279l0.908,-3.566 -0.173,-0.598z"
+        android:fillColor="?primaryText"/>
+    <path
+        android:pathData="m5.782,20.5 l-0.8,-0.8v-1.95a0.75,0.75 0,0 0,-1.5 0v1.75a2.5,2.5 0,0 0,2.5 2.5h11.535a2.5,2.5 0,0 0,2.5 -2.5v-1.75a0.75,0.75 0,0 0,-1.5 0v1.95l-0.8,0.8H5.782z"
+        android:fillColor="?primaryText"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
index 00ef35e6a..9c5bca788 100644
--- a/app/src/main/res/drawable/ic_camera.xml
+++ b/app/src/main/res/drawable/ic_camera.xml
@@ -10,13 +10,4 @@
     <item
             android:id="@+id/disabled"
             android:drawable="@drawable/ic_camera_disabled" />
-
-    <transition
-            android:drawable="@drawable/ic_camera_anim_enable"
-            android:fromId="@id/disabled"
-            android:toId="@id/enabled" />
-    <transition
-            android:drawable="@drawable/ic_camera_anim_disable"
-            android:fromId="@+id/enabled"
-            android:toId="@+id/disabled" />
 </animated-selector>
diff --git a/app/src/main/res/drawable/ic_camera_anim_disable.xml b/app/src/main/res/drawable/ic_camera_anim_disable.xml
deleted file mode 100644
index 8cf218a7d..000000000
--- a/app/src/main/res/drawable/ic_camera_anim_disable.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/. -->
-<animated-vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@drawable/ic_camera_enabled">
-    <target android:name="strike_thru_path" android:animation="@animator/strike_thru_path_disable" />
-    <target android:name="strike_thru_mask" android:animation="@animator/strike_thru_mask_disable" />
-    <target android:name="icon" android:animation="@animator/fill_disable" />
-</animated-vector>
diff --git a/app/src/main/res/drawable/ic_camera_anim_enable.xml b/app/src/main/res/drawable/ic_camera_anim_enable.xml
deleted file mode 100644
index 4cf33171a..000000000
--- a/app/src/main/res/drawable/ic_camera_anim_enable.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/. -->
-<animated-vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@drawable/ic_camera_disabled">
-    <target android:name="strike_thru_path" android:animation="@animator/strike_thru_path_enable" />
-    <target android:name="strike_thru_mask" android:animation="@animator/strike_thru_mask_enable" />
-    <target android:name="icon" android:animation="@animator/fill_enable" />
-</animated-vector>
diff --git a/app/src/main/res/drawable/ic_camera_disabled.xml b/app/src/main/res/drawable/ic_camera_disabled.xml
index ce49afbc2..6802c51fa 100644
--- a/app/src/main/res/drawable/ic_camera_disabled.xml
+++ b/app/src/main/res/drawable/ic_camera_disabled.xml
@@ -3,25 +3,12 @@
    - 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"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M 18.8 2.8 C 19.8 1.8 21.1 3.3 20.2 4.2 L 3.4 21 L 2 19.6 L 18.8 2.8 Z"/>
-        <path
-                android:name="strike_thru_path"
-                android:pathData="M 20 1.6 L 21.4 3 L 5.2 19.2 C 4.2 20.2 2.8 18.8 3.8 17.8 L 20 1.6 Z"
-                android:fillColor="@color/disabled_text"
-                android:strokeWidth="1"/>
-    </group>
-    <group>
-        <clip-path
-                android:name="strike_thru_mask"
-                android:pathData="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 6 21 L 4 19 L 21 2 Z"/>
-        <path
-                android:name="icon"
-                android:fillColor="@color/disabled_text"
-                android:pathData="M17 16a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8c0-1.1 0.9-2 2-2h10a2 2 0 0 1 2 2v2l2.9-2.8c0.4-0.4 1.07 0 1.07 0.62v8.4c0 0.6-0.6 1.06-1.07 0.6L17 14v2z" />
-    </group>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:name="icon"
+        android:fillColor="@color/disabled_text"
+        android:pathData="M17.28 19.72l-14-14a0.75 0.75 0 1 0-1.061 1.061L3 7.561V17a2.5 2.5 0 0 0 2.5 2.5h9.44l1.28 1.28a0.748 0.748 0 0 0 1.06 0 0.749 0.749 0 0 0 0-1.06zM5.3 18l-0.8-0.8V9.061L13.439 18H5.3zM15.5 6.8v3.025h0.796l2.496-2.497a0.949 0.949 0 0 1 0.689-0.298c0.423 0 1.018 0.312 1.018 1.005v7.929c0 0.693-0.595 1.005-1.018 1.005-0.26 0-0.491-0.1-0.689-0.298l-2.496-2.497H15.5v1.349l1.498 1.498L17 17l0.732 0.732a2.448 2.448 0 0 0 1.75 0.737c1.285 0 2.518-0.998 2.518-2.505V8.036c0-1.507-1.233-2.505-2.518-2.505-0.614 0-1.24 0.228-1.75 0.737L17 7a2.5 2.5 0 0 0-2.5-2.5h-9c-0.396 0-0.766 0.101-1.099 0.265L5.636 6H14.7l0.8 0.8z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_camera_enabled.xml b/app/src/main/res/drawable/ic_camera_enabled.xml
index 7eead7c05..3818f98e4 100644
--- a/app/src/main/res/drawable/ic_camera_enabled.xml
+++ b/app/src/main/res/drawable/ic_camera_enabled.xml
@@ -7,21 +7,8 @@
         android:height="24dp"
         android:viewportWidth="24"
         android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M 18.8 2.8 C 19.8 1.8 21.1 3.3 20.2 4.2 L 3.4 21 L 2 19.6 L 18.8 2.8 Z"/>
-        <path
-                android:name="strike_thru_path"
-                android:pathData="M 20 1.6 L 21.4 3 L 21.9 2.5 C 20.9 3.5 19.5 2 20.5 1.1 L 20 1.6 Z"
-                android:fillColor="?primaryText"
-                android:strokeWidth="1"/>
-    </group>
-    <group>
-        <clip-path
-                android:name="strike_thru_mask"
-                android:pathData="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 23 4 L 21 2 L 21 2 Z"/>
-        <path
-                android:name="icon"
-                android:fillColor="?primaryText"
-                android:pathData="M17 16a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8c0-1.1 0.9-2 2-2h10a2 2 0 0 1 2 2v2l2.9-2.8c0.4-0.4 1.07 0 1.07 0.62v8.4c0 0.6-0.6 1.06-1.07 0.6L17 14v2z" />
-    </group>
+    <path
+        android:name="icon"
+        android:fillColor="?primaryText"
+        android:pathData="M19.482 5.531c-0.614 0-1.24 0.228-1.75 0.737L17 7a2.5 2.5 0 0 0-2.5-2.5h-9A2.5 2.5 0 0 0 3 7v10a2.5 2.5 0 0 0 2.5 2.5h9A2.5 2.5 0 0 0 17 17l0.732 0.732a2.448 2.448 0 0 0 1.75 0.737c1.285 0 2.518-0.998 2.518-2.505V8.036c0-1.507-1.233-2.505-2.518-2.505zM20.5 15.964c0 0.693-0.595 1.005-1.018 1.005-0.26 0-0.491-0.1-0.689-0.298l-2.496-2.497H15.5V17.2L14.7 18H5.3l-0.8-0.8V6.8L5.3 6h9.4l0.8 0.8v3.025h0.796l2.496-2.497a0.949 0.949 0 0 1 0.689-0.298c0.423 0 1.018 0.312 1.018 1.005v7.929H20.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_down.xml b/app/src/main/res/drawable/ic_chevron_down.xml
index aef6a00b1..6177fe8a1 100644
--- a/app/src/main/res/drawable/ic_chevron_down.xml
+++ b/app/src/main/res/drawable/ic_chevron_down.xml
@@ -3,10 +3,10 @@
    - 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"
-        android:width="10dp"
-        android:height="6dp"
-        android:viewportWidth="10"
-        android:viewportHeight="6">
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
     <path android:fillColor="?primaryText"
-          android:pathData="M5 5.67a0.67 0.67 0 0 1-0.47-0.2l-4-4a0.67 0.67 0 0 1 0.94-0.94L5 4.06 8.53 0.53a0.67 0.67 0 0 1 0.94 0.94l-4 4c-0.12 0.13-0.3 0.2-0.47 0.2z"/>
+          android:pathData="M12 14.289L5.28 7.57a0.75 0.75 0 1 0-1.061 1.061l7.37 7.37h0.821l7.37-7.37a0.748 0.748 0 0 0 0-1.061 0.75 0.75 0 0 0-1.061 0L12 14.289z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_up.xml b/app/src/main/res/drawable/ic_chevron_up.xml
index 9148fa55d..60d8c82f8 100644
--- a/app/src/main/res/drawable/ic_chevron_up.xml
+++ b/app/src/main/res/drawable/ic_chevron_up.xml
@@ -3,10 +3,10 @@
    - 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"
-        android:width="10dp"
-        android:height="6dp"
-        android:viewportWidth="10"
-        android:viewportHeight="6">
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
     <path android:fillColor="?primaryText"
-          android:pathData="M5 0.33a0.67 0.67 0 0 0-0.47 0.2l-4 4a0.67 0.67 0 0 0 0.94 0.94L5 1.94l3.53 3.53a0.67 0.67 0 0 0 0.94-0.94l-4-4A0.67 0.67 0 0 0 5 0.33z"/>
+          android:pathData="m12,8.711 l-6.72,6.72a0.75,0.75 0,1 1,-1.061 -1.061L11.589,7h0.821l7.37,7.37c0.147,0.146 0.22,0.338 0.22,0.53a0.75,0.75 0,0 1,-1.281 0.53L12,8.711z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_clear.xml b/app/src/main/res/drawable/ic_clear.xml
index 04435d15c..049b0b031 100644
--- a/app/src/main/res/drawable/ic_clear.xml
+++ b/app/src/main/res/drawable/ic_clear.xml
@@ -5,9 +5,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="16dp"
     android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
+    android:viewportWidth="20"
+    android:viewportHeight="20">
   <path
       android:fillColor="?primaryText"
-      android:pathData="M8,0a8,8 0,1 0,8 8,8 8,0 0,0 -8,-8zM12.243,10.828a1,1 0,0 1,-1.415 1.415L8,9.414l-2.828,2.829a1,1 0,0 1,-1.415 -1.415L6.586,8 3.757,5.172a1,1 0,0 1,1.415 -1.415L8,6.586l2.828,-2.829a1,1 0,0 1,1.415 1.415L9.414,8z"/>
+      android:pathData="M10,2.5C5.858,2.5 2.5,5.858 2.5,10C2.5,14.142 5.858,17.5 10,17.5C14.142,17.5 17.5,14.142 17.5,10C17.5,5.858 14.142,2.5 10,2.5ZM12.817,11.933C13.06,12.177 13.06,12.574 12.817,12.818C12.695,12.939 12.535,13 12.375,13C12.215,13 12.055,12.939 11.933,12.817L10.204,11.088L9.797,11.087L8.068,12.816C7.945,12.939 7.785,13 7.625,13C7.465,13 7.305,12.939 7.183,12.817C6.94,12.573 6.94,12.176 7.183,11.932L8.897,10.218V9.781L7.183,8.067C6.94,7.823 6.94,7.426 7.183,7.182C7.427,6.938 7.824,6.938 8.068,7.182L9.787,8.901H10.215L11.934,7.182C12.178,6.938 12.575,6.938 12.819,7.182C13.062,7.426 13.062,7.823 12.819,8.067L11.1,9.786V10.214L12.817,11.933Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index e2c2ea022..7b82c9846 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="m18.5,17.0962 l-5.1,-5.0962 5.1,-5.0962c0.3905,-0.3905 0.3905,-1.0133 0,-1.4038s-1.0133,-0.3905 -1.4038,0l-5.0962,5.1 -5.0962,-5.1c-0.3905,-0.3905 -1.0133,-0.3905 -1.4038,0s-0.3905,1.0133 0,1.4038l5.1,5.0962 -5.1,5.0962c-0.3905,0.3905 -0.3905,1.0133 0,1.4038s1.0133,0.3905 1.4038,0l5.0962,-5.1 5.0962,5.1c0.3905,0.3905 1.0133,0.3905 1.4038,0s0.3905,-1.0133 0,-1.4038z" />
+        android:pathData="M13.108 11.776l4.709-4.709c0.244-0.244 0.244-0.641 0-0.885s-0.64-0.244-0.884 0l-4.689 4.689h-0.488L7.067 6.183c-0.244-0.244-0.64-0.244-0.884 0s-0.244 0.641 0 0.885l4.687 4.686v0.491l-4.687 4.687c-0.244 0.244-0.244 0.641 0 0.885C6.305 17.939 6.465 18 6.625 18c0.16 0 0.32-0.061 0.442-0.183l4.687-4.687h0.491l4.687 4.687C17.055 17.939 17.215 18 17.375 18c0.16 0 0.32-0.061 0.442-0.183 0.244-0.244 0.244-0.641 0-0.885l-4.709-4.709v-0.447z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_confirm_email.xml b/app/src/main/res/drawable/ic_confirm_email.xml
new file mode 100644
index 000000000..19fa069b0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_confirm_email.xml
@@ -0,0 +1,16 @@
+<?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"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10.404,18.394a6.47,6.47 0,0 1,-4.429 -3.056,2.451 2.451,0 0,1 1.839,-0.838h2.936a6.483,6.483 0,0 1,1.379 -2.068A3,3 0,1 1,14.5 9.5c0,0.591 -0.177,1.139 -0.472,1.603a6.47,6.47 0,0 1,6.945 0.962,9.725 9.725,0 0,0 -0.107,-2.176c-0.65,-3.933 -3.822,-7.105 -7.755,-7.755C6.62,1.06 1.06,6.62 2.133,13.111c0.65,3.933 3.822,7.105 7.755,7.755a9.81,9.81 0,0 0,1.731 0.115,6.465 6.465,0 0,1 -1.215,-2.587z"
+      android:fillColor="?primaryText"/>
+  <path
+      android:pathData="M16.75,12a5,5 0,1 0,0.001 10.001A5,5 0,0 0,16.75 12zM16.75,20a0.75,0.75 0,1 1,0 -1.5,0.75 0.75,0 0,1 0,1.5zM17.5,16.9a0.75,0.75 0,0 1,-1.5 0v-2.15a0.75,0.75 0,0 1,1.5 0v2.15z"
+      android:fillColor="?primaryText"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_cookies.xml b/app/src/main/res/drawable/ic_cookies.xml
index 553f16518..5c2e0c053 100644
--- a/app/src/main/res/drawable/ic_cookies.xml
+++ b/app/src/main/res/drawable/ic_cookies.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M21.3,12c-0.8,0 -1.6,-0.1 -2.4,-0.5l0.1,0.5c0,0.5 -0.5,1 -1,1a1,1 0,0 1,-1 -1c0,-0.5 0.3,-0.7 0.4,-0.8l0.3,-0.2C14,10 12,5 12,2.7c0,-1.4 -4,-0.6 -3.6,0.7 -0.5,-1.3 -4,1 -3,2 -1,-1 -3.3,2.5 -2,3 -1.3,-0.5 -2,3.6 -0.7,3.6 -1.4,0 -0.6,4 0.7,3.6 -1.3,0.5 1,4 2,3 -1,1 2.5,3.3 3,2 -0.5,1.3 3.6,2 3.6,0.7 0,1.4 4,0.6 3.5,-0.7 0.6,1.3 4,-1 3,-2 1,1 3.4,-2.5 2,-3 1.4,0.5 2.2,-3.6 0.8,-3.6zM7,12c0,0.5 -0.5,1 -1,1a1,1 0,0 1,-1 -1c0,-0.5 0.5,-1 1,-1s1,0.5 1,1zM9,18a1,1 0,0 1,-1 -1c0,-0.5 0.5,-1 1,-1s1,0.5 1,1 -0.5,1 -1,1zM9,8a1,1 0,0 1,-1 -1c0,-0.6 0.4,-1 1,-1s1,0.4 1,1 -0.4,1 -1,1zM12,13a1,1 0,0 1,-1 -1c0,-0.5 0.5,-1 1,-1s1,0.5 1,1 -0.5,1 -1,1zM15,18a1,1 0,0 1,-1 -1c0,-0.5 0.5,-1 1,-1s1,0.5 1,1 -0.5,1 -1,1z" />
+        android:pathData="M20.862,11.69a7.886,7.886 0,0 1,-1.856 0.244L19,11.934v0.817l-0.5,0.5L17,13.251l-0.5,-0.5L16.5,11.53c-3.193,-1.052 -5.501,-4.055 -5.501,-7.6 0,-0.296 0.023,-0.585 0.055,-0.87l-0.565,-0.499c-4.531,0.725 -7.997,4.64 -7.997,9.375A9.508,9.508 0,0 0,12 21.443c5.146,0 9.327,-4.09 9.492,-9.198l-0.63,-0.556zM5,12.75v-1.5l0.5,-0.5L7,10.75l0.5,0.5v1.5l-0.5,0.5L5.5,13.25l-0.5,-0.5zM9.5,18l-0.5,0.5L7.5,18.5L7,18v-1.5l0.5,-0.5L9,16l0.5,0.5L9.5,18zM9.5,7.5L9,8L7.5,8L7,7.5L7,6l0.5,-0.5L9,5.5l0.5,0.5v1.5zM13.25,12.75 L12.75,13.25h-1.5l-0.5,-0.5v-1.5l0.5,-0.5h1.5l0.5,0.5v1.5zM17,18l-0.5,0.5L15,18.5l-0.5,-0.5v-1.5l0.5,-0.5h1.5l0.5,0.5L17,18z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_cryptominers.xml b/app/src/main/res/drawable/ic_cryptominers.xml
index 9d0aba381..9764b05a1 100644
--- a/app/src/main/res/drawable/ic_cryptominers.xml
+++ b/app/src/main/res/drawable/ic_cryptominers.xml
@@ -9,6 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M11,4V3a1,1 0,0 1,2 0v1h6v5h-6v12a1,1 0,0 1,-2 0V9H5.4C4.2,9 3.6,7.8 4.3,7l1.6,-2c0.5,-0.6 1.3,-1 2.2,-1H11z"
-        android:strokeLineJoin="round" />
+        android:pathData="M16.5 4h-3V2.75a0.75 0.75 0 0 0-1.5 0V4H9.039C8.631 4 8.24 4.167 7.957 4.461L6.418 6.065A1.499 1.499 0 0 0 6 7.103V7.5A1.5 1.5 0 0 0 7.5 9H12v11.25a0.75 0.75 0 0 0 1.5 0V9h3A1.5 1.5 0 0 0 18 7.5v-2A1.5 1.5 0 0 0 16.5 4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index c8f283867..016f2ad0b 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -8,6 +8,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M12.5 17.5a0.5 0.5 0 0 1-0.5-0.5V9a0.5 0.5 0 0 1 1 0v8c0 0.3-0.2 0.5-0.5 0.5zm2.5 0a0.5 0.5 0 0 1-0.5-0.5V9a0.5 0.5 0 0 1 1 0v8c0 0.3-0.2 0.5-0.5 0.5zm-5 0a0.5 0.5 0 0 1-0.5-0.5V9a0.5 0.5 0 0 1 1 0v8c0 0.3-0.2 0.5-0.5 0.5zM19 4h-3.7a3 3 0 0 0-5.6 0H6a1 1 0 0 0 0 2v13a3 3 0 0 0 3 3h7a3 3 0 0 0 3-3V6a1 1 0 0 0 0-2zm-6.5-1a2 2 0 0 1 1.7 1h-3.4c0.3-0.6 1-1 1.7-1zM17 19c0 0.6-0.4 1-1 1H9a1 1 0 0 1-1-1V6h9v13z"
-      android:fillColor="?primaryText" />
+      android:pathData="M20.25,6L16,6L16,4.5A2.5,2.5 0,0 0,13.5 2h-3A2.5,2.5 0,0 0,8 4.5L8,6L3.75,6a0.75,0.75 0,0 0,0 1.5L4,7.5v12A2.5,2.5 0,0 0,6.5 22h11a2.5,2.5 0,0 0,2.5 -2.5v-12h0.25a0.75,0.75 0,0 0,0 -1.5zM9.5,4.3l0.8,-0.8h3.4l0.8,0.8L14.5,6h-5L9.5,4.3zM18.5,19.7 L17.7,20.5L6.3,20.5l-0.8,-0.8L5.5,7.5h13v12.2z"
+      android:fillColor="?primaryText"/>
+  <path
+      android:pathData="M10.5,10.75v6.5a0.75,0.75 0,0 1,-1.5 0v-6.5a0.75,0.75 0,0 1,1.5 0zM15,10.75v6.5a0.75,0.75 0,0 1,-1.5 0v-6.5a0.75,0.75 0,0 1,1.5 0z"
+      android:fillColor="?primaryText"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_desktop.xml b/app/src/main/res/drawable/ic_desktop.xml
index 9eec900b6..76629aa8e 100644
--- a/app/src/main/res/drawable/ic_desktop.xml
+++ b/app/src/main/res/drawable/ic_desktop.xml
@@ -8,5 +8,5 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path android:fillColor="?primaryText"
-        android:pathData="M4,6a1,1 0,0 1,1 -1h14a1,1 0,0 1,1 1v11h1.5a0.5,0.5 0,0 1,0.5 0.5v1a0.5,0.5 0,0 1,-0.5 0.5h-19a0.5,0.5 0,0 1,-0.5 -0.5v-1a0.5,0.5 0,0 1,0.5 -0.5L4,17L4,6zM10,17v1h4v-1h-4zM6,7v9h12L18,7L6,7z" />
+        android:pathData="M20.5,17h-2a2.5,2.5 0,0 0,2.5 -2.5v-9A2.5,2.5 0,0 0,18.5 3h-13A2.5,2.5 0,0 0,3 5.5v9A2.5,2.5 0,0 0,5.5 17h-2a1.5,1.5 0,0 0,0 3h17a1.5,1.5 0,0 0,0 -3zM5.3,15.5l-0.8,-0.8L4.5,5.3l0.8,-0.8h13.4l0.8,0.8v9.4l-0.8,0.8L5.3,15.5zM13.25,18.5h-2.5a0.75,0.75 0,0 1,0 -1.5h2.5a0.75,0.75 0,0 1,0 1.5z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml
index 144122018..ecccd5dd1 100644
--- a/app/src/main/res/drawable/ic_download.xml
+++ b/app/src/main/res/drawable/ic_download.xml
@@ -9,5 +9,8 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M11.3 17.7l-6-6a1 1 0 0 1 1.4-1.4l4.3 4.3V3a1 1 0 0 1 2 0v11.6l4.3-4.3a1 1 0 0 1 1.4 1.4l-6 6a1 1 0 0 1-1.4 0zM18 20a1 1 0 0 1 0 2H6a1 1 0 0 1 0-2h12z"/>
+        android:pathData="M5.782 20.5l-0.8-0.8v-1.95a0.75 0.75 0 0 0-1.5 0v1.75a2.5 2.5 0 0 0 2.5 2.5h11.535a2.5 2.5 0 0 0 2.5-2.5v-1.75a0.75 0.75 0 0 0-1.5 0v1.95l-0.8 0.8H5.782z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M18.03 10.059a0.75 0.75 0 0 0-1.061 0l-4.47 4.47V2.75a0.749 0.749 0 1 0-1.499 0v11.779l-4.47-4.47a0.75 0.75 0 1 0-1.061 1.061L11.35 17h0.8l5.88-5.88a0.75 0.75 0 0 0 0-1.061z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
index e92193503..3da6ea077 100644
--- a/app/src/main/res/drawable/ic_edit.xml
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -9,5 +9,5 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path android:fillColor="?primaryText"
-          android:pathData="M3.9 20.1l3.8-1.6 0.2-0.2-2.2-2.2-0.2 0.2zM19 9L8.8 19.2a2 2 0 0 1-0.7 0.5L2.6 22a0.5 0.5 0 0 1-0.5-0.1 0.5 0.5 0 0 1-0.1-0.5l2.3-5.5 0.5-0.7L15 5a0.5 0.5 0 0 1 0.7 0l3.3 3.3a0.5 0.5 0 0 1 0 0.7zM17 3l0.5-0.5a2 2 0 0 1 2.8 0l1.2 1.2a2 2 0 0 1 0 2.8l-0.5 0.5a0.5 0.5 0 0 1-0.7 0l-3.3-3.3a0.5 0.5 0 0 1 0-0.7z"/>
+          android:pathData="M20.976 19.308l-0.752-4.055a2.602 2.602 0 0 0-0.719-1.369L8.356 2.735a2.522 2.522 0 0 0-3.559 0L2.735 4.797a2.522 2.522 0 0 0 0 3.559l11.151 11.15c0.375 0.374 0.849 0.622 1.366 0.717l4.056 0.752a1.43 1.43 0 0 0 1.668-1.667zM5.166 8.666L3.642 7.142V6.011l2.369-2.369h1.131l1.524 1.524-3.5 3.5zm10.357 10.082a1.098 1.098 0 0 1-0.577-0.303l-8.72-8.719 3.5-3.5 8.714 8.714c0.161 0.162 0.267 0.363 0.308 0.586l0.625 3.371-0.476 0.476-3.374-0.625z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_fab_sync.xml b/app/src/main/res/drawable/ic_fab_sync.xml
index 10369da77..52ac21e97 100644
--- a/app/src/main/res/drawable/ic_fab_sync.xml
+++ b/app/src/main/res/drawable/ic_fab_sync.xml
@@ -1,16 +1,13 @@
+<?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"
-    android:width="14dp"
-    android:height="14dp"
-    android:viewportWidth="14"
-    android:viewportHeight="14">
-    <group
-        android:pivotX="7"
-        android:pivotY="7"
-        android:scaleX="0.8"
-        android:scaleY="0.8">
-        <path
-            android:fillColor="#ffffff"
-            android:fillType="evenOdd"
-            android:pathData="M12,1C12,0.4477 12.4477,0 13,0C13.5523,0 14,0.4477 14,1V5C14,5.5523 13.5523,6 13,6H9C8.4477,6 8,5.5523 8,5C8,4.4477 8.4477,4 9,4H10.967C10.0382,2.7401 8.5652,1.9976 7,2C4.7088,2.0026 2.7146,3.5672 2.167,5.792C2.0256,6.319 1.4879,6.6353 0.9586,6.503C0.4293,6.3707 0.1038,5.8385 0.227,5.307C0.8267,2.8397 2.7245,0.896 5.1768,0.2376C7.629,-0.4208 10.2451,0.3109 12,2.146V1ZM11.833,8.208C11.9668,7.6724 12.5093,7.3465 13.045,7.48C13.3024,7.5442 13.5238,7.7081 13.6603,7.9356C13.7969,8.1632 13.8374,8.4356 13.773,8.693C13.1733,11.1603 11.2755,13.104 8.8232,13.7624C6.371,14.4208 3.7548,13.6891 2,11.854V13C2,13.5523 1.5523,14 1,14C0.4477,14 0,13.5523 0,13V9C0,8.4477 0.4477,8 1,8H5C5.5523,8 6,8.4477 6,9C6,9.5523 5.5523,10 5,10H3.033C3.9618,11.2598 5.4348,12.0025 7,12C9.2912,11.9974 11.2854,10.4328 11.833,8.208Z" />
-    </group>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M12 4.675V2.501a0.5 0.5 0 0 1 0.852-0.355l2.853 2.824v0.926l-2.853 2.825A0.5 0.5 0 0 1 12 8.366V6.175a5.823 5.823 0 0 0-4.434 9.602 0.75 0.75 0 0 1-1.14 0.974 7.327 7.327 0 0 1-1.75-4.75c0-4.04 3.285-7.326 7.324-7.326zm0 10.959v2.191A5.832 5.832 0 0 0 17.825 12a5.825 5.825 0 0 0-1.369-3.751 0.75 0.75 0 0 1 1.147-0.967A7.328 7.328 0 0 1 19.325 12c0 4.039-3.286 7.325-7.325 7.325v2.174a0.5 0.5 0 0 1-0.852 0.355l-2.853-2.825v-0.926l2.853-2.824A0.5 0.5 0 0 1 12 15.634z"
+        android:fillColor="@color/mozac_ui_icons_fill" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_fingerprinters.xml b/app/src/main/res/drawable/ic_fingerprinters.xml
index 9a4652791..14dd24df1 100644
--- a/app/src/main/res/drawable/ic_fingerprinters.xml
+++ b/app/src/main/res/drawable/ic_fingerprinters.xml
@@ -9,5 +9,11 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M12.4,2c5.1,0 9.3,4.2 9.3,9.3 0,3.5 -1,5.5 -1.8,7 -0.5,1 -0.8,1.6 -0.8,2.4a1.3,1.3 0,0 1,-2.7 0c0,-1.5 0.6,-2.6 1.1,-3.7a11,11 0,0 0,1.6 -5.7,6.7 6.7,0 0,0 -13.4,0 1.3,1.3 0,1 1,-2.6 0C3,6.2 7.2,2 12.4,2zM12.4,6c3,0 5.3,2.4 5.3,5.3 0,4.3 -1.6,6.4 -2.8,8 -0.5,0.7 -1,1.3 -1.3,2a1.3,1.3 0,0 1,-2.4 -1.2c0.4,-1 1,-1.7 1.5,-2.4 1.2,-1.5 2.4,-3 2.4,-6.4a2.7,2.7 0,0 0,-5.4 0c0,2.6 -2,5.4 -5.3,5.4a1.3,1.3 0,1 1,0 -2.7c2,0 2.7,-1.8 2.7,-2.7C7,8.3 9.5,6 12.4,6zM12.4,10c0.7,0 1.3,0.6 1.3,1.3 0,7.6 -8.5,10.5 -8.9,10.6l-0.4,0.1a1.3,1.3 0,0 1,-0.4 -2.6s7,-2.5 7,-8c0,-0.8 0.7,-1.4 1.4,-1.4z" />
-</vector>
+        android:pathData="M6.688 18H2.75a0.75 0.75 0 0 1 0-1.5h3.938c3.392 0 6.15-2.76 6.15-6.151V9.722a0.75 0.75 0 0 1 1.5 0v0.627C14.339 14.567 10.907 18 6.688 18z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M9.16 21.722a0.752 0.752 0 0 1-0.199-1.474c7.415-2.031 7.729-9.538 7.739-9.856 0.254-1.618-0.972-3.084-2.722-3.365-1.739-0.277-3.374 0.726-3.618 2.247l-0.271 1.515a4.51 4.51 0 0 1-4.444 3.719H2.75a0.75 0.75 0 0 1 0-1.5h2.896a3.012 3.012 0 0 0 2.968-2.482l0.269-1.502c0.374-2.323 2.766-3.895 5.335-3.477 2.566 0.412 4.35 2.649 3.974 4.986 0.007 0-0.335 8.835-8.833 11.163a0.806 0.806 0 0 1-0.199 0.026z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M17.134 21.065a0.752 0.752 0 0 1-0.589-1.214c5.386-6.85 4.099-11.091 2.853-13.009-1.696-2.61-5.254-3.922-8.456-3.106C7.88 4.511 5.96 6.989 5.674 10.538c-0.034 0.413-0.409 0.7-0.809 0.688a0.752 0.752 0 0 1-0.688-0.809c0.337-4.166 2.728-7.207 6.396-8.135 3.806-0.965 8.048 0.61 10.082 3.743 1.465 2.254 3.032 7.169-2.931 14.754a0.746 0.746 0 0 1-0.59 0.286z" />
+ </vector>
diff --git a/app/src/main/res/drawable/ic_folder_icon.xml b/app/src/main/res/drawable/ic_folder_icon.xml
index 437fe48e0..ea7cea353 100644
--- a/app/src/main/res/drawable/ic_folder_icon.xml
+++ b/app/src/main/res/drawable/ic_folder_icon.xml
@@ -6,8 +6,8 @@
         android:autoMirrored="true"
         android:width="24dp"
         android:height="24dp"
-        android:viewportWidth="20"
-        android:viewportHeight="17">
+        android:viewportWidth="24"
+        android:viewportHeight="24">
     <path android:fillColor="?primaryText"
-          android:pathData="M17.5 3h-6.8L8.2 0.7C7.8 0.2 7.2 0 6.5 0h-4A2.5 2.5 0 0 0 0 2.5v12C0 15.9 1.1 17 2.5 17h15c1.4 0 2.5-1.1 2.5-2.5v-9A2.5 2.5 0 0 0 17.5 3zm-15-1h4l0.4 0.1 2 1.9H2V2.5a0.5 0.5 0 0 1 0.5-0.5zM18 14.5c0 0.3-0.2 0.5-0.5 0.5h-15a0.5 0.5 0 0 1-0.5-0.5V5h15.5a0.5 0.5 0 0 1 0.5 0.5v9z" />
+          android:pathData="M18.5 6h-6.354l-2.039-2.199A2.503 2.503 0 0 0 8.274 3H4.5A2.502 2.502 0 0 0 2 5.5v12C2 18.879 3.121 20 4.5 20h14c1.379 0 2.5-1.121 2.5-2.5v-9C21 7.121 19.879 6 18.5 6zm1 11.7l-0.8 0.8H4.3l-0.8-0.8V5.3l0.8-0.8h3.974c0.277 0 0.545 0.117 0.733 0.32l2.146 2.315 0.869 0.365H18.7l0.8 0.8v9.4z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_folder_new.xml b/app/src/main/res/drawable/ic_folder_new.xml
index a8de11332..fc41e1d89 100644
--- a/app/src/main/res/drawable/ic_folder_new.xml
+++ b/app/src/main/res/drawable/ic_folder_new.xml
@@ -9,5 +9,9 @@
     android:viewportHeight="24">
   <path
       android:fillColor="?primaryText"
-      android:pathData="M19.5,6h-6.76l-2.53,-2.34A2.53,2.53 0,0 0,8.51 3h-4A2.5,2.5 0,0 0,2 5.5v12A2.5,2.5 0,0 0,4.5 20L13,20a1,1 0,0 0,0 -2L4.5,18a0.5,0.5 0,0 1,-0.5 -0.5L4,8h15.5a0.5,0.5 0,0 1,0.5 0.5L20,15a1,1 0,1 0,2 0L22,8.5A2.5,2.5 0,0 0,19.5 6zM4,7L4,5.5a0.5,0.5 0,0 1,0.5 -0.5h4a0.51,0.51 0,0 1,0.34 0.13l2,1.87zM21.5,18L19,18v-2.5a0.5,0.5 0,0 0,-1 0L18,18h-2.5a0.5,0.5 0,0 0,0 1L18,19v2.5a0.5,0.5 0,0 0,1 0L19,19h2.5a0.5,0.5 0,0 0,0 -1z"/>
+      android:pathData="M21 18.5a0.745 0.745 0 0 0 0.53-0.22A0.75 0.75 0 0 0 21 17h-1.7l-0.8-0.8v-1.7a0.75 0.75 0 0 0-1.5 0v1.7L16.2 17h-1.7a0.75 0.75 0 0 0 0 1.5h1.7l0.8 0.8V21a0.75 0.75 0 0 0 1.5 0v-1.7l0.8-0.8H21z" />
+  <path
+      android:fillColor="?primaryText"
+      android:pathData="M18.5 6h-6.354l-2.039-2.199A2.503 2.503 0 0 0 8.274 3H4.5A2.502 2.502 0 0 0 2 5.5v12C2 18.879 3.121 20 4.5 20H12a0.75 0.75 0 0 0 0-1.5H4.3l-0.8-0.8V5.3l0.8-0.8h3.974c0.277 0 0.545 0.117 0.733 0.32l2.146 2.315 0.869 0.365H18.7l0.8 0.8v4.2a0.75 0.75 0 0 0 1.5 0v-4C21 7.121 19.879 6 18.5 6z" />
+
 </vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
index ca731897c..e15b9ed93 100644
--- a/app/src/main/res/drawable/ic_help.xml
+++ b/app/src/main/res/drawable/ic_help.xml
@@ -9,5 +9,8 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M12 2a10 10 0 1 0 0 20 10 10 0 0 0 0-20zm0 18a8 8 0 1 1 0-16 8 8 0 0 1 0 16zm0-4.5a1.6 1.6 0 1 0 0 3.3 1.6 1.6 0 0 0 0-3.3zm0-9.8a3.5 3.5 0 0 0-3.7 3.7 1.1 1.1 0 0 0 2.3 0c0-1.3 0.7-1.4 1.4-1.4 0.6 0 1.2 0.3 1.4 1 0.2 0.5-0.1 1-0.6 1.2a3.5 3.5 0 0 0-2 3v0.5a1.1 1.1 0 0 0 2.3 0v-0.5c0-0.4 0.4-0.8 0.8-1a3.4 3.4 0 0 0 1.7-3.8c-0.4-1.6-2-2.7-3.6-2.7z" />
+        android:pathData="M11.75 14A0.75 0.75 0 0 1 11 13.25v-0.959c0-0.645 0.452-1.206 1.074-1.336a1.6 1.6 0 0 0 1.27-1.561 1.596 1.596 0 0 0-3.101-0.522 0.75 0.75 0 1 1-1.418-0.49A3.097 3.097 0 0 1 11.75 6.3a3.098 3.098 0 0 1 3.094 3.094c0 1.418-0.979 2.661-2.344 3.002v0.854A0.75 0.75 0 0 1 11.75 14zm0.45 3h-0.9L11 16.7v-0.9l0.3-0.3h0.9l0.3 0.3v0.9L12.2 17z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M11.75 4c4.411 0 8 3.589 8 8s-3.589 8-8 8-8-3.589-8-8 3.589-8 8-8zm0-1.5a9.5 9.5 0 0 0-9.5 9.5 9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5 9.5 9.5 0 0 0-9.5-9.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml
index aa49fa9ec..757559a7e 100644
--- a/app/src/main/res/drawable/ic_history.xml
+++ b/app/src/main/res/drawable/ic_history.xml
@@ -9,5 +9,8 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        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-16zm4.5 9h-5a0.5 0.5 0 0 1-0.5-0.5v-5a0.5 0.5 0 0 1 1 0V12h4.5a0.5 0.5 0 0 1 0 1z"/>
+        android:pathData="M11.974 21.5c-5.238 0-9.5-4.262-9.5-9.5s4.262-9.5 9.5-9.5 9.5 4.262 9.5 9.5-4.262 9.5-9.5 9.5zm0-17.5c-4.411 0-8 3.589-8 8s3.589 8 8 8 8-3.589 8-8-3.589-8-8-8z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M15.414 14.948a0.748 0.748 0 0 1-0.385-0.106l-3.664-2.198L11 12V7.75a0.75 0.75 0 0 1 1.5 0v3.825l3.3 1.979a0.75 0.75 0 0 1-0.386 1.394z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
index 23964049b..0897d1761 100644
--- a/app/src/main/res/drawable/ic_info.xml
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -8,6 +8,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="?primaryText"
-        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:pathData="M11.75,17a0.75,0.75 0,0 1,-0.75 -0.75v-5.5a0.75,0.75 0,0 1,1.5 0v5.5a0.75,0.75 0,0 1,-0.75 0.75zM12.2,7h-0.9l-0.3,0.3v0.9l0.3,0.3h0.9l0.3,-0.3v-0.9l-0.3,-0.3z"
+        android:fillColor="?primaryText"/>
+    <path
+        android:pathData="M11.75,4c4.411,0 8,3.589 8,8s-3.589,8 -8,8 -8,-3.589 -8,-8 3.589,-8 8,-8zM11.75,2.5a9.5,9.5 0,0 0,-9.5 9.5,9.5 9.5,0 0,0 9.5,9.5 9.5,9.5 0,0 0,9.5 -9.5,9.5 9.5,0 0,0 -9.5,-9.5z"
+        android:fillColor="?primaryText"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_internet.xml b/app/src/main/res/drawable/ic_internet.xml
index 7aea69447..f6276035e 100644
--- a/app/src/main/res/drawable/ic_internet.xml
+++ b/app/src/main/res/drawable/ic_internet.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M12 2a10 10 0 1 0 0 20 10 10 0 0 0 0-20zm8 9h-4c0-2.2-0.5-4.4-1.2-6.5a8 8 0 0 1 5.1 6.5zm-8 9c-0.5 0-1.8-2.4-2-7h4c-0.2 4.6-1.5 7-2 7zm-2-9c0.2-4.6 1.5-7 2-7s1.8 2.4 2 7h-4zm-0.8-6.5C8.5 6.5 8 8.8 8 11H4a8 8 0 0 1 5.2-6.5zM4.1 13h4c0 2.2 0.4 4.4 1.1 6.5A8 8 0 0 1 4.1 13zm10.7 6.5c0.7-2 1.2-4.3 1.2-6.5h4a8 8 0 0 1-5.2 6.5z" />
+        android:pathData="M12 2.5A9.5 9.5 0 0 0 2.5 12a9.5 9.5 0 0 0 9.5 9.5 9.5 9.5 0 0 0 9.5-9.5A9.5 9.5 0 0 0 12 2.5zm7.962 8.75h-3.008a11.503 11.503 0 0 0-2.666-6.65h0.742a8.014 8.014 0 0 1 4.932 6.65zm-7.749 8.15h-0.429a9.988 9.988 0 0 1-3.238-6.65h6.908a9.978 9.978 0 0 1-3.241 6.65zm-3.667-8.15a10.007 10.007 0 0 1 3.232-6.65h0.446a10.015 10.015 0 0 1 3.231 6.65H8.546zM8.97 4.6h0.743a11.499 11.499 0 0 0-2.667 6.65H4.038A8.014 8.014 0 0 1 8.97 4.6zm-4.932 8.15h3.008a11.476 11.476 0 0 0 2.67 6.65H8.97a8.014 8.014 0 0 1-4.932-6.65zM15.03 19.4h-0.733a11.465 11.465 0 0 0 2.658-6.65h3.007a8.014 8.014 0 0 1-4.932 6.65z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_link_disabled.xml b/app/src/main/res/drawable/ic_link_disabled.xml
index 083c07dc6..b0084eee8 100644
--- a/app/src/main/res/drawable/ic_link_disabled.xml
+++ b/app/src/main/res/drawable/ic_link_disabled.xml
@@ -7,7 +7,14 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
+
     <path
         android:fillColor="@color/disabled_text"
-        android:pathData="M4.47 7.5l3-3c0.3-0.3 0.7-0.3 1 0l4.2 4.2c0.8-1 0.7-2.4-0.2-3.3L9.84 2.7a2.5 2.5 0 0 0-3.53 0L2.77 6.28a2.5 2.5 0 0 0 0 3.52l2.66 2.67c0.9 0.9 2.25 1 3.2 0.2l-4.2-4.2a0.7 0.7 0 0 1 0-1zm16.8 6.63a2.5 2.5 0 0 1 0 3.53l-3.55 3.54a2.5 2.5 0 0 1-3.53 0l-2.7-2.7a2.49 2.49 0 0 1-0.2-3.24l4.2 4.2a0.7 0.7 0 0 0 1 0l3.04-3.05a0.7 0.7 0 0 0 0-1l-4.2-4.2c1-0.8 2.4-0.7 3.3 0.2l2.66 2.66zm-5.1 0.56a1 1 0 0 1-1.42 1.41L7.8 9.2A1 1 0 1 1 9.24 7.8l6.9 6.9z" />
+        android:pathData="M10.08 15.526l4.324 4.324h1.13l3.815-3.815v-1.13l-4.324-4.324a1.5 1.5 0 0 1 2.12 0l3.123 3.123a2.498 2.498 0 0 1 0 3.533l-3.533 3.533a2.498 2.498 0 0 1-3.533 0l-3.123-3.123a1.5 1.5 0 0 1 0.001-2.121z" />
+    <path
+        android:fillColor="@color/disabled_text"
+        android:pathData="M7.791 8.997l6.712 6.712a0.749 0.749 0 1 0 1.06-1.06L8.85 7.937a0.749 0.749 0 1 0-1.059 1.06z" />
+    <path
+        android:fillColor="@color/disabled_text"
+        android:pathData="M7.974 13.42L3.65 9.096v-1.13L7.466 4.15h1.13l4.324 4.324a1.5 1.5 0 0 0 0-2.12L9.797 3.232a2.498 2.498 0 0 0-3.533 0L2.732 6.764a2.498 2.498 0 0 0 0 3.533l3.123 3.123a1.497 1.497 0 0 0 2.119 0z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_link_enabled.xml b/app/src/main/res/drawable/ic_link_enabled.xml
index 87e43535b..ecbc5488c 100644
--- a/app/src/main/res/drawable/ic_link_enabled.xml
+++ b/app/src/main/res/drawable/ic_link_enabled.xml
@@ -9,5 +9,11 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M4.47 7.5l3-3c0.3-0.3 0.7-0.3 1 0l4.2 4.2c0.8-1 0.7-2.4-0.2-3.3L9.84 2.7a2.5 2.5 0 0 0-3.53 0L2.77 6.28a2.5 2.5 0 0 0 0 3.52l2.66 2.67c0.9 0.9 2.25 1 3.2 0.2l-4.2-4.2a0.7 0.7 0 0 1 0-1zm16.8 6.63a2.5 2.5 0 0 1 0 3.53l-3.55 3.54a2.5 2.5 0 0 1-3.53 0l-2.7-2.7a2.49 2.49 0 0 1-0.2-3.24l4.2 4.2a0.7 0.7 0 0 0 1 0l3.04-3.05a0.7 0.7 0 0 0 0-1l-4.2-4.2c1-0.8 2.4-0.7 3.3 0.2l2.66 2.66zm-5.1 0.56a1 1 0 0 1-1.42 1.41L7.8 9.2A1 1 0 1 1 9.24 7.8l6.9 6.9z" />
+        android:pathData="M10.08 15.526l4.324 4.324h1.13l3.815-3.815v-1.13l-4.324-4.324a1.5 1.5 0 0 1 2.12 0l3.123 3.123a2.498 2.498 0 0 1 0 3.533l-3.533 3.533a2.498 2.498 0 0 1-3.533 0l-3.123-3.123a1.5 1.5 0 0 1 0.001-2.121z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M7.791 8.997l6.712 6.712a0.749 0.749 0 1 0 1.06-1.06L8.85 7.937a0.749 0.749 0 1 0-1.059 1.06z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M7.974 13.42L3.65 9.096v-1.13L7.466 4.15h1.13l4.324 4.324a1.5 1.5 0 0 0 0-2.12L9.797 3.232a2.498 2.498 0 0 0-3.533 0L2.732 6.764a2.498 2.498 0 0 0 0 3.533l3.123 3.123a1.497 1.497 0 0 0 2.119 0z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_location.xml b/app/src/main/res/drawable/ic_location.xml
index a6fbc4b6d..13454f7f2 100644
--- a/app/src/main/res/drawable/ic_location.xml
+++ b/app/src/main/res/drawable/ic_location.xml
@@ -10,13 +10,4 @@
     <item
             android:id="@+id/disabled"
             android:drawable="@drawable/ic_location_disabled" />
-  
-    <transition
-            android:drawable="@drawable/ic_location_anim_enable"
-            android:fromId="@id/disabled"
-            android:toId="@id/enabled" />
-    <transition
-            android:drawable="@drawable/ic_location_anim_disable"
-            android:fromId="@+id/enabled"
-            android:toId="@+id/disabled" />
 </animated-selector>
diff --git a/app/src/main/res/drawable/ic_location_anim_disable.xml b/app/src/main/res/drawable/ic_location_anim_disable.xml
deleted file mode 100644
index 4664906a7..000000000
--- a/app/src/main/res/drawable/ic_location_anim_disable.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/. -->
-<animated-vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@drawable/ic_location_enabled">
-    <target android:name="strike_thru_path" android:animation="@animator/strike_thru_path_disable" />
-    <target android:name="strike_thru_mask" android:animation="@animator/strike_thru_mask_disable" />
-    <target android:name="icon" android:animation="@animator/fill_disable" />
-</animated-vector>
diff --git a/app/src/main/res/drawable/ic_location_anim_enable.xml b/app/src/main/res/drawable/ic_location_anim_enable.xml
deleted file mode 100644
index 89b92fd4a..000000000
--- a/app/src/main/res/drawable/ic_location_anim_enable.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/. -->
-<animated-vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@drawable/ic_location_disabled">
-    <target android:name="strike_thru_path" android:animation="@animator/strike_thru_path_enable" />
-    <target android:name="strike_thru_mask" android:animation="@animator/strike_thru_mask_enable" />
-    <target android:name="icon" android:animation="@animator/fill_enable" />
-</animated-vector>
diff --git a/app/src/main/res/drawable/ic_location_disabled.xml b/app/src/main/res/drawable/ic_location_disabled.xml
index b7f85fa0a..9b0e5fb95 100644
--- a/app/src/main/res/drawable/ic_location_disabled.xml
+++ b/app/src/main/res/drawable/ic_location_disabled.xml
@@ -3,25 +3,14 @@
    - 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"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M 18.8 2.8 C 19.8 1.8 21.1 3.3 20.2 4.2 L 3.4 21 L 2 19.6 L 18.8 2.8 Z"/>
-        <path
-                android:name="strike_thru_path"
-                android:pathData="M 20 1.6 L 21.4 3 L 5.2 19.2 C 4.2 20.2 2.8 18.8 3.8 17.8 L 20 1.6 Z"
-                android:fillColor="@color/disabled_text"
-                android:strokeWidth="1"/>
-    </group>
-    <group>
-        <clip-path
-                android:name="strike_thru_mask"
-                android:pathData="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 6 21 L 4 19 L 21 2 Z"/>
-        <path
-                android:name="icon"
-                android:fillColor="@color/disabled_text"
-                android:pathData="M12,9a3,3 0,1 0,3 3,3 3,0 0,0 -3,-3zM21,11h-1.07A8,8 0,0 0,13 4.07L13,3a1,1 0,0 0,-2 0v1.07A8,8 0,0 0,4.07 11L3,11a1,1 0,0 0,0 2h1.07A8,8 0,0 0,11 19.93L11,21a1,1 0,0 0,2 0v-1.07A8,8 0,0 0,19.93 13L21,13a1,1 0,0 0,0 -2zM12,18a6,6 0,1 1,6 -6,6 6,0 0,1 -6,6z" />
-    </group>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/disabled_text"
+        android:pathData="M3.78 5.22a0.75 0.75 0 1 0-1.061 1.061l1.318 1.318a8.367 8.367 0 0 0-0.535 3.105c0.081 3.397 4.401 8.09 6.968 10.585a2.487 2.487 0 0 0 1.806 0.71 2.485 2.485 0 0 0 1.77-0.796 51.854 51.854 0 0 0 1.692-1.905l2.482 2.482a0.748 0.748 0 0 0 1.06 0 0.75 0.75 0 0 0 0-1.061L3.78 5.22zm9.171 14.959a0.968 0.968 0 0 1-0.281 0.196h-0.897a0.957 0.957 0 0 1-0.257-0.161c-4.029-3.916-6.464-7.484-6.513-9.545a6.917 6.917 0 0 1 0.219-1.886l9.447 9.447a48.709 48.709 0 0 1-1.718 1.949zM11.833 3.502c3.859-0.092 7.074 2.971 7.166 6.83 0.031 1.298-0.856 3.238-2.473 5.521l1.076 1.076c1.608-2.227 2.944-4.678 2.897-6.633-0.112-4.686-4.016-8.406-8.702-8.294A8.472 8.472 0 0 0 5.6 4.928L6.662 5.99a6.976 6.976 0 0 1 5.171-2.488z" />
+    <path
+        android:fillColor="@color/disabled_text"
+        android:pathData="M10.152 9.48a2.245 2.245 0 0 1 1.794-0.978 2.246 2.246 0 0 1 1.327 4.099l1.062 1.062a3.734 3.734 0 0 0 1.413-3.003 3.754 3.754 0 0 0-3.839-3.659 3.728 3.728 0 0 0-2.821 1.415l1.064 1.064z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_location_enabled.xml b/app/src/main/res/drawable/ic_location_enabled.xml
index 41270ef01..785b356ab 100644
--- a/app/src/main/res/drawable/ic_location_enabled.xml
+++ b/app/src/main/res/drawable/ic_location_enabled.xml
@@ -3,25 +3,14 @@
    - 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"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M 18.8 2.8 C 19.8 1.8 21.1 3.3 20.2 4.2 L 3.4 21 L 2 19.6 L 18.8 2.8 Z"/>
-        <path
-                android:name="strike_thru_path"
-                android:pathData="M 20 1.6 L 21.4 3 L 21.9 2.5 C 20.9 3.5 19.5 2 20.5 1.1 L 20 1.6 Z"
-                android:fillColor="?primaryText"
-                android:strokeWidth="1"/>
-    </group>
-    <group>
-        <clip-path
-                android:name="strike_thru_mask"
-                android:pathData="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 23 4 L 21 2 L 21 2 Z"/>
-        <path
-                android:name="icon"
-                android:fillColor="?primaryText"
-                android:pathData="M12,9a3,3 0,1 0,3 3,3 3,0 0,0 -3,-3zM21,11h-1.07A8,8 0,0 0,13 4.07L13,3a1,1 0,0 0,-2 0v1.07A8,8 0,0 0,4.07 11L3,11a1,1 0,0 0,0 2h1.07A8,8 0,0 0,11 19.93L11,21a1,1 0,0 0,2 0v-1.07A8,8 0,0 0,19.93 13L21,13a1,1 0,0 0,0 -2zM12,18a6,6 0,1 1,6 -6,6 6,0 0,1 -6,6z" />
-    </group>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M12.09 14.5a3.755 3.755 0 0 1-3.839-3.659 3.755 3.755 0 0 1 3.659-3.839 3.755 3.755 0 0 1 3.839 3.659A3.755 3.755 0 0 1 12.09 14.5zm-0.144-5.998a2.252 2.252 0 0 0-2.195 2.303A2.252 2.252 0 0 0 12.054 13a2.252 2.252 0 0 0 2.195-2.303 2.252 2.252 0 0 0-2.303-2.195z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M11.797 2.002C7.111 2.115 3.39 6.018 3.502 10.704c0.081 3.397 4.4 8.09 6.968 10.585a2.487 2.487 0 0 0 1.806 0.71 2.485 2.485 0 0 0 1.77-0.796c2.445-2.615 6.534-7.51 6.453-10.907-0.113-4.685-4.017-8.406-8.702-8.294zm1.154 18.177a0.968 0.968 0 0 1-0.281 0.196h-0.897a0.957 0.957 0 0 1-0.257-0.161c-4.029-3.916-6.464-7.484-6.513-9.545a7.008 7.008 0 0 1 6.83-7.167c3.858-0.092 7.074 2.971 7.166 6.83 0.05 2.062-2.212 5.742-6.048 9.847z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_login.xml b/app/src/main/res/drawable/ic_login.xml
index e95281678..a61455db0 100644
--- a/app/src/main/res/drawable/ic_login.xml
+++ b/app/src/main/res/drawable/ic_login.xml
@@ -3,11 +3,11 @@
    - 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"
-    android:width="20dp"
-    android:height="10dp"
-    android:viewportWidth="20"
-    android:viewportHeight="10">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:pathData="M15,-0C12.7241,0.0054 10.7404,1.5503 10.1778,3.7556L1.2889,3.7556C0.6016,3.7556 0.0444,4.3127 0.0444,5C0.0444,5.6873 0.6016,6.2444 1.2889,6.2444L1.2889,7.5C1.2889,8.1934 1.851,8.7556 2.5444,8.7556C3.2379,8.7556 3.8,8.1934 3.8,7.5L3.8,6.2444L5,6.2444L5,7.5C4.9552,7.9747 5.1832,8.4339 5.5884,8.6851C5.9937,8.9363 6.5063,8.9363 6.9116,8.6851C7.3168,8.4339 7.5448,7.9747 7.5,7.5L7.5,6.2444L10.1778,6.2444C10.8302,8.7533 13.2953,10.3444 15.8502,9.9058C18.4051,9.4673 20.1984,7.145 19.9767,4.5623C19.755,1.9795 17.5923,-0.0032 15,-0ZM15,7.5C13.9888,7.5 13.0773,6.8909 12.6903,5.9567C12.3033,5.0225 12.5172,3.9472 13.2322,3.2322C13.9472,2.5172 15.0225,2.3033 15.9567,2.6903C16.8909,3.0773 17.5,3.9888 17.5,5C17.5,6.3807 16.3807,7.5 15,7.5Z"
+      android:pathData="M21.25 11h-9.351A5.01 5.01 0 0 0 7 7c-2.757 0-5 2.243-5 5s2.243 5 5 5c2.586 0 4.694-1.98 4.949-4.5H18.5v2.75a0.75 0.75 0 0 0 1.5 0V12.5h1.25a0.75 0.75 0 0 0 0-1.5zM7 15.5c-1.93 0-3.5-1.57-3.5-3.5S5.07 8.5 7 8.5s3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"
       android:fillColor="?primaryText" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_microphone.xml b/app/src/main/res/drawable/ic_microphone.xml
index e3d9712f5..69a5db52e 100644
--- a/app/src/main/res/drawable/ic_microphone.xml
+++ b/app/src/main/res/drawable/ic_microphone.xml
@@ -11,12 +11,4 @@
             android:id="@+id/disabled"
             android:drawable="@drawable/ic_microphone_disabled" />
 
-    <transition
-            android:drawable="@drawable/ic_microphone_anim_enable"
-            android:fromId="@id/disabled"
-            android:toId="@id/enabled" />
-    <transition
-            android:drawable="@drawable/ic_microphone_anim_disable"
-            android:fromId="@+id/enabled"
-            android:toId="@+id/disabled" />
-</animated-selector>
+  </animated-selector>
diff --git a/app/src/main/res/drawable/ic_microphone_anim_disable.xml b/app/src/main/res/drawable/ic_microphone_anim_disable.xml
deleted file mode 100644
index 556580d5b..000000000
--- a/app/src/main/res/drawable/ic_microphone_anim_disable.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/. -->
-<animated-vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@drawable/ic_microphone_enabled">
-    <target android:name="strike_thru_path" android:animation="@animator/strike_thru_path_disable" />
-    <target android:name="strike_thru_mask" android:animation="@animator/strike_thru_mask_disable" />
-    <target android:name="icon" android:animation="@animator/fill_disable" />
-</animated-vector>
diff --git a/app/src/main/res/drawable/ic_microphone_anim_enable.xml b/app/src/main/res/drawable/ic_microphone_anim_enable.xml
deleted file mode 100644
index bccb4de81..000000000
--- a/app/src/main/res/drawable/ic_microphone_anim_enable.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/. -->
-<animated-vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@drawable/ic_microphone_disabled">
-    <target android:name="strike_thru_path" android:animation="@animator/strike_thru_path_enable" />
-    <target android:name="strike_thru_mask" android:animation="@animator/strike_thru_mask_enable" />
-    <target android:name="icon" android:animation="@animator/fill_enable" />
-</animated-vector>
diff --git a/app/src/main/res/drawable/ic_microphone_disabled.xml b/app/src/main/res/drawable/ic_microphone_disabled.xml
index ffe797fc9..929cb80a0 100644
--- a/app/src/main/res/drawable/ic_microphone_disabled.xml
+++ b/app/src/main/res/drawable/ic_microphone_disabled.xml
@@ -3,25 +3,11 @@
    - 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"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M 18.8 2.8 C 19.8 1.8 21.1 3.3 20.2 4.2 L 3.4 21 L 2 19.6 L 18.8 2.8 Z"/>
-        <path
-                android:name="strike_thru_path"
-                android:pathData="M 20 1.6 L 21.4 3 L 5.2 19.2 C 4.2 20.2 2.8 18.8 3.8 17.8 L 20 1.6 Z"
-                android:fillColor="@color/disabled_text"
-                android:strokeWidth="1"/>
-    </group>
-    <group>
-        <clip-path
-                android:name="strike_thru_mask"
-                android:pathData="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 6 21 L 4 19 L 21 2 Z"/>
-        <path
-                android:name="icon"
-                android:fillColor="@color/disabled_text"
-                android:pathData="M17,11v-1c0,-0.552 0.448,-1 1,-1s1,0.5 1,1v1c0,3.5 -2.6,6.4 -6,6.9L13,21c0,0.6 -0.5,1 -1,1s-1,-0.5 -1,-1v-3c-3.4,-0.5 -6,-3.4 -6,-7v-1c0,-0.6 0.5,-1 1,-1s1,0.5 1,1v1c0,2.8 2.2,5 5,5s5,-2.2 5,-5zM12,2c1.7,0 3,1.3 3,3v6c0,1.7 -1.3,3 -3,3s-3,-1.343 -3,-3L9,5c0,-1.657 1.343,-3 3,-3z" />
-    </group>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/disabled_text"
+        android:pathData="M20.78 19.72L4.28 3.22a0.75 0.75 0 1 0-1.061 1.061l5.787 5.787a2.992 2.992 0 0 0 2.926 2.926l1.312 1.312A4.32 4.32 0 0 1 12 14.5c-2.225 0-4.14-1.658-4.455-3.856a0.742 0.742 0 0 0-0.849-0.636 0.75 0.75 0 0 0-0.636 0.849c0.355 2.478 2.244 4.404 4.608 4.95l0.582 0.485V19.5h-2.5a0.75 0.75 0 0 0 0 1.5h6.5a0.75 0.75 0 0 0 0-1.5h-2.5v-3.227l0.491-0.447a6.09 6.09 0 0 0 1.147-0.377l5.331 5.331a0.748 0.748 0 0 0 1.06 0 0.748 0.748 0 0 0 0.001-1.06zM10.5 6c0-0.827 0.673-1.5 1.5-1.5s1.5 0.673 1.5 1.5v4c0 0.107-0.012 0.211-0.034 0.312l1.142 1.142C14.851 11.022 15 10.531 15 10V6a3 3 0 0 0-3-3 2.993 2.993 0 0 0-2.986 2.859L10.5 7.345V6zm7.439 4.856a0.75 0.75 0 0 0-0.636-0.849 0.745 0.745 0 0 0-0.849 0.636 4.43 4.43 0 0 1-0.763 1.894l1.066 1.066a5.808 5.808 0 0 0 1.182-2.747z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_microphone_enabled.xml b/app/src/main/res/drawable/ic_microphone_enabled.xml
index 148a6695d..e639d9faa 100644
--- a/app/src/main/res/drawable/ic_microphone_enabled.xml
+++ b/app/src/main/res/drawable/ic_microphone_enabled.xml
@@ -7,21 +7,10 @@
         android:height="24dp"
         android:viewportWidth="24"
         android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M 18.8 2.8 C 19.8 1.8 21.1 3.3 20.2 4.2 L 3.4 21 L 2 19.6 L 18.8 2.8 Z"/>
-        <path
-                android:name="strike_thru_path"
-                android:pathData="M 20 1.6 L 21.4 3 L 21.9 2.5 C 20.9 3.5 19.5 2 20.5 1.1 L 20 1.6 Z"
-                android:fillColor="?primaryText"
-                android:strokeWidth="1"/>
-    </group>
-    <group>
-        <clip-path
-                android:name="strike_thru_mask"
-                android:pathData="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 23 4 L 21 2 L 21 2 Z"/>
-        <path
-                android:name="icon"
-                android:fillColor="?primaryText"
-                android:pathData="M17,11v-1c0,-0.552 0.448,-1 1,-1s1,0.5 1,1v1c0,3.5 -2.6,6.4 -6,6.9L13,21c0,0.6 -0.5,1 -1,1s-1,-0.5 -1,-1v-3c-3.4,-0.5 -6,-3.4 -6,-7v-1c0,-0.6 0.5,-1 1,-1s1,0.5 1,1v1c0,2.8 2.2,5 5,5s5,-2.2 5,-5zM12,2c1.7,0 3,1.3 3,3v6c0,1.7 -1.3,3 -3,3s-3,-1.343 -3,-3L9,5c0,-1.657 1.343,-3 3,-3z" />
-    </group>
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M12 4.5c0.827 0 1.5 0.673 1.5 1.5v4c0 0.827-0.673 1.5-1.5 1.5s-1.5-0.673-1.5-1.5V6c0-0.827 0.673-1.5 1.5-1.5zM12 3a3 3 0 0 0-3 3v4a3 3 0 1 0 6 0V6a3 3 0 0 0-3-3z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M13.241 15.827c2.406-0.517 4.338-2.46 4.698-4.969a0.75 0.75 0 0 0-0.636-0.849 0.745 0.745 0 0 0-0.849 0.636c-0.315 2.198-2.23 3.856-4.454 3.856-2.224 0-4.139-1.658-4.454-3.856a0.742 0.742 0 0 0-0.849-0.636 0.75 0.75 0 0 0-0.636 0.849c0.355 2.478 2.244 4.403 4.607 4.95l0.582 0.485V19.5h-2.5a0.75 0.75 0 0 0 0 1.5h6.499a0.75 0.75 0 0 0 0-1.5h-2.5v-3.227l0.492-0.446z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_multiple_tabs.xml b/app/src/main/res/drawable/ic_multiple_tabs.xml
index e57048109..4df88b72c 100644
--- a/app/src/main/res/drawable/ic_multiple_tabs.xml
+++ b/app/src/main/res/drawable/ic_multiple_tabs.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:pathData="M15.22 22H5.78A3.78 3.78 0 0 1 2 18.22V8.78C2 6.69 3.7 5 5.78 5h9.44C17.31 5 19 6.7 19 8.78v9.44c0 2-1.7 3.78-3.78 3.78zM5.86 7C4.83 7 4 7.83 4 8.86v9.28C4 19.17 4.83 20 5.86 20h9.28c1 0 1.86-0.83 1.86-1.86V8.86C17 8 16.17 7 15 7H6zM6 4c0-1.1 1-2 2-2h8a6 6 0 0 1 6 6v0L22 16a2 2 0 0 1-2 2L20 8V8a4 4 0 0 0-4-4H6z"
+        android:pathData="M5.5 3A2.5 2.5 0 0 0 3 5.5v8A2.5 2.5 0 0 0 5.5 16h13a2.5 2.5 0 0 0 2.5-2.5v-8A2.5 2.5 0 0 0 18.5 3h-13zm14 10.7l-0.8 0.8H5.3l-0.8-0.8V5.3l0.8-0.8h13.4l0.8 0.8v8.4zM5.3 19.5l-0.8-0.8v-0.95a0.75 0.75 0 0 0-1.5 0v0.75A2.5 2.5 0 0 0 5.5 21h13a2.5 2.5 0 0 0 2.5-2.5v-0.75a0.75 0.75 0 0 0-1.5 0v0.95l-0.8 0.8H5.3z"
         android:fillColor="?primaryText" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_new.xml b/app/src/main/res/drawable/ic_new.xml
index 52f76c04b..ea1ea7ba1 100644
--- a/app/src/main/res/drawable/ic_new.xml
+++ b/app/src/main/res/drawable/ic_new.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M13,4a1,1 0,1 0,-2 0v7H4a1,1 0,1 0,0 2h7v7a1,1 0,1 0,2 0v-7h7a1,1 0,1 0,0 -2h-7V4z" />
+        android:pathData="M19.25 12.75c0.207 0 0.395-0.084 0.53-0.22C19.916 12.394 20 12.207 20 12c0-0.414-0.336-0.75-0.75-0.75h-5.7l-0.8-0.8v-5.7C12.75 4.336 12.414 4 12 4s-0.75 0.336-0.75 0.75v5.7l-0.8 0.8h-5.7C4.336 11.25 4 11.586 4 12s0.336 0.75 0.75 0.75h5.7l0.8 0.8v5.7c0 0.414 0.336 0.75 0.75 0.75 0.207 0 0.395-0.084 0.53-0.22 0.136-0.136 0.22-0.323 0.22-0.53v-5.7l0.8-0.8h5.7z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_notifications.xml b/app/src/main/res/drawable/ic_notifications.xml
index 23fd8c1d0..813693ef5 100644
--- a/app/src/main/res/drawable/ic_notifications.xml
+++ b/app/src/main/res/drawable/ic_notifications.xml
@@ -10,13 +10,4 @@
     <item
             android:id="@+id/disabled"
             android:drawable="@drawable/ic_notifications_disabled" />
-
-    <transition
-            android:drawable="@drawable/ic_notifications_anim_enable"
-            android:fromId="@id/disabled"
-            android:toId="@id/enabled" />
-    <transition
-            android:drawable="@drawable/ic_notifications_anim_disable"
-            android:fromId="@+id/enabled"
-            android:toId="@+id/disabled" />
 </animated-selector>
diff --git a/app/src/main/res/drawable/ic_notifications_anim_disable.xml b/app/src/main/res/drawable/ic_notifications_anim_disable.xml
deleted file mode 100644
index b54382c08..000000000
--- a/app/src/main/res/drawable/ic_notifications_anim_disable.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/. -->
-<animated-vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@drawable/ic_notifications_enabled">
-    <target android:name="strike_thru_path" android:animation="@animator/strike_thru_path_disable" />
-    <target android:name="strike_thru_mask" android:animation="@animator/strike_thru_mask_disable" />
-    <target android:name="icon" android:animation="@animator/fill_disable" />
-</animated-vector>
diff --git a/app/src/main/res/drawable/ic_notifications_anim_enable.xml b/app/src/main/res/drawable/ic_notifications_anim_enable.xml
deleted file mode 100644
index 8f4aa3bda..000000000
--- a/app/src/main/res/drawable/ic_notifications_anim_enable.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/. -->
-<animated-vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@drawable/ic_notifications_disabled">
-    <target android:name="strike_thru_path" android:animation="@animator/strike_thru_path_enable" />
-    <target android:name="strike_thru_mask" android:animation="@animator/strike_thru_mask_enable" />
-    <target android:name="icon" android:animation="@animator/fill_enable" />
-</animated-vector>
diff --git a/app/src/main/res/drawable/ic_notifications_disabled.xml b/app/src/main/res/drawable/ic_notifications_disabled.xml
index 9c30ac7bd..dcce0b521 100644
--- a/app/src/main/res/drawable/ic_notifications_disabled.xml
+++ b/app/src/main/res/drawable/ic_notifications_disabled.xml
@@ -7,21 +7,10 @@
         android:height="24dp"
         android:viewportWidth="24"
         android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M 18.8 2.8 C 19.8 1.8 21.1 3.3 20.2 4.2 L 3.4 21 L 2 19.6 L 18.8 2.8 Z"/>
-        <path
-                android:name="strike_thru_path"
-                android:pathData="M 20 1.6 L 21.4 3 L 5.2 19.2 C 4.2 20.2 2.8 18.8 3.8 17.8 L 20 1.6 Z"
-                android:fillColor="@color/disabled_text"
-                android:strokeWidth="1"/>
-    </group>
-    <group>
-        <clip-path
-                android:name="strike_thru_mask"
-                android:pathData="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 6 21 L 4 19 L 21 2 Z"/>
-        <path
-                android:name="icon"
-                android:fillColor="@color/disabled_text"
-                android:pathData="M19 3H5a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h7.6l3.7 3.7A1 1 0 0 0 18 20v-3h1a3 3 0 0 0 3-3V6a3 3 0 0 0-3-3zm1 11c0 0.6-0.4 1-1 1h-2a1 1 0 0 0-1 1v1.6l-2.3-2.3a1 1 0 0 0-0.7-0.3H5a1 1 0 0 1-1-1V6c0-0.6 0.4-1 1-1h14c0.6 0 1 0.4 1 1v8zm-3.5-6h-9a0.5 0.5 0 0 0 0 1h9a0.5 0.5 0 0 0 0-1zm0 3h-9a0.5 0.5 0 0 0 0 1h9a0.5 0.5 0 0 0 0-1z" />
-    </group>
-</vector>
+    <path
+        android:pathData="M11.732,8.5h4.518a0.75,0.75 0,0 0,0 -1.5h-6.018l1.5,1.5zM3.28,2.22a0.75,0.75 0,1 0,-1.061 1.061L3.3,4.361c-0.18,0.343 -0.3,0.723 -0.3,1.139v9A2.5,2.5 0,0 0,5.5 17h5.036l5,4h1.607v-2.797l2.577,2.577a0.748,0.748 0,0 0,1.06 0,0.75 0.75,0 0,0 0,-1.061L3.28,2.22zM15.643,19.165 L11.063,15.501L5.301,15.501l-0.8,-0.8v-9.14L9.939,11L7.75,11a0.75,0.75 0,0 0,0 1.5h3.689l4.203,4.203v2.462h0.001z"
+        android:fillColor="@color/disabled_text"/>
+    <path
+        android:pathData="M18.5,3H6.232l1.5,1.5H18.7l0.8,0.8v9.4l-0.784,0.784 1.122,1.122A2.494,2.494 0,0 0,21 14.5v-9A2.5,2.5 0,0 0,18.5 3z"
+        android:fillColor="@color/disabled_text"/>
+ </vector>
diff --git a/app/src/main/res/drawable/ic_notifications_enabled.xml b/app/src/main/res/drawable/ic_notifications_enabled.xml
index 86447ec03..8fcc4d39d 100644
--- a/app/src/main/res/drawable/ic_notifications_enabled.xml
+++ b/app/src/main/res/drawable/ic_notifications_enabled.xml
@@ -7,21 +7,10 @@
         android:height="24dp"
         android:viewportWidth="24"
         android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M 18.8 2.8 C 19.8 1.8 21.1 3.3 20.2 4.2 L 3.4 21 L 2 19.6 L 18.8 2.8 Z"/>
-        <path
-                android:name="strike_thru_path"
-                android:pathData="M 20 1.6 L 21.4 3 L 21.9 2.5 C 20.9 3.5 19.5 2 20.5 1.1 L 20 1.6 Z"
-                android:fillColor="?primaryText"
-                android:strokeWidth="1"/>
-    </group>
-    <group>
-        <clip-path
-                android:name="strike_thru_mask"
-                android:pathData="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 23 4 L 21 2 L 21 2 Z"/>
-        <path
-                android:name="icon"
-                android:fillColor="?primaryText"
-                android:pathData="M19 3H5a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h7.6l3.7 3.7A1 1 0 0 0 18 20v-3h1a3 3 0 0 0 3-3V6a3 3 0 0 0-3-3zm1 11c0 0.6-0.4 1-1 1h-2a1 1 0 0 0-1 1v1.6l-2.3-2.3a1 1 0 0 0-0.7-0.3H5a1 1 0 0 1-1-1V6c0-0.6 0.4-1 1-1h14c0.6 0 1 0.4 1 1v8zm-3.5-6h-9a0.5 0.5 0 0 0 0 1h9a0.5 0.5 0 0 0 0-1zm0 3h-9a0.5 0.5 0 0 0 0 1h9a0.5 0.5 0 0 0 0-1z" />
-    </group>
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M21 5.5A2.5 2.5 0 0 0 18.5 3h-13A2.5 2.5 0 0 0 3 5.5v9A2.5 2.5 0 0 0 5.5 17h5.036l5 4h1.607v-4H18.5a2.5 2.5 0 0 0 2.5-2.5v-9zM4.5 5.3l0.8-0.8h13.4l0.8 0.8v9.4l-0.8 0.8h-2.307a0.75 0.75 0 0 0-0.75 0.75v2.915l-4.17-3.336a1.498 1.498 0 0 0-0.937-0.329H5.3l-0.8-0.8" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M13.25 12.5h-5.5a0.75 0.75 0 0 1 0-1.5h5.5a0.75 0.75 0 0 1 0 1.5zm3-4h-8.5a0.75 0.75 0 0 1 0-1.5h8.5a0.75 0.75 0 0 1 0 1.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_onboarding_avatar_anonymous_large.xml b/app/src/main/res/drawable/ic_onboarding_avatar_anonymous_large.xml
index 078d9b0ec..c8312c4bf 100644
--- a/app/src/main/res/drawable/ic_onboarding_avatar_anonymous_large.xml
+++ b/app/src/main/res/drawable/ic_onboarding_avatar_anonymous_large.xml
@@ -8,9 +8,12 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="?accent"
-      android:pathData="M17.6655,14.2092C16.1843,12.4998 14.1333,14.8 11.9997,14.8C9.8675,14.8 7.8151,12.4998 6.3339,14.2092C5.9139,14.6936 5.8803,15.3992 6.2401,15.9284C7.4959,17.7764 9.5959,19 11.9997,19C14.4035,19 16.5035,17.7764 17.7593,15.9284C18.1205,15.3992 18.0855,14.6936 17.6655,14.2092M16.25,9.25C16.25,6.9026 14.3474,5 12,5C9.6526,5 7.75,6.9026 7.75,9.25C7.75,11.5974 9.6526,13.5 12,13.5C14.3474,13.5 16.25,11.5974 16.25,9.25Z" />
+      android:fillColor="?onboardingSelected"
+      android:pathData="M12 6.5a3 3 0 1 0 0 6 3 3 0 0 0 0-6z" />
   <path
-      android:fillColor="?accent"
-      android:pathData="M12,22C6.4772,22 2,17.5228 2,12C2,6.4772 6.4772,2 12,2C17.5228,2 22,6.4772 22,12C21.9939,17.5203 17.5203,21.9939 12,22L12,22ZM12,4C7.5817,4 4,7.5817 4,12C4,16.4183 7.5817,20 12,20C16.4183,20 20,16.4183 20,12C19.995,7.5838 16.4162,4.005 12,4Z" />
+      android:fillColor="?onboardingSelected"
+      android:pathData="M12 21.5c-5.238 0-9.5-4.262-9.5-9.5S6.762 2.5 12 2.5s9.5 4.262 9.5 9.5-4.262 9.5-9.5 9.5zM12 4c-4.411 0-8 3.589-8 8s3.589 8 8 8 8-3.589 8-8-3.589-8-8-8z" />
+  <path
+      android:fillColor="?onboardingSelected"
+      android:pathData="M8.314 14c-0.652 0-1.232 0.269-1.672 0.684A6.014 6.014 0 0 0 12 18a6.355 6.355 0 0 0 1.084-0.104c0.083-0.014 0.165-0.033 0.247-0.051a6.014 6.014 0 0 0 4.027-3.162A2.43 2.43 0 0 0 15.686 14H8.314z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_onboarding_privacy_notice.xml b/app/src/main/res/drawable/ic_onboarding_privacy_notice.xml
deleted file mode 100644
index e836da928..000000000
--- a/app/src/main/res/drawable/ic_onboarding_privacy_notice.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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="24dp"
-    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">
-    <aapt:attr name="android:fillColor">
-      <gradient 
-          android:startY="3.2727787"
-          android:startX="22.576483"
-          android:endY="15.679591"
-          android:endX="6.9187684"
-          android:type="linear">
-        <item android:offset="0" android:color="#6A11CB"/>
-        <item android:offset="1" android:color="#2575FC"/>
-      </gradient>
-    </aapt:attr>
-  </path>
-</vector>
diff --git a/app/src/main/res/drawable/ic_onboarding_tracking_protection.xml b/app/src/main/res/drawable/ic_onboarding_tracking_protection.xml
index 6ec758a14..3fc0e565c 100644
--- a/app/src/main/res/drawable/ic_onboarding_tracking_protection.xml
+++ b/app/src/main/res/drawable/ic_onboarding_tracking_protection.xml
@@ -2,23 +2,29 @@
 <!-- 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="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:name="vector"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:pathData="M20 6c0-1-0.8-1.9-1.8-2L12 3 5.8 4C4.8 4 4 5 4 6l0.1 5c0.3 3.2 1 5 2.5 7a8.4 8.4 0 0 0 5.3 3h0.2c2.1-0.3 4-1.4 5.3-3 1.6-2 2.2-3.8 2.5-7l0.1-5zm-2.1 4.8a10 10 0 0 1-2 6c-1 1.1-2.4 2-3.9 2.3a6.5 6.5 0 0 1-3.9-2.4 9.9 9.9 0 0 1-2-5.9 67.3 67.3 0 0 1 0-4.9L12 5l5.9 1 0.1 0.2-0.1 4.7zM8 7.6v3c0.3 2.7 0.8 3.7 1.7 5 0.6 0.6 1.4 1.2 2.3 1.4V7l-4 0.6z">
+        android:pathData="M12.0002,22C11.5342,22 11.0662,21.885 10.6462,21.668C8.4962,20.547 6.5242,18.735 5.0942,16.566C4.3852,15.493 3.8882,14.198 3.6162,12.716L2.9092,8.872C2.6692,7.563 3.2942,6.259 4.4632,5.625L10.5652,2.363C11.4632,1.88 12.5362,1.88 13.4322,2.359L19.5342,5.682C20.7082,6.313 21.3352,7.621 21.0912,8.936L20.3862,12.728C20.1152,14.201 19.6172,15.49 18.9112,16.56C17.4822,18.729 15.5102,20.542 13.3562,21.666C12.9372,21.885 12.4682,22 12.0002,22ZM11.5152,3.556L4.8452,7.13L4.3382,8.368L5.0922,12.445C5.3272,13.727 5.7502,14.836 6.3472,15.74C7.6392,17.7 9.4122,19.332 11.3392,20.337H12.6632C14.5932,19.329 16.3672,17.694 17.6582,15.735C18.2532,14.833 18.6752,13.729 18.9102,12.455L19.6632,8.368L19.0532,7.129L12.4942,3.557H11.5152V3.556Z">
         <aapt:attr name="android:fillColor">
             <gradient
-                    android:endX="21.592728"
-                    android:endY="43.40673"
-                    android:startX="53.66253"
-                    android:startY="4.9456143"
-                    android:type="linear">
-                <item android:color="#6A11CB" android:offset="0"/>
-                <item android:color="#2575FC" android:offset="1"/>
+                android:endX="3"
+                android:endY="22"
+                android:startX="21"
+                android:startY="2"
+                android:type="linear">
+                <item
+                    android:color="#FFAB71FF"
+                    android:offset="0" />
+                <item
+                    android:color="#FF0250BB"
+                    android:offset="1" />
             </gradient>
         </aapt:attr>
     </path>
diff --git a/app/src/main/res/drawable/ic_private_browsing.xml b/app/src/main/res/drawable/ic_private_browsing.xml
index baf1a8062..10276e31e 100644
--- a/app/src/main/res/drawable/ic_private_browsing.xml
+++ b/app/src/main/res/drawable/ic_private_browsing.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="@color/photonWhite"
-        android:pathData="M17.5 17c-2.1 0-3.5-2.5-5.5-2.5S8.4 17 6.5 17C3.9 17 2 14.6 2 10.4 2 7.8 2.8 7 6.1 7s4.3 1.4 5.9 1.4c1.6 0 2.6-1.4 5.9-1.4 3.3 0 4.1 0.8 4.1 3.4 0 4.2-1.9 6.6-4.5 6.6zm-9.8-6.8c-2 0.1-2.9 1.3-2.9 1.6 0 0.3 1.3 1.1 2.7 1.1 1.3 0 2.9-0.5 2.9-0.9 0-0.5-0.8-1.9-2.7-1.8zm8.6 0c-1.9-0.1-2.7 1.3-2.7 1.8 0 0.4 1.5 0.9 2.9 0.9s2.7-0.8 2.7-1.1c-0.1-0.3-0.9-1.5-2.9-1.6z" />
+        android:pathData="M21.914 8.476c-1.906-2.502-5.646-2.821-7.976-0.681l-1.303 1.197h-1.276l-1.303-1.197c-2.329-2.14-6.07-1.82-7.976 0.681-0.247 0.975 0.134 4.575 0.35 5.141 0.434 2.287 2.303 4.007 4.543 4.007 1.119 0 2.132-0.447 2.933-1.161l0.488-0.418c0.91-0.778 2.217-0.789 3.138-0.026l0.733 0.608v-0.003c0.772 0.621 1.718 1.001 2.754 1.001 2.24 0 4.109-1.72 4.543-4.007 0.218-0.567 0.613-4.152 0.352-5.142zM9.79 12.045C9.257 12.626 8.43 13 7.5 13c-0.93 0-1.757-0.374-2.29-0.955-0.28-0.305-0.28-0.785 0-1.09C5.743 10.374 6.57 10 7.5 10c0.93 0 1.757 0.374 2.29 0.955 0.28 0.305 0.28 0.785 0 1.09zm9 0C18.257 12.626 17.43 13 16.5 13c-0.93 0-1.757-0.374-2.29-0.955-0.28-0.305-0.28-0.785 0-1.09C14.743 10.374 15.57 10 16.5 10c0.93 0 1.757 0.374 2.29 0.955 0.28 0.305 0.28 0.785 0 1.09z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_qr.xml b/app/src/main/res/drawable/ic_qr.xml
index aa81e7c49..2b237163d 100644
--- a/app/src/main/res/drawable/ic_qr.xml
+++ b/app/src/main/res/drawable/ic_qr.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M17.5 3c2 0 3.5 1.6 3.5 3.5V9a1 1 0 0 1-2 0V6.5c0-0.8-0.7-1.5-1.5-1.5H15a1 1 0 0 1 0-2h2.5zM20 14c0.6 0 1 0.4 1 1v2.5c0 2-1.6 3.5-3.5 3.5H15a1 1 0 0 1 0-2h2.5c0.8 0 1.5-0.7 1.5-1.5V15c0-0.6 0.4-1 1-1zM9 19a1 1 0 0 1 0 2H6.5c-2 0-3.5-1.6-3.5-3.5V15a1 1 0 0 1 2 0v2.5c0 0.8 0.7 1.5 1.5 1.5H9zm-5-9a1 1 0 0 1-1-1V6.5C3 4.5 4.6 3 6.5 3H9a1 1 0 0 1 0 2H6.5C5.7 5 5 5.7 5 6.5V9c0 0.6-0.4 1-1 1zm11-3h2v2h-2V7zM7 9V7h4v4H7V9zm8 2h2v2h-2v-2zm-6 2h2v2H9v-2zm6 2h2v2h-2v-2zm-4 0h2v2h-2v-2zm-4 0h2v2H7v-2zm6-2h2v2h-2v-2zm0-4h2v2h-2V9z" />
+        android:pathData="M15.8 4.5a0.8 0.8 0 0 1 0-1.5h2.7A2.5 2.5 0 0 1 21 5.5v2.8a0.8 0.8 0 0 1-1.5 0v-3l-0.8-0.8h-3zm-7.6 0a0.8 0.8 0 0 0 0-1.5H5.5A2.5 2.5 0 0 0 3 5.5v2.8a0.8 0.8 0 0 0 1.5 0v-3l0.8-0.8h3zm7.6 15a0.8 0.8 0 0 0 0 1.5h2.7a2.5 2.5 0 0 0 2.5-2.5v-2.8a0.8 0.8 0 0 0-1.5 0v3l-0.8 0.8h-3zm-7.6 0a0.8 0.8 0 0 1 0 1.5H5.5A2.5 2.5 0 0 1 3 18.5v-2.8a0.8 0.8 0 0 1 1.5 0v3l0.8 0.8h3zm2-8.5H7.8A0.8 0.8 0 0 1 7 10.2V7.8A0.8 0.8 0 0 1 7.8 7h2.5A0.8 0.8 0 0 1 11 7.8v2.5a0.8 0.8 0 0 1-0.8 0.7zm6.6 4H15v1.8s0.1 0.2 0.3 0.2h1.4a0.3 0.3 0 0 0 0.3-0.3v-1.4a0.3 0.3 0 0 0-0.3-0.3zm0-6H15V7.2A0.3 0.3 0 0 1 15.3 7h1.4A0.3 0.3 0 0 1 17 7.3v1.5A0.3 0.3 0 0 1 16.7 9zM15 11h-1.8a0.3 0.3 0 0 1-0.2-0.3V9.3A0.3 0.3 0 0 1 13.3 9H15v2zm1.8 2H15v-2h1.8a0.3 0.3 0 0 1 0.2 0.3v1.4a0.3 0.3 0 0 1-0.3 0.3zM15 13h-1.8a0.3 0.3 0 0 0-0.2 0.3V15h2v-2zm-2 2h-2v1.8s0.1 0.2 0.3 0.2h1.4a0.3 0.3 0 0 0 0.3-0.3V15zm-2.3-2H9.3A0.3 0.3 0 0 0 9 13.3V15h2v-1.8a0.3 0.3 0 0 0-0.3-0.2zM9 15H7.2A0.3 0.3 0 0 0 7 15.3v1.4C7 16.9 7.1 17 7.3 17h1.5A0.3 0.3 0 0 0 9 16.7V15z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_readermode.xml b/app/src/main/res/drawable/ic_readermode.xml
index d5aac5b81..396e54072 100644
--- a/app/src/main/res/drawable/ic_readermode.xml
+++ b/app/src/main/res/drawable/ic_readermode.xml
@@ -9,5 +9,8 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M16.7 21H7.3A3.3 3.3 0 0 1 4 17.7V6.3C4 4.5 5.5 3 7.3 3h9.4C18.5 3 20 4.5 20 6.3v11.4c0 1.8-1.5 3.3-3.3 3.3zM7.3 5C6.6 5 6 5.6 6 6.3v11.4c0 0.7 0.6 1.3 1.3 1.3h9.4c0.7 0 1.3-0.6 1.3-1.3V6.3c0-0.7-0.6-1.3-1.3-1.3H7.3zM15 8H9a0.5 0.5 0 0 1 0-1h6a0.5 0.5 0 0 1 0 1zm0 3H9a0.5 0.5 0 0 1 0-1h6a0.5 0.5 0 0 1 0 1zm0 3H9a0.5 0.5 0 0 1 0-1h6a0.5 0.5 0 0 1 0 1zm-3.4 3H9a0.5 0.5 0 0 1 0-1h2.6a0.5 0.5 0 0 1 0 1z" />
+        android:pathData="M6.5 3A2.5 2.5 0 0 0 4 5.5v13A2.5 2.5 0 0 0 6.5 21h11a2.5 2.5 0 0 0 2.5-2.5v-13A2.5 2.5 0 0 0 17.5 3h-11zm12 15.7l-0.8 0.8H6.3l-0.8-0.8V5.3l0.8-0.8h11.4l0.8 0.8v13.4z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M15.25 8.5h-6.5a0.75 0.75 0 0 1 0-1.5h6.5a0.75 0.75 0 0 1 0 1.5zm0 4h-6.5a0.75 0.75 0 0 1 0-1.5h6.5a0.75 0.75 0 0 1 0 1.5zm-3 4h-3.5a0.75 0.75 0 0 1 0-1.5h3.5a0.75 0.75 0 0 1 0 1.5z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_readermode_selected.xml b/app/src/main/res/drawable/ic_readermode_selected.xml
index c72b5267b..9a87ee124 100644
--- a/app/src/main/res/drawable/ic_readermode_selected.xml
+++ b/app/src/main/res/drawable/ic_readermode_selected.xml
@@ -9,7 +9,20 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:pathData="M16.7 21H7.3A3.3 3.3 0 0 1 4 17.7V6.3C4 4.5 5.5 3 7.3 3h9.4C18.5 3 20 4.5 20 6.3v11.4c0 1.8-1.5 3.3-3.3 3.3zM7.3 5C6.6 5 6 5.6 6 6.3v11.4c0 0.7 0.6 1.3 1.3 1.3h9.4c0.7 0 1.3-0.6 1.3-1.3V6.3c0-0.7-0.6-1.3-1.3-1.3H7.3zM15 8H9a0.5 0.5 0 0 1 0-1h6a0.5 0.5 0 0 1 0 1zm0 3H9a0.5 0.5 0 0 1 0-1h6a0.5 0.5 0 0 1 0 1zm0 3H9a0.5 0.5 0 0 1 0-1h6a0.5 0.5 0 0 1 0 1zm-3.4 3H9a0.5 0.5 0 0 1 0-1h2.6a0.5 0.5 0 0 1 0 1z">
+        android:pathData="M6.5 3A2.5 2.5 0 0 0 4 5.5v13A2.5 2.5 0 0 0 6.5 21h11a2.5 2.5 0 0 0 2.5-2.5v-13A2.5 2.5 0 0 0 17.5 3h-11zm12 15.7l-0.8 0.8H6.3l-0.8-0.8V5.3l0.8-0.8h11.4l0.8 0.8v13.4z" >
+        <aapt:attr name="android:fillColor">
+            <gradient
+                android:type="linear"
+                android:startX="24"
+                android:startY="0"
+                android:endX="0"
+                android:endY="24"
+                android:startColor="?readerModeStartGradient"
+                android:endColor="?readerModeEndGradient"/>
+        </aapt:attr>
+    </path>
+    <path
+        android:pathData="M15.25 8.5h-6.5a0.75 0.75 0 0 1 0-1.5h6.5a0.75 0.75 0 0 1 0 1.5zm0 4h-6.5a0.75 0.75 0 0 1 0-1.5h6.5a0.75 0.75 0 0 1 0 1.5zm-3 4h-3.5a0.75 0.75 0 0 1 0-1.5h3.5a0.75 0.75 0 0 1 0 1.5z" >
         <aapt:attr name="android:fillColor">
             <gradient
                 android:type="linear"
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index 4cb6a8c00..dd401903f 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M21.5 20l-6-6a7.5 7.5 0 1 0-1.5 1.5l6 6a1 1 0 0 0 1.5-1.5zm-12-5a5.5 5.5 0 1 1 0-11 5.5 5.5 0 0 1 0 11z" />
+        android:pathData="M15.685,14.074C16.511,12.925 17,11.519 17,10C17,6.141 13.86,3 10,3C6.14,3 3,6.141 3,10C3,13.859 6.14,17 10,17C11.525,17 12.936,16.508 14.087,15.676L14.611,15.67L19.721,20.78C19.867,20.926 20.059,21 20.251,21C20.443,21 20.635,20.927 20.781,20.78C21.074,20.487 21.074,20.012 20.781,19.719L15.675,14.612L15.685,14.074ZM10,15.5C6.967,15.5 4.5,13.032 4.5,10C4.5,6.968 6.967,4.5 10,4.5C13.033,4.5 15.5,6.968 15.5,10C15.5,13.032 13.033,15.5 10,15.5Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index 051a9abb9..6c3315b26 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -8,6 +8,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M20.8 11h-2.9a6 6 0 0 0-1-2.5l2-2a1 1 0 0 0-1.4-1.4l-2 2a6 6 0 0 0-2.5-1V3.3a1 1 0 0 0-2 0V6a6 6 0 0 0-2.5 1l-2-2a1 1 0 0 0-1.4 1.4l2 2a6 6 0 0 0-1 2.5H3.3a1 1 0 0 0 0 2H6a6 6 0 0 0 1 2.5l-0.2 0.2-1.8 1.8a1 1 0 1 0 1.4 1.4L8.3 17l0.2-0.2a6 6 0 0 0 2.5 1v2.9a1 1 0 0 0 2 0v-2.9a6 6 0 0 0 2.5-1l2 2a1 1 0 0 0 1.4-1.4l-2-2a6 6 0 0 0 1-2.5h2.9a1 1 0 0 0 0-2zM8 12a4 4 0 1 1 8 0 4 4 0 0 1-8 0z"
-      android:fillColor="?primaryText" />
+      android:pathData="M12.8,22h-1.6a2,2 0,0 1,-1.9 -1.4l-0.5,-1.8 -1,-0.6 -1.9,0.4a2,2 0,0 1,-2.2 -1L3,16.4a2,2 0,0 1,0.3 -2.4l1.3,-1.3a6.7,6.7 0,0 1,0 -1.2l-1.3,-1.3A2,2 0,0 1,3 7.7l0.8,-1.4a2,2 0,0 1,2.2 -1l1.9,0.5 1,-0.6 0.5,-1.8a2,2 0,0 1,2 -1.4h1.5a2,2 0,0 1,2 1.4l0.4,1.8 1,0.6 1.9,-0.4a2,2 0,0 1,2.2 1l0.8,1.3a2,2 0,0 1,-0.3 2.4l-1.3,1.3a6.6,6.6 0,0 1,0 1.2l1.3,1.3c0.6,0.7 0.7,1.7 0.3,2.4l-0.8,1.4a2,2 0,0 1,-2.2 1l-1.8,-0.5 -1,0.6 -0.6,1.8a2,2 0,0 1,-2 1.4zM7.8,16.6l0.6,0.2 1.3,0.7 0.4,0.5 0.6,2.1c0.1,0.3 0.3,0.4 0.5,0.4h1.6c0.2,0 0.4,-0.1 0.5,-0.4l0.6,-2 0.4,-0.6a6,6 0,0 0,1.3 -0.7l0.7,-0.2 2.1,0.6c0.2,0 0.5,0 0.6,-0.3l0.8,-1.3 -0.1,-0.6 -1.6,-1.7 -0.2,-0.6a5.8,5.8 0,0 0,0 -1.5l0.2,-0.6L19.7,9c0.1,-0.1 0.2,-0.4 0,-0.6L19,7.1a0.5,0.5 0,0 0,-0.6 -0.3l-2.2,0.6 -0.6,-0.2a6,6 0,0 0,-1.3 -0.7L14,6l-0.6,-2.1c0,-0.3 -0.3,-0.4 -0.5,-0.4h-1.6c-0.2,0 -0.4,0.1 -0.5,0.4l-0.6,2 -0.4,0.6a6,6 0,0 0,-1.3 0.7l-0.6,0.2 -2.2,-0.6c-0.2,0 -0.5,0 -0.6,0.3l-0.8,1.3 0.1,0.6L6,10.6l0.2,0.6a6.1,6.1 0,0 0,0 1.5l-0.2,0.7L4.3,15c-0.1,0.1 -0.2,0.4 0,0.6l0.7,1.3c0.1,0.2 0.4,0.3 0.6,0.3l2.1,-0.6z"
+      android:fillColor="?primaryText"/>
+  <path
+      android:pathData="M12,15.5a3.5,3.5 0,1 1,0 -7,3.5 3.5,0 0,1 0,7zM12,10a2,2 0,1 0,0 4,2 2,0 0,0 0,-4z"
+      android:fillColor="?primaryText"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
new file mode 100644
index 000000000..c36e1839d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -0,0 +1,13 @@
+<?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"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M18.4 14.1a3.5 3.5 0 0 0-3.6 1.2l-5-2.4a3.6 3.6 0 0 0 0-1.7l5-2.5a3.5 3.5 0 0 0 3.6 1.2 3.5 3.5 0 0 0 2.5-4.3 3.5 3.5 0 0 0-1.7-2.1 3.5 3.5 0 0 0-2.6-0.4A3.5 3.5 0 0 0 14 7.4L9.2 9.8 9 9.5a3.5 3.5 0 0 0-5 0 3.5 3.5 0 0 0 0 5 3.5 3.5 0 0 0 2.5 1c0.9 0 1.8-0.3 2.5-1l0.2-0.3 5 2.4a3.5 3.5 0 0 0 3.3 4.4c0.6 0 1.2-0.2 1.7-0.5a3.5 3.5 0 0 0 1.7-2 3.5 3.5 0 0 0-2.5-4.4zM17 4.6a2 2 0 0 1 1.5 0.2A2 2 0 0 1 18 8.4 2 2 0 0 1 15.6 7 2 2 0 0 1 17 4.6zm-9 8.8a2 2 0 0 1-3 0 2 2 0 0 1 0-2.8 2 2 0 0 1 3 0c0.7 0.8 0.7 2 0 2.8zM19.3 18a2 2 0 0 1-0.9 1.2 2 2 0 0 1-1.5 0.2 2 2 0 0 1-1.4-2.4 2 2 0 0 1 2.4-1.4 2 2 0 0 1 1.4 2.4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_share_filled.xml b/app/src/main/res/drawable/ic_share_filled.xml
deleted file mode 100644
index d8b6ccbf8..000000000
--- a/app/src/main/res/drawable/ic_share_filled.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-    <path android:fillColor="?primaryText"
-          android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sign_in.xml b/app/src/main/res/drawable/ic_sign_in.xml
index e02a2ef30..28629bb9c 100644
--- a/app/src/main/res/drawable/ic_sign_in.xml
+++ b/app/src/main/res/drawable/ic_sign_in.xml
@@ -8,6 +8,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:pathData="M11.586,11l-1.293,-1.293a1,1 0,0 1,1.414 -1.414l3,3a1,1 0,0 1,0 1.414l-3,3a1,1 0,0 1,-1.414 -1.414L11.586,13H3a1,1 0,0 1,0 -2h8.586zM7,8a1,1 0,1 1,-2 0V6a4,4 0,0 1,4 -4h8a4,4 0,0 1,4 4v12a4,4 0,0 1,-4 4H9a4,4 0,0 1,-4 -4v-2a1,1 0,0 1,2 0v2a2,2 0,0 0,2 2h8a2,2 0,0 0,2 -2V6a2,2 0,0 0,-2 -2H9a2,2 0,0 0,-2 2v2z"
+        android:pathData="M12 2.5c-5.238 0-9.5 4.262-9.5 9.5s4.262 9.5 9.5 9.5 9.5-4.262 9.5-9.5-4.262-9.5-9.5-9.5zM12 7a3 3 0 1 1 0 6 3 3 0 0 1 0-6zm0 12c-2.353 0-4.395-1.277-5.525-3.162A2.451 2.451 0 0 1 8.314 15h7.373c0.734 0 1.386 0.328 1.839 0.838C16.395 17.723 14.353 19 12 19z"
         android:fillColor="?primaryText" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_signed_out.xml b/app/src/main/res/drawable/ic_signed_out.xml
new file mode 100644
index 000000000..2a52d161e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_signed_out.xml
@@ -0,0 +1,20 @@
+<?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"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M12 6.5a3 3 0 1 0 0 6 3 3 0 0 0 0-6z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M12 21.5c-5.238 0-9.5-4.262-9.5-9.5S6.762 2.5 12 2.5s9.5 4.262 9.5 9.5-4.262 9.5-9.5 9.5zM12 4c-4.411 0-8 3.589-8 8s3.589 8 8 8 8-3.589 8-8-3.589-8-8-8z" />
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M8.314 14c-0.652 0-1.232 0.269-1.672 0.684A6.014 6.014 0 0 0 12 18a6.355 6.355 0 0 0 1.084-0.104c0.083-0.014 0.165-0.033 0.247-0.051a6.014 6.014 0 0 0 4.027-3.162A2.43 2.43 0 0 0 15.686 14H8.314z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_social_media_trackers.xml b/app/src/main/res/drawable/ic_social_media_trackers.xml
index fe473248a..a1c78bd68 100644
--- a/app/src/main/res/drawable/ic_social_media_trackers.xml
+++ b/app/src/main/res/drawable/ic_social_media_trackers.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?attr/primaryText"
-        android:pathData="M20.9,8.4c0.6,-1.3 0.1,-2.4 -0.8,-3.3 0.3,-1.8 -0.9,-2.5 -2.8,-3 -0.5,-0.2 -2.5,0 -3.3,0l-6,0.3C6,2.4 3.8,2 1.7,2v8.6h4.3c0.3,0.1 1,0.8 1.1,1 0.2,0.1 0.2,0.3 0.2,0.3s0.4,1 0.8,1.3c1.6,1.6 2.9,4.5 3.5,6.8 0.5,0.7 -1,1.8 0.9,2 1.7,0.2 2.4,-3 1.8,-4.3 -0.6,-1.3 -1.2,-3.8 0,-3.5l1,0.2c1.6,0.5 4,0.7 5.3,-0.1 1.2,-0.9 0.6,-1.6 0.4,-2.6 1,-1 0.8,-2.2 0,-3.3" />
+        android:pathData="M4.5,15h-1A1.5,1.5 0,0 1,2 13.5v-8A1.5,1.5 0,0 1,3.5 4h1A1.5,1.5 0,0 1,6 5.5v8A1.5,1.5 0,0 1,4.5 15zM18.767,16.077a2.461,2.461 0,0 0,2.335 -3.24l-2.051,-6.154A2.46,2.46 0,0 0,16.716 5H8v9.023l2.154,3.285 1.037,3.112a0.85,0.85 0,0 0,0.806 0.58H12c1.02,0 1.846,-0.827 1.846,-1.846v-2.708l0.369,-0.369h4.552z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_static_shortcut_private_tab_foreground.xml b/app/src/main/res/drawable/ic_static_shortcut_private_tab_foreground.xml
index 77047eb00..0b22e26b8 100644
--- a/app/src/main/res/drawable/ic_static_shortcut_private_tab_foreground.xml
+++ b/app/src/main/res/drawable/ic_static_shortcut_private_tab_foreground.xml
@@ -9,7 +9,7 @@
   <group android:translateX="44.18182"
       android:translateY="44.18182">
     <path
-        android:pathData="M70.53,69C64.293,69 59.979,61.5 54,61.5C48.021,61.5 43.335,69 37.47,69C29.775,69 24.093,61.713 24,49.227C23.943,41.472 26.259,39 36.246,39C46.233,39 49.161,43.089 54,43.089C58.839,43.089 61.767,39 71.754,39C81.741,39 84.054,41.472 84,49.227C83.907,61.713 78.225,69 70.53,69ZM41.13,48.543C35.061,48.807 32.559,52.425 32.559,53.316C32.559,54.207 36.6,56.724 40.53,56.724C44.46,56.724 49.101,55.281 49.101,53.997C48.265,50.389 44.808,48.021 41.142,48.543L41.13,48.543ZM66.846,48.543C63.179,48.021 59.722,50.391 58.887,54C58.887,55.284 63.522,56.727 67.458,56.727C71.394,56.727 75.417,54.207 75.417,53.316C75.417,52.425 72.927,48.807 66.858,48.543L66.846,48.543Z"
+        android:pathData="M98.6 38.1a24.6 24.6 0 0 0-35.9-3L57 40.5h-6L45.3 35a24.6 24.6 0 0 0-36 3c-1 4.4 0.7 20.6 1.6 23.2 2 10.3 10.4 18 20.5 18 5 0 9.6-2 13.2-5.2l2.2-1.9c4-3.5 10-3.5 14-0.1l3.4 2.7c3.5 2.8 7.7 4.5 12.4 4.5 10 0 18.5-7.7 20.4-18 1-2.6 2.8-18.7 1.6-23.2zM44.1 54.2c-2.4 2.6-6.2 4.3-10.4 4.3s-7.9-1.7-10.3-4.3a3.7 3.7 0 0 1 0-4.9c2.4-2.6 6.2-4.3 10.4-4.3s7.9 1.7 10.3 4.3a3.7 3.7 0 0 1 0 4.9zm40.5 0c-2.4 2.6-6.2 4.3-10.3 4.3s-8-1.7-10.4-4.3a3.7 3.7 0 0 1 0-4.9c2.4-2.6 6.2-4.3 10.4-4.3s7.9 1.7 10.3 4.3a3.7 3.7 0 0 1 0 4.9z"
         android:strokeWidth="1"
         android:fillColor="#312A65"
         android:fillType="evenOdd"
diff --git a/app/src/main/res/drawable/ic_static_shortcut_tab_foreground.xml b/app/src/main/res/drawable/ic_static_shortcut_tab_foreground.xml
index 46f0f636f..1cd4da1fb 100644
--- a/app/src/main/res/drawable/ic_static_shortcut_tab_foreground.xml
+++ b/app/src/main/res/drawable/ic_static_shortcut_tab_foreground.xml
@@ -9,7 +9,7 @@
   <group android:translateX="63.391304"
       android:translateY="63.391304">
     <path
-        android:pathData="M81,49.5L58.5,49.5L58.5,27C58.5,24.515 56.485,22.5 54,22.5C51.515,22.5 49.5,24.515 49.5,27L49.5,49.5L27,49.5C24.515,49.5 22.5,51.515 22.5,54C22.5,56.485 24.515,58.5 27,58.5L49.5,58.5L49.5,81C49.5,83.485 51.515,85.5 54,85.5C56.485,85.5 58.5,83.485 58.5,81L58.5,58.5L81,58.5C83.485,58.5 85.5,56.485 85.5,54C85.5,51.515 83.485,49.5 81,49.5Z"
+        android:pathData="M86.625 57.375c0.931 0 1.778-0.378 2.385-0.99A3.36 3.36 0 0 0 90 54a3.376 3.376 0 0 0-3.375-3.375h-25.65l-3.6-3.6v-25.65a3.376 3.376 0 0 0-6.75 0v25.65l-3.6 3.6h-25.65a3.376 3.376 0 0 0 0 6.75h25.65l3.6 3.6v25.65A3.376 3.376 0 0 0 54 90c0.931 0 1.778-0.378 2.385-0.99a3.36 3.36 0 0 0 0.99-2.385v-25.65l3.6-3.6h25.65z"
         android:strokeWidth="1"
         android:fillColor="#312A65"
         android:fillType="evenOdd"
diff --git a/app/src/main/res/drawable/ic_storage_disabled.xml b/app/src/main/res/drawable/ic_storage_disabled.xml
index 6efaaac62..e9608e862 100644
--- a/app/src/main/res/drawable/ic_storage_disabled.xml
+++ b/app/src/main/res/drawable/ic_storage_disabled.xml
@@ -8,6 +8,9 @@
     android:viewportHeight="24"
     android:autoMirrored="true">
   <path
-      android:fillColor="@color/disabled_text"
-      android:pathData="M2,20h20v-4L2,16v4zM4,17h2v2L4,19v-2zM2,4v4h20L22,4L2,4zM6,7L4,7L4,5h2v2zM2,14h20v-4L2,10v4zM4,11h2v2L4,13v-2z"/>
-</vector>
+      android:pathData="M7.2,11h-0.9l-0.3,0.3v0.9l0.3,0.3h0.9l0.3,-0.3v-0.9l-0.3,-0.3z"
+      android:fillColor="@color/disabled_text"/>
+  <path
+      android:pathData="M3.78,2.22a0.75,0.75 0,1 0,-1.061 1.061L5.439,6H4.5A2.5,2.5 0,0 0,2 8.5v6A2.5,2.5 0,0 0,4.5 17h11.939l3.78,3.78a0.748,0.748 0,0 0,1.06 0,0.75 0.75,0 0,0 0,-1.061L3.78,2.22zM4.3,15.5l-0.8,-0.8V8.3l0.8,-0.8h2.639l8,8H4.3zM19.5,6H9.691l1.5,1.5H19.7l0.8,0.8v6.4l-0.8,0.8h-0.509l1.296,1.296A2.499,2.499 0,0 0,22 14.5v-6A2.5,2.5 0,0 0,19.5 6z"
+      android:fillColor="@color/disabled_text"/>
+ </vector>
diff --git a/app/src/main/res/drawable/ic_storage_enabled.xml b/app/src/main/res/drawable/ic_storage_enabled.xml
index dc941e619..b5d2f7b4a 100644
--- a/app/src/main/res/drawable/ic_storage_enabled.xml
+++ b/app/src/main/res/drawable/ic_storage_enabled.xml
@@ -11,5 +11,8 @@
     android:autoMirrored="true">
   <path
       android:fillColor="?primaryText"
-      android:pathData="M2,20h20v-4L2,16v4zM4,17h2v2L4,19v-2zM2,4v4h20L22,4L2,4zM6,7L4,7L4,5h2v2zM2,14h20v-4L2,10v4zM4,11h2v2L4,13v-2z"/>
-</vector>
+      android:pathData="M7.2 11H6.3L6 11.3v0.9l0.3 0.3h0.9l0.3-0.3v-0.9L7.2 11z" />
+  <path
+      android:fillColor="?primaryText"
+      android:pathData="M19.7 7.5l0.8 0.8v6.4l-0.8 0.8H4.3l-0.8-0.8V8.3l0.8-0.8h15.4zM19.5 6h-15A2.5 2.5 0 0 0 2 8.5v6A2.5 2.5 0 0 0 4.5 17h15a2.5 2.5 0 0 0 2.5-2.5v-6A2.5 2.5 0 0 0 19.5 6z" />
+ </vector>
diff --git a/app/src/main/res/drawable/ic_sync_disconnected.xml b/app/src/main/res/drawable/ic_sync_disconnected.xml
index ab6bd0299..b4d61e51c 100644
--- a/app/src/main/res/drawable/ic_sync_disconnected.xml
+++ b/app/src/main/res/drawable/ic_sync_disconnected.xml
@@ -3,13 +3,14 @@
    - 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"
-    android:width="23dp"
-    android:height="21dp"
-    android:viewportWidth="23"
-    android:viewportHeight="21">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
   <path
-      android:pathData="M16 9c0.6 0 1.16 0.32 1.47 0.83l0.07 0.13 4.32 8.55A1.72 1.72 0 0 1 20.38 21H11.68a1.73 1.73 0 0 1-1.57-2.33l0.07-0.16 4.27-8.55c0.3-0.59 0.9-0.96 1.55-0.96zm-6-9a10 10 0 0 1 9.77 12.14l-1.33-2.63a2.72 2.72 0 0 0-4.6-0.46 4.25 4.25 0 1 0-0.4 0.68l-1.23 2.49a5.9 5.9 0 0 1-2.21 0.58c-2.13 0-4.18-2.3-5.67-0.6a1.41 1.41 0 0 0-0.1 1.73c1.22 1.8 3.25 3 5.58 3.07l-0.54 1.06c-0.3 0.6-0.35 1.27-0.2 1.9A10 10 0 0 1 10 0zm5.32 17.3a1.02 1.02 0 1 0 1.45 1.43 1.02 1.02 0 0 0-1.45-1.44zm0.26-5.31a0.87 0.87 0 0 0-0.4 0.85v2.6a0.87 0.87 0 0 0 1.73 0v-2.6a0.87 0.87 0 0 0-1.33-0.85z"
-      android:strokeWidth="1"
-      android:fillColor="#20123A"
-      android:fillType="nonZero"/>
+      android:fillColor="?primaryText"
+      android:pathData="M10.07 20.336l1.198-2.089A6.364 6.364 0 0 1 9.5 18.5c-2.353 0-4.395-1.277-5.525-3.162a2.451 2.451 0 0 1 1.84-0.838h7.372c0.075 0 0.144 0.017 0.217 0.024l1.28-2.231c0.916-1.596 3.218-1.596 4.134 0l0.12 0.208a9.71 9.71 0 0 0-0.07-2.613c-0.65-3.933-3.823-7.105-7.756-7.755C4.62 1.06-0.94 6.62 0.133 13.111c0.65 3.933 3.822 7.105 7.755 7.755a9.794 9.794 0 0 0 1.93 0.111c0.052-0.217 0.132-0.432 0.251-0.641zM9.5 6.5a3 3 0 1 1 0 6 3 3 0 0 1 0-6z" />
+  <path
+      android:fillColor="?primaryText"
+      android:pathData="M21.58 20.073l-3.68-6.414c-0.504-0.879-1.795-0.879-2.299 0l-3.679 6.414C11.427 20.935 12.062 22 13.072 22h7.358c1.008 0 1.643-1.065 1.15-1.927zM16.75 21a0.75 0.75 0 1 1 0-1.5 0.75 0.75 0 0 1 0 1.5zM16 15.725a0.75 0.75 0 0 1 1.5 0V17.9a0.75 0.75 0 0 1-1.5 0v-2.175z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_synced_tabs.xml b/app/src/main/res/drawable/ic_synced_tabs.xml
index a707e9daf..5968047c9 100644
--- a/app/src/main/res/drawable/ic_synced_tabs.xml
+++ b/app/src/main/res/drawable/ic_synced_tabs.xml
@@ -8,9 +8,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="m14.5,12.833v-7.5a0.836,0.836 0,0 0,-0.833 -0.833h-10.834a0.836,0.836 0,0 0,-0.833 0.833v7.5a0.836,0.836 0,0 0,0.833 0.834h10.834a0.836,0.836 0,0 0,0.833 -0.834zM12,12h-8.333v-5.833h8.333zM13.25,10.333a0.417,0.417 0,0 1,-0.417 -0.416v-1.667a0.417,0.417 0,0 1,0.834 0v1.667a0.417,0.417 0,0 1,-0.417 0.416z"
+      android:pathData="M20.5 19h-2a2.5 2.5 0 0 0 2.5-2.5v-7A2.5 2.5 0 0 0 18.5 7h-1v1.5h1.2l0.8 0.8v7.4l-0.8 0.8H7.3l-0.8-0.8V13H5v3.5A2.5 2.5 0 0 0 7.5 19h-2a1.5 1.5 0 0 0 0 3h15a1.5 1.5 0 0 0 0-3zm-6.75 1.5h-1.5a0.75 0.75 0 0 1 0-1.5h1.5a0.75 0.75 0 0 1 0 1.5z"
       android:fillColor="?primaryText"/>
   <path
-      android:pathData="m21.375,17.833h-1.042v-7.033a1.259,1.259 0,0 0,-1.217 -1.3h-3.783v1.667h3.334v5h-8.334v-1.667h-1.666v3.333h-1.042c-0.345,0 -0.625,0.373 -0.625,0.834s0.28,0.833 0.625,0.833h13.75c0.345,0 0.625,-0.372 0.625,-0.833s-0.28,-0.834 -0.625,-0.834zM17,18.667h-5v-0.834h5z"
+      android:pathData="M13.5 2.5h-9A2.5 2.5 0 0 0 2 5v4a2.5 2.5 0 0 0 2.5 2.5h9A2.5 2.5 0 0 0 16 9V5a2.5 2.5 0 0 0-2.5-2.5zM11 10H4.3L3.5 9.2V4.8L4.3 4H11v6zm3.25-2.25a0.75 0.75 0 0 1-1.5 0v-1.5a0.75 0.75 0 0 1 1.5 0v1.5z"
       android:fillColor="?primaryText"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_tab_collection.xml b/app/src/main/res/drawable/ic_tab_collection.xml
index b78a92c35..df421740c 100644
--- a/app/src/main/res/drawable/ic_tab_collection.xml
+++ b/app/src/main/res/drawable/ic_tab_collection.xml
@@ -9,8 +9,8 @@
     android:viewportHeight="24">
     <path
         android:fillColor="?primaryText"
-        android:pathData="M19 9H5v9c0 0.5 0.5 1 1 1h12c0.5 0 1-0.5 1-1V9zm-1-2l-2-2H8L6 7h12zM3 18V8c0-0.7 0.5-1.5 1-2l2-2c0.5-0.5 1.3-1 2-1h8c0.8 0 1.5 0.4 2 1l2 2c0.4 0.5 1 1.3 1 2v10c0 1.5-1.5 3-3 3H6c-1.5 0-3-1.5-3-3z" />
+        android:pathData="M8.75 12.5h6.5a0.75 0.75 0 0 0 0-1.5h-6.5a0.75 0.75 0 0 0 0 1.5zm0 4h6.5a0.75 0.75 0 0 0 0-1.5h-6.5a0.75 0.75 0 0 0 0 1.5z" />
     <path
         android:fillColor="?primaryText"
-        android:pathData="M16.5 11h-9a0.5 0.5 0 0 0 0 1h9a0.5 0.5 0 0 0 0-1zM16.5 16h-9a0.5 0.5 0 0 0 0 1h9a0.5 0.5 0 0 0 0-1zM16.5 13.5h-9a0.5 0.5 0 0 0 0 1h9a0.5 0.5 0 0 0 0-1z" />
-</vector>
+        android:pathData="M19.962 7.811l0.018-0.005-0.788-2.951A2.504 2.504 0 0 0 16.776 3H7.22a2.502 2.502 0 0 0-2.419 1.868L4.088 7.596C4.072 7.632 4.07 7.673 4.058 7.711L4.041 7.777l0.004 0.001C4.028 7.852 4 7.921 4 8v10.5A2.5 2.5 0 0 0 6.5 21h11a2.5 2.5 0 0 0 2.5-2.5V8c0-0.067-0.026-0.125-0.038-0.189zM7.12 4.5h9.756l0.858 0.713L18.212 7H5.794l0.484-1.787L7.12 4.5zM18.5 18.7l-0.8 0.8H6.3l-0.8-0.8V8.5h13v10.2z" />
+   </vector>
diff --git a/app/src/main/res/drawable/ic_tabs.xml b/app/src/main/res/drawable/ic_tabs.xml
index eed851286..04f47f556 100644
--- a/app/src/main/res/drawable/ic_tabs.xml
+++ b/app/src/main/res/drawable/ic_tabs.xml
@@ -8,7 +8,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:pathData="M17.5556,22L6.4444,22C3.9898,22 2,20.0102 2,17.5556L2,6.4444C2,3.9898 3.9898,2 6.4444,2L17.5556,2C20.0102,2 22,3.9898 22,6.4444L22,17.5556C22,20.0102 20.0102,22 17.5556,22ZM6.5378,4.3529C5.3311,4.3529 4.3529,5.3311 4.3529,6.5378L4.3529,17.4622C4.3529,18.6689 5.3311,19.6471 6.5378,19.6471L17.4622,19.6471C18.6689,19.6471 19.6471,18.6689 19.6471,17.4622L19.6471,6.5378C19.6471,5.3311 18.6689,4.3529 17.4622,4.3529L6.5378,4.3529Z"
+      android:pathData="M4.5 4A2.5 2.5 0 0 0 2 6.5v11A2.5 2.5 0 0 0 4.5 20h15a2.5 2.5 0 0 0 2.5-2.5v-11A2.5 2.5 0 0 0 19.5 4h-15zm16 13.7l-0.8 0.8H4.3l-0.8-0.8V6.3l0.8-0.8h15.4l0.8 0.8v11.4z"
       android:strokeWidth="1"
       android:fillColor="?primaryText"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_top_sites.xml b/app/src/main/res/drawable/ic_top_sites.xml
index 44ca20fe3..af3d6c0b4 100644
--- a/app/src/main/res/drawable/ic_top_sites.xml
+++ b/app/src/main/res/drawable/ic_top_sites.xml
@@ -9,6 +9,6 @@
     android:viewportHeight="24">
   <path
       android:fillColor="?primaryText"
-      android:pathData="m9.667,13c0.7362,0 1.333,0.5968 1.333,1.333v5.334c0,0.7362 -0.5968,1.333 -1.333,1.333h-5.334c-0.7362,0 -1.333,-0.5968 -1.333,-1.333v-5.334c0,-0.7362 0.5968,-1.333 1.333,-1.333zM19.667,13c0.7362,0 1.333,0.5968 1.333,1.333v5.334c0,0.7362 -0.5968,1.333 -1.333,1.333h-5.334c-0.7362,0 -1.333,-0.5968 -1.333,-1.333v-5.334c0,-0.7362 0.5968,-1.333 1.333,-1.333zM9.667,3c0.7362,0 1.333,0.5968 1.333,1.333v5.334c0,0.7362 -0.5968,1.333 -1.333,1.333h-5.334c-0.7362,0 -1.333,-0.5968 -1.333,-1.333v-5.334c0,-0.7362 0.5968,-1.333 1.333,-1.333zM19.667,3c0.7362,0 1.333,0.5968 1.333,1.333v5.334c0,0.7362 -0.5968,1.333 -1.333,1.333h-5.334c-0.7362,0 -1.333,-0.5968 -1.333,-1.333v-5.334c0,-0.7362 0.5968,-1.333 1.333,-1.333z" />
+      android:pathData="M21.28 20.22l-5.472-5.472 2.986-2.986c0.527-0.528 0.68-1.285 0.398-1.976a1.796 1.796 0 0 0-1.665-1.133l-2.475-0.029-3.775-3.776 1.068-1.068a0.75 0.75 0 1 0-1.061-1.061L2.72 11.287a0.75 0.75 0 0 0 1.06 1.061l1.079-1.079 3.775 3.775 0.029 2.475a1.794 1.794 0 0 0 1.135 1.665 1.795 1.795 0 0 0 1.973-0.398l2.977-2.977 5.472 5.472a0.748 0.748 0 0 0 1.06 0 0.75 0.75 0 0 0 0-1.061zm-10.569-2.495a0.304 0.304 0 0 1-0.348 0.07 0.307 0.307 0 0 1-0.2-0.294l-0.037-3.086-4.207-4.207 4.299-4.299 4.206 4.207 3.086 0.037a0.306 0.306 0 0 1 0.294 0.199 0.31 0.31 0 0 1-0.07 0.349l-7.023 7.024z" />
 </vector>
 
diff --git a/app/src/main/res/drawable/ic_tracking_protection.xml b/app/src/main/res/drawable/ic_tracking_protection.xml
index ed41ca68e..64f2d3cac 100644
--- a/app/src/main/res/drawable/ic_tracking_protection.xml
+++ b/app/src/main/res/drawable/ic_tracking_protection.xml
@@ -11,12 +11,4 @@
             android:id="@+id/disabled"
             android:drawable="@drawable/ic_tracking_protection_disabled" />
 
-    <transition
-            android:drawable="@drawable/ic_tracking_protection_anim_enable"
-            android:fromId="@id/disabled"
-            android:toId="@id/enabled" />
-    <transition
-            android:drawable="@drawable/ic_tracking_protection_anim_disable"
-            android:fromId="@+id/enabled"
-            android:toId="@+id/disabled" />
 </animated-selector>
diff --git a/app/src/main/res/drawable/ic_tracking_protection_anim_disable.xml b/app/src/main/res/drawable/ic_tracking_protection_anim_disable.xml
deleted file mode 100644
index 14f17035d..000000000
--- a/app/src/main/res/drawable/ic_tracking_protection_anim_disable.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/. -->
-<animated-vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@drawable/ic_tracking_protection_enabled">
-    <target android:name="strike_thru_path" android:animation="@animator/strike_thru_path_disable" />
-    <target android:name="strike_thru_mask" android:animation="@animator/strike_thru_mask_disable" />
-    <target android:name="icon" android:animation="@animator/fill_disable" />
-</animated-vector>
diff --git a/app/src/main/res/drawable/ic_tracking_protection_anim_enable.xml b/app/src/main/res/drawable/ic_tracking_protection_anim_enable.xml
deleted file mode 100644
index 3080ef51b..000000000
--- a/app/src/main/res/drawable/ic_tracking_protection_anim_enable.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/. -->
-<animated-vector
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawable="@drawable/ic_tracking_protection_disabled">
-    <target android:name="strike_thru_path" android:animation="@animator/strike_thru_path_enable" />
-    <target android:name="strike_thru_mask" android:animation="@animator/strike_thru_mask_enable" />
-    <target android:name="icon" android:animation="@animator/fill_enable" />
-</animated-vector>
diff --git a/app/src/main/res/drawable/ic_tracking_protection_disabled.xml b/app/src/main/res/drawable/ic_tracking_protection_disabled.xml
index 0ef9a1b5c..54d9215ad 100644
--- a/app/src/main/res/drawable/ic_tracking_protection_disabled.xml
+++ b/app/src/main/res/drawable/ic_tracking_protection_disabled.xml
@@ -7,21 +7,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M 18.8 2.8 C 19.8 1.8 21.1 3.3 20.2 4.2 L 3.4 21 L 2 19.6 L 18.8 2.8 Z" />
-        <path
-            android:name="strike_thru_path"
-            android:fillColor="@color/disabled_text"
-            android:pathData="M 20 1.6 L 21.4 3 L 5.2 19.2 C 4.2 20.2 2.8 18.8 3.8 17.8 L 20 1.6 Z"
-            android:strokeWidth="1" />
-    </group>
-    <group>
-        <clip-path
-            android:name="strike_thru_mask"
-            android:pathData="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 6 21 L 4 19 L 21 2 Z" />
-        <path
-            android:name="icon"
-            android:fillColor="@color/disabled_text"
-            android:pathData="M20 6c0-1-0.8-1.9-1.8-2L12 3 5.8 4C4.8 4 4 5 4 6l0.1 5c0.3 3.2 1 5 2.5 7a8.4 8.4 0 0 0 5.3 3h0.2c2.1-0.3 4-1.4 5.3-3 1.6-2 2.2-3.8 2.5-7l0.1-5zm-2.1 4.8a10 10 0 0 1-2 6c-1 1.1-2.4 2-3.9 2.3a6.5 6.5 0 0 1-3.9-2.4 9.9 9.9 0 0 1-2-5.9 67.3 67.3 0 0 1 0-4.9L12 5l5.9 1 0.1 0.2-0.1 4.7zM8 7.6v3c0.3 2.7 0.8 3.7 1.7 5 0.6 0.6 1.4 1.2 2.3 1.4V7l-4 0.6z" />
-    </group>
+    <path
+        android:pathData="M3.53,3.22C3.237,2.927 2.762,2.927 2.469,3.22C2.176,3.513 2.176,3.988 2.469,4.281L4.069,5.881C3.158,6.571 2.698,7.719 2.909,8.872L3.617,12.717C3.888,14.198 4.386,15.493 5.095,16.567C6.525,18.736 8.496,20.547 10.647,21.669C11.066,21.885 11.534,22 12,22C12.468,22 12.937,21.885 13.355,21.667C14.687,20.972 15.944,20.007 17.051,18.862L19.47,21.281C19.616,21.427 19.808,21.501 20,21.501C20.192,21.501 20.384,21.428 20.53,21.281C20.823,20.988 20.823,20.513 20.53,20.22L3.53,3.22ZM12.663,20.337H11.339C9.412,19.332 7.639,17.7 6.347,15.74C5.75,14.836 5.327,13.727 5.092,12.445L4.338,8.368L4.844,7.131L5.154,6.965L15.993,17.804C14.995,18.841 13.861,19.711 12.663,20.337Z"
+        android:fillColor="@color/disabled_text"/>
+    <path
+        android:pathData="M19.533,5.683L13.431,2.36C12.535,1.881 11.462,1.881 10.564,2.364L6.795,4.378L7.907,5.49L11.516,3.556H12.495L19.054,7.128L19.664,8.368L18.911,12.455C18.701,13.59 18.336,14.58 17.84,15.423L18.936,16.519C19.628,15.457 20.118,14.183 20.386,12.729L21.091,8.937C21.334,7.622 20.707,6.313 19.533,5.683Z"
+        android:fillColor="@color/disabled_text"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_tracking_protection_enabled.xml b/app/src/main/res/drawable/ic_tracking_protection_enabled.xml
index 633271b15..2c5cf04a7 100644
--- a/app/src/main/res/drawable/ic_tracking_protection_enabled.xml
+++ b/app/src/main/res/drawable/ic_tracking_protection_enabled.xml
@@ -3,25 +3,11 @@
    - 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"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-    <group>
-        <clip-path android:pathData="M 18.8 2.8 C 19.8 1.8 21.1 3.3 20.2 4.2 L 3.4 21 L 2 19.6 L 18.8 2.8 Z"/>
-        <path
-                android:name="strike_thru_path"
-                android:pathData="M 20 1.6 L 21.4 3 L 21.9 2.5 C 20.9 3.5 19.5 2 20.5 1.1 L 20 1.6 Z"
-                android:fillColor="?primaryText"
-                android:strokeWidth="1"/>
-    </group>
-    <group>
-        <clip-path
-                android:name="strike_thru_mask"
-                android:pathData="M 0 0 L 0 24 L 24 24 L 24 0 L 0 0 Z M 21 2 L 23 4 L 23 4 L 21 2 L 21 2 Z"/>
-        <path
-                android:name="icon"
-                android:fillColor="?primaryText"
-                android:pathData="M20 6c0-1-0.8-1.9-1.8-2L12 3 5.8 4C4.8 4 4 5 4 6l0.1 5c0.3 3.2 1 5 2.5 7a8.4 8.4 0 0 0 5.3 3h0.2c2.1-0.3 4-1.4 5.3-3 1.6-2 2.2-3.8 2.5-7l0.1-5zm-2.1 4.8a10 10 0 0 1-2 6c-1 1.1-2.4 2-3.9 2.3a6.5 6.5 0 0 1-3.9-2.4 9.9 9.9 0 0 1-2-5.9 67.3 67.3 0 0 1 0-4.9L12 5l5.9 1 0.1 0.2-0.1 4.7zM8 7.6v3c0.3 2.7 0.8 3.7 1.7 5 0.6 0.6 1.4 1.2 2.3 1.4V7l-4 0.6z" />
-    </group>
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M12.0002,22C11.5342,22 11.0662,21.885 10.6462,21.668C8.4962,20.547 6.5242,18.735 5.0942,16.566C4.3852,15.493 3.8882,14.198 3.6162,12.716L2.9092,8.872C2.6692,7.563 3.2942,6.259 4.4632,5.625L10.5652,2.363C11.4632,1.88 12.5362,1.88 13.4322,2.359L19.5342,5.682C20.7082,6.313 21.3352,7.621 21.0912,8.936L20.3862,12.728C20.1152,14.201 19.6172,15.49 18.9112,16.56C17.4822,18.729 15.5102,20.542 13.3562,21.666C12.9372,21.885 12.4682,22 12.0002,22ZM11.5152,3.556L4.8452,7.13L4.3382,8.368L5.0922,12.445C5.3272,13.727 5.7502,14.836 6.3472,15.74C7.6392,17.7 9.4122,19.332 11.3392,20.337H12.6632C14.5932,19.329 16.3672,17.694 17.6582,15.735C18.2532,14.833 18.6752,13.729 18.9102,12.455L19.6632,8.368L19.0532,7.129L12.4942,3.557H11.5152V3.556Z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_whats_new.xml b/app/src/main/res/drawable/ic_whats_new.xml
index 7fb9e238c..c96c8b5b9 100644
--- a/app/src/main/res/drawable/ic_whats_new.xml
+++ b/app/src/main/res/drawable/ic_whats_new.xml
@@ -9,5 +9,5 @@
     android:viewportHeight="24">
   <path
       android:fillColor="?primaryText"
-      android:pathData="M10.714,13.939L10.714,22L5.877,22a1.628,1.628 0,0 1,-1.591 -1.663v-6.4zM19.706,13.939h-6.42L13.286,22h4.837a1.628,1.628 0,0 0,1.591 -1.663v-6.39a0.007,0.007 0,0 0,-0.008 -0.008zM10.714,7.221L4.286,7.221A1.316,1.316 0,0 0,3 8.565v4.018a0.011,0.011 0,0 0,0.011 0.012h7.7zM19.714,7.221h-6.428L13.286,12.6h7.7A0.011,0.011 0,0 0,21 12.583L21,8.565a1.316,1.316 0,0 0,-1.286 -1.344zM14.761,2.393c-1.008,-0.9 -2.288,-0.084 -2.75,0.8L12,3.2L12,3.193c-0.462,-0.881 -1.742,-1.7 -2.75,-0.8S7.843,5.185 12,7.221c4.157,-2.036 3.768,-3.921 2.761,-4.828z"/>
+      android:pathData="M18.5 7h-1.1A3.3 3.3 0 0 0 17 3a3.3 3.3 0 0 0-4.6 0 2 2 0 0 0-0.3 0.2A1.9 1.9 0 0 0 12 3a3.3 3.3 0 0 0-4.6 0A3.3 3.3 0 0 0 7 7H5.5A2.5 2.5 0 0 0 3 9.5v1c0 0.8 0.4 1.5 1 2v6A2.5 2.5 0 0 0 6.5 21h11a2.5 2.5 0 0 0 2.5-2.5v-6a2.5 2.5 0 0 0 1-2v-1A2.5 2.5 0 0 0 18.5 7zm0.2 1.5l0.8 0.8v1.4l-0.8 0.8h-6v-3h6zM13.4 4c0.7-0.7 1.8-0.7 2.5 0a1.8 1.8 0 0 1 0 2.5C15.5 6.9 14 7 12.9 7V6.3c0-1 0.2-2 0.5-2.3zm-5 2.5a1.8 1.8 0 0 1 1.2-3c0.5 0 1 0.2 1.3 0.5 0.3 0.3 0.5 1.3 0.5 2.3V7h-0.8c-1 0-1.9-0.2-2.2-0.5zM4.5 9.3l0.8-0.8h6v3h-6l-0.8-0.8V9.3zm1.8 10.2l-0.8-0.8V13h5.8v6.5h-5zm12.2-0.8l-0.8 0.8h-5V13h5.8v5.7z"/>
 </vector>
diff --git a/app/src/main/res/drawable/mozac_ic_extensions_black.xml b/app/src/main/res/drawable/mozac_ic_extensions_black.xml
index 097a4a094..9395d6040 100644
--- a/app/src/main/res/drawable/mozac_ic_extensions_black.xml
+++ b/app/src/main/res/drawable/mozac_ic_extensions_black.xml
@@ -5,9 +5,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
         android:fillColor="?android:attr/textColorPrimary"
-        android:pathData="M14.5,8c-0.971,0 -1,1 -1.75,1a0.765,0.765 0,0 1,-0.75 -0.75V5a1,1 0,0 0,-1 -1H7.75A0.765,0.765 0,0 1,7 3.25c0,-0.75 1,-0.779 1,-1.75C8,0.635 7.1,0 6,0S4,0.635 4,1.5c0,0.971 1,1 1,1.75a0.765,0.765 0,0 1,-0.75 0.75H1a1,1 0,0 0,-1 1v2.25A0.765,0.765 0,0 0,0.75 8c0.75,0 0.779,-1 1.75,-1C3.365,7 4,7.9 4,9s-0.635,2 -1.5,2c-0.971,0 -1,-1 -1.75,-1a0.765,0.765 0,0 0,-0.75 0.75V15a1,1 0,0 0,1 1h3.25a0.765,0.765 0,0 0,0.75 -0.75c0,-0.75 -1,-0.779 -1,-1.75 0,-0.865 0.9,-1.5 2,-1.5s2,0.635 2,1.5c0,0.971 -1,1 -1,1.75a0.765,0.765 0,0 0,0.75 0.75H11a1,1 0,0 0,1 -1v-3.25a0.765,0.765 0,0 1,0.75 -0.75c0.75,0 0.779,1 1.75,1 0.865,0 1.5,-0.9 1.5,-2s-0.635,-2 -1.5,-2z" />
+        android:pathData="M17.5,7H15.5V5.127C15.5,3.533 14.317,2.166 12.807,2.015C11.958,1.931 11.116,2.206 10.488,2.775C9.86,3.342 9.5,4.154 9.5,4.999V7H6.5C5.119,7 4,8.119 4,9.5V11.75C4,12.44 4.56,13 5.25,13H6.873C7.706,13 8.417,13.59 8.493,14.343C8.536,14.775 8.402,15.188 8.114,15.506C7.829,15.82 7.424,16 7.001,16H5.25C4.56,16 4,16.56 4,17.25V19.5C4,20.881 5.119,22 6.5,22H17.5C18.881,22 20,20.881 20,19.5V9.5C20,8.119 18.881,7 17.5,7ZM18.5,19.7L17.7,20.5H6.3L5.5,19.7V17.5H7.001C7.847,17.5 8.658,17.14 9.226,16.512C9.794,15.885 10.07,15.039 9.985,14.194C9.834,12.683 8.467,11.5 6.873,11.5H5.5V9.3L6.3,8.5H10C10.552,8.5 11,8.052 11,7.5V4.999C11,4.576 11.18,4.171 11.494,3.887C11.812,3.599 12.227,3.466 12.657,3.507C13.41,3.582 14,4.294 14,5.127V7.5C14,8.052 14.448,8.5 15,8.5H17.7L18.5,9.3V19.7Z" />
 </vector>
diff --git a/app/src/main/res/drawable/private_browsing_button.xml b/app/src/main/res/drawable/private_browsing_button.xml
index 344500088..be68036ec 100644
--- a/app/src/main/res/drawable/private_browsing_button.xml
+++ b/app/src/main/res/drawable/private_browsing_button.xml
@@ -23,7 +23,7 @@
             android:viewportHeight="24">
             <path
                 android:fillColor="?attr/privateBrowsingButtonAccent"
-                android:pathData="M17.5 17c-2.1 0-3.5-2.5-5.5-2.5S8.4 17 6.5 17C3.9 17 2 14.6 2 10.4 2 7.8 2.8 7 6.1 7s4.3 1.4 5.9 1.4c1.6 0 2.6-1.4 5.9-1.4 3.3 0 4.1 0.8 4.1 3.4 0 4.2-1.9 6.6-4.5 6.6zm-9.8-6.8c-2 0.1-2.9 1.3-2.9 1.6 0 0.3 1.3 1.1 2.7 1.1 1.3 0 2.9-0.5 2.9-0.9 0-0.5-0.8-1.9-2.7-1.8zm8.6 0c-1.9-0.1-2.7 1.3-2.7 1.8 0 0.4 1.5 0.9 2.9 0.9s2.7-0.8 2.7-1.1c-0.1-0.3-0.9-1.5-2.9-1.6z" />
+                android:pathData="M21.914 8.476c-1.906-2.502-5.646-2.821-7.976-0.681l-1.303 1.197h-1.276l-1.303-1.197c-2.329-2.14-6.07-1.82-7.976 0.681-0.247 0.975 0.134 4.575 0.35 5.141 0.434 2.287 2.303 4.007 4.543 4.007 1.119 0 2.132-0.447 2.933-1.161l0.488-0.418c0.91-0.778 2.217-0.789 3.138-0.026l0.733 0.608v-0.003c0.772 0.621 1.718 1.001 2.754 1.001 2.24 0 4.109-1.72 4.543-4.007 0.218-0.567 0.613-4.152 0.352-5.142zM9.79 12.045C9.257 12.626 8.43 13 7.5 13c-0.93 0-1.757-0.374-2.29-0.955-0.28-0.305-0.28-0.785 0-1.09C5.743 10.374 6.57 10 7.5 10c0.93 0 1.757 0.374 2.29 0.955 0.28 0.305 0.28 0.785 0 1.09zm9 0C18.257 12.626 17.43 13 16.5 13c-0.93 0-1.757-0.374-2.29-0.955-0.28-0.305-0.28-0.785 0-1.09C14.743 10.374 15.57 10 16.5 10c0.93 0 1.757 0.374 2.29 0.955 0.28 0.305 0.28 0.785 0 1.09z" />
         </vector>
     </item>
 </layer-list>
diff --git a/app/src/main/res/drawable/shield_dark.xml b/app/src/main/res/drawable/shield_dark.xml
index a230ffa1e..f97e24bdb 100644
--- a/app/src/main/res/drawable/shield_dark.xml
+++ b/app/src/main/res/drawable/shield_dark.xml
@@ -13,9 +13,8 @@
             android:viewportHeight="24">
             <path
                 android:name="path"
-                android:fillColor="#fbfbfe"
-                android:pathData="M 20 6 C 20 5 19.2 4.1 18.2 4 L 12 3 L 5.8 4 C 4.8 4 4 5 4 6 L 4.1 11 C 4.4 14.2 5.1 16 6.6 18 C 7.929 19.627 9.821 20.698 11.9 21 L 12.1 21 C 14.2 20.7 16.1 19.6 17.4 18 C 19 16 19.6 14.2 19.9 11 L 20 6 Z M 17.9 10.8 C 17.9 12.963 17.198 15.069 15.9 16.8 C 14.9 17.9 13.5 18.8 12 19.1 C 10.452 18.8 9.066 17.946 8.1 16.7 C 6.816 15 6.114 12.93 6.1 10.8 C 6.041 9.167 6.041 7.533 6.1 5.9 L 12 5 L 17.9 6 L 18 6.2 L 17.9 10.9 Z M 8 7.6 L 8 10.6 C 8.3 13.3 8.8 14.3 9.7 15.6 C 10.3 16.2 11.1 16.8 12 17 L 12 7 L 8 7.6 Z"
-                android:strokeWidth="1" />
+                android:fillColor="#FF00DDFF"
+                android:pathData="M12.0002,22C11.5342,22 11.0662,21.885 10.6462,21.668C8.4962,20.547 6.5242,18.735 5.0942,16.566C4.3852,15.493 3.8882,14.198 3.6162,12.716L2.9092,8.872C2.6692,7.563 3.2942,6.259 4.4632,5.625L10.5652,2.363C11.4632,1.88 12.5362,1.88 13.4322,2.359L19.5342,5.682C20.7082,6.313 21.3352,7.621 21.0912,8.936L20.3862,12.728C20.1152,14.201 19.6172,15.49 18.9112,16.56C17.4822,18.729 15.5102,20.542 13.3562,21.666C12.9372,21.885 12.4682,22 12.0002,22ZM11.5152,3.556L4.8452,7.13L4.3382,8.368L5.0922,12.445C5.3272,13.727 5.7502,14.836 6.3472,15.74C7.6392,17.7 9.4122,19.332 11.3392,20.337H12.6632C14.5932,19.329 16.3672,17.694 17.6582,15.735C18.2532,14.833 18.6752,13.729 18.9102,12.455L19.6632,8.368L19.0532,7.129L12.4942,3.557H11.5152V3.556Z" />
         </vector>
     </aapt:attr>
     <target android:name="path">
@@ -25,7 +24,7 @@
                 android:interpolator="@android:interpolator/fast_out_slow_in"
                 android:propertyName="fillColor"
                 android:valueFrom="#fbfbfe"
-                android:valueTo="#00b3f4"
+                android:valueTo="#FF00DDFF"
                 android:valueType="colorType" />
         </aapt:attr>
     </target>
diff --git a/app/src/main/res/drawable/shield_light.xml b/app/src/main/res/drawable/shield_light.xml
index 083f74145..f621f8390 100644
--- a/app/src/main/res/drawable/shield_light.xml
+++ b/app/src/main/res/drawable/shield_light.xml
@@ -14,8 +14,7 @@
             <path
                 android:name="path"
                 android:fillColor="#20123a"
-                android:pathData="M 20 6 C 20 5 19.2 4.1 18.2 4 L 12 3 L 5.8 4 C 4.8 4 4 5 4 6 L 4.1 11 C 4.4 14.2 5.1 16 6.6 18 C 7.929 19.627 9.821 20.698 11.9 21 L 12.1 21 C 14.2 20.7 16.1 19.6 17.4 18 C 19 16 19.6 14.2 19.9 11 L 20 6 Z M 17.9 10.8 C 17.9 12.963 17.198 15.069 15.9 16.8 C 14.9 17.9 13.5 18.8 12 19.1 C 10.452 18.8 9.066 17.946 8.1 16.7 C 6.816 15 6.114 12.93 6.1 10.8 C 6.041 9.167 6.041 7.533 6.1 5.9 L 12 5 L 17.9 6 L 18 6.2 L 17.9 10.9 Z M 8 7.6 L 8 10.6 C 8.3 13.3 8.8 14.3 9.7 15.6 C 10.3 16.2 11.1 16.8 12 17 L 12 7 L 8 7.6 Z"
-                android:strokeWidth="1" />
+                android:pathData="M12.0002,22C11.5342,22 11.0662,21.885 10.6462,21.668C8.4962,20.547 6.5242,18.735 5.0942,16.566C4.3852,15.493 3.8882,14.198 3.6162,12.716L2.9092,8.872C2.6692,7.563 3.2942,6.259 4.4632,5.625L10.5652,2.363C11.4632,1.88 12.5362,1.88 13.4322,2.359L19.5342,5.682C20.7082,6.313 21.3352,7.621 21.0912,8.936L20.3862,12.728C20.1152,14.201 19.6172,15.49 18.9112,16.56C17.4822,18.729 15.5102,20.542 13.3562,21.666C12.9372,21.885 12.4682,22 12.0002,22ZM11.5152,3.556L4.8452,7.13L4.3382,8.368L5.0922,12.445C5.3272,13.727 5.7502,14.836 6.3472,15.74C7.6392,17.7 9.4122,19.332 11.3392,20.337H12.6632C14.5932,19.329 16.3672,17.694 17.6582,15.735C18.2532,14.833 18.6752,13.729 18.9102,12.455L19.6632,8.368L19.0532,7.129L12.4942,3.557H11.5152V3.556Z" />
         </vector>
     </aapt:attr>
     <target android:name="path">
@@ -25,7 +24,7 @@
                 android:interpolator="@android:interpolator/fast_out_slow_in"
                 android:propertyName="fillColor"
                 android:valueFrom="#20123a"
-                android:valueTo="#0250bb"
+                android:valueTo="#FF0250BB"
                 android:valueType="colorType" />
         </aapt:attr>
     </target>
diff --git a/app/src/main/res/layout/collection_home_list_row.xml b/app/src/main/res/layout/collection_home_list_row.xml
index 15feff9e8..d37675e47 100644
--- a/app/src/main/res/layout/collection_home_list_row.xml
+++ b/app/src/main/res/layout/collection_home_list_row.xml
@@ -48,8 +48,8 @@
         tools:text="@tools:sample/lorem/random" />
     <ImageView
         android:id="@+id/chevron"
-        android:layout_width="10dp"
-        android:layout_height="6dp"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
         android:layout_marginEnd="16dp"
         android:background="@drawable/ic_chevron"
         android:contentDescription="@string/tab_menu"
@@ -68,7 +68,7 @@
         app:layout_constraintBottom_toBottomOf="@id/collection_icon"
         app:layout_constraintEnd_toStartOf="@id/collection_overflow_button"
         app:layout_constraintTop_toTopOf="@id/collection_icon"
-        app:srcCompat="@drawable/ic_share_filled"
+        app:srcCompat="@drawable/ic_share"
         tools:visibility="visible" />
 
     <ImageButton
diff --git a/app/src/main/res/layout/component_collection_creation.xml b/app/src/main/res/layout/component_collection_creation.xml
index e8fe8a816..94ab60977 100644
--- a/app/src/main/res/layout/component_collection_creation.xml
+++ b/app/src/main/res/layout/component_collection_creation.xml
@@ -156,7 +156,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/mozac_ic_close"
+            app:srcCompat="@drawable/ic_close"
             app:tint="?neutral" />
 
         <TextView
diff --git a/app/src/main/res/layout/component_collection_creation_name_collection.xml b/app/src/main/res/layout/component_collection_creation_name_collection.xml
index b061271ca..f2996944c 100644
--- a/app/src/main/res/layout/component_collection_creation_name_collection.xml
+++ b/app/src/main/res/layout/component_collection_creation_name_collection.xml
@@ -127,7 +127,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/mozac_ic_close"
+            app:srcCompat="@drawable/ic_close"
             app:tint="?neutral" />
 
         <TextView
diff --git a/app/src/main/res/layout/download_dialog_layout.xml b/app/src/main/res/layout/download_dialog_layout.xml
index 9485b40e5..344a7f617 100644
--- a/app/src/main/res/layout/download_dialog_layout.xml
+++ b/app/src/main/res/layout/download_dialog_layout.xml
@@ -50,7 +50,7 @@
         android:contentDescription="@string/mozac_feature_downloads_button_close"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/mozac_ic_close"
+        app:srcCompat="@drawable/ic_close"
         app:tint="?primaryText" />
 
     <TextView
diff --git a/app/src/main/res/layout/onboarding_privacy_notice.xml b/app/src/main/res/layout/onboarding_privacy_notice.xml
index 302af0c13..6a51e8243 100644
--- a/app/src/main/res/layout/onboarding_privacy_notice.xml
+++ b/app/src/main/res/layout/onboarding_privacy_notice.xml
@@ -15,7 +15,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text="@string/onboarding_privacy_notice_header"
-            tools:drawableStart="@drawable/ic_onboarding_privacy_notice"
+            tools:drawableStart="@drawable/ic_info"
             android:drawablePadding="12dp"
             android:textAppearance="@style/HeaderTextStyle"
             android:gravity="center_vertical"
diff --git a/app/src/main/res/layout/quicksettings_tracking_protection.xml b/app/src/main/res/layout/quicksettings_tracking_protection.xml
deleted file mode 100644
index e04f94ed8..000000000
--- a/app/src/main/res/layout/quicksettings_tracking_protection.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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/. -->
-
-<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:id="@+id/tracking_protection_view"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <Switch
-        android:id="@+id/trackingProtectionSwitch"
-        style="@style/QuickSettingsText.Icon"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/quicksettings_item_height"
-        android:paddingEnd="24dp"
-        android:text="@string/preferences_tracking_protection"
-        app:layout_constraintBottom_toTopOf="@id/trackingProtectionAction"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:drawableStart="@drawable/ic_tracking_protection" />
-
-    <TextView
-        android:id="@+id/trackingProtectionAction"
-        style="@style/QuickSettingsText.Icon"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/quicksettings_item_height"
-        android:gravity="top"
-        android:paddingStart="48dp"
-        android:paddingEnd="0dp"
-        android:text="@string/preferences_tracking_protection_turned_off_globally"
-        android:textColor="?accentBright"
-        android:visibility="gone"
-        tools:visibility="visible"
-        app:layout_constraintBottom_toBottomOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/share_close.xml b/app/src/main/res/layout/share_close.xml
index 1221af606..8bc84de86 100644
--- a/app/src/main/res/layout/share_close.xml
+++ b/app/src/main/res/layout/share_close.xml
@@ -24,7 +24,7 @@
         app:iconTint="@color/neutral_text"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/mozac_ic_close" />
+        app:srcCompat="@drawable/ic_close" />
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/title"
diff --git a/app/src/main/res/layout/tab_header.xml b/app/src/main/res/layout/tab_header.xml
index eb61ecf5a..16432a445 100644
--- a/app/src/main/res/layout/tab_header.xml
+++ b/app/src/main/res/layout/tab_header.xml
@@ -27,7 +27,7 @@
         android:layout_height="48dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/tabs_menu_share_tabs"
-        app:srcCompat="@drawable/ic_share_filled"
+        app:srcCompat="@drawable/ic_share"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/close_tabs_button"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/tab_tray_grid_item.xml b/app/src/main/res/layout/tab_tray_grid_item.xml
index dd83b20dc..35cdb4c8f 100644
--- a/app/src/main/res/layout/tab_tray_grid_item.xml
+++ b/app/src/main/res/layout/tab_tray_grid_item.xml
@@ -76,7 +76,7 @@ A FrameLayout here is an efficient way of having a views stack while allowing:
                 app:layout_constraintBottom_toTopOf="@+id/horizonatal_divider"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/mozac_ic_close"
+                app:srcCompat="@drawable/ic_close"
                 app:tint="@color/photonInk80" />
 
             <View
diff --git a/app/src/main/res/layout/tab_tray_item.xml b/app/src/main/res/layout/tab_tray_item.xml
index 5fcddd74b..f8661c46d 100644
--- a/app/src/main/res/layout/tab_tray_item.xml
+++ b/app/src/main/res/layout/tab_tray_item.xml
@@ -103,7 +103,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/mozac_ic_close"
+        app:srcCompat="@drawable/ic_close"
         app:tint="@color/tab_tray_item_text_normal_theme" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/tabstray_multiselect_items.xml b/app/src/main/res/layout/tabstray_multiselect_items.xml
index 795753f94..22d325a1a 100644
--- a/app/src/main/res/layout/tabstray_multiselect_items.xml
+++ b/app/src/main/res/layout/tabstray_multiselect_items.xml
@@ -32,7 +32,7 @@
         app:layout_constraintBottom_toBottomOf="@id/topBar"
         app:layout_constraintEnd_toStartOf="@id/menu_multi_select"
         app:layout_constraintTop_toTopOf="@id/topBar"
-        app:srcCompat="@drawable/ic_share_filled"
+        app:srcCompat="@drawable/ic_share"
         app:tint="@color/contrast_text_normal_theme" />
 
     <ImageButton
diff --git a/app/src/main/res/menu/bookmarks_select_multi.xml b/app/src/main/res/menu/bookmarks_select_multi.xml
index faa422caa..7190328ce 100644
--- a/app/src/main/res/menu/bookmarks_select_multi.xml
+++ b/app/src/main/res/menu/bookmarks_select_multi.xml
@@ -6,7 +6,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/share_bookmark_multi_select"
-        android:icon="@drawable/ic_share_filled"
+        android:icon="@drawable/ic_share"
         app:iconTint="@color/white_color"
         android:title="@string/browser_menu_share"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/history_select_multi.xml b/app/src/main/res/menu/history_select_multi.xml
index 52f7aed44..344b19c44 100644
--- a/app/src/main/res/menu/history_select_multi.xml
+++ b/app/src/main/res/menu/history_select_multi.xml
@@ -6,7 +6,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
             android:id="@+id/share_history_multi_select"
-            android:icon="@drawable/ic_share_filled"
+            android:icon="@drawable/ic_share"
             app:iconTint="@color/white_color"
             android:title="@string/browser_menu_share"
             app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e2c8297ae..32440af48 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -191,8 +191,8 @@
     <dimen name="tab_tray_new_collection_drawable_padding">28dp</dimen>
 
     <!-- Saved Logins Fragment -->
-    <dimen name="saved_logins_sort_menu_dropdown_chevron_icon_margin_start">10dp</dimen>
-    <dimen name="saved_logins_sort_menu_dropdown_chevron_icon_size">12dp</dimen>
+    <dimen name="saved_logins_sort_menu_dropdown_chevron_icon_margin_start">24dp</dimen>
+    <dimen name="saved_logins_sort_menu_dropdown_chevron_icon_size">24dp</dimen>
     <dimen name="saved_logins_detail_menu_vertical_padding">5dp</dimen>
     <dimen name="saved_logins_end_icon_drawable_padding">16dp</dimen>
     <dimen name="saved_logins_item_padding">4dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 800ae195e..6bb76da7f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -433,9 +433,6 @@
     <!-- Text displayed when there are no exceptions, with learn more link that brings users to a tracking protection SUMO page -->
     <string name="exceptions_empty_message_learn_more_link">Learn more</string>
 
-    <!-- Description in Quick Settings that tells user tracking protection is off globally for all sites, and links to Settings to turn it on -->
-    <string name="preferences_tracking_protection_turned_off_globally">Turned off globally, go to Settings to turn it on.</string>
-
     <!-- Preference switch for Telemetry -->
     <string name="preferences_telemetry">Telemetry</string>
     <!-- Preference switch for usage and technical data collection -->
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 799b9130a..fa3778b13 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -14,16 +14,15 @@
         app:allowDividerBelow="false" />
 
     <androidx.preference.SwitchPreference
-            android:key="@string/pref_key_allow_domestic_china_fxa_server"
-            android:title="@string/preferences_allow_domestic_china_fxa_server"
-            android:defaultValue="true"/>
-    
+        android:key="@string/pref_key_allow_domestic_china_fxa_server"
+        android:title="@string/preferences_allow_domestic_china_fxa_server"
+        android:defaultValue="true"/>
+
     <androidx.preference.PreferenceCategory
         android:key="@string/pref_key_account_category"
         android:title="@string/preferences_category_account"
-        app:iconSpaceReserved="false"
         app:isPreferenceVisible="false"
-        android:layout="@layout/preference_cat_style">
+        android:layout="@layout/preference_category_no_icon_style">
 
         <org.mozilla.fenix.settings.account.AccountPreference
             android:icon="@drawable/ic_account"
@@ -50,160 +49,157 @@
 
     <androidx.preference.PreferenceCategory
         android:title="@string/preferences_category_general"
-        app:iconSpaceReserved="false"
-        android:layout="@layout/preference_cat_style">
+        android:layout="@layout/preference_category_no_icon_style">
         <androidx.preference.Preference
-            android:icon="@drawable/ic_search"
+            app:iconSpaceReserved="false"
             android:key="@string/pref_key_search_settings"
             android:title="@string/preferences_search" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_multiple_tabs"
+            app:iconSpaceReserved="false"
             android:key="@string/pref_key_tabs"
             android:title="@string/preferences_tabs" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_customize"
             android:key="@string/pref_key_customize"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_customize" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_login"
             android:key="@string/pref_key_passwords"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_passwords_logins_and_passwords" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_formfill"
+            app:iconSpaceReserved="false"
             android:key="@string/pref_key_credit_cards"
             android:title="@string/preferences_credit_cards"
             app:isPreferenceVisible="false" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_accessibility"
             android:key="@string/pref_key_accessibility"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_accessibility" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_language"
             android:key="@string/pref_key_language"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_language" />
 
         <org.mozilla.fenix.settings.DefaultBrowserPreference
-            android:icon="@drawable/ic_internet"
             android:key="@string/pref_key_make_default_browser"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_set_as_default_browser" />
     </androidx.preference.PreferenceCategory>
 
     <androidx.preference.PreferenceCategory
         android:title="@string/preferences_category_privacy_security"
-        app:iconSpaceReserved="false"
-        android:layout="@layout/preference_cat_style">
+        android:layout="@layout/preference_category_no_icon_style">
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_private_browsing"
             android:key="@string/pref_key_private_browsing"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_private_browsing_options" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_tracking_protection_enabled"
             android:key="@string/pref_key_tracking_protection_settings"
+            app:iconSpaceReserved="false"
             android:title="@string/preference_enhanced_tracking_protection" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_permission"
             android:key="@string/pref_key_site_permissions"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_site_permissions" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_delete"
             android:key="@string/pref_key_delete_browsing_data"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_delete_browsing_data" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_exit"
             android:key="@string/pref_key_delete_browsing_data_on_quit_preference"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_delete_browsing_data_on_quit" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_notifications"
             android:key="@string/pref_key_notifications"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_notifications" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_data_collection"
             android:key="@string/pref_key_data_choices"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_data_collection" />
 
     </androidx.preference.PreferenceCategory>
 
     <PreferenceCategory
         android:title="@string/preferences_category_advanced"
-        app:iconSpaceReserved="false"
         android:key="@string/pref_key_advanced"
-        android:layout="@layout/preference_cat_style">
+        android:layout="@layout/preference_category_no_icon_style">
         <androidx.preference.Preference
-            android:icon="@drawable/ic_addons_extensions"
             android:key="@string/pref_key_addons"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_addons" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_addons_extensions"
             android:key="@string/pref_key_override_amo_collection"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_customize_amo_collection" />
 
         <androidx.preference.SwitchPreference
             android:defaultValue="false"
-            android:icon="@drawable/ic_open_in_app"
             android:key="@string/pref_key_open_links_in_external_app"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_open_links_in_apps" />
 
         <androidx.preference.SwitchPreference
             android:defaultValue="false"
-            android:icon="@drawable/ic_download"
             android:key="@string/pref_key_external_download_manager"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_external_download_manager" />
 
         <androidx.preference.SwitchPreference
             android:defaultValue="true"
-            android:icon="@drawable/ic_info"
             android:key="@string/pref_key_leakcanary"
             android:title="@string/preference_leakcanary"
+            app:iconSpaceReserved="false"
             app:isPreferenceVisible="@bool/IS_DEBUG" />
 
         <androidx.preference.SwitchPreference
-            android:icon="@drawable/ic_energy"
             android:key="@string/pref_key_remote_debugging"
             android:title="@string/preferences_remote_debugging"
+            app:iconSpaceReserved="false"
             android:defaultValue="false" />
     </PreferenceCategory>
 
     <androidx.preference.PreferenceCategory
         android:title="@string/preferences_category_about"
         app:iconSpaceReserved="false"
-        android:layout="@layout/preference_cat_style">
+        android:layout="@layout/preference_category_no_icon_style">
         <androidx.preference.Preference
-            android:icon="@drawable/ic_bookmark_outline"
             android:key="@string/pref_key_rate"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_rate" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_info"
             android:key="@string/pref_key_about"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_about" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_info"
             android:key="@string/pref_key_debug_settings"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_debug_settings"
             app:isPreferenceVisible="false" />
         <androidx.preference.Preference
-            android:icon="@drawable/ic_info"
             android:key="@string/pref_key_secret_debug_info"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_debug_info"
             app:isPreferenceVisible="false" />
         <androidx.preference.Preference
-            android:icon="@drawable/ic_info"
             android:key="@string/pref_key_nimbus_experiments"
+            app:iconSpaceReserved="false"
             android:title="@string/preferences_nimbus_experiments"
             app:isPreferenceVisible="false" />
     </androidx.preference.PreferenceCategory>
diff --git a/app/src/main/res/xml/preferences_default_browser_experiment.xml b/app/src/main/res/xml/preferences_default_browser_experiment.xml
index 827101e3a..c6e050db0 100644
--- a/app/src/main/res/xml/preferences_default_browser_experiment.xml
+++ b/app/src/main/res/xml/preferences_default_browser_experiment.xml
@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?><!-- This Source Code Form is subject to the terms of the Mozilla Public
+<?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/. -->
 
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.preference.PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.preference.Preference
@@ -30,185 +32,178 @@
         app:isPreferenceVisible="false" />
 
     <androidx.preference.PreferenceCategory
-        android:layout="@layout/preference_cat_style"
-        android:title="@string/preferences_category_general"
-        app:iconSpaceReserved="false">
+        android:layout="@layout/preference_category_no_icon_style"
+        android:title="@string/preferences_category_general">
         <androidx.preference.Preference
-            android:icon="@drawable/ic_search"
             android:key="@string/pref_key_search_settings"
-            android:title="@string/preferences_search" />
+            android:title="@string/preferences_search"
+            app:iconSpaceReserved="false" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_multiple_tabs"
             android:key="@string/pref_key_tabs"
-            android:title="@string/preferences_tabs" />
+            android:title="@string/preferences_tabs"
+            app:iconSpaceReserved="false" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_customize"
             android:key="@string/pref_key_customize"
-            android:title="@string/preferences_customize" />
+            android:title="@string/preferences_customize"
+            app:iconSpaceReserved="false" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_login"
             android:key="@string/pref_key_passwords"
-            android:title="@string/preferences_passwords_logins_and_passwords" />
+            android:title="@string/preferences_passwords_logins_and_passwords"
+            app:iconSpaceReserved="false" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_formfill"
             android:key="@string/pref_key_credit_cards"
             android:title="@string/preferences_credit_cards"
-            app:isPreferenceVisible="false" />
+            app:iconSpaceReserved="false" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_accessibility"
             android:key="@string/pref_key_accessibility"
-            android:title="@string/preferences_accessibility" />
+            android:title="@string/preferences_accessibility"
+            app:iconSpaceReserved="false" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_language"
             android:key="@string/pref_key_language"
-            android:title="@string/preferences_language" />
+            android:title="@string/preferences_language"
+            app:iconSpaceReserved="false" />
+
     </androidx.preference.PreferenceCategory>
 
     <androidx.preference.PreferenceCategory
         android:key="@string/pref_key_sign_in"
-        android:layout="@layout/preference_cat_style"
+        android:layout="@layout/preference_category_no_icon_style"
         android:title="@string/preferences_category_account">
-
         <androidx.preference.Preference
-            android:icon="@drawable/ic_account"
             android:key="@string/pref_key_sign_in"
             android:title="@string/preferences_sync"
             app:allowDividerBelow="true"
             app:iconSpaceReserved="false" />
-
     </androidx.preference.PreferenceCategory>
 
     <androidx.preference.PreferenceCategory
         android:key="@string/pref_key_account_category"
-        android:layout="@layout/preference_cat_style"
+        android:layout="@layout/preference_category_no_icon_style"
         android:title="@string/preferences_category_account"
         app:isPreferenceVisible="false">
 
         <org.mozilla.fenix.settings.account.AccountPreference
-            android:icon="@drawable/ic_account"
-            android:key="@string/pref_key_account" />
+            android:key="@string/pref_key_account"
+            app:iconSpaceReserved="false"/>
 
         <org.mozilla.fenix.settings.account.AccountAuthErrorPreference
-            android:icon="@drawable/ic_account_warning"
-            android:key="@string/pref_key_account_auth_error" />
+            android:key="@string/pref_key_account_auth_error"
+            app:iconSpaceReserved="false"/>
 
     </androidx.preference.PreferenceCategory>
 
     <androidx.preference.PreferenceCategory
-        android:layout="@layout/preference_cat_style"
-        android:title="@string/preferences_category_privacy_security"
-        app:iconSpaceReserved="false">
+        android:layout="@layout/preference_category_no_icon_style"
+        android:title="@string/preferences_category_privacy_security">
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_private_browsing"
             android:key="@string/pref_key_private_browsing"
-            android:title="@string/preferences_private_browsing_options" />
+            android:title="@string/preferences_private_browsing_options"
+            app:iconSpaceReserved="false" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_tracking_protection_enabled"
             android:key="@string/pref_key_tracking_protection_settings"
-            android:title="@string/preference_enhanced_tracking_protection" />
+            android:title="@string/preference_enhanced_tracking_protection"
+            app:iconSpaceReserved="false" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_permission"
             android:key="@string/pref_key_site_permissions"
-            android:title="@string/preferences_site_permissions" />
+            android:title="@string/preferences_site_permissions"
+            app:iconSpaceReserved="false" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_delete"
             android:key="@string/pref_key_delete_browsing_data"
-            android:title="@string/preferences_delete_browsing_data" />
+            android:title="@string/preferences_delete_browsing_data"
+            app:iconSpaceReserved="false" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_exit"
             android:key="@string/pref_key_delete_browsing_data_on_quit_preference"
-            android:title="@string/preferences_delete_browsing_data_on_quit" />
+            android:title="@string/preferences_delete_browsing_data_on_quit"
+            app:iconSpaceReserved="false" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_notifications"
             android:key="@string/pref_key_notifications"
-            android:title="@string/preferences_notifications" />
+            android:title="@string/preferences_notifications"
+            app:iconSpaceReserved="false" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_data_collection"
             android:key="@string/pref_key_data_choices"
-            android:title="@string/preferences_data_collection" />
+            android:title="@string/preferences_data_collection"
+            app:iconSpaceReserved="false" />
 
     </androidx.preference.PreferenceCategory>
 
     <PreferenceCategory
         android:key="@string/pref_key_advanced"
-        android:layout="@layout/preference_cat_style"
-        android:title="@string/preferences_category_advanced"
-        app:iconSpaceReserved="false">
+        android:layout="@layout/preference_category_no_icon_style"
+        android:title="@string/preferences_category_advanced">
         <androidx.preference.Preference
-            android:icon="@drawable/ic_addons_extensions"
             android:key="@string/pref_key_addons"
-            android:title="@string/preferences_addons" />
+            android:title="@string/preferences_addons"
+            app:iconSpaceReserved="false" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_addons_extensions"
             android:key="@string/pref_key_override_amo_collection"
-            android:title="@string/preferences_customize_amo_collection" />
+            android:title="@string/preferences_customize_amo_collection"
+            app:iconSpaceReserved="false" />
 
         <androidx.preference.SwitchPreference
             android:defaultValue="false"
-            android:icon="@drawable/ic_open_in_app"
             android:key="@string/pref_key_open_links_in_external_app"
-            android:title="@string/preferences_open_links_in_apps" />
+            android:title="@string/preferences_open_links_in_apps"
+            app:iconSpaceReserved="false" />
 
         <androidx.preference.SwitchPreference
             android:defaultValue="false"
-            android:icon="@drawable/ic_download"
             android:key="@string/pref_key_external_download_manager"
-            android:title="@string/preferences_external_download_manager" />
+            android:title="@string/preferences_external_download_manager"
+            app:iconSpaceReserved="false" />
 
         <androidx.preference.SwitchPreference
             android:defaultValue="true"
-            android:icon="@drawable/ic_info"
             android:key="@string/pref_key_leakcanary"
             android:title="@string/preference_leakcanary"
+            app:iconSpaceReserved="false"
             app:isPreferenceVisible="@bool/IS_DEBUG" />
 
         <androidx.preference.SwitchPreference
             android:defaultValue="false"
-            android:icon="@drawable/ic_energy"
             android:key="@string/pref_key_remote_debugging"
-            android:title="@string/preferences_remote_debugging" />
+            android:title="@string/preferences_remote_debugging"
+            app:iconSpaceReserved="false" />
     </PreferenceCategory>
 
     <androidx.preference.PreferenceCategory
-        android:layout="@layout/preference_cat_style"
+        android:layout="@layout/preference_category_no_icon_style"
         android:title="@string/preferences_category_about"
         app:iconSpaceReserved="false">
         <androidx.preference.Preference
-            android:icon="@drawable/ic_bookmark_outline"
             android:key="@string/pref_key_rate"
-            android:title="@string/preferences_rate" />
+            android:title="@string/preferences_rate"
+            app:iconSpaceReserved="false" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_info"
             android:key="@string/pref_key_about"
-            android:title="@string/preferences_about" />
+            android:title="@string/preferences_about"
+            app:iconSpaceReserved="false" />
 
         <androidx.preference.Preference
-            android:icon="@drawable/ic_info"
             android:key="@string/pref_key_debug_settings"
             android:title="@string/preferences_debug_settings"
+            app:iconSpaceReserved="false"
             app:isPreferenceVisible="false" />
         <androidx.preference.Preference
-            android:icon="@drawable/ic_info"
             android:key="@string/pref_key_secret_debug_info"
             android:title="@string/preferences_debug_info"
+            app:iconSpaceReserved="false"
             app:isPreferenceVisible="false" />
         <androidx.preference.Preference
-            android:icon="@drawable/ic_info"
             android:key="@string/pref_key_nimbus_experiments"
             android:title="@string/preferences_nimbus_experiments"
             app:isPreferenceVisible="false" />
diff --git a/app/src/main/res/xml/preferences_without_icons.xml b/app/src/main/res/xml/preferences_without_icons.xml
deleted file mode 100644
index 8f8458d94..000000000
--- a/app/src/main/res/xml/preferences_without_icons.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?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/. -->
-
-<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <androidx.preference.Preference
-        android:key="@string/pref_key_sign_in"
-        android:layout="@layout/sign_in_preference"
-        android:summary="@string/preferences_sign_in_description"
-        android:title="@string/preferences_sync"
-        app:allowDividerBelow="false" />
-
-    <androidx.preference.SwitchPreference
-        android:key="@string/pref_key_allow_domestic_china_fxa_server"
-        android:title="@string/preferences_allow_domestic_china_fxa_server"
-        android:defaultValue="true" />
-
-    <androidx.preference.PreferenceCategory
-        android:key="@string/pref_key_account_category"
-        android:title="@string/preferences_category_account"
-        app:isPreferenceVisible="false"
-        android:layout="@layout/preference_category_no_icon_style">
-
-        <org.mozilla.fenix.settings.account.AccountPreference
-            android:icon="@drawable/ic_account"
-            android:key="@string/pref_key_account" />
-
-        <org.mozilla.fenix.settings.account.AccountAuthErrorPreference
-            android:icon="@drawable/ic_account_warning"
-            android:key="@string/pref_key_account_auth_error" />
-    </androidx.preference.PreferenceCategory>
-
-    <androidx.preference.EditTextPreference
-        android:key="@string/pref_key_override_fxa_server"
-        android:title="@string/preferences_override_fxa_server"
-        android:inputType="textUri"
-        app:iconSpaceReserved="false"
-        app:isPreferenceVisible="false" />
-
-    <androidx.preference.EditTextPreference
-        android:key="@string/pref_key_override_sync_tokenserver"
-        android:title="@string/preferences_override_sync_tokenserver"
-        android:inputType="textUri"
-        app:iconSpaceReserved="false"
-        app:isPreferenceVisible="false" />
-
-    <androidx.preference.PreferenceCategory
-        android:title="@string/preferences_category_general"
-        android:layout="@layout/preference_category_no_icon_style">
-        <androidx.preference.Preference
-            app:iconSpaceReserved="false"
-            android:key="@string/pref_key_search_settings"
-            android:title="@string/preferences_search" />
-
-        <androidx.preference.Preference
-            app:iconSpaceReserved="false"
-            android:key="@string/pref_key_tabs"
-            android:title="@string/preferences_tabs" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_customize"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_customize" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_passwords"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_passwords_logins_and_passwords" />
-
-        <androidx.preference.Preference
-            app:iconSpaceReserved="false"
-            android:key="@string/pref_key_credit_cards"
-            android:title="@string/preferences_credit_cards"
-            app:isPreferenceVisible="false" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_accessibility"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_accessibility" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_language"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_language" />
-
-        <org.mozilla.fenix.settings.DefaultBrowserPreference
-            android:key="@string/pref_key_make_default_browser"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_set_as_default_browser" />
-    </androidx.preference.PreferenceCategory>
-
-    <androidx.preference.PreferenceCategory
-        android:title="@string/preferences_category_privacy_security"
-        android:layout="@layout/preference_category_no_icon_style">
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_private_browsing"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_private_browsing_options" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_tracking_protection_settings"
-            app:iconSpaceReserved="false"
-            android:title="@string/preference_enhanced_tracking_protection" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_site_permissions"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_site_permissions" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_delete_browsing_data"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_delete_browsing_data" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_delete_browsing_data_on_quit_preference"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_delete_browsing_data_on_quit" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_notifications"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_notifications" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_data_choices"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_data_collection" />
-
-    </androidx.preference.PreferenceCategory>
-
-    <PreferenceCategory
-        android:title="@string/preferences_category_advanced"
-        android:key="@string/pref_key_advanced"
-        android:layout="@layout/preference_category_no_icon_style">
-        <androidx.preference.Preference
-            android:key="@string/pref_key_addons"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_addons" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_override_amo_collection"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_customize_amo_collection" />
-
-        <androidx.preference.SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/pref_key_open_links_in_external_app"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_open_links_in_apps" />
-
-        <androidx.preference.SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/pref_key_external_download_manager"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_external_download_manager" />
-
-        <androidx.preference.SwitchPreference
-            android:defaultValue="true"
-            android:key="@string/pref_key_leakcanary"
-            android:title="@string/preference_leakcanary"
-            app:iconSpaceReserved="false"
-            app:isPreferenceVisible="@bool/IS_DEBUG" />
-
-        <androidx.preference.SwitchPreference
-            android:key="@string/pref_key_remote_debugging"
-            android:title="@string/preferences_remote_debugging"
-            app:iconSpaceReserved="false"
-            android:defaultValue="false" />
-    </PreferenceCategory>
-
-    <androidx.preference.PreferenceCategory
-        android:title="@string/preferences_category_about"
-        app:iconSpaceReserved="false"
-        android:layout="@layout/preference_category_no_icon_style">
-        <androidx.preference.Preference
-            android:key="@string/pref_key_rate"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_rate" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_about"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_about" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_debug_settings"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_debug_settings"
-            app:isPreferenceVisible="false" />
-        <androidx.preference.Preference
-            android:key="@string/pref_key_secret_debug_info"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_debug_info"
-            app:isPreferenceVisible="false" />
-        <androidx.preference.Preference
-            android:key="@string/pref_key_nimbus_experiments"
-            app:iconSpaceReserved="false"
-            android:title="@string/preferences_nimbus_experiments"
-            app:isPreferenceVisible="false" />
-    </androidx.preference.PreferenceCategory>
-</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/preferences_without_icons_default_browser_experiment.xml b/app/src/main/res/xml/preferences_without_icons_default_browser_experiment.xml
deleted file mode 100644
index c6e050db0..000000000
--- a/app/src/main/res/xml/preferences_without_icons_default_browser_experiment.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?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/. -->
-
-<androidx.preference.PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <androidx.preference.Preference
-        android:key="@string/pref_key_make_default_browser"
-        android:layout="@layout/default_browser_experiment_preference"
-        app:allowDividerBelow="false" />
-
-    <androidx.preference.SwitchPreference
-        android:defaultValue="true"
-        android:key="@string/pref_key_allow_domestic_china_fxa_server"
-        android:title="@string/preferences_allow_domestic_china_fxa_server" />
-
-    <androidx.preference.EditTextPreference
-        android:inputType="textUri"
-        android:key="@string/pref_key_override_fxa_server"
-        android:title="@string/preferences_override_fxa_server"
-        app:iconSpaceReserved="false"
-        app:isPreferenceVisible="false" />
-
-    <androidx.preference.EditTextPreference
-        android:inputType="textUri"
-        android:key="@string/pref_key_override_sync_tokenserver"
-        android:title="@string/preferences_override_sync_tokenserver"
-        app:iconSpaceReserved="false"
-        app:isPreferenceVisible="false" />
-
-    <androidx.preference.PreferenceCategory
-        android:layout="@layout/preference_category_no_icon_style"
-        android:title="@string/preferences_category_general">
-        <androidx.preference.Preference
-            android:key="@string/pref_key_search_settings"
-            android:title="@string/preferences_search"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_tabs"
-            android:title="@string/preferences_tabs"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_customize"
-            android:title="@string/preferences_customize"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_passwords"
-            android:title="@string/preferences_passwords_logins_and_passwords"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_credit_cards"
-            android:title="@string/preferences_credit_cards"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_accessibility"
-            android:title="@string/preferences_accessibility"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_language"
-            android:title="@string/preferences_language"
-            app:iconSpaceReserved="false" />
-
-    </androidx.preference.PreferenceCategory>
-
-    <androidx.preference.PreferenceCategory
-        android:key="@string/pref_key_sign_in"
-        android:layout="@layout/preference_category_no_icon_style"
-        android:title="@string/preferences_category_account">
-        <androidx.preference.Preference
-            android:key="@string/pref_key_sign_in"
-            android:title="@string/preferences_sync"
-            app:allowDividerBelow="true"
-            app:iconSpaceReserved="false" />
-    </androidx.preference.PreferenceCategory>
-
-    <androidx.preference.PreferenceCategory
-        android:key="@string/pref_key_account_category"
-        android:layout="@layout/preference_category_no_icon_style"
-        android:title="@string/preferences_category_account"
-        app:isPreferenceVisible="false">
-
-        <org.mozilla.fenix.settings.account.AccountPreference
-            android:key="@string/pref_key_account"
-            app:iconSpaceReserved="false"/>
-
-        <org.mozilla.fenix.settings.account.AccountAuthErrorPreference
-            android:key="@string/pref_key_account_auth_error"
-            app:iconSpaceReserved="false"/>
-
-    </androidx.preference.PreferenceCategory>
-
-    <androidx.preference.PreferenceCategory
-        android:layout="@layout/preference_category_no_icon_style"
-        android:title="@string/preferences_category_privacy_security">
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_private_browsing"
-            android:title="@string/preferences_private_browsing_options"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_tracking_protection_settings"
-            android:title="@string/preference_enhanced_tracking_protection"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_site_permissions"
-            android:title="@string/preferences_site_permissions"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_delete_browsing_data"
-            android:title="@string/preferences_delete_browsing_data"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_delete_browsing_data_on_quit_preference"
-            android:title="@string/preferences_delete_browsing_data_on_quit"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_notifications"
-            android:title="@string/preferences_notifications"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_data_choices"
-            android:title="@string/preferences_data_collection"
-            app:iconSpaceReserved="false" />
-
-    </androidx.preference.PreferenceCategory>
-
-    <PreferenceCategory
-        android:key="@string/pref_key_advanced"
-        android:layout="@layout/preference_category_no_icon_style"
-        android:title="@string/preferences_category_advanced">
-        <androidx.preference.Preference
-            android:key="@string/pref_key_addons"
-            android:title="@string/preferences_addons"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_override_amo_collection"
-            android:title="@string/preferences_customize_amo_collection"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/pref_key_open_links_in_external_app"
-            android:title="@string/preferences_open_links_in_apps"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/pref_key_external_download_manager"
-            android:title="@string/preferences_external_download_manager"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.SwitchPreference
-            android:defaultValue="true"
-            android:key="@string/pref_key_leakcanary"
-            android:title="@string/preference_leakcanary"
-            app:iconSpaceReserved="false"
-            app:isPreferenceVisible="@bool/IS_DEBUG" />
-
-        <androidx.preference.SwitchPreference
-            android:defaultValue="false"
-            android:key="@string/pref_key_remote_debugging"
-            android:title="@string/preferences_remote_debugging"
-            app:iconSpaceReserved="false" />
-    </PreferenceCategory>
-
-    <androidx.preference.PreferenceCategory
-        android:layout="@layout/preference_category_no_icon_style"
-        android:title="@string/preferences_category_about"
-        app:iconSpaceReserved="false">
-        <androidx.preference.Preference
-            android:key="@string/pref_key_rate"
-            android:title="@string/preferences_rate"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_about"
-            android:title="@string/preferences_about"
-            app:iconSpaceReserved="false" />
-
-        <androidx.preference.Preference
-            android:key="@string/pref_key_debug_settings"
-            android:title="@string/preferences_debug_settings"
-            app:iconSpaceReserved="false"
-            app:isPreferenceVisible="false" />
-        <androidx.preference.Preference
-            android:key="@string/pref_key_secret_debug_info"
-            android:title="@string/preferences_debug_info"
-            app:iconSpaceReserved="false"
-            app:isPreferenceVisible="false" />
-        <androidx.preference.Preference
-            android:key="@string/pref_key_nimbus_experiments"
-            android:title="@string/preferences_nimbus_experiments"
-            app:isPreferenceVisible="false" />
-    </androidx.preference.PreferenceCategory>
-</androidx.preference.PreferenceScreen>