diff --git a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
index 89663ad138ff..f17a484c0035 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/BrowserTabFragment.kt
@@ -171,8 +171,6 @@ import com.duckduckgo.appbuildconfig.api.AppBuildConfig
 import com.duckduckgo.autoconsent.api.Autoconsent
 import com.duckduckgo.autoconsent.api.AutoconsentCallback
 import com.duckduckgo.autofill.*
-import com.duckduckgo.autofill.BrowserAutofill
-import com.duckduckgo.autofill.Callback
 import com.duckduckgo.autofill.domain.app.LoginCredentials
 import com.duckduckgo.autofill.domain.app.LoginTriggerType
 import com.duckduckgo.autofill.store.AutofillStore.ContainsCredentialsResult.*
@@ -187,9 +185,6 @@ import com.duckduckgo.downloads.api.FileDownloader
 import com.duckduckgo.downloads.api.FileDownloader.PendingFileDownload
 import com.duckduckgo.mobile.android.ui.store.BrowserAppTheme
 import com.duckduckgo.mobile.android.ui.view.*
-import com.duckduckgo.mobile.android.ui.view.DaxDialog
-import com.duckduckgo.mobile.android.ui.view.DaxDialogListener
-import com.duckduckgo.mobile.android.ui.view.KeyboardAwareEditText
 import com.duckduckgo.mobile.android.ui.view.dialog.CustomAlertDialogBuilder
 import com.duckduckgo.mobile.android.ui.view.dialog.DaxAlertDialog
 import com.duckduckgo.mobile.android.ui.view.dialog.StackedAlertDialogBuilder
@@ -202,7 +197,6 @@ import com.duckduckgo.voice.api.VoiceSearchLauncher.Source.BROWSER
 import com.google.android.material.snackbar.BaseTransientBottomBar
 import com.google.android.material.snackbar.Snackbar
 import java.io.File
-import java.util.EventListener
 import javax.inject.Inject
 import javax.inject.Provider
 import kotlin.coroutines.CoroutineContext
@@ -2517,11 +2511,12 @@ class BrowserTabFragment :
         context?.let {
             val isShowing: Boolean? = emailAutofillTooltipDialog?.isShowing
             if (isShowing != true) {
-                emailAutofillTooltipDialog = EmailAutofillTooltipFragment(it, address)
-                emailAutofillTooltipDialog?.show()
-                emailAutofillTooltipDialog?.setOnCancelListener { viewModel.cancelAutofillTooltip() }
-                emailAutofillTooltipDialog?.useAddress = { viewModel.useAddress() }
-                emailAutofillTooltipDialog?.usePrivateAlias = { viewModel.consumeAlias() }
+                emailAutofillTooltipDialog = EmailAutofillTooltipFragment(it, address).apply {
+                    show()
+                    setOnCancelListener { viewModel.cancelAutofillTooltip() }
+                    useAddress = { viewModel.useAddress() }
+                    usePrivateAlias = { viewModel.consumeAlias() }
+                }
             }
         }
     }
diff --git a/app/src/main/java/com/duckduckgo/app/browser/history/NavigationHistoryAdapter.kt b/app/src/main/java/com/duckduckgo/app/browser/history/NavigationHistoryAdapter.kt
index e4d7f47ddaa0..cca97f0a8563 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/history/NavigationHistoryAdapter.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/history/NavigationHistoryAdapter.kt
@@ -19,12 +19,12 @@ package com.duckduckgo.app.browser.history
 import android.annotation.SuppressLint
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import android.widget.ImageView
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.RecyclerView
-import com.duckduckgo.app.browser.databinding.ItemNavigationHistoryPopupRowBinding
 import com.duckduckgo.app.browser.favicon.FaviconManager
