diff --git a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
index 7c8d152d5..b19757dc6 100644
--- a/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
+++ b/app/src/main/java/org/mozilla/fenix/HomeActivity.kt
@@ -700,7 +700,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity {
             setSupportActionBar(navigationToolbar)
             // Add ids to this that we don't want to have a toolbar back button
             setupNavigationToolbar()
-            setNavigationIcon(R.drawable.mozac_ic_back)
+            setNavigationIcon(R.drawable.ic_back_button)
 
             isToolbarInflated = true
         }
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
index 546fc6f6e..da88c5939 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BrowserFragment.kt
@@ -168,7 +168,7 @@ class BrowserFragment : BaseBrowserFragment(), UserInteractionHandler {
             BrowserToolbar.ToggleButton(
                 image = AppCompatResources.getDrawable(
                     context,
-                    R.drawable.mozac_ic_reader_mode
+                    R.drawable.ic_readermode
                 )!!,
                 imageSelected =
                 AppCompatResources.getDrawable(
diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationBottomBarView.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationBottomBarView.kt
index d114d6ff6..33370f09e 100644
--- a/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationBottomBarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionCreationBottomBarView.kt
@@ -39,7 +39,7 @@ class CollectionCreationBottomBarView(
 
         iconButton.apply {
             val drawable = context.getDrawableWithTint(
-                R.drawable.mozac_ic_close,
+                R.drawable.ic_close,
                 ContextCompat.getColor(context, R.color.photonWhite)
             )
             setImageDrawable(drawable)
@@ -84,7 +84,7 @@ class CollectionCreationBottomBarView(
 
         iconButton.apply {
             val drawable = context.getDrawableWithTint(
-                R.drawable.mozac_ic_new,
+                R.drawable.ic_new,
                 ContextCompat.getColor(context, R.color.photonWhite)
             )
             setImageDrawable(drawable)
diff --git a/app/src/main/java/org/mozilla/fenix/collections/CollectionsListAdapter.kt b/app/src/main/java/org/mozilla/fenix/collections/CollectionsListAdapter.kt
index 68575e588..71ede56df 100644
--- a/app/src/main/java/org/mozilla/fenix/collections/CollectionsListAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/collections/CollectionsListAdapter.kt
@@ -49,7 +49,7 @@ class CollectionsListAdapter(
             holder.textView.putCompoundDrawablesRelativeWithIntrinsicBounds(
                 start = AppCompatResources.getDrawable(
                     holder.textView.context,
-                    R.drawable.mozac_ic_new
+                    R.drawable.ic_new
                 )
             )
         } else {
diff --git a/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt b/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt
index 883134652..cfa54b7af 100644
--- a/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt
+++ b/app/src/main/java/org/mozilla/fenix/components/tips/providers/MasterPasswordTipProvider.kt
@@ -68,7 +68,7 @@ class MasterPasswordTipProvider(
             title = context.getString(R.string.mp_homescreen_tip_title),
             description = context.getString(R.string.mp_homescreen_tip_message),
             learnMoreURL = null,
-            titleDrawable = AppCompatResources.getDrawable(context, R.drawable.mozac_ic_login)
+            titleDrawable = AppCompatResources.getDrawable(context, R.drawable.ic_login)
         )
 
     private fun showMasterPasswordMigration() {
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 74ce88b61..5d9949aa4 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
@@ -84,7 +84,7 @@ open class DefaultToolbarMenu(
             store = store,
             style = WebExtensionBrowserMenuBuilder.Style(
                 webExtIconTintColorResource = primaryTextColor(),
-                addonsManagerMenuItemDrawableRes = R.drawable.mozac_ic_extensions
+                addonsManagerMenuItemDrawableRes = R.drawable.ic_addons_extensions
             ),
             onAddonsManagerTapped = {
                 onItemTapped.invoke(ToolbarMenu.Item.AddonsManager)
@@ -143,7 +143,7 @@ open class DefaultToolbarMenu(
         }
 
         val share = BrowserMenuItemToolbar.Button(
-            imageResource = R.drawable.mozac_ic_share,
+            imageResource = R.drawable.ic_share,
             contentDescription = context.getString(R.string.browser_menu_share),
             iconTintColorResource = primaryTextColor(),
             listener = {
@@ -196,7 +196,7 @@ open class DefaultToolbarMenu(
 
     val newTabItem = BrowserMenuImageText(
         context.getString(R.string.library_new_tab),
-        R.drawable.mozac_ic_new,
+        R.drawable.ic_new,
         primaryTextColor()
     ) {
         onItemTapped.invoke(ToolbarMenu.Item.NewTab)
@@ -212,7 +212,7 @@ open class DefaultToolbarMenu(
 
     val downloadsItem = BrowserMenuImageText(
         context.getString(R.string.library_downloads),
-        R.drawable.mozac_ic_download,
+        R.drawable.ic_download,
         primaryTextColor()
     ) {
         onItemTapped.invoke(ToolbarMenu.Item.Downloads)
@@ -231,7 +231,7 @@ open class DefaultToolbarMenu(
     }
 
     val desktopSiteItem = BrowserMenuImageSwitch(
-        imageResource = R.drawable.mozac_ic_device_desktop,
+        imageResource = R.drawable.ic_desktop,
         label = context.getString(R.string.browser_menu_desktop_site),
         initialState = {
             selectedSession?.content?.desktopMode ?: false
@@ -278,8 +278,8 @@ open class DefaultToolbarMenu(
     val addRemoveTopSitesItem = TwoStateBrowserMenuImageText(
         primaryLabel = context.getString(R.string.browser_menu_add_to_top_sites),
         secondaryLabel = context.getString(R.string.browser_menu_remove_from_top_sites),
-        primaryStateIconResource = R.drawable.mozac_ic_pin,
-        secondaryStateIconResource = R.drawable.mozac_ic_pin,
+        primaryStateIconResource = R.drawable.ic_top_sites,
+        secondaryStateIconResource = R.drawable.ic_top_sites,
         iconTintColorResource = primaryTextColor(),
         isInPrimaryState = { !isCurrentUrlPinned },
         isInSecondaryState = { isCurrentUrlPinned },
diff --git a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
index 2d7a84a06..fdf978ec1 100644
--- a/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/customtabs/CustomTabToolbarMenu.kt
@@ -133,7 +133,7 @@ class CustomTabToolbarMenu(
     }
 
     private val desktopMode = BrowserMenuImageSwitch(
-        imageResource = R.drawable.mozac_ic_device_desktop,
+        imageResource = R.drawable.ic_desktop,
         label = context.getString(R.string.browser_menu_desktop_site),
         initialState = { session?.content?.desktopMode ?: false }
     ) { checked ->
diff --git a/app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt
index 38907dc4a..d403703e1 100644
--- a/app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/exceptions/viewholders/ExceptionsListItemViewHolder.kt
@@ -25,7 +25,7 @@ class ExceptionsListItemViewHolder<T : Any>(
 
     init {
         view.setSecondaryButton(
-            icon = R.drawable.mozac_ic_close,
+            icon = R.drawable.ic_close,
             contentDescription = R.string.history_delete_item
         ) {
             interactor.onDeleteOne(item)
diff --git a/app/src/main/java/org/mozilla/fenix/ext/Fragment.kt b/app/src/main/java/org/mozilla/fenix/ext/Fragment.kt
index d9e519a9a..8d0cf1eaa 100644
--- a/app/src/main/java/org/mozilla/fenix/ext/Fragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/ext/Fragment.kt
@@ -36,7 +36,7 @@ fun Fragment.getPreferenceKey(@StringRes resourceId: Int): String = getString(re
  */
 fun Fragment.showToolbar(title: String) {
     (requireActivity() as AppCompatActivity).title = title
-    activity?.setNavigationIcon(R.drawable.mozac_ic_back)
+    activity?.setNavigationIcon(R.drawable.ic_back_button)
     (activity as NavHostActivity).getSupportActionBarAndInflateIfNecessary().show()
 }
 
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 9a09de948..24c9f8d1d 100644
--- a/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/HomeMenu.kt
@@ -102,7 +102,7 @@ class HomeMenu(
     }
 
     val desktopItem = BrowserMenuImageSwitch(
-        imageResource = R.drawable.mozac_ic_device_desktop,
+        imageResource = R.drawable.ic_desktop,
         label = context.getString(R.string.browser_menu_desktop_site),
         initialState = { context.settings().openNextTabInDesktopMode }
     ) { checked ->
@@ -131,7 +131,7 @@ class HomeMenu(
 
         val downloadsItem = BrowserMenuImageText(
             context.getString(R.string.library_downloads),
-            R.drawable.mozac_ic_download,
+            R.drawable.ic_download,
             primaryTextColor
         ) {
             onItemTapped.invoke(Item.Downloads)
@@ -139,7 +139,7 @@ class HomeMenu(
 
         val extensionsItem = BrowserMenuImageText(
             context.getString(R.string.browser_menu_add_ons),
-            R.drawable.mozac_ic_extensions,
+            R.drawable.ic_addons_extensions,
             primaryTextColor
         ) {
             onItemTapped.invoke(Item.Extensions)
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt
index bbb0f13a9..862e31984 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SwipeToDeleteCallback.kt
@@ -44,7 +44,7 @@ class SwipeToDeleteCallback(
         isCurrentlyActive: Boolean
     ) {
         super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive)
-        val icon = AppCompatResources.getDrawable(recyclerView.context, R.drawable.mozac_ic_delete)
+        val icon = AppCompatResources.getDrawable(recyclerView.context, R.drawable.ic_delete)
         icon?.setTint(recyclerView.context.getColorFromAttr(R.attr.destructive))
 
         val backgroundDrawable = when {
diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt
index f51ac54fd..dd59e02f4 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/TabInCollectionViewHolder.kt
@@ -51,7 +51,7 @@ class TabInCollectionViewHolder(
         }
 
         view.setSecondaryButton(
-            icon = R.drawable.mozac_ic_close,
+            icon = R.drawable.ic_close,
             contentDescription = R.string.remove_tab_from_collection
         ) {
             interactor.onCollectionRemoveTab(collection, tab, wasSwiped = false)
diff --git a/app/src/main/java/org/mozilla/fenix/library/LibraryPageView.kt b/app/src/main/java/org/mozilla/fenix/library/LibraryPageView.kt
index 18f0ee216..a9d8ece85 100644
--- a/app/src/main/java/org/mozilla/fenix/library/LibraryPageView.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/LibraryPageView.kt
@@ -43,7 +43,7 @@ open class LibraryPageView(
         activity?.title = title
         val toolbar = activity?.findViewById<Toolbar>(R.id.navigationToolbar)
         toolbar?.setToolbarColors(foregroundColor, backgroundColor)
-        toolbar?.setNavigationIcon(R.drawable.mozac_ic_back)
+        toolbar?.setNavigationIcon(R.drawable.ic_back_button)
         toolbar?.navigationIcon?.setTint(foregroundColor)
     }
 }
diff --git a/app/src/main/java/org/mozilla/fenix/library/downloads/viewholders/DownloadsListItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/downloads/viewholders/DownloadsListItemViewHolder.kt
index cf23a13b3..eb272e05d 100644
--- a/app/src/main/java/org/mozilla/fenix/library/downloads/viewholders/DownloadsListItemViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/downloads/viewholders/DownloadsListItemViewHolder.kt
@@ -48,7 +48,7 @@ class DownloadsListItemViewHolder(
 
         librarySiteItemBinding.favicon.setImageResource(item.getIcon())
 
-        librarySiteItemBinding.overflowMenu.setImageResource(R.drawable.mozac_ic_delete)
+        librarySiteItemBinding.overflowMenu.setImageResource(R.drawable.ic_delete)
 
         librarySiteItemBinding.overflowMenu.showAndEnable()
 
diff --git a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt
index 72062e213..720c90d09 100644
--- a/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/history/viewholders/HistoryListItemViewHolder.kt
@@ -34,7 +34,7 @@ class HistoryListItemViewHolder(
         }
 
         binding.historyLayout.overflowView.apply {
-            setImageResource(R.drawable.mozac_ic_close)
+            setImageResource(R.drawable.ic_close)
             contentDescription = view.context.getString(R.string.history_delete_item)
             setOnClickListener {
                 val item = item ?: return@setOnClickListener
diff --git a/app/src/main/java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolder.kt
index 8e3391906..e721a461b 100644
--- a/app/src/main/java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/historymetadata/view/HistoryMetadataGroupItemViewHolder.kt
@@ -29,7 +29,7 @@ class HistoryMetadataGroupItemViewHolder(
 
     init {
         binding.historyLayout.overflowView.apply {
-            setImageResource(R.drawable.mozac_ic_close)
+            setImageResource(R.drawable.ic_close)
             contentDescription = view.context.getString(R.string.history_delete_item)
             setOnClickListener {
                 val item = item ?: return@setOnClickListener
diff --git a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt
index eca152ea6..4d6e20dea 100644
--- a/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/recentlyclosed/RecentlyClosedItemViewHolder.kt
@@ -25,7 +25,7 @@ class RecentlyClosedItemViewHolder(
 
     init {
         binding.historyLayout.overflowView.apply {
-            setImageResource(R.drawable.mozac_ic_close)
+            setImageResource(R.drawable.ic_close)
             contentDescription = view.context.getString(R.string.history_delete_item)
             setOnClickListener {
                 val item = item ?: return@setOnClickListener
diff --git a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
index d209661b4..55816fee4 100644
--- a/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
+++ b/app/src/main/java/org/mozilla/fenix/search/awesomebar/AwesomeBarView.kt
@@ -148,7 +148,7 @@ class AwesomeBarView(
                 )
             )
 
-        val searchBitmap = getDrawable(activity, R.drawable.mozac_ic_search)!!.apply {
+        val searchBitmap = getDrawable(activity, R.drawable.ic_search)!!.apply {
             colorFilter = createBlendModeColorFilterCompat(primaryTextColor, SRC_IN)
         }.toBitmap()
 
@@ -335,7 +335,7 @@ class AwesomeBarView(
             val components = activity.components
             val primaryTextColor = activity.getColorFromAttr(R.attr.primaryText)
 
-            val searchBitmap = getDrawable(activity, R.drawable.mozac_ic_search)!!.apply {
+            val searchBitmap = getDrawable(activity, R.drawable.ic_search)!!.apply {
                 colorFilter = createBlendModeColorFilterCompat(primaryTextColor, SRC_IN)
             }.toBitmap()
 
diff --git a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt
index 5d7016a38..b74cbcf50 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/creditcards/CreditCardsSettingFragment.kt
@@ -157,7 +157,7 @@ class CreditCardsSettingFragment : BiometricPromptPreferenceFragment() {
             manageSavedCardsPreference.title =
                 getString(R.string.preferences_credit_cards_manage_saved_cards)
         } else {
-            manageSavedCardsPreference.setIcon(R.drawable.mozac_ic_new)
+            manageSavedCardsPreference.setIcon(R.drawable.ic_new)
             manageSavedCardsPreference.title =
                 getString(R.string.preferences_credit_cards_add_credit_card)
         }
diff --git a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt
index 8c01b009a..4b640f4f4 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/quicksettings/QuickSettingsFragmentState.kt
@@ -71,7 +71,7 @@ enum class WebsiteSecurityUiValues(
 ) {
     SECURE(
         R.string.quick_settings_sheet_secure_connection_2,
-        R.drawable.mozac_ic_lock
+        R.drawable.ic_lock
     ),
     INSECURE(
         R.string.quick_settings_sheet_insecure_connection_2,
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt b/app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt
index 3e49e8730..3d2b1796e 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/FloatingActionButtonBinding.kt
@@ -44,7 +44,7 @@ class FloatingActionButtonBinding(
                     shrink()
                     show()
                     contentDescription = context.getString(R.string.add_tab)
-                    setIconResource(R.drawable.mozac_ic_new)
+                    setIconResource(R.drawable.ic_new)
                     setOnClickListener {
                         browserTrayInteractor.onFabClicked(false)
                     }
@@ -56,7 +56,7 @@ class FloatingActionButtonBinding(
                     extend()
                     show()
                     contentDescription = context.getString(R.string.add_private_tab)
-                    setIconResource(R.drawable.mozac_ic_new)
+                    setIconResource(R.drawable.ic_new)
                     setOnClickListener {
                         browserTrayInteractor.onFabClicked(true)
                     }
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt
index c036a08fe..be67b9a99 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/TabsTouchHelper.kt
@@ -84,7 +84,7 @@ class TouchCallback(
         }
 
         val icon = recyclerView.context.getDrawableWithTint(
-            R.drawable.mozac_ic_delete,
+            R.drawable.ic_delete,
             recyclerView.context.getColorFromAttr(R.attr.destructive)
         )!!
         val background = AppCompatResources.getDrawable(
diff --git a/app/src/main/res/drawable/ic_addons_extensions.xml b/app/src/main/res/drawable/ic_addons_extensions.xml
new file mode 100644
index 000000000..efe803ba3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_addons_extensions.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: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_arrowhead_right.xml b/app/src/main/res/drawable/ic_arrowhead_right.xml
new file mode 100644
index 000000000..268da1cce
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrowhead_right.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:autoMirrored="true"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?primaryText"
+        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.xml b/app/src/main/res/drawable/ic_autoplay.xml
index 259436fb8..f3d5a487f 100644
--- a/app/src/main/res/drawable/ic_autoplay.xml
+++ b/app/src/main/res/drawable/ic_autoplay.xml
@@ -10,6 +10,6 @@
     android:state_enabled="true" />
 <item
     android:id="@+id/disabled"
-    android:drawable="@drawable/mozac_ic_autoplay_blocked" />
+    android:drawable="@drawable/ic_autoplay_disabled" />
 
 </selector>
diff --git a/app/src/main/res/drawable/ic_autoplay_disabled.xml b/app/src/main/res/drawable/ic_autoplay_disabled.xml
new file mode 100644
index 000000000..c5f4e048b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_autoplay_disabled.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:fillColor="?primaryText"
+        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="?primaryText"
+        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_back_button.xml b/app/src/main/res/drawable/ic_back_button.xml
new file mode 100644
index 000000000..5194f6f76
--- /dev/null
+++ b/app/src/main/res/drawable/ic_back_button.xml
@@ -0,0 +1,14 @@
+<?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:autoMirrored="true"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="?primaryText"
+        android:pathData="M20.25,11.5H5.461L11.431,5.53C11.724,5.237 11.724,4.762 11.431,4.469C11.138,4.176 10.663,4.176 10.37,4.469L3,11.839V12.66L10.37,20.03C10.516,20.176 10.708,20.25 10.9,20.25C11.092,20.25 11.284,20.177 11.43,20.03C11.723,19.737 11.723,19.262 11.43,18.969L5.461,13H20.25C20.664,13 21,12.664 21,12.25C21,11.836 20.664,11.5 20.25,11.5Z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
index 82c1e1934..9c5bca788 100644
--- a/app/src/main/res/drawable/ic_camera.xml
+++ b/app/src/main/res/drawable/ic_camera.xml
@@ -5,7 +5,7 @@
 <animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
             android:id="@+id/enabled"
-            android:drawable="@drawable/mozac_ic_video"
+            android:drawable="@drawable/ic_camera_enabled"
             android:state_enabled="true" />
     <item
             android:id="@+id/disabled"
diff --git a/app/src/main/res/drawable/ic_camera_enabled.xml b/app/src/main/res/drawable/ic_camera_enabled.xml
new file mode 100644
index 000000000..3818f98e4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_camera_enabled.xml
@@ -0,0 +1,14 @@
+<?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: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.xml b/app/src/main/res/drawable/ic_chevron.xml
index edb0da373..8ca3aae73 100644
--- a/app/src/main/res/drawable/ic_chevron.xml
+++ b/app/src/main/res/drawable/ic_chevron.xml
@@ -3,6 +3,6 @@
    - 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/. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android" android:constantSize="true">
-    <item android:drawable="@drawable/mozac_ic_arrowhead_up" android:state_activated="true" />
-    <item android:drawable="@drawable/mozac_ic_arrowhead_down" />
+    <item android:drawable="@drawable/ic_chevron_up" android:state_activated="true" />
+    <item android:drawable="@drawable/ic_chevron_down" />
 </selector>
diff --git a/app/src/main/res/drawable/ic_chevron_down.xml b/app/src/main/res/drawable/ic_chevron_down.xml
new file mode 100644
index 000000000..6177fe8a1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_chevron_down.xml
@@ -0,0 +1,12 @@
+<?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 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
new file mode 100644
index 000000000..60d8c82f8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_chevron_up.xml
@@ -0,0 +1,12 @@
+<?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,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_close.xml b/app/src/main/res/drawable/ic_close.xml
new file mode 100644
index 000000000..7b82c9846
--- /dev/null
+++ b/app/src/main/res/drawable/ic_close.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="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_delete.xml b/app/src/main/res/drawable/ic_delete.xml
new file mode 100644
index 000000000..016f2ad0b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delete.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="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
new file mode 100644
index 000000000..de303bb1e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_desktop.xml
@@ -0,0 +1,12 @@
+<?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="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>
diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml
new file mode 100644
index 000000000..ecccd5dd1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_download.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:fillColor="?primaryText"
+        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_internet.xml b/app/src/main/res/drawable/ic_internet.xml
new file mode 100644
index 000000000..f6276035e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_internet.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="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_location.xml b/app/src/main/res/drawable/ic_location.xml
index d86e8f1d3..13454f7f2 100644
--- a/app/src/main/res/drawable/ic_location.xml
+++ b/app/src/main/res/drawable/ic_location.xml
@@ -5,7 +5,7 @@
 <animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
             android:id="@+id/enabled"
-            android:drawable="@drawable/mozac_ic_location"
+            android:drawable="@drawable/ic_location_enabled"
             android:state_enabled="true" />
     <item
             android:id="@+id/disabled"
diff --git a/app/src/main/res/drawable/ic_location_enabled.xml b/app/src/main/res/drawable/ic_location_enabled.xml
new file mode 100644
index 000000000..785b356ab
--- /dev/null
+++ b/app/src/main/res/drawable/ic_location_enabled.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: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_lock.xml b/app/src/main/res/drawable/ic_lock.xml
new file mode 100644
index 000000000..8b2fe6870
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock.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.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="?attr/primaryText"
+        android:pathData="M17.5 11H17V7A5 5 0 0 0 7 7v4H6.5A2.5 2.5 0 0 0 4 13.5v6A2.5 2.5 0 0 0 6.5 22h11a2.5 2.5 0 0 0 2.5-2.5v-6a2.5 2.5 0 0 0-2.5-2.5zm-9-4c0-1.93 1.57-3.5 3.5-3.5s3.5 1.57 3.5 3.5v4h-7V7zm10 12.7l-0.8 0.8H6.3l-0.8-0.8v-6.4l0.8-0.8h11.4l0.8 0.8v6.4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_login.xml b/app/src/main/res/drawable/ic_login.xml
new file mode 100644
index 000000000..a61455db0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_login.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: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_menu.xml b/app/src/main/res/drawable/ic_menu.xml
new file mode 100644
index 000000000..126d113c3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu.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="M14,6a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM14,12a2,2 0,1 1,-4 0,2 2,0 0,1 4,0zM12,20a2,2 0,1 0,0 -4,2 2,0 0,0 0,4z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_microphone.xml b/app/src/main/res/drawable/ic_microphone.xml
index e8ae23dce..69a5db52e 100644
--- a/app/src/main/res/drawable/ic_microphone.xml
+++ b/app/src/main/res/drawable/ic_microphone.xml
@@ -5,7 +5,7 @@
 <animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
             android:id="@+id/enabled"
-            android:drawable="@drawable/mozac_ic_microphone"
+            android:drawable="@drawable/ic_microphone_enabled"
             android:state_enabled="true" />
     <item
             android:id="@+id/disabled"
diff --git a/app/src/main/res/drawable/ic_microphone_enabled.xml b/app/src/main/res/drawable/ic_microphone_enabled.xml
new file mode 100644
index 000000000..e639d9faa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_microphone_enabled.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: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_new.xml b/app/src/main/res/drawable/ic_new.xml
new file mode 100644
index 000000000..ea1ea7ba1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_new.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="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 aaa780b57..813693ef5 100644
--- a/app/src/main/res/drawable/ic_notifications.xml
+++ b/app/src/main/res/drawable/ic_notifications.xml
@@ -5,7 +5,7 @@
 <animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item
             android:id="@+id/enabled"
-            android:drawable="@drawable/mozac_ic_notification"
+            android:drawable="@drawable/ic_notifications_enabled"
             android:state_enabled="true" />
     <item
             android:id="@+id/disabled"
diff --git a/app/src/main/res/drawable/ic_notifications_enabled.xml b/app/src/main/res/drawable/ic_notifications_enabled.xml
new file mode 100644
index 000000000..8fcc4d39d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notifications_enabled.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: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_readermode.xml b/app/src/main/res/drawable/ic_readermode.xml
new file mode 100644
index 000000000..396e54072
--- /dev/null
+++ b/app/src/main/res/drawable/ic_readermode.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:fillColor="?primaryText"
+        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_search.xml b/app/src/main/res/drawable/ic_search.xml
new file mode 100644
index 000000000..dd401903f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_search.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="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_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_storage.xml b/app/src/main/res/drawable/ic_storage.xml
index af586b40a..2340546f0 100644
--- a/app/src/main/res/drawable/ic_storage.xml
+++ b/app/src/main/res/drawable/ic_storage.xml
@@ -2,6 +2,6 @@
    - 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/. -->
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/enabled" android:drawable="@drawable/mozac_ic_storage" android:state_enabled="true" />
+    <item android:id="@+id/enabled" android:drawable="@drawable/ic_storage_enabled" android:state_enabled="true" />
     <item android:id="@+id/disabled" android:drawable="@drawable/ic_storage_disabled" />
 </selector>
diff --git a/app/src/main/res/drawable/ic_storage_enabled.xml b/app/src/main/res/drawable/ic_storage_enabled.xml
new file mode 100644
index 000000000..b5d2f7b4a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_storage_enabled.xml
@@ -0,0 +1,18 @@
+<?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"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="?primaryText"
+      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_top_sites.xml b/app/src/main/res/drawable/ic_top_sites.xml
new file mode 100644
index 000000000..59a02d306
--- /dev/null
+++ b/app/src/main/res/drawable/ic_top_sites.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="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/mozac_ic_extensions_black.xml b/app/src/main/res/drawable/mozac_ic_extensions_black.xml
new file mode 100644
index 000000000..9395d6040
--- /dev/null
+++ b/app/src/main/res/drawable/mozac_ic_extensions_black.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="?android:attr/textColorPrimary"
+        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/layout/activity_privacy_content_display.xml b/app/src/main/res/layout/activity_privacy_content_display.xml
index 8d1fcd069..cee2f0499 100644
--- a/app/src/main/res/layout/activity_privacy_content_display.xml
+++ b/app/src/main/res/layout/activity_privacy_content_display.xml
@@ -21,7 +21,7 @@
                     android:layout_marginLeft="10dp"
                     android:background="@android:color/transparent"
                     android:id="@+id/privacyContentCloseButton"
-                    android:src="@drawable/mozac_ic_close"
+                    android:src="@drawable/ic_close"
                     android:contentDescription="@string/privacy_content_close_button_content_description"
                     tools:ignore="AndroidSrcXmlDetector" />
 
diff --git a/app/src/main/res/layout/button_tip_item.xml b/app/src/main/res/layout/button_tip_item.xml
index 2199f1fe2..5cd8d139a 100644
--- a/app/src/main/res/layout/button_tip_item.xml
+++ b/app/src/main/res/layout/button_tip_item.xml
@@ -38,7 +38,7 @@
         app:tint="@color/photonLightGrey05"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/mozac_ic_close" />
+        app:srcCompat="@drawable/ic_close" />
 
     <TextView
         android:id="@+id/tip_description_text"
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 f11b59f0a..61c711b73 100644
--- a/app/src/main/res/layout/collection_home_list_row.xml
+++ b/app/src/main/res/layout/collection_home_list_row.xml
@@ -69,7 +69,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/mozac_ic_share"
+        app:srcCompat="@drawable/ic_share"
         tools:visibility="visible" />
 
     <ImageButton
@@ -82,7 +82,7 @@
         app:layout_constraintBottom_toBottomOf="@id/collection_icon"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/collection_icon"
-        app:srcCompat="@drawable/mozac_ic_menu"
+        app:srcCompat="@drawable/ic_menu"
         tools:visibility="visible" />
 
     <View
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/component_collection_creation_select_collection.xml b/app/src/main/res/layout/component_collection_creation_select_collection.xml
index dc3892abc..6e801ff82 100644
--- a/app/src/main/res/layout/component_collection_creation_select_collection.xml
+++ b/app/src/main/res/layout/component_collection_creation_select_collection.xml
@@ -131,7 +131,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/mozac_ic_new"
+            app:srcCompat="@drawable/ic_new"
             app:tint="?neutral" />
 
         <TextView
diff --git a/app/src/main/res/layout/component_tabstray2.xml b/app/src/main/res/layout/component_tabstray2.xml
index 6e6b6a9af..6cfbf9db2 100644
--- a/app/src/main/res/layout/component_tabstray2.xml
+++ b/app/src/main/res/layout/component_tabstray2.xml
@@ -51,7 +51,7 @@
         app:layout_constraintBottom_toBottomOf="@+id/multiselect_title"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/multiselect_title"
-        app:srcCompat="@drawable/mozac_ic_close"
+        app:srcCompat="@drawable/ic_close"
         app:tint="@color/contrast_text_normal_theme" />
 
     <TextView
@@ -120,7 +120,7 @@
         app:layout_constraintBottom_toBottomOf="@id/tab_layout"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/tab_layout"
-        app:srcCompat="@drawable/mozac_ic_menu"
+        app:srcCompat="@drawable/ic_menu"
         app:tint="@color/fx_mobile_icon_color_primary" />
 
     <View
diff --git a/app/src/main/res/layout/component_tabstray_fab.xml b/app/src/main/res/layout/component_tabstray_fab.xml
index e094f912d..312fed0c9 100644
--- a/app/src/main/res/layout/component_tabstray_fab.xml
+++ b/app/src/main/res/layout/component_tabstray_fab.xml
@@ -20,5 +20,5 @@
     android:visibility="gone"
     app:elevation="99dp"
     app:borderWidth="0dp"
-    app:icon="@drawable/mozac_ic_new"
+    app:icon="@drawable/ic_new"
     app:iconTint="@color/photonWhite" />
diff --git a/app/src/main/res/layout/connection_details_website_info.xml b/app/src/main/res/layout/connection_details_website_info.xml
index 74dd38bc4..b33f1eaa8 100644
--- a/app/src/main/res/layout/connection_details_website_info.xml
+++ b/app/src/main/res/layout/connection_details_website_info.xml
@@ -43,7 +43,7 @@
                 android:scaleType="fitCenter"
                 android:layout_marginStart="16dp"
                 android:layout_gravity="center_vertical"
-                tools:drawable="@drawable/mozac_ic_globe" />
+                tools:drawable="@drawable/ic_internet" />
 
             <TextView
                 android:id="@+id/title"
diff --git a/app/src/main/res/layout/download_dialog_layout.xml b/app/src/main/res/layout/download_dialog_layout.xml
index 9a6afc14a..99afd7e01 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/exception_item.xml b/app/src/main/res/layout/exception_item.xml
index d6a4128ab..f16285bc1 100644
--- a/app/src/main/res/layout/exception_item.xml
+++ b/app/src/main/res/layout/exception_item.xml
@@ -53,7 +53,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="16dp"
         android:background="?android:attr/selectableItemBackgroundBorderless"
-        app:srcCompat="@drawable/mozac_ic_close"
+        app:srcCompat="@drawable/ic_close"
         android:contentDescription="@string/history_delete_item"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/experiment_default_browser.xml b/app/src/main/res/layout/experiment_default_browser.xml
index 62e3655af..83dbd9d07 100644
--- a/app/src/main/res/layout/experiment_default_browser.xml
+++ b/app/src/main/res/layout/experiment_default_browser.xml
@@ -19,8 +19,8 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/description_text"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/mozac_ic_close"
-        tools:srcCompat="@drawable/mozac_ic_close" />
+        app:srcCompat="@drawable/ic_close"
+        tools:srcCompat="@drawable/ic_close" />
 
     <TextView
         android:id="@+id/description_text"
diff --git a/app/src/main/res/layout/fragment_search_dialog.xml b/app/src/main/res/layout/fragment_search_dialog.xml
index 6f510572a..d4747c157 100644
--- a/app/src/main/res/layout/fragment_search_dialog.xml
+++ b/app/src/main/res/layout/fragment_search_dialog.xml
@@ -186,7 +186,7 @@
         style="@style/search_pill"
         android:textOff="@string/search_engine_button"
         android:textOn="@string/search_engine_button"
-        app:drawableStartCompat="@drawable/mozac_ic_search"
+        app:drawableStartCompat="@drawable/ic_search"
         app:layout_constraintBottom_toBottomOf="@id/pill_wrapper"
         app:layout_constraintStart_toEndOf="@id/qr_scan_button"
         app:layout_constraintTop_toTopOf="@id/pill_wrapper" />
diff --git a/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml b/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml
index 43f606010..476a6bcc3 100644
--- a/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml
+++ b/app/src/main/res/layout/fragment_site_permissions_exceptions_item.xml
@@ -18,7 +18,7 @@
             android:layout_height="24dp"
             android:importantForAccessibility="no"
             android:scaleType="fitCenter"
-            app:drawableStartCompat="@drawable/mozac_ic_globe"/>
+            app:drawableStartCompat="@drawable/ic_internet"/>
 
     <TextView
             android:id="@+id/exception_text"
diff --git a/app/src/main/res/layout/inactive_header_item.xml b/app/src/main/res/layout/inactive_header_item.xml
index 8f872d332..6ace4d6a6 100644
--- a/app/src/main/res/layout/inactive_header_item.xml
+++ b/app/src/main/res/layout/inactive_header_item.xml
@@ -64,7 +64,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/mozac_ic_delete" />
+            app:srcCompat="@drawable/ic_delete" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/inactive_tabs_auto_close.xml b/app/src/main/res/layout/inactive_tabs_auto_close.xml
index 503074d96..873597fe1 100644
--- a/app/src/main/res/layout/inactive_tabs_auto_close.xml
+++ b/app/src/main/res/layout/inactive_tabs_auto_close.xml
@@ -48,7 +48,7 @@
                 android:contentDescription="@string/tab_tray_inactive_auto_close_button_content_description"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/mozac_ic_close" />
+                app:srcCompat="@drawable/ic_close" />
 
             <TextView
                 android:id="@+id/message"
diff --git a/app/src/main/res/layout/layout_add_credit_card.xml b/app/src/main/res/layout/layout_add_credit_card.xml
index efb18ce2f..4857fb161 100644
--- a/app/src/main/res/layout/layout_add_credit_card.xml
+++ b/app/src/main/res/layout/layout_add_credit_card.xml
@@ -17,7 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/credit_cards_saved_cards_item_margin_start"
-        app:srcCompat="@drawable/mozac_ic_new"
+        app:srcCompat="@drawable/ic_new"
         android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="@id/add_credit_card_text"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/layout_add_login.xml b/app/src/main/res/layout/layout_add_login.xml
index 970cd0431..23750d5c9 100644
--- a/app/src/main/res/layout/layout_add_login.xml
+++ b/app/src/main/res/layout/layout_add_login.xml
@@ -17,7 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/credit_cards_saved_cards_item_margin_start"
-        app:srcCompat="@drawable/mozac_ic_new"
+        app:srcCompat="@drawable/ic_new"
         android:importantForAccessibility="no"
         app:layout_constraintBottom_toBottomOf="@id/add_login_text"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/library_site_item.xml b/app/src/main/res/layout/library_site_item.xml
index 9aba63dc4..530759fed 100644
--- a/app/src/main/res/layout/library_site_item.xml
+++ b/app/src/main/res/layout/library_site_item.xml
@@ -77,7 +77,7 @@
             android:layout_height="@dimen/glyph_button_height"
             android:background="?android:attr/selectableItemBackgroundBorderless"
             android:contentDescription="@string/content_description_menu"
-            app:srcCompat="@drawable/mozac_ic_menu"
+            app:srcCompat="@drawable/ic_menu"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"/>
diff --git a/app/src/main/res/layout/no_collections_message.xml b/app/src/main/res/layout/no_collections_message.xml
index fca1f95bb..f5eb97838 100644
--- a/app/src/main/res/layout/no_collections_message.xml
+++ b/app/src/main/res/layout/no_collections_message.xml
@@ -36,7 +36,7 @@
         app:layout_constraintBottom_toBottomOf="@id/no_collections_header"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@id/no_collections_header"
-        app:srcCompat="@drawable/mozac_ic_close" />
+        app:srcCompat="@drawable/ic_close" />
 
     <TextView
         android:id="@+id/no_collections_description"
diff --git a/app/src/main/res/layout/onboarding_inactive_tabs_cfr.xml b/app/src/main/res/layout/onboarding_inactive_tabs_cfr.xml
index a6ac484a3..04e250672 100644
--- a/app/src/main/res/layout/onboarding_inactive_tabs_cfr.xml
+++ b/app/src/main/res/layout/onboarding_inactive_tabs_cfr.xml
@@ -54,7 +54,7 @@
             android:contentDescription="@string/content_description_close_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/mozac_ic_close"
+            app:srcCompat="@drawable/ic_close"
             app:tint="@color/fx_mobile_private_text_color_primary" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml b/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml
index 37d9cb62c..994dc2ca7 100644
--- a/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml
+++ b/app/src/main/res/layout/onboarding_jump_back_in_cfr.xml
@@ -44,7 +44,7 @@
             android:contentDescription="@string/content_description_close_button"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/mozac_ic_close"
+            app:srcCompat="@drawable/ic_close"
             app:tint="@color/fx_mobile_private_text_color_primary" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/overlay_add_on_progress.xml b/app/src/main/res/layout/overlay_add_on_progress.xml
index 77f682fbf..7ee5ecd1b 100644
--- a/app/src/main/res/layout/overlay_add_on_progress.xml
+++ b/app/src/main/res/layout/overlay_add_on_progress.xml
@@ -24,7 +24,7 @@
             android:gravity="start|center_vertical"
             android:padding="16dp"
             android:text="@string/mozac_add_on_install_progress_caption"
-            app:drawableStartCompat="@drawable/mozac_ic_extensions" />
+            app:drawableStartCompat="@drawable/mozac_ic_extensions_black" />
 
         <Button
             android:id="@+id/cancel_button"
diff --git a/app/src/main/res/layout/preference_search_add_engine.xml b/app/src/main/res/layout/preference_search_add_engine.xml
index 623ba2f81..32d33ab8b 100644
--- a/app/src/main/res/layout/preference_search_add_engine.xml
+++ b/app/src/main/res/layout/preference_search_add_engine.xml
@@ -22,7 +22,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/mozac_ic_new" />
+        app:srcCompat="@drawable/ic_new" />
 
     <TextView
         android:id="@+id/add_engine_text"
diff --git a/app/src/main/res/layout/quicksettings_tracking_protection.xml b/app/src/main/res/layout/quicksettings_tracking_protection.xml
index 246a2c9ea..24fd205c7 100644
--- a/app/src/main/res/layout/quicksettings_tracking_protection.xml
+++ b/app/src/main/res/layout/quicksettings_tracking_protection.xml
@@ -30,7 +30,7 @@
         android:layout_alignParentEnd="true"
         android:text="@string/enhanced_tracking_protection_details"
         android:visibility="gone"
-        app:drawableEndCompat="@drawable/mozac_ic_arrowhead_right"
+        app:drawableEndCompat="@drawable/ic_arrowhead_right"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/quicksettings_website_info.xml b/app/src/main/res/layout/quicksettings_website_info.xml
index 043a9e2cf..d65ad90e5 100644
--- a/app/src/main/res/layout/quicksettings_website_info.xml
+++ b/app/src/main/res/layout/quicksettings_website_info.xml
@@ -64,7 +64,7 @@
                 android:layout_width="match_parent"
                 android:paddingStart="8dp"
                 android:layout_height="wrap_content"
-                app:drawableEndCompat="@drawable/mozac_ic_arrowhead_right"
+                app:drawableEndCompat="@drawable/ic_arrowhead_right"
                 android:paddingEnd="0dp"
                 tools:text="Connection is secure" />
         </LinearLayout>
diff --git a/app/src/main/res/layout/search_engine_radio_button.xml b/app/src/main/res/layout/search_engine_radio_button.xml
index c2bae754e..d352591af 100644
--- a/app/src/main/res/layout/search_engine_radio_button.xml
+++ b/app/src/main/res/layout/search_engine_radio_button.xml
@@ -43,5 +43,5 @@
         android:layout_height="@dimen/glyph_button_height"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/content_description_menu"
-        app:srcCompat="@drawable/mozac_ic_menu" />
+        app:srcCompat="@drawable/ic_menu" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/share_close.xml b/app/src/main/res/layout/share_close.xml
index 4ff87a7c7..918f0c9f3 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/survey_inactive_tabs_disable.xml b/app/src/main/res/layout/survey_inactive_tabs_disable.xml
index 011271476..ceb413d17 100644
--- a/app/src/main/res/layout/survey_inactive_tabs_disable.xml
+++ b/app/src/main/res/layout/survey_inactive_tabs_disable.xml
@@ -96,7 +96,7 @@
         android:paddingBottom="20dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/mozac_ic_close" />
+        app:srcCompat="@drawable/ic_close" />
 
     <Button
         android:id="@+id/send_button"
diff --git a/app/src/main/res/layout/tab_group_item.xml b/app/src/main/res/layout/tab_group_item.xml
index 34740d2ef..752db3c65 100644
--- a/app/src/main/res/layout/tab_group_item.xml
+++ b/app/src/main/res/layout/tab_group_item.xml
@@ -18,7 +18,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:tint="@color/primary_text_normal_theme"
-        app:srcCompat="@drawable/mozac_ic_search" />
+        app:srcCompat="@drawable/ic_search" />
 
     <TextView
         android:id="@+id/tab_group_title"
diff --git a/app/src/main/res/layout/tab_preview.xml b/app/src/main/res/layout/tab_preview.xml
index ef12e7016..6d4cc1464 100644
--- a/app/src/main/res/layout/tab_preview.xml
+++ b/app/src/main/res/layout/tab_preview.xml
@@ -43,7 +43,7 @@
             android:layout_height="48dp"
             android:layout_gravity="center"
             android:scaleType="center"
-            app:srcCompat="@drawable/mozac_ic_menu"
+            app:srcCompat="@drawable/ic_menu"
             app:tint="?primaryText" />
     </LinearLayout>
 </merge>
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 95fe99abe..e74c290b9 100644
--- a/app/src/main/res/layout/tab_tray_grid_item.xml
+++ b/app/src/main/res/layout/tab_tray_grid_item.xml
@@ -77,7 +77,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/primary_text_normal_theme" />
 
             <View
diff --git a/app/src/main/res/layout/tab_tray_item.xml b/app/src/main/res/layout/tab_tray_item.xml
index a29790af5..c302234aa 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/primary_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 8e8daafd2..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/mozac_ic_share"
+        app:srcCompat="@drawable/ic_share"
         app:tint="@color/contrast_text_normal_theme" />
 
     <ImageButton
@@ -45,6 +45,6 @@
         app:layout_constraintBottom_toBottomOf="@id/topBar"
         app:layout_constraintEnd_toEndOf="@id/topBar"
         app:layout_constraintTop_toTopOf="@id/topBar"
-        app:srcCompat="@drawable/mozac_ic_menu"
+        app:srcCompat="@drawable/ic_menu"
         app:tint="@color/contrast_text_normal_theme" />
 </merge>
diff --git a/app/src/main/res/layout/tracking_protection_learn_more_preference.xml b/app/src/main/res/layout/tracking_protection_learn_more_preference.xml
index 7e26f921e..6f96cf973 100644
--- a/app/src/main/res/layout/tracking_protection_learn_more_preference.xml
+++ b/app/src/main/res/layout/tracking_protection_learn_more_preference.xml
@@ -81,7 +81,7 @@
         app:layout_constraintBottom_toBottomOf="@id/learn_more"
         app:layout_constraintStart_toEndOf="@id/learn_more"
         app:layout_constraintTop_toTopOf="@id/learn_more"
-        app:srcCompat="@drawable/mozac_ic_arrowhead_right" />
+        app:srcCompat="@drawable/ic_arrowhead_right" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline"
diff --git a/app/src/main/res/menu/bookmarks_edit.xml b/app/src/main/res/menu/bookmarks_edit.xml
index 4aa4bd5af..f9a024b3d 100644
--- a/app/src/main/res/menu/bookmarks_edit.xml
+++ b/app/src/main/res/menu/bookmarks_edit.xml
@@ -6,7 +6,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/delete_bookmark_button"
-        android:icon="@drawable/mozac_ic_delete"
+        android:icon="@drawable/ic_delete"
         app:iconTint="?primaryText"
         android:title="@string/bookmark_menu_delete_button"
         android:contentDescription="@string/bookmark_menu_delete_button"
diff --git a/app/src/main/res/menu/bookmarks_menu.xml b/app/src/main/res/menu/bookmarks_menu.xml
index a6add49e4..393dcb064 100644
--- a/app/src/main/res/menu/bookmarks_menu.xml
+++ b/app/src/main/res/menu/bookmarks_menu.xml
@@ -13,7 +13,7 @@
 
     <item
         android:id="@+id/close_bookmarks"
-        android:icon="@drawable/mozac_ic_close"
+        android:icon="@drawable/ic_close"
         app:iconTint="?primaryText"
         android:title="@string/content_description_close_button"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/bookmarks_select_folder.xml b/app/src/main/res/menu/bookmarks_select_folder.xml
index e621d5ab4..0a6f6b670 100644
--- a/app/src/main/res/menu/bookmarks_select_folder.xml
+++ b/app/src/main/res/menu/bookmarks_select_folder.xml
@@ -6,7 +6,7 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
             android:id="@+id/add_folder_button"
-            android:icon="@drawable/mozac_ic_new"
+            android:icon="@drawable/ic_new"
             app:iconTint="?primaryText"
             android:title="@string/bookmark_add_folder"
             app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/bookmarks_select_multi.xml b/app/src/main/res/menu/bookmarks_select_multi.xml
index d436e6f3c..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/mozac_ic_share"
+        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/credit_card_editor.xml b/app/src/main/res/menu/credit_card_editor.xml
index fe374b1bc..5b4c672a2 100644
--- a/app/src/main/res/menu/credit_card_editor.xml
+++ b/app/src/main/res/menu/credit_card_editor.xml
@@ -6,7 +6,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/delete_credit_card_button"
-        android:icon="@drawable/mozac_ic_delete"
+        android:icon="@drawable/ic_delete"
         android:title="@string/credit_cards_menu_delete_card"
         android:visible="false"
         app:iconTint="?primaryText"
diff --git a/app/src/main/res/menu/history_menu.xml b/app/src/main/res/menu/history_menu.xml
index 620a06731..7d8badf26 100644
--- a/app/src/main/res/menu/history_menu.xml
+++ b/app/src/main/res/menu/history_menu.xml
@@ -6,7 +6,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/history_delete_all"
-        android:icon="@drawable/mozac_ic_delete"
+        android:icon="@drawable/ic_delete"
         android:title="@string/history_delete_all"
         app:iconTint="?primaryText"
         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 df688d4bb..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/mozac_ic_share"
+            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/languages_list.xml b/app/src/main/res/menu/languages_list.xml
index b8690f2a8..f3d854c2c 100644
--- a/app/src/main/res/menu/languages_list.xml
+++ b/app/src/main/res/menu/languages_list.xml
@@ -5,7 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/search"
-        android:icon="@drawable/mozac_ic_search"
+        android:icon="@drawable/ic_search"
         android:title="@string/locale_search_hint"
         app:iconTint="?primaryText"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
diff --git a/app/src/main/res/menu/library_menu.xml b/app/src/main/res/menu/library_menu.xml
index a4fc30d85..5bc903838 100644
--- a/app/src/main/res/menu/library_menu.xml
+++ b/app/src/main/res/menu/library_menu.xml
@@ -7,7 +7,7 @@
 
     <item
         android:id="@+id/close_history"
-        android:icon="@drawable/mozac_ic_close"
+        android:icon="@drawable/ic_close"
         app:iconTint="?primaryText"
         android:title="@string/content_description_close_button"
         app:showAsAction="ifRoom" />
diff --git a/app/src/main/res/menu/login_list.xml b/app/src/main/res/menu/login_list.xml
index 583d7957f..e6e0c6959 100644
--- a/app/src/main/res/menu/login_list.xml
+++ b/app/src/main/res/menu/login_list.xml
@@ -5,7 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/search"
-        android:icon="@drawable/mozac_ic_search"
+        android:icon="@drawable/ic_search"
         android:title="@string/preferences_passwords_saved_logins_search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:iconTint="?primaryText"
diff --git a/app/src/main/res/menu/login_options_menu.xml b/app/src/main/res/menu/login_options_menu.xml
index 276211c3f..840c9f50d 100644
--- a/app/src/main/res/menu/login_options_menu.xml
+++ b/app/src/main/res/menu/login_options_menu.xml
@@ -25,7 +25,7 @@
     <item
         android:id="@+id/delete_login_button"
         android:contentDescription="@string/login_menu_delete_button"
-        android:icon="@drawable/mozac_ic_delete"
+        android:icon="@drawable/ic_delete"
         android:minWidth="82dp"
         android:padding="20dp"
         android:paddingStart="20dp"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index eaac2f1d5..73a55059e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -251,6 +251,10 @@
     <color name="bottom_bar_shadow">#1A000000</color>
     <color name="snackbar_error_color">#B52645</color>
 
+    <!-- Reader View colors -->
+    <color name="mozac_feature_readerview_text_color" tools:ignore="UnusedResources">@color/primary_text_light_theme</color>
+    <color name="mozac_feature_readerview_selected">@color/photonViolet40</color>
+
     <!-- Share UI -->
     <color name="default_share_background">#E3E2E3</color>
     <color name="device_type_desktop_background">#F091C3</color>
@@ -278,18 +282,13 @@
     <!-- SearchView Hint Color -->
     <color name="search_view_hint_color">@color/photonDarkGrey05</color>
 
+    <!-- Tab Counter colors -->
+    <color name="mozac_ui_tabcounter_default_tint" tools:ignore="UnusedResources">@color/primary_text_light_theme</color>
+    <color name="mozac_ui_tabcounter_default_text" tools:ignore="UnusedResources">@color/primary_text_light_theme</color>
+
     <!-- App Spinners colors -->
     <color name="spinner_selected_item">#1415141A</color>
 
     <!-- Toolbar menu icon colors -->
     <color name="toolbar_menu_transparent">@android:color/transparent</color>
-
-    <!-- Mozilla Android Component color variable overrides -->
-    <color name="mozac_ui_icons_fill" tools:ignore="UnusedResources">?primaryText</color>
-    <!-- Tab Counter colors -->
-    <color name="mozac_ui_tabcounter_default_tint" tools:ignore="UnusedResources">@color/primary_text_light_theme</color>
-    <color name="mozac_ui_tabcounter_default_text" tools:ignore="UnusedResources">@color/primary_text_light_theme</color>
-    <!-- Reader View colors -->
-    <color name="mozac_feature_readerview_text_color" tools:ignore="UnusedResources">@color/primary_text_light_theme</color>
-    <color name="mozac_feature_readerview_selected">@color/photonViolet40</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7f50ba332..66e118d8a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -467,7 +467,7 @@
 
     <style name="QuickSettingsLargeText.Icon">
         <item name="android:drawablePadding">8dp</item>
-        <item name="drawableEndCompat">@drawable/mozac_ic_arrowhead_right</item>
+        <item name="drawableEndCompat">@drawable/ic_arrowhead_right</item>
     </style>
 
     <style name="QuickSettingsText.Icon">
diff --git a/app/src/main/res/xml/logins_preferences.xml b/app/src/main/res/xml/logins_preferences.xml
index 00f46dcc2..8545bc916 100644
--- a/app/src/main/res/xml/logins_preferences.xml
+++ b/app/src/main/res/xml/logins_preferences.xml
@@ -26,5 +26,5 @@
     <androidx.preference.Preference
         android:key="@string/pref_key_login_exceptions"
         android:title="@string/preferences_passwords_exceptions"
-        app:icon="@drawable/mozac_ic_globe" />
+        app:icon="@drawable/ic_internet" />
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml b/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml
index ce4397aae..6bb8cfbbe 100644
--- a/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml
+++ b/app/src/main/res/xml/site_permissions_details_exceptions_preferences.xml
@@ -5,25 +5,25 @@
 <androidx.preference.PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android">
     <androidx.preference.Preference
-            android:icon="@drawable/mozac_ic_video"
+            android:icon="@drawable/ic_camera_enabled"
             android:key="@string/pref_key_phone_feature_camera"
             android:title="@string/preference_phone_feature_camera"
             android:summary="@string/preference_option_phone_feature_ask_to_allow"/>
 
     <androidx.preference.Preference
-            android:icon="@drawable/mozac_ic_location"
+            android:icon="@drawable/ic_location_enabled"
             android:key="@string/pref_key_phone_feature_location"
             android:title="@string/preference_phone_feature_location"
             android:summary="@string/preference_option_phone_feature_ask_to_allow"/>
 
     <androidx.preference.Preference
-            android:icon="@drawable/mozac_ic_microphone"
+            android:icon="@drawable/ic_microphone_enabled"
             android:key="@string/pref_key_phone_feature_microphone"
             android:title="@string/preference_phone_feature_microphone"
             android:summary="@string/preference_option_phone_feature_ask_to_allow"/>
 
     <androidx.preference.Preference
-            android:icon="@drawable/mozac_ic_notification"
+            android:icon="@drawable/ic_notifications_enabled"
             android:key="@string/pref_key_phone_feature_notification"
             android:title="@string/preference_phone_feature_notification"
             android:summary="@string/preference_option_phone_feature_ask_to_allow"/>
diff --git a/app/src/main/res/xml/site_permissions_preferences.xml b/app/src/main/res/xml/site_permissions_preferences.xml
index bd11553a0..d053c49e9 100644
--- a/app/src/main/res/xml/site_permissions_preferences.xml
+++ b/app/src/main/res/xml/site_permissions_preferences.xml
@@ -12,25 +12,25 @@
             android:summary="@string/preference_option_autoplay_blocked3"/>
 
     <androidx.preference.Preference
-            android:icon="@drawable/mozac_ic_video"
+            android:icon="@drawable/ic_camera_enabled"
             android:key="@string/pref_key_phone_feature_camera"
             android:title="@string/preference_phone_feature_camera"
             android:summary="@string/preference_option_phone_feature_ask_to_allow"/>
 
     <androidx.preference.Preference
-            android:icon="@drawable/mozac_ic_location"
+            android:icon="@drawable/ic_location_enabled"
             android:key="@string/pref_key_phone_feature_location"
             android:title="@string/preference_phone_feature_location"
             android:summary="@string/preference_option_phone_feature_ask_to_allow"/>
 
     <androidx.preference.Preference
-            android:icon="@drawable/mozac_ic_microphone"
+            android:icon="@drawable/ic_microphone_enabled"
             android:key="@string/pref_key_phone_feature_microphone"
             android:title="@string/preference_phone_feature_microphone"
             android:summary="@string/preference_option_phone_feature_ask_to_allow"/>
 
     <androidx.preference.Preference
-            android:icon="@drawable/mozac_ic_notification"
+            android:icon="@drawable/ic_notifications_enabled"
             android:key="@string/pref_key_phone_feature_notification"
             android:title="@string/preference_phone_feature_notification"
             android:summary="@string/preference_option_phone_feature_ask_to_allow"
@@ -58,7 +58,7 @@
         app:allowDividerBelow="true"/>
 
     <androidx.preference.Preference
-            android:icon="@drawable/mozac_ic_globe"
+            android:icon="@drawable/ic_internet"
             android:key="@string/pref_key_show_site_exceptions"
             android:title="@string/preference_exceptions"
             app:allowDividerAbove="true"/>
diff --git a/app/src/main/res/xml/tracking_protection_preferences.xml b/app/src/main/res/xml/tracking_protection_preferences.xml
index 287576707..f53ca38e6 100644
--- a/app/src/main/res/xml/tracking_protection_preferences.xml
+++ b/app/src/main/res/xml/tracking_protection_preferences.xml
@@ -78,7 +78,7 @@
         android:title="@string/etp_redirect_trackers_title" />
 
     <Preference
-        android:icon="@drawable/mozac_ic_globe"
+        android:icon="@drawable/ic_internet"
         android:key="@string/pref_key_tracking_protection_exceptions"
         android:title="@string/preferences_tracking_protection_exceptions"
         app:allowDividerAbove="true" />
diff --git a/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt b/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt
index 1b347d233..48c1eacdd 100644
--- a/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/search/toolbar/ToolbarViewTest.kt
@@ -44,7 +44,7 @@ class ToolbarViewTest {
         searchEngineSource = SearchEngineSource.Default(
             mockk {
                 every { name } returns "Search Engine"
-                every { icon } returns testContext.getDrawable(R.drawable.mozac_ic_search)!!.toBitmap()
+                every { icon } returns testContext.getDrawable(R.drawable.ic_search)!!.toBitmap()
             }
         ),
         defaultEngine = null,
diff --git a/app/src/test/java/org/mozilla/fenix/tabstray/FloatingActionButtonBindingTest.kt b/app/src/test/java/org/mozilla/fenix/tabstray/FloatingActionButtonBindingTest.kt
index d7a20f1f8..ff742a5e5 100644
--- a/app/src/test/java/org/mozilla/fenix/tabstray/FloatingActionButtonBindingTest.kt
+++ b/app/src/test/java/org/mozilla/fenix/tabstray/FloatingActionButtonBindingTest.kt
@@ -99,7 +99,7 @@ class FloatingActionButtonBindingTest {
         verify(exactly = 1) { actionButton.show() }
         verify(exactly = 0) { actionButton.extend() }
         verify(exactly = 0) { actionButton.hide() }
-        verify(exactly = 1) { actionButton.setIconResource(R.drawable.mozac_ic_new) }
+        verify(exactly = 1) { actionButton.setIconResource(R.drawable.ic_new) }
         verify(exactly = 1) { actionButton.contentDescription = any() }
 
         tabsTrayStore.dispatch(TabsTrayAction.PageSelected(Page.positionToPage(Page.PrivateTabs.ordinal)))
@@ -110,7 +110,7 @@ class FloatingActionButtonBindingTest {
         verify(exactly = 1) { actionButton.extend() }
         verify(exactly = 0) { actionButton.hide() }
         verify(exactly = 1) { actionButton.setText(R.string.tab_drawer_fab_content) }
-        verify(exactly = 2) { actionButton.setIconResource(R.drawable.mozac_ic_new) }
+        verify(exactly = 2) { actionButton.setIconResource(R.drawable.ic_new) }
         verify(exactly = 2) { actionButton.contentDescription = any() }
 
         tabsTrayStore.dispatch(TabsTrayAction.PageSelected(Page.positionToPage(Page.SyncedTabs.ordinal)))