+import com.duckduckgo.mobile.android.databinding.RowOneLineListItemBinding
+import com.duckduckgo.mobile.android.ui.view.listitem.OneLineListItem
 import kotlinx.coroutines.launch
 
 class NavigationHistoryAdapter(
@@ -45,7 +45,7 @@ class NavigationHistoryAdapter(
         viewType: Int,
     ): NavigationViewHolder {
         val inflater = LayoutInflater.from(parent.context)
-        val binding = ItemNavigationHistoryPopupRowBinding.inflate(inflater, parent, false)
+        val binding = RowOneLineListItemBinding.inflate(inflater, parent, false)
         return NavigationViewHolder(binding)
     }
 
@@ -54,10 +54,11 @@ class NavigationHistoryAdapter(
         position: Int,
     ) {
         val entry = navigationHistory[position]
+        val listItem = holder.binding.root
 
-        with(holder.binding.title) { text = entry.title }
-        loadFavicon(entry, holder.binding.favicon)
-        holder.binding.root.setOnClickListener { listener.historicalPageSelected(position) }
+        loadFavicon(entry, holder.binding.root)
+        listItem.setPrimaryText(entry.title.orEmpty())
+        listItem.setOnClickListener { listener.historicalPageSelected(position) }
     }
 
     override fun getItemCount(): Int {
@@ -72,15 +73,15 @@ class NavigationHistoryAdapter(
 
     private fun loadFavicon(
         historyEntry: NavigationHistoryEntry,
-        view: ImageView,
+        oneListItem: OneLineListItem,
     ) {
         lifecycleOwner.lifecycleScope.launch {
-            faviconManager.loadToViewFromLocalOrFallback(url = historyEntry.url, tabId = tabId, view = view)
+            faviconManager.loadToViewFromLocalOrFallback(url = historyEntry.url, tabId = tabId, view = oneListItem.leadingIcon())
         }
     }
 }
 
-data class NavigationViewHolder(val binding: ItemNavigationHistoryPopupRowBinding) :
+data class NavigationViewHolder(val binding: RowOneLineListItemBinding) :
     RecyclerView.ViewHolder(binding.root)
 
 data class NavigationHistoryEntry(
diff --git a/app/src/main/java/com/duckduckgo/app/browser/history/NavigationHistorySheet.kt b/app/src/main/java/com/duckduckgo/app/browser/history/NavigationHistorySheet.kt
index 747fbd9fd688..c4757beffb22 100644
--- a/app/src/main/java/com/duckduckgo/app/browser/history/NavigationHistorySheet.kt
+++ b/app/src/main/java/com/duckduckgo/app/browser/history/NavigationHistorySheet.kt
@@ -19,13 +19,12 @@ package com.duckduckgo.app.browser.history
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
+import android.view.LayoutInflater
 import androidx.lifecycle.LifecycleOwner
-import androidx.recyclerview.widget.RecyclerView
 import com.duckduckgo.app.browser.BrowserTabViewModel.Command.ShowBackNavigationHistory
+import com.duckduckgo.app.browser.databinding.NavigationHistoryPopupViewBinding
 import com.duckduckgo.app.browser.favicon.FaviconManager
 import com.duckduckgo.app.browser.history.NavigationHistoryAdapter.NavigationHistoryListener
-import com.duckduckgo.mobile.android.R
-import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 
 @SuppressLint("NoBottomSheetDialog")
@@ -36,7 +35,9 @@ class NavigationHistorySheet(
     private val tabId: String,
     private val history: ShowBackNavigationHistory,
     private val listener: NavigationHistorySheetListener,
-) : BottomSheetDialog(context, R.style.NavigationHistoryDialog) {
+) : BottomSheetDialog(context) {
+
+    private val binding = NavigationHistoryPopupViewBinding.inflate(LayoutInflater.from(context))
 
     interface NavigationHistorySheetListener {
         fun historicalPageSelected(stackIndex: Int)
@@ -45,12 +46,9 @@ class NavigationHistorySheet(
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        behavior.state = BottomSheetBehavior.STATE_EXPANDED
-        behavior.skipCollapsed = true
-
-        setContentView(com.duckduckgo.app.browser.R.layout.navigation_history_popup_view)
+        setContentView(binding.root)
 
-        findViewById<RecyclerView>(com.duckduckgo.app.browser.R.id.historyRecycler)?.also { recycler ->
+        binding.historyRecycler.also { recycler ->
             NavigationHistoryAdapter(
                 viewLifecycleOwner,
                 faviconManager,
diff --git a/app/src/main/java/com/duckduckgo/app/email/EmailAutofillTooltipFragment.kt b/app/src/main/java/com/duckduckgo/app/email/EmailAutofillTooltipFragment.kt
index 1eaaf3efc892..ea4270cb805f 100644
--- a/app/src/main/java/com/duckduckgo/app/email/EmailAutofillTooltipFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/email/EmailAutofillTooltipFragment.kt
@@ -19,23 +19,25 @@ package com.duckduckgo.app.email
 import android.annotation.SuppressLint
 import android.content.Context
 import android.os.Bundle
+import android.view.LayoutInflater
 import com.duckduckgo.app.browser.R
+import com.duckduckgo.app.browser.databinding.ContentAutofillTooltipBinding
 import com.duckduckgo.app.global.extensions.html
-import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
-import kotlinx.android.synthetic.main.content_autofill_tooltip.*
 
 @SuppressLint("NoBottomSheetDialog")
 class EmailAutofillTooltipFragment(
     context: Context,
     val address: String,
-) : BottomSheetDialog(context, R.style.EmailTooltip) {
+) : BottomSheetDialog(context) {
+
+    private val binding = ContentAutofillTooltipBinding.inflate(LayoutInflater.from(context))
 
     var useAddress: (() -> Unit) = {}
     var usePrivateAlias: (() -> Unit) = {}
 
     init {
-        setContentView(R.layout.content_autofill_tooltip)
+        setContentView(binding.root)
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -44,16 +46,15 @@ class EmailAutofillTooltipFragment(
     }
 
     private fun setDialog() {
-        behavior.state = BottomSheetBehavior.STATE_EXPANDED
         val addressFormatted = context.getString(R.string.autofillTooltipUseYourAlias, address)
-        tooltipPrimaryCtaTitle.text = addressFormatted.html(context)
+        binding.primaryCta.setPrimaryText(addressFormatted.html(context).toString())
 
-        secondaryCta.setOnClickListener {
+        binding.secondaryCta.setOnClickListener {
             usePrivateAlias()
             dismiss()
         }
 
-        primaryCta.setOnClickListener {
+        binding.primaryCta.setOnClickListener {
             useAddress()
             dismiss()
         }
diff --git a/app/src/main/res/drawable/ic_cancel_brownish.xml b/app/src/main/res/drawable/ic_cancel_brownish.xml
deleted file mode 100644
index 11da1448efcc..000000000000
--- a/app/src/main/res/drawable/ic_cancel_brownish.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-  ~ Copyright (c) 2022 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="14dp"
-    android:height="14dp"
-    android:viewportWidth="14"
-    android:viewportHeight="14">
-  <path
-      android:pathData="M2.207,0.793C1.817,0.402 1.183,0.402 0.793,0.793C0.402,1.183 0.402,1.817 0.793,2.207L5.615,7.029L0.822,11.822C0.448,12.197 0.448,12.803 0.822,13.178C1.197,13.552 1.803,13.552 2.178,13.178L6.971,8.385L11.793,13.207C12.183,13.598 12.817,13.598 13.207,13.207C13.598,12.817 13.598,12.183 13.207,11.793L8.385,6.971L13.178,2.178C13.552,1.803 13.552,1.197 13.178,0.822C12.803,0.448 12.197,0.448 11.822,0.822L7.029,5.615L2.207,0.793Z"
-      android:fillColor="?attr/primaryIconColor"
-      android:fillAlpha="0.8"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_download_brownish.xml b/app/src/main/res/drawable/ic_download_brownish.xml
deleted file mode 100644
index cd9523de747e..000000000000
--- a/app/src/main/res/drawable/ic_download_brownish.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-  ~ Copyright (c) 2022 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="22dp"
-    android:viewportWidth="18"
-    android:viewportHeight="22">
-  <path
-      android:pathData="M9,0C9.552,0 10,0.448 10,1V13.586L14.293,9.293C14.683,8.902 15.316,8.902 15.707,9.293C16.098,9.683 16.098,10.317 15.707,10.707L9.707,16.707C9.317,17.098 8.683,17.098 8.293,16.707L2.293,10.707C1.902,10.317 1.902,9.683 2.293,9.293C2.683,8.902 3.317,8.902 3.707,9.293L8,13.586V1C8,0.448 8.448,0 9,0Z"
-      android:fillColor="?attr/primaryIconColor"
-      android:fillAlpha="0.8"/>
-  <path
-      android:pathData="M1,19.048C0.448,19.048 0,19.495 0,20.048C0,20.6 0.448,21.048 1,21.048H17C17.552,21.048 18,20.6 18,20.048C18,19.495 17.552,19.048 17,19.048H1Z"
-      android:fillColor="?attr/primaryIconColor"
-      android:fillAlpha="0.8"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_cancel_brownish_24dp.xml b/app/src/main/res/drawable/ic_downloads_24.xml
similarity index 54%
rename from app/src/main/res/drawable/ic_cancel_brownish_24dp.xml
rename to app/src/main/res/drawable/ic_downloads_24.xml
index 796f2febb521..e5821c36071b 100644
--- a/app/src/main/res/drawable/ic_cancel_brownish_24dp.xml
+++ b/app/src/main/res/drawable/ic_downloads_24.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2018 DuckDuckGo
+  ~ Copyright (c) 2022 DuckDuckGo
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -17,9 +17,12 @@
 <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="?normalTextColor"
-        android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,2c0.552,0 1,0.448 1,1v10.586l3.293,-3.293c0.39,-0.39 1.024,-0.39 1.414,0 0.39,0.39 0.39,1.024 0,1.414l-5,5c-0.39,0.39 -1.024,0.39 -1.414,0l-5,-5c-0.39,-0.39 -0.39,-1.024 0,-1.414 0.39,-0.39 1.024,-0.39 1.414,0L11,13.586V3c0,-0.552 0.448,-1 1,-1z"
+      android:fillColor="?attr/daxColorPrimaryIcon"/>
+  <path
+      android:pathData="M5,19.048c-0.552,0 -1,0.447 -1,1 0,0.552 0.448,1 1,1h14c0.552,0 1,-0.448 1,-1 0,-0.553 -0.448,-1 -1,-1H5z"
+      android:fillColor="?attr/daxColorPrimaryIcon"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_fire_red.xml b/app/src/main/res/drawable/ic_fire_red.xml
index 03d1526ba195..c0f712a0c69d 100644
--- a/app/src/main/res/drawable/ic_fire_red.xml
+++ b/app/src/main/res/drawable/ic_fire_red.xml
@@ -20,6 +20,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@color/marketing_red"
+        android:fillColor="?attr/daxColorDestructive"
         android:pathData="M10.208,22.307c-2.552,-0.843 -4.667,-2.904 -5.762,-6.043C2.818,11.79 6.172,8.23 6.172,8.23s-0.097,0.913 0.316,1.92c0.413,1.007 1.216,1.734 1.216,1.734S6.926,9.775 8.822,6.26c2.14,-3.959 6.855,-4.803 6.855,-4.803S14.486,3.356 15.02,5.3c0.414,1.453 1.094,2.156 1.848,4.123 0.754,2.015 0.632,3.116 0.632,3.116s0.22,-1.24 0.754,-2.084C19.42,8.603 21,8.159 21,8.159s-0.826,1.686 -0.631,3.958c0.145,1.664 0.388,3.585 -0.511,5.74 -0.706,1.71 -2.747,4.052 -5.615,4.685 1.653,-0.703 2.746,-2.343 2.625,-4.123 -0.073,-1.03 -0.705,-2.015 -1.385,-2.694 -0.413,2.6 -1.896,2.905 -1.896,2.905s0.85,-1.71 0.972,-3.608a5.997,5.997 0,0 0,-0.219 -2.342c-0.777,-2.694 -2.114,-3.42 -2.114,-3.42s0.438,1.568 -1.167,4.099c-1.119,1.757 -3.015,3.045 -2.942,5.669 0.05,1.405 0.9,2.6 2.091,3.28z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_autofill_tooltip.xml b/app/src/main/res/layout/content_autofill_tooltip.xml
index 22063ce891c7..ed8ca1cdeb51 100644
--- a/app/src/main/res/layout/content_autofill_tooltip.xml
+++ b/app/src/main/res/layout/content_autofill_tooltip.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 DuckDuckGo
+  ~ Copyright (c) 2022 DuckDuckGo
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -16,83 +16,24 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_gravity="bottom"
-    android:background="?attr/daxDialogBackgroundColor"
     android:orientation="vertical"
-    android:paddingTop="16dp"
-    android:paddingBottom="16dp"
-    android:theme="@style/Theme.AppCompat.Light">
+    android:paddingTop="@dimen/actionBottomSheetVerticalPadding"
+    android:paddingBottom="@dimen/actionBottomSheetVerticalPadding">
 
-    <LinearLayout
+    <com.duckduckgo.mobile.android.ui.view.listitem.TwoLineListItem
         android:id="@+id/primaryCta"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:foreground="?selectableItemBackgroundBorderless"
-        android:orientation="vertical"
-        android:padding="16dp"
-        tools:ignore="UnusedAttribute">
+        app:primaryText="@string/autofillTooltipUseYourAlias"
+        app:secondaryText="@string/autofillTooltipUseYourAliasDescription" />
 
-        <TextView
-            android:id="@+id/tooltipPrimaryCtaTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="21dp"
-            android:layout_marginEnd="21dp"
-            android:text="@string/autofillTooltipUseYourAlias"
-            android:textColor="?attr/normalTextColor"
-            android:textSize="15sp"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/tooltipPrimaryCtaDescription"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="21dp"
-            android:layout_marginEnd="21dp"
-            android:text="@string/autofillTooltipUseYourAliasDescription"
-            android:textColor="?attr/normalTextColor"
-            android:textSize="12sp" />
-
-    </LinearLayout>
-
-    <LinearLayout
+    <com.duckduckgo.mobile.android.ui.view.listitem.TwoLineListItem
         android:id="@+id/secondaryCta"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:foreground="?selectableItemBackgroundBorderless"
-        android:orientation="vertical"
-        android:padding="16dp"
-        tools:ignore="UnusedAttribute">
-
-        <TextView
-            android:id="@+id/tooltipSecondaryCtaTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="21dp"
-            android:layout_marginEnd="21dp"
-            android:text="@string/autofillTooltipGenerateAddress"
-            android:textColor="?attr/normalTextColor"
-            android:textSize="15sp"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/tooltipSecondaryCtaDescription"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="21dp"
-            android:layout_marginEnd="21dp"
-            android:text="@string/autofillTooltipGenerateAddressDescription"
-            android:textColor="?attr/normalTextColor"
-            android:textSize="12sp" />
+        app:primaryText="@string/autofillTooltipGenerateAddress"
+        app:secondaryText="@string/autofillTooltipGenerateAddressDescription" />
 
-    </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/download_confirmation.xml b/app/src/main/res/layout/download_confirmation.xml
index 47101049b99b..7863cf0a9c4c 100644
--- a/app/src/main/res/layout/download_confirmation.xml
+++ b/app/src/main/res/layout/download_confirmation.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 DuckDuckGo
+  ~ Copyright (c) 2022 DuckDuckGo
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -14,59 +14,39 @@
   ~ limitations under the License.
   -->
 
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/dialogBgColor"
-    android:paddingTop="@dimen/keyline_2"
-    android:paddingBottom="@dimen/keyline_2"
-    app:layout_behavior="@string/bottom_sheet_behavior">
+    android:orientation="vertical"
+    android:paddingTop="@dimen/actionBottomSheetVerticalPadding"
+    android:paddingBottom="@dimen/actionBottomSheetVerticalPadding">
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/downloadMessage"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/keyline_4"
         android:paddingTop="@dimen/keyline_4"
         android:paddingEnd="@dimen/keyline_4"
         android:paddingBottom="@dimen/keyline_4"
-        android:textAppearance="@style/TextAppearance.DuckDuckGo.Body1"
-        android:textColor="?attr/callToActionSubtitleColor"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:textType="secondary"
+        app:typography="body1"
         tools:text="sample-file.pdf" />
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.listitem.OneLineListItem
         android:id="@+id/continueDownload"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/selectableItemBackground"
-        android:drawablePadding="20dp"
-        android:paddingStart="@dimen/keyline_4"
-        android:paddingTop="@dimen/keyline_4"
-        android:paddingEnd="@dimen/keyline_4"
-        android:paddingBottom="@dimen/keyline_4"
-        android:text="@string/downloadConfirmationContinue"
-        android:textAppearance="@style/TextAppearance.DuckDuckGo.Body1"
-        app:drawableStartCompat="@drawable/ic_download_brownish"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/downloadMessage" />
+        app:leadingIcon="@drawable/ic_downloads_24"
+        app:primaryText="@string/downloadConfirmationContinue" />
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.listitem.OneLineListItem
         android:id="@+id/cancel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/selectableItemBackground"
-        android:drawablePadding="20dp"
-        android:paddingStart="18dp"
-        android:paddingTop="@dimen/keyline_4"
-        android:paddingEnd="@dimen/keyline_4"
-        android:paddingBottom="@dimen/keyline_4"
-        android:text="@string/fireCancel"
-        android:textAppearance="@style/TextAppearance.DuckDuckGo.Body1"
-        app:drawableStartCompat="@drawable/ic_cancel_brownish"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/continueDownload" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+        app:leadingIcon="@drawable/ic_close_24"
+        app:primaryText="@string/fireCancel" />
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/item_navigation_history_popup_row.xml b/app/src/main/res/layout/item_navigation_history_popup_row.xml
deleted file mode 100644
index dd978a315519..000000000000
--- a/app/src/main/res/layout/item_navigation_history_popup_row.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2021 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:padding="@dimen/keyline_3"
-    android:focusableInTouchMode="false"
-    android:layout_height="wrap_content">
-
-    <ImageView
-        android:layout_width="@dimen/keyline_5"
-        android:layout_height="@dimen/keyline_5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:importantForAccessibility="no"
-        android:id="@+id/favicon" />
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
-        android:textColor="?normalTextColor"
-        android:layout_marginStart="20dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/favicon"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="spreadprivacy.com" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/navigation_history_popup_view.xml b/app/src/main/res/layout/navigation_history_popup_view.xml
index 69f9118a5d04..2d500c0f2c6e 100644
--- a/app/src/main/res/layout/navigation_history_popup_view.xml
+++ b/app/src/main/res/layout/navigation_history_popup_view.xml
@@ -14,31 +14,19 @@
   ~ limitations under the License.
   -->
 
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:paddingTop="@dimen/actionBottomSheetVerticalPadding"
+    android:paddingBottom="@dimen/actionBottomSheetVerticalPadding">
 
-    <androidx.cardview.widget.CardView
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/historyRecycler"
         android:layout_width="match_parent"
-        app:contentPaddingTop="@dimen/keyline_3"
-        app:contentPaddingBottom="@dimen/keyline_3"
-        app:cardBackgroundColor="?attr/daxDialogBackgroundColor"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:itemCount="4" />
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/historyRecycler"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            tools:itemCount="4"
-            tools:listitem="@layout/item_navigation_history_popup_row" />
-
-    </androidx.cardview.widget.CardView>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/sheet_fire_clear_data.xml b/app/src/main/res/layout/sheet_fire_clear_data.xml
index 350b963077c0..7c5c7bf878b6 100644
--- a/app/src/main/res/layout/sheet_fire_clear_data.xml
+++ b/app/src/main/res/layout/sheet_fire_clear_data.xml
@@ -15,7 +15,6 @@
   -->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -42,53 +41,29 @@
             android:layout_marginBottom="24dp"
             android:layout="@layout/include_dax_dialog_cta" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:background="?dialogBgColor">
+            android:background="@drawable/rounded_top_corners_bottom_sheet_background"
+            android:orientation="vertical"
+            android:paddingTop="@dimen/actionBottomSheetVerticalPadding"
+            android:paddingBottom="@dimen/actionBottomSheetVerticalPadding">
 
-            <TextView
+            <com.duckduckgo.mobile.android.ui.view.listitem.OneLineListItem
                 android:id="@+id/clearAllOption"
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground"
-                app:drawableStartCompat="@drawable/ic_fire_red"
-                android:drawablePadding="24dp"
-                android:fontFamily="sans-serif"
-                android:paddingStart="24dp"
-                android:paddingTop="24dp"
-                android:paddingEnd="24dp"
-                android:paddingBottom="17dp"
-                android:text="@string/fireClearAll"
-                android:textColor="@color/marketing_red"
-                android:textSize="16sp"
-                android:textStyle="normal"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                app:leadingIcon="@drawable/ic_fire_red"
+                app:primaryText="@string/fireClearAll"
+                app:primaryTextColorOverlay="?attr/daxColorDestructive" />
 
-            <!-- Drawable tint does not work on API 21 so we have to use a pre-colored drawable -->
-            <TextView
+            <com.duckduckgo.mobile.android.ui.view.listitem.OneLineListItem
                 android:id="@+id/cancelOption"
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?attr/selectableItemBackground"
-                app:drawableStartCompat="@drawable/ic_cancel_brownish_24dp"
-                android:drawablePadding="24dp"
-                android:fontFamily="sans-serif"
-                android:paddingStart="24dp"
-                android:paddingTop="17dp"
-                android:paddingEnd="24dp"
-                android:paddingBottom="24dp"
-                android:text="@string/fireCancel"
-                android:textColor="?normalTextColor"
-                android:textSize="16sp"
-                android:textStyle="normal"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/clearAllOption"
-                tools:ignore="UnusedAttribute" />
+                app:leadingIcon="@drawable/ic_close_24"
+                app:primaryText="@string/fireCancel" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        </LinearLayout>
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index 016e25ebbb45..7947b6f4bd99 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -21,11 +21,4 @@
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="bottomSheetStyle">@style/FireDialogStyle</item>
     </style>
-
-    <style name="EmailTooltip" parent="@style/Theme.Design.BottomSheetDialog">
-        <item name="android:windowIsFloating">false</item>
-        <item name="android:navigationBarColor">?toolbarBgColor</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="bottomSheetStyle">@style/EmailTooltipStyle</item>
-    </style>
 </resources>
\ No newline at end of file
diff --git a/autofill/autofill-impl/src/main/res/drawable/rounded_top_corners_bottom_sheet_background.xml b/autofill/autofill-impl/src/main/res/drawable/rounded_top_corners_bottom_sheet_background.xml
index 57ee9d898710..7b719e31ea46 100644
--- a/autofill/autofill-impl/src/main/res/drawable/rounded_top_corners_bottom_sheet_background.xml
+++ b/autofill/autofill-impl/src/main/res/drawable/rounded_top_corners_bottom_sheet_background.xml
@@ -17,7 +17,7 @@
 <shape
     xmlns:android="http://schemas.android.com/apk/res/android">
     <corners
-        android:topLeftRadius="12dp"
-        android:topRightRadius="12dp" />
-    <solid android:color="?attr/daxDialogBackgroundColor" />
+        android:topLeftRadius="@dimen/dialogBorderRadius"
+        android:topRightRadius="@dimen/dialogBorderRadius" />
+    <solid android:color="?attr/daxColorSurface" />
 </shape>
\ No newline at end of file
diff --git a/common-ui/src/main/res/values/design-system-colors.xml b/common-ui/src/main/res/values/design-system-colors.xml
index 8c0129956de6..792f6ffb6ede 100644
--- a/common-ui/src/main/res/values/design-system-colors.xml
+++ b/common-ui/src/main/res/values/design-system-colors.xml
@@ -17,7 +17,7 @@
 <resources>
 
     <!-- Design System Theme Agnostic Reference Colors
-        daxColorDim - Dim color behine some dialogs / Dax Dialog
+        daxColorDim - Dim color behind some dialogs / Dax Dialog
         daxColorWhite - Brand White
         daxColorBlack - Brand Black
         -->
diff --git a/common-ui/src/main/res/values/design-system-dimensions.xml b/common-ui/src/main/res/values/design-system-dimensions.xml
index 73e274a6b0dd..d44dded796f5 100644
--- a/common-ui/src/main/res/values/design-system-dimensions.xml
+++ b/common-ui/src/main/res/values/design-system-dimensions.xml
@@ -67,7 +67,7 @@
     <!-- Dialogs -->
     <dimen name="dialogButtonHeight">40dp</dimen>
     <dimen name="dialogImageSize">40dp</dimen>
-    <dimen name="dialogBorderRadius">12dp</dimen>
+    <dimen name="dialogBorderRadius">@dimen/mediumShapeCornerRadius</dimen>
     <dimen name="dialogRadioGroupHeightMax">376dp</dimen>
 
     <!-- Bottom Sheet -->
diff --git a/common-ui/src/main/res/values/styles.xml b/common-ui/src/main/res/values/styles.xml
index 97baccac07d5..99c2a5a42521 100644
--- a/common-ui/src/main/res/values/styles.xml
+++ b/common-ui/src/main/res/values/styles.xml
@@ -258,45 +258,12 @@
         <item name="android:background">@android:color/transparent</item>
     </style>
 
-    <style name="NavigationHistoryDialog" parent="@style/Theme.Design.BottomSheetDialog">
-        <item name="android:windowIsFloating">false</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="bottomSheetStyle">@style/NavigationHistoryDialogStyle</item>
-    </style>
-
-    <style name="NavigationHistoryDialogStyle" parent="@style/Widget.Design.BottomSheet.Modal">
-        <item name="android:background">@android:color/transparent</item>
-    </style>
-
-    <style name="EmailTooltip" parent="@style/Theme.Design.BottomSheetDialog">
-        <item name="android:windowIsFloating">false</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="bottomSheetStyle">@style/EmailTooltipStyle</item>
-    </style>
-
-    <style name="EmailTooltipStyle" parent="@style/Widget.Design.BottomSheet.Modal">
-        <item name="android:background">@android:color/transparent</item>
-    </style>
-
     <style name="LocationPermissionDialogSplitter">
         <item name="android:background">?attr/daxColorLines</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">1dp</item>
     </style>
 
-    <style name="SitePermissionsSwitch">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingTop">12dp</item>
-        <item name="android:paddingBottom">12dp</item>
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textColor">?attr/settingsItemTextColor</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:selectable">false</item>
-        <item name="android:gravity">start</item>
-    </style>
-
     <style name="DeviceShield" />
 
     <style name="DeviceShield.PrivacyReport" />