diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/ManuallyDisableAppProtectionDialog.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/ManuallyDisableAppProtectionDialog.kt
index 760a2e726133..8531494913e7 100644
--- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/ManuallyDisableAppProtectionDialog.kt
+++ b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/ManuallyDisableAppProtectionDialog.kt
@@ -121,11 +121,6 @@ class ManuallyDisableAppProtectionDialog : DialogFragment() {
         private const val KEY_APP_PACKAGE_NAME = "KEY_APP_PACKAGE_NAME"
         private const val KEY_APP_NAME = "KEY_APP_NAME"
 
-        const val NO_REASON_NEEDED = 0
-        const val STOPPED_WORKING = 1
-        const val TRACKING_OK = 2
-        const val DONT_USE = 3
-
         fun instance(appInfo: TrackingProtectionAppInfo): ManuallyDisableAppProtectionDialog {
             return ManuallyDisableAppProtectionDialog().also { fragment ->
                 val bundle = Bundle()
diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/TrackingProtectionAppsAdapter.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/TrackingProtectionAppsAdapter.kt
index c3c81de857de..490eb7a45a72 100644
--- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/TrackingProtectionAppsAdapter.kt
+++ b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/apps/ui/TrackingProtectionAppsAdapter.kt
@@ -76,10 +76,6 @@ class TrackingProtectionAppsAdapter(val listener: AppProtectionListener) :
         return excludedApps.size
     }
 
-    fun updateSwitchPosition(position: Int) {
-        notifyItemChanged(position)
-    }
-
     private class DiffCallback(
         private val oldList: List<AppsProtectionType>,
         private val newList: List<AppsProtectionType>,
diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/breakage/ReportBreakageAppListAdapter.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/breakage/ReportBreakageAppListAdapter.kt
index 4cb328c2396c..cf9262856694 100644
--- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/breakage/ReportBreakageAppListAdapter.kt
+++ b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/breakage/ReportBreakageAppListAdapter.kt
@@ -24,7 +24,6 @@ import androidx.recyclerview.widget.RecyclerView
 import com.duckduckgo.app.global.extensions.safeGetApplicationIcon
 import com.duckduckgo.mobile.android.ui.view.quietlySetIsChecked
 import com.duckduckgo.mobile.android.vpn.R
-import com.duckduckgo.mobile.android.vpn.ui.notification.applyBoldSpanTo
 import kotlinx.android.synthetic.main.view_device_shield_report_app_breakage_entry.view.*
 
 class ReportBreakageAppListAdapter(private val listener: Listener) : RecyclerView.Adapter<ReportBreakageAppListViewHolder>() {
@@ -104,9 +103,7 @@ class ReportBreakageAppListViewHolder(view: View) : RecyclerView.ViewHolder(view
         position: Int,
         listener: ReportBreakageAppListAdapter.Listener,
     ) {
-        itemView.deviceShieldInstalledAppEntryName.text =
-            String.format(itemView.context.resources.getString(R.string.atp_ReportBreakageAppEntry), installedApp.name)
-                .applyBoldSpanTo(listOf(installedApp.name))
+        itemView.deviceShieldInstalledAppEntryName.text = installedApp.name
 
         itemView.deviceShieldInstalledAppSelector.quietlySetIsChecked(installedApp.isSelected) { _, _ ->
             listener.onInstalledAppSelected(installedApp, position)
diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/breakage/ReportBreakageCategorySingleChoiceActivity.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/breakage/ReportBreakageCategorySingleChoiceActivity.kt
index 5c3acf5e2c35..6396c1bff9df 100644
--- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/breakage/ReportBreakageCategorySingleChoiceActivity.kt
+++ b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/breakage/ReportBreakageCategorySingleChoiceActivity.kt
@@ -20,7 +20,6 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.util.Base64
-import androidx.appcompat.app.AlertDialog
 import androidx.core.text.HtmlCompat
 import androidx.lifecycle.Lifecycle.State.STARTED
 import androidx.lifecycle.flowWithLifecycle
@@ -29,6 +28,7 @@ import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.app.global.DuckDuckGoActivity
 import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.di.scopes.VpnScope
+import com.duckduckgo.mobile.android.ui.view.dialog.RadioListAlertDialogBuilder
 import com.duckduckgo.mobile.android.ui.viewbinding.viewBinding
 import com.duckduckgo.mobile.android.vpn.R
 import com.duckduckgo.mobile.android.vpn.breakage.ReportBreakageCategorySingleChoiceViewModel.Command
@@ -87,21 +87,28 @@ class ReportBreakageCategorySingleChoiceActivity : DuckDuckGoActivity() {
     }
 
     private fun configureListeners() {
-        val categories = viewModel.shuffledCategories.map { getString(it.category) }.toTypedArray()
-        binding.categoriesSelection.setOnClickListener {
-            AlertDialog.Builder(this)
+        val categories = viewModel.shuffledCategories.map { it.category }
+        binding.categoriesSelection.onAction {
+            RadioListAlertDialogBuilder(this)
                 .setTitle(getString(R.string.atp_ReportBreakageCategoriesTitle))
-                .setSingleChoiceItems(categories, viewModel.indexSelected) { _, newIndex ->
-                    viewModel.onCategoryIndexChanged(newIndex)
-                }
-                .setPositiveButton(getString(android.R.string.yes)) { dialog, _ ->
-                    viewModel.onCategoryAccepted()
-                    dialog.dismiss()
-                }
-                .setNegativeButton(getString(android.R.string.no)) { dialog, _ ->
-                    viewModel.onCategorySelectionCancelled()
-                    dialog.dismiss()
-                }
+                .setOptions(categories, viewModel.indexSelected + 1)
+                .setPositiveButton(android.R.string.ok)
+                .setNegativeButton(android.R.string.cancel)
+                .addEventListener(
+                    object : RadioListAlertDialogBuilder.EventListener() {
+                        override fun onRadioItemSelected(selectedItem: Int) {
+                            viewModel.onCategoryIndexChanged(selectedItem - 1)
+                        }
+
+                        override fun onPositiveButtonClicked(selectedItem: Int) {
+                            viewModel.onCategoryAccepted()
+                        }
+
+                        override fun onNegativeButtonClicked() {
+                            viewModel.onCategorySelectionCancelled()
+                        }
+                    },
+                )
                 .show()
         }
         binding.ctaNextFormSubmit.setOnClickListener { viewModel.onSubmitPressed() }
@@ -149,7 +156,7 @@ class ReportBreakageCategorySingleChoiceActivity : DuckDuckGoActivity() {
     private fun render(viewState: ViewState) {
         val category =
             viewState.categorySelected?.let { getString(viewState.categorySelected.category) }.orEmpty()
-        binding.categoriesSelection.setText(category)
+        binding.categoriesSelection.text = category
         binding.ctaNextFormSubmit.isEnabled = viewState.submitAllowed
     }
 
diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/alwayson/AlwaysOnAlertDialogFragment.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/alwayson/AlwaysOnAlertDialogFragment.kt
index 5683b199c520..933915fa8ca1 100644
--- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/alwayson/AlwaysOnAlertDialogFragment.kt
+++ b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/alwayson/AlwaysOnAlertDialogFragment.kt
@@ -49,7 +49,7 @@ class AlwaysOnAlertDialogFragment private constructor() : BottomSheetDialogFragm
     private lateinit var listener: Listener
     private lateinit var fragmentType: FragmentType
 
-    override fun getTheme(): Int = R.style.AlwaysOnBottomSheetDialogTheme
+    override fun getTheme(): Int = com.duckduckgo.mobile.android.R.style.Widget_DuckDuckGo_BottomSheetDialogCollapsed
 
     override fun onAttach(context: Context) {
         AndroidSupportInjection.inject(this)
diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/onboarding/VpnOnboardingActivity.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/onboarding/VpnOnboardingActivity.kt
index 9706d7fa3428..57b3e3ec681a 100644
--- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/onboarding/VpnOnboardingActivity.kt
+++ b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/onboarding/VpnOnboardingActivity.kt
@@ -31,6 +31,7 @@ import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.app.global.DuckDuckGoActivity
 import com.duckduckgo.appbuildconfig.api.AppBuildConfig
 import com.duckduckgo.di.scopes.ActivityScope
+import com.duckduckgo.mobile.android.ui.view.dialog.TextAlertDialogBuilder
 import com.duckduckgo.mobile.android.ui.view.getColorFromAttr
 import com.duckduckgo.mobile.android.ui.viewbinding.viewBinding
 import com.duckduckgo.mobile.android.vpn.AppTpVpnFeature
@@ -43,14 +44,13 @@ import com.duckduckgo.mobile.android.vpn.ui.onboarding.Command.LaunchVPN
 import com.duckduckgo.mobile.android.vpn.ui.onboarding.Command.RequestVPNPermission
 import com.duckduckgo.mobile.android.vpn.ui.onboarding.Command.ShowVpnAlwaysOnConflictDialog
 import com.duckduckgo.mobile.android.vpn.ui.onboarding.Command.ShowVpnConflictDialog
-import com.duckduckgo.mobile.android.vpn.ui.tracker_activity.AppTPVpnConflictDialog
 import com.duckduckgo.mobile.android.vpn.ui.tracker_activity.DeviceShieldTrackerActivity
 import javax.inject.Inject
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
 @InjectWith(ActivityScope::class)
-class VpnOnboardingActivity : DuckDuckGoActivity(), AppTPVpnConflictDialog.Listener {
+class VpnOnboardingActivity : DuckDuckGoActivity() {
 
     @Inject
     lateinit var deviceShieldPixels: DeviceShieldPixels
@@ -180,8 +180,8 @@ class VpnOnboardingActivity : DuckDuckGoActivity(), AppTPVpnConflictDialog.Liste
     private fun processCommand(command: Command) {
         when (command) {
             is LaunchVPN -> startVpn()
-            is ShowVpnConflictDialog -> launchVPNConflictDialog(false)
-            is ShowVpnAlwaysOnConflictDialog -> launchVPNConflictDialog(true)
+            is ShowVpnConflictDialog -> showVpnConflictDialog()
+            is ShowVpnAlwaysOnConflictDialog -> showAlwaysOnConflictDialog()
             is CheckVPNPermission -> checkVPNPermission()
             is RequestVPNPermission -> obtainVpnRequestPermission(command.vpnIntent)
         }
@@ -228,21 +228,54 @@ class VpnOnboardingActivity : DuckDuckGoActivity(), AppTPVpnConflictDialog.Liste
         viewModel.onAppTpEnabled()
     }
 
-    private fun launchVPNConflictDialog(isAlwaysOn: Boolean) {
+    private fun showVpnConflictDialog() {
         deviceShieldPixels.didShowVpnConflictDialog()
-        val dialog = AppTPVpnConflictDialog.instance(this, isAlwaysOn)
-        dialog.show(
-            supportFragmentManager,
-            AppTPVpnConflictDialog.TAG_VPN_CONFLICT_DIALOG,
-        )
+        TextAlertDialogBuilder(this)
+            .setTitle(R.string.atp_VpnConflictDialogTitle)
+            .setMessage(R.string.atp_VpnConflictDialogMessage)
+            .setPositiveButton(R.string.atp_VpnConflictDialogGotIt)
+            .setNegativeButton(R.string.atp_VpnConflictDialogCancel)
+            .addEventListener(
+                object : TextAlertDialogBuilder.EventListener() {
+                    override fun onPositiveButtonClicked() {
+                        onVpnConflictDialogContinue()
+                    }
+
+                    override fun onNegativeButtonClicked() {
+                        onVpnConflictDialogDismiss()
+                    }
+                },
+            )
+            .show()
+    }
+
+    private fun showAlwaysOnConflictDialog() {
+        deviceShieldPixels.didShowVpnConflictDialog()
+        TextAlertDialogBuilder(this)
+            .setTitle(R.string.atp_VpnConflictAlwaysOnDialogTitle)
+            .setMessage(R.string.atp_VpnConflictDialogAlwaysOnMessage)
+            .setPositiveButton(R.string.atp_VpnConflictDialogOpenSettings)
+            .setNegativeButton(R.string.atp_VpnConflictDialogCancel)
+            .addEventListener(
+                object : TextAlertDialogBuilder.EventListener() {
+                    override fun onPositiveButtonClicked() {
+                        onVpnConflictDialogGoToSettings()
+                    }
+
+                    override fun onNegativeButtonClicked() {
+                        onVpnConflictDialogDismiss()
+                    }
+                },
+            )
+            .show()
     }
 
-    override fun onVpnConflictDialogDismiss() {
+    fun onVpnConflictDialogDismiss() {
         deviceShieldPixels.didChooseToDismissVpnConflictDialog()
     }
 
     @SuppressLint("InlinedApi")
-    override fun onVpnConflictDialogGoToSettings() {
+    fun onVpnConflictDialogGoToSettings() {
         deviceShieldPixels.didChooseToOpenSettingsFromVpnConflictDialog()
 
         val intent = if (appBuildConfig.sdkInt >= Build.VERSION_CODES.N) {
@@ -254,7 +287,7 @@ class VpnOnboardingActivity : DuckDuckGoActivity(), AppTPVpnConflictDialog.Liste
         startActivity(intent)
     }
 
-    override fun onVpnConflictDialogContinue() {
+    fun onVpnConflictDialogContinue() {
         deviceShieldPixels.didChooseToContinueFromVpnConflictDialog()
         checkVPNPermission()
     }
diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/AppTPCompanyTrackersActivity.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/AppTPCompanyTrackersActivity.kt
index 2a63d071f2a8..d0d34d0bdfb5 100644
--- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/AppTPCompanyTrackersActivity.kt
+++ b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/AppTPCompanyTrackersActivity.kt
@@ -136,7 +136,7 @@ class AppTPCompanyTrackersActivity : DuckDuckGoActivity() {
 
     private fun renderViewState(viewState: ViewState) {
         cachedState = viewState
-        binding.trackingAttempts.text = resources.getQuantityString(
+        binding.trackingAttempts.primaryText = resources.getQuantityString(
             R.plurals.atp_CompanyDetailsTrackingAttemptsTitle,
             viewState.totalTrackingAttempts,
             viewState.totalTrackingAttempts,
diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/AppTPDisableConfirmationDialog.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/AppTPDisableConfirmationDialog.kt
deleted file mode 100644
index cd69a86a2586..000000000000
--- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/AppTPDisableConfirmationDialog.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2019 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.
- */
-
-package com.duckduckgo.mobile.android.vpn.ui.tracker_activity
-
-import android.app.Dialog
-import android.os.Bundle
-import android.widget.Button
-import androidx.fragment.app.DialogFragment
-import com.duckduckgo.mobile.android.vpn.R
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-
-class AppTPDisableConfirmationDialog private constructor(private val listener: Listener) : DialogFragment() {
-
-    interface Listener {
-        fun onOpenAppProtection()
-        fun onTurnAppTrackingProtectionOff()
-        fun onDisableDialogCancelled()
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        isCancelable = false
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val rootView = layoutInflater.inflate(R.layout.dialog_tracking_protection_confirm_disable, null)
-
-        val disableOneApp = rootView.findViewById<Button>(R.id.disableConfirmationDialogOneApp)
-        val disableAllApps = rootView.findViewById<Button>(R.id.disableConfirmationDialogAllApps)
-        val cancel = rootView.findViewById<Button>(R.id.disableConfirmationDialogCancel)
-
-        val alertDialog = MaterialAlertDialogBuilder(
-            requireActivity(),
-            com.duckduckgo.mobile.android.R.style.Widget_DuckDuckGo_Dialog,
-        )
-            .setView(rootView)
-
-        isCancelable = false
-
-        configureListeners(disableOneApp, disableAllApps, cancel)
-
-        return alertDialog.create()
-    }
-
-    private fun configureListeners(
-        disableOneApp: Button,
-        disableAllApps: Button,
-        cancel: Button,
-    ) {
-        disableOneApp.setOnClickListener {
-            dismiss()
-            listener.onOpenAppProtection()
-        }
-        disableAllApps.setOnClickListener {
-            dismiss()
-            listener.onTurnAppTrackingProtectionOff()
-        }
-        cancel.setOnClickListener {
-            dismiss()
-            listener.onDisableDialogCancelled()
-        }
-    }
-
-    companion object {
-
-        const val TAG_APPTP_DISABLE_DIALOG = "AppTPDisableConfirmationDialog"
-
-        fun instance(listener: Listener): AppTPDisableConfirmationDialog {
-            return AppTPDisableConfirmationDialog(listener)
-        }
-    }
-}
diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/AppTPVpnConflictDialog.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/AppTPVpnConflictDialog.kt
deleted file mode 100644
index e94063ad2a72..000000000000
--- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/AppTPVpnConflictDialog.kt
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (c) 2019 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.
- */
-
-package com.duckduckgo.mobile.android.vpn.ui.tracker_activity
-
-import android.app.Dialog
-import android.os.Bundle
-import android.widget.Button
-import android.widget.TextView
-import androidx.fragment.app.DialogFragment
-import com.duckduckgo.mobile.android.vpn.R
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-
-class AppTPVpnConflictDialog private constructor(private val listener: Listener) : DialogFragment() {
-
-    interface Listener {
-        fun onVpnConflictDialogDismiss()
-        fun onVpnConflictDialogGoToSettings()
-        fun onVpnConflictDialogContinue()
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        isCancelable = false
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val rootView = layoutInflater.inflate(R.layout.dialog_tracking_protection_vpn_conflict, null)
-
-        val endCta = rootView.findViewById<Button>(R.id.vpnConflictDialogEndCta)
-        val startCta = rootView.findViewById<Button>(R.id.vpnConflictDialogStartCta)
-        val titleView = rootView.findViewById<TextView>(R.id.vpnConflictDialogTitle)
-        val messageView = rootView.findViewById<TextView>(R.id.vpnConflictDialogMessage)
-
-        val alertDialog = MaterialAlertDialogBuilder(
-            requireActivity(),
-            com.duckduckgo.mobile.android.R.style.Widget_DuckDuckGo_Dialog,
-        )
-            .setView(rootView)
-
-        isCancelable = false
-
-        configureViews(titleView, messageView, startCta, endCta)
-
-        return alertDialog.create()
-    }
-
-    private fun configureViews(
-        titleView: TextView,
-        messageView: TextView,
-        startCta: Button,
-        endCta: Button,
-    ) {
-        arguments?.let { args ->
-            val isAlwaysOn = args.getBoolean(KEY_ALWAYS_ON_CONFLICT)
-            if (isAlwaysOn) {
-                configureAlwaysOnDialogViews(titleView, messageView, startCta, endCta)
-            } else {
-                configureVpnConflictViews(titleView, messageView, startCta, endCta)
-            }
-        }
-    }
-
-    private fun configureVpnConflictViews(
-        titleView: TextView,
-        messageView: TextView,
-        startCta: Button,
-        endCta: Button,
-    ) {
-        configureVpnConflictText(titleView, messageView)
-        configureVpnConflictListeners(startCta, endCta)
-    }
-
-    private fun configureVpnConflictText(
-        titleView: TextView,
-        messageView: TextView,
-    ) {
-        titleView.setText(getText(R.string.atp_VpnConflictDialogTitle))
-        messageView.setText(getText(R.string.atp_VpnConflictDialogMessage))
-    }
-
-    private fun configureVpnConflictListeners(
-        startCta: Button,
-        endCta: Button,
-    ) {
-        endCta.setText(R.string.atp_VpnConflictDialogGotIt)
-        endCta.setOnClickListener {
-            dismiss()
-            listener.onVpnConflictDialogContinue()
-        }
-        startCta.setOnClickListener {
-            dismiss()
-            listener.onVpnConflictDialogDismiss()
-        }
-    }
-
-    private fun configureAlwaysOnDialogViews(
-        titleView: TextView,
-        messageView: TextView,
-        startCta: Button,
-        endCta: Button,
-    ) {
-        configureAlwaysOnText(titleView, messageView)
-        configureAlwaysOnListeners(startCta, endCta)
-    }
-
-    private fun configureAlwaysOnText(
-        titleView: TextView,
-        messageView: TextView,
-    ) {
-        titleView.setText(getText(R.string.atp_VpnConflictAlwaysOnDialogTitle))
-        messageView.setText(getText(R.string.atp_VpnConflictDialogAlwaysOnMessage))
-    }
-
-    private fun configureAlwaysOnListeners(
-        startCta: Button,
-        endCta: Button,
-    ) {
-        endCta.setText(R.string.atp_VpnConflictDialogOpenSettings)
-        endCta.setOnClickListener {
-            dismiss()
-            listener.onVpnConflictDialogGoToSettings()
-        }
-        startCta.setOnClickListener {
-            dismiss()
-            listener.onVpnConflictDialogDismiss()
-        }
-    }
-
-    companion object {
-
-        const val TAG_VPN_CONFLICT_DIALOG = "AppTPVpnConflictDialog"
-        private const val KEY_ALWAYS_ON_CONFLICT = "KEY_ALWAYS_ON_CONFLICT"
-
-        fun instance(listener: Listener, alwaysOn: Boolean = false): AppTPVpnConflictDialog {
-            return AppTPVpnConflictDialog(listener).also { fragment ->
-                val bundle = Bundle()
-                bundle.putBoolean(KEY_ALWAYS_ON_CONFLICT, alwaysOn)
-                fragment.arguments = bundle
-            }
-        }
-    }
-}
diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldTrackerActivity.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldTrackerActivity.kt
index ee4afc3f5199..047c1907baf7 100644
--- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldTrackerActivity.kt
+++ b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldTrackerActivity.kt
@@ -39,6 +39,8 @@ import com.duckduckgo.mobile.android.ui.view.InfoPanel.Companion.APPTP_SETTINGS_
 import com.duckduckgo.mobile.android.ui.view.InfoPanel.Companion.REPORT_ISSUES_ANNOTATION
 import com.duckduckgo.mobile.android.ui.view.SwitchView
 import com.duckduckgo.mobile.android.ui.view.TypewriterDaxDialog
+import com.duckduckgo.mobile.android.ui.view.dialog.StackedAlertDialogBuilder
+import com.duckduckgo.mobile.android.ui.view.dialog.TextAlertDialogBuilder
 import com.duckduckgo.mobile.android.ui.view.gone
 import com.duckduckgo.mobile.android.ui.view.quietlySetIsChecked
 import com.duckduckgo.mobile.android.ui.view.show
@@ -62,6 +64,7 @@ import com.duckduckgo.mobile.android.vpn.ui.report.DeviceShieldAppTrackersInfo
 import com.duckduckgo.mobile.android.vpn.ui.tracker_activity.DeviceShieldTrackerActivityViewModel.BannerState
 import com.duckduckgo.mobile.android.vpn.ui.tracker_activity.DeviceShieldTrackerActivityViewModel.ViewEvent
 import com.duckduckgo.mobile.android.vpn.ui.tracker_activity.DeviceShieldTrackerActivityViewModel.ViewEvent.StartVpn
+import com.duckduckgo.mobile.android.vpn.ui.tracker_activity.view.DisableVpnDialogOptions
 import com.google.android.material.snackbar.Snackbar
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -78,10 +81,7 @@ import nl.dionsegijn.konfetti.models.Size
 @InjectWith(ActivityScope::class)
 class DeviceShieldTrackerActivity :
     DuckDuckGoActivity(),
-    DeviceShieldActivityFeedFragment.DeviceShieldActivityFeedListener,
-    AppTPDisableConfirmationDialog.Listener,
-    AppTPVpnConflictDialog.Listener,
-    VpnRemoveFeatureConfirmationDialog.Listener {
+    DeviceShieldActivityFeedFragment.DeviceShieldActivityFeedListener {
 
     @Inject
     lateinit var deviceShieldPixels: DeviceShieldPixels
@@ -247,8 +247,8 @@ class DeviceShieldTrackerActivity :
             is DeviceShieldTrackerActivityViewModel.Command.LaunchManageAppsProtection -> launchManageAppsProtection()
             is DeviceShieldTrackerActivityViewModel.Command.LaunchMostRecentActivity -> launchMostRecentActivity()
             is DeviceShieldTrackerActivityViewModel.Command.ShowDisableVpnConfirmationDialog -> launchDisableConfirmationDialog()
-            is DeviceShieldTrackerActivityViewModel.Command.ShowVpnConflictDialog -> launchVPNConflictDialog(false)
-            is DeviceShieldTrackerActivityViewModel.Command.ShowVpnAlwaysOnConflictDialog -> launchVPNConflictDialog(true)
+            is DeviceShieldTrackerActivityViewModel.Command.ShowVpnConflictDialog -> showVpnConflictDialog()
+            is DeviceShieldTrackerActivityViewModel.Command.ShowVpnAlwaysOnConflictDialog -> showAlwaysOnConflictDialog()
             is DeviceShieldTrackerActivityViewModel.Command.ShowAlwaysOnPromotionDialog -> launchAlwaysOnPromotionDialog()
             is DeviceShieldTrackerActivityViewModel.Command.ShowAlwaysOnLockdownWarningDialog -> launchAlwaysOnLockdownEnabledDialog()
             is DeviceShieldTrackerActivityViewModel.Command.VPNPermissionNotGranted -> quietlyToggleAppTpSwitch(false)
@@ -273,30 +273,88 @@ class DeviceShieldTrackerActivity :
     private fun launchDisableConfirmationDialog() {
         deviceShieldSwitch.quietlySetIsChecked(true, enableAppTPSwitchListener)
         deviceShieldPixels.didShowDisableTrackingProtectionDialog()
-        val dialog = AppTPDisableConfirmationDialog.instance(this)
-        dialog.show(
-            supportFragmentManager,
-            AppTPDisableConfirmationDialog.TAG_APPTP_DISABLE_DIALOG,
-        )
+
+        StackedAlertDialogBuilder(this)
+            .setTitle(R.string.atp_DisableConfirmationDialogTitle)
+            .setMessage(getString(R.string.atp_DisableConfirmationDialogMessage))
+            .setStackedButtons(DisableVpnDialogOptions.asOptions())
+            .addEventListener(
+                object : StackedAlertDialogBuilder.EventListener() {
+                    override fun onButtonClicked(position: Int) {
+                        when (DisableVpnDialogOptions.getOptionFromPosition(position)) {
+                            DisableVpnDialogOptions.DISABLE_APP -> onOpenAppProtection()
+                            DisableVpnDialogOptions.DISABLE_VPN -> onTurnAppTrackingProtectionOff()
+                            DisableVpnDialogOptions.CANCEL -> onDisableDialogCancelled()
+                        }
+                    }
+                },
+            )
+            .show()
     }
 
     private fun launchRemoveFeatureConfirmationDialog() {
         deviceShieldPixels.didShowRemoveTrackingProtectionFeatureDialog()
-        val dialog = VpnRemoveFeatureConfirmationDialog.instance(this)
-        dialog.show(
-            supportFragmentManager,
-            VpnRemoveFeatureConfirmationDialog.TAG_VPN_REMOVE_FEATURE_DIALOG,
-        )
+
+        TextAlertDialogBuilder(this)
+            .setTitle(R.string.atp_RemoveFeatureDialogTitle)
+            .setMessage(R.string.atp_RemoveFeatureDialogMessage)
+            .setPositiveButton(R.string.atp_RemoveFeatureDialogRemove)
+            .setNegativeButton(R.string.atp_RemoveFeatureDialogCancel)
+            .addEventListener(
+                object : TextAlertDialogBuilder.EventListener() {
+                    override fun onPositiveButtonClicked() {
+                        viewModel.removeFeature()
+                    }
+
+                    override fun onNegativeButtonClicked() {
+                        deviceShieldPixels.didChooseToCancelRemoveTrakcingProtectionDialog()
+                    }
+                },
+            )
+            .show()
     }
 
-    private fun launchVPNConflictDialog(isAlwaysOn: Boolean) {
+    private fun showVpnConflictDialog() {
         quietlyToggleAppTpSwitch(false)
         deviceShieldPixels.didShowVpnConflictDialog()
-        val dialog = AppTPVpnConflictDialog.instance(this, isAlwaysOn)
-        dialog.show(
-            supportFragmentManager,
-            AppTPVpnConflictDialog.TAG_VPN_CONFLICT_DIALOG,
-        )
+        TextAlertDialogBuilder(this)
+            .setTitle(R.string.atp_VpnConflictDialogTitle)
+            .setMessage(R.string.atp_VpnConflictDialogMessage)
+            .setPositiveButton(R.string.atp_VpnConflictDialogGotIt)
+            .setNegativeButton(R.string.atp_VpnConflictDialogCancel)
+            .addEventListener(
+                object : TextAlertDialogBuilder.EventListener() {
+                    override fun onPositiveButtonClicked() {
+                        onVpnConflictDialogContinue()
+                    }
+
+                    override fun onNegativeButtonClicked() {
+                        onVpnConflictDialogDismiss()
+                    }
+                },
+            )
+            .show()
+    }
+
+    private fun showAlwaysOnConflictDialog() {
+        deviceShieldPixels.didShowVpnConflictDialog()
+        TextAlertDialogBuilder(this)
+            .setTitle(R.string.atp_VpnConflictAlwaysOnDialogTitle)
+            .setMessage(R.string.atp_VpnConflictDialogAlwaysOnMessage)
+            .setPositiveButton(R.string.atp_VpnConflictDialogOpenSettings)
+            .setNegativeButton(R.string.atp_VpnConflictDialogCancel)
+            .addEventListener(
+                object : TextAlertDialogBuilder.EventListener() {
+                    override fun onPositiveButtonClicked() {
+                        onVpnConflictDialogGoToSettings()
+                    }
+
+                    override fun onNegativeButtonClicked() {
+                        onVpnConflictDialogDismiss()
+                    }
+                },
+            )
+            .show()
     }
 
     private fun launchAlwaysOnPromotionDialog() {
@@ -333,26 +391,26 @@ class DeviceShieldTrackerActivity :
         ).show(supportFragmentManager, TAG_APPTP_PROMOTE_ALWAYS_ON_DIALOG)
     }
 
-    override fun onOpenAppProtection() {
+    fun onOpenAppProtection() {
         deviceShieldPixels.didChooseToDisableOneAppFromDialog()
         viewModel.onViewEvent(ViewEvent.LaunchExcludedApps)
     }
 
-    override fun onTurnAppTrackingProtectionOff() {
+    fun onTurnAppTrackingProtectionOff() {
         quietlyToggleAppTpSwitch(false)
         deviceShieldPixels.didChooseToDisableTrackingProtectionFromDialog()
         viewModel.onAppTpManuallyDisabled()
     }
 
-    override fun onDisableDialogCancelled() {
+    fun onDisableDialogCancelled() {
         deviceShieldPixels.didChooseToCancelTrackingProtectionDialog()
     }
 
-    override fun onVpnConflictDialogDismiss() {
+    fun onVpnConflictDialogDismiss() {
         deviceShieldPixels.didChooseToDismissVpnConflictDialog()
     }
 
-    override fun onVpnConflictDialogGoToSettings() {
+    fun onVpnConflictDialogGoToSettings() {
         deviceShieldPixels.didChooseToOpenSettingsFromVpnConflictDialog()
         openVPNSettings()
     }
@@ -368,19 +426,11 @@ class DeviceShieldTrackerActivity :
         startActivity(intent)
     }
 
-    override fun onVpnConflictDialogContinue() {
+    fun onVpnConflictDialogContinue() {
         deviceShieldPixels.didChooseToContinueFromVpnConflictDialog()
         checkVPNPermission()
     }
 
-    override fun OnRemoveFeatureDialogCancel() {
-        deviceShieldPixels.didChooseToCancelRemoveTrakcingProtectionDialog()
-    }
-
-    override fun onRemoveFeature() {
-        viewModel.removeFeature()
-    }
-
     private fun checkVPNPermission() {
         when (val permissionStatus = checkVpnPermissionStatus()) {
             is VpnPermissionStatus.Granted -> {
diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/TrackerBadgeAdapter.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/TrackerBadgeAdapter.kt
index 1c644fae095b..cc8587818549 100644
--- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/TrackerBadgeAdapter.kt
+++ b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/TrackerBadgeAdapter.kt
@@ -17,7 +17,6 @@
 package com.duckduckgo.mobile.android.vpn.ui.tracker_activity
 
 import android.content.Context
-import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -26,6 +25,7 @@ import android.widget.TextView
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.RecyclerView
 import com.duckduckgo.mobile.android.ui.TextDrawable
+import com.duckduckgo.mobile.android.ui.view.getColorFromAttr
 import com.duckduckgo.mobile.android.ui.view.hide
 import com.duckduckgo.mobile.android.ui.view.show
 import com.duckduckgo.mobile.android.vpn.R
@@ -84,13 +84,14 @@ class TrackerBadgeAdapter : RecyclerView.Adapter<TrackerBadgeAdapter.TrackerBadg
 
         private fun displayTrackerCompany(trackerInfo: TrackerCompanyBadge.Company) {
             val badge = badgeIcon(iconBadge.context, trackerInfo.companyName)
+            val textColor = iconBadge.context.getColorFromAttr(com.duckduckgo.mobile.android.R.attr.daxColorPrimaryText)
             if (badge == null) {
                 iconBadge.setImageDrawable(
                     TextDrawable.builder()
                         .beginConfig()
                         .fontSize(50)
                         .endConfig()
-                        .buildRound(trackerInfo.companyName.take(1), Color.DKGRAY),
+                        .buildRound(trackerInfo.companyName.take(1), textColor),
                 )
             } else {
                 iconBadge.setImageResource(badge)
diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/TrackerFeedAdapter.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/TrackerFeedAdapter.kt
index 1d8477aa21a4..d7db9188f58a 100644
--- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/TrackerFeedAdapter.kt
+++ b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/TrackerFeedAdapter.kt
@@ -35,7 +35,7 @@ import com.duckduckgo.app.global.extensions.safeGetApplicationIcon
 import com.duckduckgo.mobile.android.ui.TextDrawable
 import com.duckduckgo.mobile.android.ui.recyclerviewext.StickyHeaders
 import com.duckduckgo.mobile.android.ui.view.gone
-import com.duckduckgo.mobile.android.ui.view.hide
+import com.duckduckgo.mobile.android.ui.view.listitem.SectionHeaderListItem
 import com.duckduckgo.mobile.android.ui.view.show
 import com.duckduckgo.mobile.android.vpn.R
 import com.duckduckgo.mobile.android.vpn.ui.tracker_activity.model.TrackerFeedItem
@@ -56,12 +56,7 @@ class TrackerFeedAdapter @Inject constructor(
         position: Int,
     ) {
         when (holder) {
-            is TrackerFeedViewHolder -> holder.bind(
-                trackerFeedItems[position] as TrackerFeedItem.TrackerFeedData,
-                onAppClick,
-                position == trackerFeedItems.size - 1,
-            )
-
+            is TrackerFeedViewHolder -> holder.bind(trackerFeedItems[position] as TrackerFeedItem.TrackerFeedData, onAppClick)
             is TrackerSkeletonViewHolder -> holder.bind()
             is TrackerFeedHeaderViewHolder -> holder.bind(trackerFeedItems[position] as TrackerFeedItem.TrackerFeedItemHeader)
             is TrackerAppsProtectionStateViewHolder ->
@@ -131,7 +126,7 @@ class TrackerFeedAdapter @Inject constructor(
     }
 
     private class TrackerFeedHeaderViewHolder(
-        val view: TextView,
+        val view: SectionHeaderListItem,
     ) :
         RecyclerView.ViewHolder(view) {
         companion object {
@@ -140,12 +135,12 @@ class TrackerFeedAdapter @Inject constructor(
             ): TrackerFeedHeaderViewHolder {
                 val inflater = LayoutInflater.from(parent.context)
                 val view = inflater.inflate(R.layout.view_device_shield_activity_entry_header, parent, false)
-                return TrackerFeedHeaderViewHolder(view as TextView)
+                return TrackerFeedHeaderViewHolder(view as SectionHeaderListItem)
             }
         }
 
         fun bind(item: TrackerFeedItem.TrackerFeedItemHeader) {
-            view.text = item.timestamp
+            view.primaryText = item.timestamp
         }
     }
 
@@ -161,7 +156,6 @@ class TrackerFeedAdapter @Inject constructor(
         val context: Context = view.context
         var activityMessage: TextView = view.findViewById(R.id.activity_message)
         var timeSinceTrackerBlocked: TextView = view.findViewById(R.id.activity_time_since)
-        var splitter: View = view.findViewById(R.id.entry_splitter)
         var trackingAppIcon: ImageView = view.findViewById(R.id.tracking_app_icon)
         var trackerBadgesView: RecyclerView = view.findViewById<RecyclerView>(R.id.tracker_badges).apply {
             adapter = TrackerBadgeAdapter()
@@ -172,7 +166,6 @@ class TrackerFeedAdapter @Inject constructor(
         fun bind(
             tracker: TrackerFeedItem.TrackerFeedData?,
             onAppClick: (TrackerFeedItem.TrackerFeedData) -> Unit,
-            shouldHideDivider: Boolean,
         ) {
             tracker?.let { item ->
                 with(activityMessage) {
@@ -240,11 +233,6 @@ class TrackerFeedAdapter @Inject constructor(
                 itemView.setOnClickListener {
                     onAppClick(item)
                 }
-                if (shouldHideDivider) {
-                    splitter.hide()
-                } else {
-                    splitter.show()
-                }
             }
         }
 
diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/VpnRemoveFeatureConfirmationDialog.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/VpnRemoveFeatureConfirmationDialog.kt
deleted file mode 100644
index 23d124ae8227..000000000000
--- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/VpnRemoveFeatureConfirmationDialog.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2019 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.
- */
-
-package com.duckduckgo.mobile.android.vpn.ui.tracker_activity
-
-import android.app.Dialog
-import android.os.Bundle
-import android.widget.Button
-import androidx.fragment.app.DialogFragment
-import com.duckduckgo.mobile.android.vpn.R
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-
-class VpnRemoveFeatureConfirmationDialog private constructor(private val listener: Listener) : DialogFragment() {
-
-    interface Listener {
-        fun OnRemoveFeatureDialogCancel()
-        fun onRemoveFeature()
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        isCancelable = false
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val rootView = layoutInflater.inflate(R.layout.dialog_tracking_protection_remove_feature_confirm_disable, null)
-
-        val cancelCta = rootView.findViewById<Button>(R.id.vpnFeatureRemoveDialogCancel)
-        val removeCta = rootView.findViewById<Button>(R.id.vpnFeatureRemoveDialogRemove)
-
-        val alertDialog = MaterialAlertDialogBuilder(
-            requireActivity(),
-            com.duckduckgo.mobile.android.R.style.Widget_DuckDuckGo_Dialog,
-        )
-            .setView(rootView)
-
-        isCancelable = false
-
-        configureListeners(cancelCta, removeCta)
-
-        return alertDialog.create()
-    }
-
-    private fun configureListeners(
-        cancelCta: Button,
-        removeCta: Button,
-    ) {
-        cancelCta.setOnClickListener {
-            dismiss()
-            listener.OnRemoveFeatureDialogCancel()
-        }
-        removeCta.setOnClickListener {
-            dismiss()
-            listener.onRemoveFeature()
-        }
-    }
-    companion object {
-
-        const val TAG_VPN_REMOVE_FEATURE_DIALOG = "VpnRemoveFeatureDialog"
-
-        fun instance(listener: Listener): VpnRemoveFeatureConfirmationDialog {
-            return VpnRemoveFeatureConfirmationDialog(listener)
-        }
-    }
-}
diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/view/DisableVpnDialogOptions.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/view/DisableVpnDialogOptions.kt
new file mode 100644
index 000000000000..9c808e81f1d3
--- /dev/null
+++ b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/view/DisableVpnDialogOptions.kt
@@ -0,0 +1,26 @@
+package com.duckduckgo.mobile.android.vpn.ui.tracker_activity.view
+
+import androidx.annotation.StringRes
+import com.duckduckgo.mobile.android.vpn.R
+
+enum class DisableVpnDialogOptions(val order: Int, @StringRes val stringRes: Int) {
+    DISABLE_APP(0, R.string.atp_DisableConfirmationDisableApp),
+    DISABLE_VPN(1, R.string.atp_DisableConfirmationDisableAllApps),
+    CANCEL(2, R.string.atp_DisableConfirmationCancel),
+    ;
+
+    companion object {
+        fun asOptions(): List<Int> {
+            return listOf(DISABLE_APP.stringRes, DISABLE_VPN.stringRes, CANCEL.stringRes)
+        }
+        fun getOptionFromPosition(position: Int): DisableVpnDialogOptions {
+            var defaultOption = DISABLE_APP
+            values().forEach {
+                if (it.order == position) {
+                    defaultOption = it
+                }
+            }
+            return defaultOption
+        }
+    }
+}
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_chevron_forward_small_24.xml b/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_chevron_forward_small_24.xml
index df4db0729ee6..a45bead33b9f 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_chevron_forward_small_24.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_chevron_forward_small_24.xml
@@ -20,7 +20,7 @@
     android:viewportWidth="8"
     android:viewportHeight="14">
     <path
-        android:fillColor="@color/primary_icon_color_selector"
+        android:fillColor="?attr/daxColorPrimaryIcon"
         android:fillType="evenOdd"
         android:pathData="M0.293,0.293C0.683,-0.098 1.317,-0.098 1.707,0.293L7.707,6.293C8.098,6.683 8.098,7.317 7.707,7.707L1.707,13.707C1.317,14.098 0.683,14.098 0.293,13.707C-0.098,13.317 -0.098,12.683 0.293,12.293L5.586,7L0.293,1.707C-0.098,1.317 -0.098,0.683 0.293,0.293Z" />
 </vector>
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable/rounded_top_corners_bottom_sheet_background.xml b/app-tracking-protection/vpn-impl/src/main/res/drawable/rounded_top_corners_bottom_sheet_background.xml
index 57ee9d898710..189df7c89926 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/drawable/rounded_top_corners_bottom_sheet_background.xml
+++ b/app-tracking-protection/vpn-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" />
+        android:topLeftRadius="@dimen/mediumShapeCornerRadius"
+        android:topRightRadius="@dimen/mediumShapeCornerRadius" />
     <solid android:color="?attr/daxDialogBackgroundColor" />
 </shape>
\ No newline at end of file
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/activity_app_trackers_info.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/activity_app_trackers_info.xml
index 9f19712d663c..a65d5cbcf919 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/activity_app_trackers_info.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/activity_app_trackers_info.xml
@@ -50,23 +50,24 @@
                 app:lottie_rawRes="@raw/device_shield_tracker_count"
                 app:lottie_autoPlay="true"/>
 
-            <TextView
+            <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
                 android:id="@+id/trackerProfilingInfoHeader"
-                style="@style/DeviceShieldOnboardingFAQHeaderStyle"
+                app:typography="h2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="35dp"
-                android:paddingEnd="35dp"
+                android:paddingStart="@dimen/keyline_6"
+                android:paddingEnd="@dimen/keyline_6"
                 android:text="@string/atp_ProfilingInfoTitle"/>
 
-            <TextView
+            <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
                 android:id="@+id/trackerProfilingInfoFirstContent"
-                style="@style/DeviceShieldOnboardingFAQTextStyle"
+                app:typography="body1"
+                app:textType="secondary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                android:paddingStart="35dp"
-                android:paddingEnd="35dp"
+                android:layout_marginTop="@dimen/keyline_4"
+                android:paddingStart="@dimen/keyline_6"
+                android:paddingEnd="@dimen/keyline_6"
                 android:text="@string/atp_ProfilingInfoFirstParagraph"/>
 
             <ImageView
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/activity_apptp_company_trackers_activity.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/activity_apptp_company_trackers_activity.xml
index 3d72cef30a6e..b391a56e99d5 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/activity_apptp_company_trackers_activity.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/activity_apptp_company_trackers_activity.xml
@@ -46,15 +46,15 @@
                 app:panelDrawable="@drawable/ic_info_panel_alert"
                 app:panelText="@string/atp_CompanyDetailsAppInfoPanel"
                 android:visibility="gone"
-                android:layout_margin="16dp"/>
+                android:layout_marginTop="@dimen/keyline_4"
+                android:layout_marginStart="@dimen/keyline_4"
+                android:layout_marginEnd="@dimen/keyline_4"/>
 
-            <com.duckduckgo.mobile.android.ui.view.text.SectionHeaderTextView
+            <com.duckduckgo.mobile.android.ui.view.listitem.SectionHeaderListItem
                 android:id="@+id/tracking_attempts"
-                android:paddingStart="@dimen/keyline_4"
+                android:layout_marginTop="@dimen/keyline_4"
                 android:layout_height="wrap_content"
                 android:layout_width="match_parent"
-                android:paddingTop="@dimen/keyline_4"
-                android:paddingBottom="@dimen/keyline_2"
                 tools:text="9 tracking attempts blocked"/>
 
             <androidx.recyclerview.widget.RecyclerView
@@ -67,10 +67,10 @@
                 android:paddingBottom="@dimen/keyline_5"
                 app:layout_constraintStart_toStartOf="parent"/>
 
-            <TextView
+            <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
                 android:id="@+id/tracking_learn_more"
-                style="@style/TextAppearance.DuckDuckGo.Body2"
-                android:textColor="?secondaryTextColor"
+                app:typography="body2"
+                app:textType="secondary"
                 tools:text="@string/atp_CompanyDetailsTrackingLearnMore"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/activity_device_shield_activity.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/activity_device_shield_activity.xml
index 43b0f5ecff33..99230bfcecef 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/activity_device_shield_activity.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/activity_device_shield_activity.xml
@@ -17,16 +17,16 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical"
-              tools:context="com.duckduckgo.mobile.android.vpn.ui.tracker_activity.DeviceShieldTrackerActivity">
+    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:orientation="vertical"
+    tools:context="com.duckduckgo.mobile.android.vpn.ui.tracker_activity.DeviceShieldTrackerActivity">
 
     <include
         android:id="@+id/include_toolbar"
-        layout="@layout/include_trackers_toolbar"/>
+        layout="@layout/include_trackers_toolbar" />
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
@@ -45,34 +45,32 @@
                 <com.duckduckgo.mobile.android.ui.view.InfoPanel
                     android:id="@+id/deviceShieldTrackerLabelEnabled"
                     style="@style/Widget.DuckDuckGo.InfoPanel"
+                    android:layout_margin="@dimen/keyline_4"
+                    android:visibility="gone"
                     app:panelBackground="@drawable/info_panel_tooltip_background"
                     app:panelDrawable="@drawable/ic_info_panel_info"
-                    app:panelText="@string/atp_ActivityEnabledBannerLabel"
-                    android:visibility="gone"
-                    android:layout_margin="16dp"/>
+                    app:panelText="@string/atp_ActivityEnabledBannerLabel" />
 
                 <com.duckduckgo.mobile.android.ui.view.InfoPanel
                     android:id="@+id/deviceShieldTrackerLabelDisabled"
                     style="@style/Widget.DuckDuckGo.InfoPanel"
+                    android:layout_margin="@dimen/keyline_4"
+                    android:visibility="gone"
                     app:panelBackground="@drawable/info_panel_alert_background"
                     app:panelDrawable="@drawable/ic_info_panel_alert"
-                    app:panelText="@string/atp_ActivityDisabledLabel"
-                    android:visibility="gone"
-                    android:layout_margin="16dp"/>
+                    app:panelText="@string/atp_ActivityDisabledLabel" />
 
-                <com.duckduckgo.mobile.android.ui.view.text.SectionHeaderTextView
+                <com.duckduckgo.mobile.android.ui.view.listitem.SectionHeaderListItem
                     android:id="@+id/past_week_activity"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingTop="@dimen/keyline_4"
-                    android:paddingBottom="@dimen/keyline_2"
-                    android:paddingStart="@dimen/keyline_4"
-                    android:text="@string/atp_ActivityPastWeek"/>
+                    app:primaryText="@string/atp_ActivityPastWeek" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
+                    android:layout_marginTop="@dimen/keyline_3"
+                    android:layout_marginBottom="@dimen/keyline_3"
                     android:orientation="horizontal">
 
                     <com.duckduckgo.mobile.android.vpn.ui.tracker_activity.PastWeekTrackerActivityContentView
@@ -80,111 +78,106 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="@string/atp_ActivityPastWeekBlocked"/>
+                        android:text="@string/atp_ActivityPastWeekBlocked" />
 
                     <com.duckduckgo.mobile.android.ui.view.divider.VerticalDivider
                         android:id="@+id/vertical_divider"
                         android:layout_width="wrap_content"
                         android:layout_height="match_parent"
-                        android:layout_marginTop="4dp"
-                        android:layout_marginBottom="4dp"/>
+                        android:layout_marginTop="@dimen/keyline_1"
+                        android:layout_marginBottom="@dimen/keyline_1" />
 
                     <com.duckduckgo.mobile.android.vpn.ui.tracker_activity.PastWeekTrackerActivityContentView
                         android:id="@+id/tracking_apps_count"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:text="@string/atp_ActivityPastWeekAcross"/>
+                        android:text="@string/atp_ActivityPastWeekAcross" />
 
                 </LinearLayout>
 
                 <com.duckduckgo.mobile.android.ui.view.divider.HorizontalDivider
                     android:id="@+id/horizontal_divider"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"/>
+                    android:layout_height="wrap_content" />
 
-                <com.duckduckgo.mobile.android.ui.view.text.SectionHeaderTextView
+                <com.duckduckgo.mobile.android.ui.view.listitem.SectionHeaderListItem
                     android:id="@+id/most_recent_activity"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text="@string/atp_ActivityRecentActivityHeader"
-                    android:paddingStart="@dimen/keyline_4"
-                    android:paddingBottom="@dimen/keyline_2"/>
+                    app:primaryText="@string/atp_ActivityRecentActivityHeader" />
 
                 <androidx.fragment.app.FragmentContainerView
                     android:id="@+id/activity_list"
                     android:layout_width="match_parent"
                     android:layout_height="0dp"
-                    android:layout_weight="1"/>
+                    android:layout_weight="1" />
 
                 <com.duckduckgo.mobile.android.ui.view.listitem.OneLineListItem
                     android:id="@+id/cta_show_all"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:primaryText="@string/atp_ActivityCtaShowAll"
+                    android:paddingStart="56dp"
                     android:paddingTop="@dimen/keyline_2"
                     android:paddingBottom="@dimen/keyline_2"
-                    android:paddingStart="56dp"
-                    android:visibility="gone"/>
+                    android:visibility="gone"
+                    app:primaryText="@string/atp_ActivityCtaShowAll" />
 
                 <com.duckduckgo.mobile.android.ui.view.divider.HorizontalDivider
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/keyline_4"
-                    app:defaultPadding="false"/>
+                    android:layout_marginBottom="@dimen/keyline_2"
+                    app:defaultPadding="false" />
 
-                <com.duckduckgo.mobile.android.ui.view.text.SectionHeaderTextView
+                <com.duckduckgo.mobile.android.ui.view.listitem.SectionHeaderListItem
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingBottom="@dimen/keyline_2"
-                    android:paddingStart="@dimen/keyline_4"
-                    android:text="@string/atp_ActivityAbout"/>
+                    app:primaryText="@string/atp_ActivityAbout" />
 
                 <com.duckduckgo.mobile.android.ui.view.listitem.OneLineListItem
                     android:id="@+id/cta_what_are_app_trackers"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:primaryText="@string/atp_ActivityAppTrackersFAQ"/>
+                    app:primaryText="@string/atp_ActivityAppTrackersFAQ" />
 
                 <com.duckduckgo.mobile.android.ui.view.listitem.OneLineListItem
                     android:id="@+id/cta_tracker_faq"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:primaryText="@string/atp_FAQCta"/>
+                    app:primaryText="@string/atp_FAQCta" />
 
-                <com.duckduckgo.mobile.android.ui.view.text.SectionHeaderTextView
+                <com.duckduckgo.mobile.android.ui.view.listitem.SectionHeaderListItem
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingTop="@dimen/keyline_4"
-                    android:paddingBottom="@dimen/keyline_2"
-                    android:paddingStart="@dimen/keyline_4"
-                    android:text="@string/atp_ActivityManage"/>
+                    app:primaryText="@string/atp_ActivityManage" />
 
                 <com.duckduckgo.mobile.android.ui.view.listitem.OneLineListItem
                     android:id="@+id/cta_manage_protection"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:primaryText="@string/atp_ActivityManageProtectionLabel"/>
+                    app:primaryText="@string/atp_ActivityManageProtectionLabel" />
 
                 <com.duckduckgo.mobile.android.ui.view.listitem.OneLineListItem
                     android:id="@+id/cta_manage_view_all_apps"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:primaryText="@string/atp_ActivityViewAppsLabel"/>
+                    app:primaryText="@string/atp_ActivityViewAppsLabel" />
 
                 <com.duckduckgo.mobile.android.ui.view.listitem.OneLineListItem
                     android:id="@+id/cta_remove_feature"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:primaryTextColorOverlay="@color/red_text_color_selector"
-                    app:primaryText="@string/atp_ActivityRemoveFeature"/>
+                    android:layout_marginBottom="@dimen/keyline_2"
+                    app:primaryText="@string/atp_ActivityRemoveFeature"
+                    app:primaryTextColorOverlay="@color/red_text_color_selector" />
 
             </LinearLayout>
 
             <nl.dionsegijn.konfetti.KonfettiView
                 android:id="@+id/appTpEnabledKonfetti"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"/>
+                android:layout_height="match_parent" />
 
         </FrameLayout>
     </androidx.core.widget.NestedScrollView>
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/activity_device_shield_faq.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/activity_device_shield_faq.xml
index 3a0da4f6ff7d..6fa4d980e417 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/activity_device_shield_faq.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/activity_device_shield_faq.xml
@@ -51,7 +51,7 @@
             <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:typography="body2"
+                app:typography="body1"
                 app:textType="secondary"
                 android:layout_marginTop="@dimen/keyline_4"
                 android:text="@string/atp_FAQFirstText"/>
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/activity_manage_recent_apps_protection.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/activity_manage_recent_apps_protection.xml
index 1ca089768ee0..2ba2edc38951 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/activity_manage_recent_apps_protection.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/activity_manage_recent_apps_protection.xml
@@ -41,13 +41,13 @@
             android:layout_height="match_parent"
             android:orientation="vertical">
 
-            <TextView
+            <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
                 android:id="@+id/manageRecentAppsReportIssues"
-                style="@style/TextAppearance.DuckDuckGo.Body2"
+                app:typography="body2"
+                app:textType="secondary"
                 tools:text="@string/atp_ManageRecentAppsProtectionReportIssues"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:textColor="?secondaryTextColor"
                 android:paddingStart="@dimen/keyline_4"
                 android:paddingEnd="@dimen/keyline_4"
                 android:paddingTop="@dimen/keyline_4"
@@ -89,9 +89,9 @@
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:listItem="@layout/view_device_shield_excluded_app_entry"/>
 
-            <TextView
+            <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
                 android:id="@+id/manageRecentAppsEmptyView"
-                style="@style/DeviceShield.PrivacyReport.TrackerEntry"
+                app:typography="body1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/keyline_4"
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/activity_report_breakage_app_list.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/activity_report_breakage_app_list.xml
index 60041a151a11..cbd6c5959d84 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/activity_report_breakage_app_list.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/activity_report_breakage_app_list.xml
@@ -15,54 +15,51 @@
   -->
 
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
->
-    <include
-        android:id="@+id/include_toolbar"
-        layout="@layout/include_default_toolbar"/>
+        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:background="?attr/daxColorSurface"
+        android:orientation="vertical">
 
+    <include
+            android:id="@+id/include_toolbar"
+            layout="@layout/include_default_toolbar"/>
 
     <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
-
-        <LinearLayout
+            android:background="?attr/daxColorBackground"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
+            android:layout_height="0dp"
+            android:layout_weight="1">
 
-            <TextView
-                android:id="@+id/appBreakageReportFeature"
-                style="@style/TextAppearance.DuckDuckGo.Body2"
-                android:paddingTop="@dimen/keyline_4"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/keyline_4"
-                android:layout_marginEnd="@dimen/keyline_4"
-                android:text="@string/atp_ReportBreakageAppFeature"
-                android:textColor="?attr/settingsMinorTextColor"/>
-
-            <com.duckduckgo.mobile.android.ui.view.divider.HorizontalDivider
-                android:id="@+id/appBreakageReportSplitter"
+        <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"/>
+                android:layout_height="match_parent"
+                android:orientation="vertical"
+                android:paddingTop="@dimen/keyline_4"
+                android:paddingEnd="@dimen/keyline_4"
+                android:paddingStart="@dimen/keyline_4">
+
+            <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+                    android:id="@+id/appBreakageReportFeature"
+                    app:typography="body2"
+                    app:textType="secondary"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/keyline_3"
+                    android:text="@string/atp_ReportBreakageAppFeature"/>
 
             <com.facebook.shimmer.ShimmerFrameLayout
-                android:id="@+id/deviceShieldReportBreakageAppListSkeleton"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                    android:id="@+id/deviceShieldReportBreakageAppListSkeleton"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
 
                 <LinearLayout
-                    android:paddingTop="@dimen/keyline_2"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical">
+                        android:paddingBottom="@dimen/keyline_2"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:orientation="vertical">
 
                     <include layout="@layout/view_device_shield_report_breakage_app_list_skeleton"/>
 
@@ -91,30 +88,29 @@
             </com.facebook.shimmer.ShimmerFrameLayout>
 
             <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/reportBreakageAppsRecycler"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:clipToPadding="false"
-                android:paddingBottom="@dimen/keyline_2"
-                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-                tools:listItem="@layout/view_device_shield_report_app_breakage_entry"/>
+                    android:id="@+id/reportBreakageAppsRecycler"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:clipToPadding="false"
+                    app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                    tools:listItem="@layout/view_device_shield_report_app_breakage_entry"/>
 
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
 
     <com.duckduckgo.mobile.android.ui.view.divider.HorizontalDivider
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+            app:defaultPadding="false"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
 
-    <com.duckduckgo.mobile.android.ui.view.button.ButtonPrimaryLarge
-        android:id="@+id/ctaSubmitAppBreakage"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/keyline_4"
-        android:layout_marginEnd="@dimen/keyline_4"
-        android:layout_marginBottom="@dimen/keyline_4"
-        android:enabled="false"
-        android:text="@string/atp_ReportBreakageAppSubmitCta"/>
+    <com.duckduckgo.mobile.android.ui.view.button.DaxButtonPrimary
+            android:id="@+id/ctaSubmitAppBreakage"
+            app:buttonSize="large"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="@dimen/keyline_4"
+            android:enabled="false"
+            android:text="@string/atp_ReportBreakageAppNextCta"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/activity_report_breakage_category_single_choice.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/activity_report_breakage_category_single_choice.xml
index 0ddf557a0cc5..c895c4533f0a 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/activity_report_breakage_category_single_choice.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/activity_report_breakage_category_single_choice.xml
@@ -17,134 +17,97 @@
   -->
 
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".breakage.ReportBreakageCategorySingleChoiceActivity">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:background="?attr/daxColorSurface"
+        tools:context=".breakage.ReportBreakageCategorySingleChoiceActivity">
 
     <include
-        android:id="@+id/include_toolbar"
-        layout="@layout/include_default_toolbar"/>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1">
+            android:id="@+id/include_toolbar"
+            layout="@layout/include_default_toolbar"/>
 
-        <LinearLayout
+    <androidx.core.widget.NestedScrollView
+            android:background="?attr/daxColorBackground"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
+            android:layout_height="0dp"
+            android:layout_weight="1">
 
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/textInputLayout"
-                style="@style/TextInputBoxStyle"
+        <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="60dp"
-                android:layout_marginStart="25dp"
-                android:layout_marginTop="25dp"
-                android:layout_marginEnd="25dp"
-                android:hint="@string/atp_ReportBreakageCategoriesHint"
-                android:textColorHint="?attr/normalTextColor"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/include_toolbar">
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:layout_marginStart="@dimen/keyline_4"
+                android:layout_marginTop="@dimen/keyline_4"
+                android:layout_marginEnd="@dimen/keyline_4">
 
-                <EditText
+            <com.duckduckgo.mobile.android.ui.view.text.DaxTextInput
                     android:id="@+id/categoriesSelection"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:cursorVisible="false"
-                    android:ellipsize="end"
-                    android:focusable="false"
-                    android:importantForAutofill="no"
-                    android:inputType="none"
-                    android:labelFor="@id/categoriesSelection"
-                    android:maxLines="1"
-                    android:drawableEnd="@drawable/ic_report_breakage_down_arrow_24dp"
-                    android:textColor="?attr/normalTextColor"
-                    android:textIsSelectable="false"
-                    tools:ignore="RtlSymmetry" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <LinearLayout
-                android:id="@+id/otherCategoryDescription"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:visibility="visible">
+                    android:layout_height="wrap_content"
+                    android:hint="@string/atp_ReportBreakageCategoriesHint"
+                    app:editable="false"
+                    app:endIcon="@drawable/ic_chevron_down_24_small"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"/>
 
-                <TextView
+            <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
                     android:id="@+id/appBreakageFormHeading"
-                    style="@style/TextAppearance.DuckDuckGo.Headline3"
+                    app:typography="body2"
+                    app:textType="secondary"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/keyline_2"
-                    android:fontFamily="sans-serif-medium"
-                    android:padding="@dimen/keyline_4"
-                    android:text="@string/atp_ReportBreakageFormWhatHappenedText"
-                    android:textStyle="bold"
-                    android:textColor="?attr/normalTextColor"/>
+                    android:layout_marginTop="@dimen/keyline_4"
+                    android:text="@string/atp_ReportBreakageFormWhatHappenedText"/>
 
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/appBreakageFormFeedbackContainer"
-                    style="@style/TextInputBoxStyle"
+            <com.duckduckgo.mobile.android.ui.view.text.DaxTextInput
+                    android:id="@+id/appBreakageFormFeedbackInput"
                     android:layout_width="match_parent"
-                    android:layout_height="140dp"
-                    android:layout_marginTop="@dimen/keyline_2"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/keyline_4"
                     android:hint="@string/atp_ReportBreakageFormInputHint"
-                    android:paddingStart="@dimen/keyline_4"
-                    android:paddingEnd="@dimen/keyline_4"
-                    app:hintTextAppearance="@android:style/TextAppearance"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/appBreakageFormFeedbackInput"
-                        style="@style/TextInputStyle"
-                        android:gravity="top" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/appBreakageFormDisclaimer"
-                style="@style/TextAppearance.DuckDuckGo.Body2"
-                android:layout_marginTop="@dimen/keyline_2"
-                android:padding="@dimen/keyline_4"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/atp_ReportBreakageFormDisclaimerText"
-                android:textColor="?attr/settingsMinorTextColor"/>
+                    app:editable="true"
+                    app:type="multi_line"
+                    android:minLines="3"/>
+
+            <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+                    android:id="@+id/appBreakageFormDisclaimer"
+                    app:typography="body2"
+                    app:textType="secondary"
+                    android:layout_marginTop="@dimen/keyline_4"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/atp_ReportBreakageFormDisclaimerText"/>
 
         </LinearLayout>
 
-    </ScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-    <TextView
-        android:id="@+id/appBreakageFormConfirmationCheckbox"
-        android:padding="@dimen/keyline_4"
-        style="@style/TextAppearance.AppCompat.Body1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/atp_ReportBreakageFormCheckboxText" />
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:id="@+id/appBreakageFormConfirmationCheckbox"
+            app:typography="body1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/keyline_4"
+            android:layout_marginEnd="@dimen/keyline_4"
+            android:layout_marginTop="@dimen/keyline_4"
+            android:text="@string/atp_ReportBreakageFormCheckboxText"/>
 
     <com.duckduckgo.mobile.android.ui.view.divider.HorizontalDivider
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"/>
 
-    <com.duckduckgo.mobile.android.ui.view.button.ButtonPrimaryLarge
-        android:id="@+id/ctaNextFormSubmit"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/keyline_4"
-        android:layout_marginEnd="@dimen/keyline_4"
-        android:layout_marginBottom="@dimen/keyline_4"
-        android:text="@string/atp_ReportBreakageAppSubmitCta"/>
+    <com.duckduckgo.mobile.android.ui.view.button.DaxButtonPrimary
+            android:id="@+id/ctaNextFormSubmit"
+            app:buttonSize="large"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/keyline_4"
+            android:layout_marginEnd="@dimen/keyline_4"
+            android:layout_marginBottom="@dimen/keyline_4"
+            android:text="@string/atp_ReportBreakageAppSubmitCta"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/content_vpn_always_on_alert.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/content_vpn_always_on_alert.xml
index 8dd435778f41..c3cc8ee286a3 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/content_vpn_always_on_alert.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/content_vpn_always_on_alert.xml
@@ -26,10 +26,12 @@
     <ImageView
         android:id="@+id/closeButton"
         android:src="@drawable/ic_close_24"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginTop="@dimen/keyline_4"
+        android:layout_marginEnd="@dimen/keyline_4"
+        android:layout_marginBottom="@dimen/keyline_1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:background="?selectableItemBackground"
         android:layout_gravity="end"
     />
 
@@ -48,16 +50,15 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="40dp"
-        android:paddingEnd="40dp"
-        android:paddingBottom="40dp"
+        android:paddingStart="@dimen/keyline_6"
+        android:paddingEnd="@dimen/keyline_6"
+        android:paddingBottom="@dimen/keyline_6"
     >
-
         <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:id="@+id/alwaysOnModalHeading"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="24dp"
+            android:paddingTop="@dimen/keyline_5"
             android:gravity="center"
             app:typography="h2"
             android:text="@string/atp_AlwaysOnModalHeading"
@@ -67,26 +68,27 @@
             android:id="@+id/alwaysOnModalDescription"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="24dp"
+            android:paddingTop="@dimen/keyline_5"
             android:gravity="center"
             app:typography="body1"
             android:text="@string/atp_AlwaysOnModalBody"
         />
 
-
-        <com.duckduckgo.mobile.android.ui.view.button.ButtonPrimaryLowercase
+        <com.duckduckgo.mobile.android.ui.view.button.DaxButtonPrimary
             android:id="@+id/goToSettingsButton"
+            app:buttonSize="large"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
+            android:layout_marginTop="@dimen/keyline_5"
             android:text="@string/atp_PromoteAlwaysOnDialogSettings"
         />
 
-        <com.duckduckgo.mobile.android.ui.view.button.ButtonSecondaryLarge
+        <com.duckduckgo.mobile.android.ui.view.button.DaxButtonSecondary
             android:id="@+id/notNowButton"
+            app:buttonSize="large"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="@dimen/keyline_1"
             android:text="@string/atp_PromoteAlwaysOnDialogNotNow"
         />
     </LinearLayout>
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_confirm_disable.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_confirm_disable.xml
deleted file mode 100644
index 7e9386843549..000000000000
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_confirm_disable.xml
+++ /dev/null
@@ -1,74 +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.
-  -->
-
-<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:orientation="vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?dialogBgColor"
-        android:padding="@dimen/keyline_4">
-
-    <TextView
-            android:id="@+id/disableConfirmationDialogTitle"
-            style="@style/TextAppearance.DuckDuckGo.Headline2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:textAlignment="viewStart"
-            android:text="@string/atp_DisableConfirmationDialogTitle"/>
-
-    <TextView
-            android:id="@+id/disableConfirmationDialogMessage"
-            style="@style/TextAppearance.DuckDuckGo.Body1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAlignment="viewStart"
-            android:textColor="?attr/settingsMinorTextColor"
-            android:layout_marginTop="@dimen/keyline_3"
-            android:text="@string/atp_DisableConfirmationDialogMessage"/>
-
-    <com.duckduckgo.mobile.android.ui.view.button.ButtonGhostSmall
-            android:id="@+id/disableConfirmationDialogOneApp"
-            android:layout_gravity="end"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dialogButtonHeight"
-            android:textColor="@color/cornflowerBlue"
-            android:layout_marginTop="@dimen/keyline_5"
-            android:text="@string/atp_DisableConfirmationDisableApp"/>
-
-    <com.duckduckgo.mobile.android.ui.view.button.ButtonGhostSmall
-            android:id="@+id/disableConfirmationDialogAllApps"
-            android:layout_gravity="end"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dialogButtonHeight"
-            android:layout_marginTop="@dimen/keyline_2"
-            android:text="@string/atp_DisableConfirmationDisableAllApps"/>
-
-    <com.duckduckgo.mobile.android.ui.view.button.ButtonGhostSmall
-            android:id="@+id/disableConfirmationDialogCancel"
-            android:layout_gravity="end"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dialogButtonHeight"
-            android:textColor="@color/cornflowerBlue"
-            android:layout_marginTop="@dimen/keyline_2"
-            android:text="@string/atp_DisableConfirmationCancel"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_manually_disable_app.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_manually_disable_app.xml
index 5168144b4edf..5189e124c3ef 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_manually_disable_app.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_manually_disable_app.xml
@@ -19,13 +19,13 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    style="@style/Widget.DuckDuckGo.Dialog.Content">
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/trackingProtectionScrollView"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?dialogBgColor">
+        android:layout_height="wrap_content">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
@@ -35,50 +35,43 @@
                 android:id="@+id/trackingProtectionAppIcon"
                 android:layout_width="@dimen/listItemImageContainerSize"
                 android:layout_height="@dimen/listItemImageContainerSize"
-                android:layout_marginTop="@dimen/keyline_5"
                 android:importantForAccessibility="no"
                 android:src="@drawable/ic_globe_gray_16dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
+            <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
                 android:id="@+id/trackingProtectionTitle"
-                style="@style/TextAppearance.AppCompat.Title"
+                app:typography="h2"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/keyline_5"
                 android:layout_marginTop="@dimen/keyline_4"
-                android:layout_marginEnd="@dimen/keyline_5"
                 android:gravity="center"
                 android:text="@string/atp_ExcludeAppsManuallyDisableAppDialogTitle"
-                android:textColor="?normalTextColor"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/trackingProtectionAppIcon" />
 
-            <TextView
+            <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
                 android:id="@+id/trackingProtectionAppLabel"
-                style="@style/TextAppearance.DuckDuckGo.Body2"
+                app:typography="body2"
+                app:textType="secondary"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/keyline_5"
                 android:layout_marginTop="@dimen/keyline_2"
-                android:layout_marginEnd="@dimen/keyline_5"
                 android:gravity="center"
                 android:text="@string/atp_ExcludeAppsManuallyDisableAppDialogLabel"
-                android:textColor="?secondaryTextColor"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/trackingProtectionTitle" />
 
-            <com.duckduckgo.mobile.android.ui.view.button.ButtonPrimarySmall
+            <com.duckduckgo.mobile.android.ui.view.button.DaxButtonPrimary
                 android:id="@+id/trackingProtectionExcludeAppDialogReport"
                 android:layout_width="wrap_content"
-                android:layout_height="@dimen/dialogButtonHeight"
+                android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/keyline_0"
                 android:layout_marginTop="@dimen/keyline_4"
-                android:layout_marginBottom="@dimen/keyline_5"
                 android:gravity="center|center_horizontal"
                 android:text="@string/atp_ExcludeAppsManuallyCTAReportIssue"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -87,13 +80,12 @@
                 app:layout_constraintStart_toEndOf="@id/trackingProtectionExcludeAppDialogSkip"
                 app:layout_constraintTop_toBottomOf="@+id/trackingProtectionAppLabel" />
 
-            <com.duckduckgo.mobile.android.ui.view.button.ButtonGhostSmall
+            <com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
                 android:id="@+id/trackingProtectionExcludeAppDialogSkip"
                 android:layout_width="wrap_content"
-                android:layout_height="@dimen/dialogButtonHeight"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/keyline_4"
-                android:layout_marginEnd="@dimen/keyline_0"
-                android:layout_marginBottom="@dimen/keyline_5"
+                android:layout_marginEnd="@dimen/keyline_2"
                 android:gravity="center|center_horizontal"
                 android:text="@string/atp_ExcludeAppsManuallyCTANotNow"
                 app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_manually_enable_app.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_manually_enable_app.xml
index 1e7e74ecbcd4..7cbe0156be1c 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_manually_enable_app.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_manually_enable_app.xml
@@ -21,38 +21,34 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?dialogBgColor">
+    style="@style/Widget.DuckDuckGo.Dialog.Content">
 
     <ImageView
         android:id="@+id/trackingProtectionAppIcon"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:layout_marginTop="@dimen/keyline_5"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_globe_gray_16dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/trackingProtectionTitle"
-        style="@style/TextAppearance.AppCompat.Title"
+        app:typography="h2"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/keyline_5"
         android:layout_marginTop="@dimen/keyline_4"
-        android:layout_marginEnd="@dimen/keyline_5"
         android:gravity="center"
-        android:textColor="?normalTextColor"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/trackingProtectionAppIcon"
         tools:text="Facebook may experience issues if App Tracking Protection is enabled" />
 
-    <com.duckduckgo.mobile.android.ui.view.button.ButtonPrimarySmall
+    <com.duckduckgo.mobile.android.ui.view.button.DaxButtonPrimary
         android:id="@+id/trackingProtectionExcludeAppDialogEnable"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/dialogButtonHeight"
+        android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/keyline_0"
         android:layout_marginTop="@dimen/keyline_4"
         android:gravity="center|center_horizontal"
@@ -62,15 +58,14 @@
         app:layout_constraintStart_toEndOf="@id/trackingProtectionExcludeAppDialogSkip"
         app:layout_constraintTop_toBottomOf="@id/trackingProtectionTitle" />
 
-    <com.duckduckgo.mobile.android.ui.view.button.ButtonGhostSmall
+    <com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
         android:id="@+id/trackingProtectionExcludeAppDialogSkip"
         android:layout_width="wrap_content"
-        android:layout_height="@dimen/dialogButtonHeight"
+        android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/keyline_4"
-        android:layout_marginEnd="@dimen/keyline_0"
+        android:layout_marginEnd="@dimen/keyline_2"
         android:gravity="center|center_horizontal"
         android:text="@string/atp_ExcludeAppsManuallyCTACancel"
-        android:textColor="@color/cornflowerBlue"
         app:layout_constraintEnd_toStartOf="@id/trackingProtectionExcludeAppDialogEnable"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
@@ -84,18 +79,16 @@
         android:layout_marginBottom="-4dp"
         app:layout_constraintBottom_toBottomOf="@+id/trackingProtectionAppIcon"
         app:layout_constraintEnd_toEndOf="@+id/trackingProtectionAppIcon" app:srcCompat="@drawable/ic_apptp_alert"/>
-    <TextView
+
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/trackingProtectionEnableProtectionDisclaimer"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/keyline_5"
+        app:typography="caption"
+        app:textType="secondary"
         android:layout_marginTop="@dimen/keyline_4"
-        android:layout_marginEnd="@dimen/keyline_5"
-        android:layout_marginBottom="@dimen/keyline_5"
         android:gravity="center"
         android:text="@string/atp_ExcludeAppsManuallyEnableFooter"
-        android:textAppearance="@style/TextAppearance.DuckDuckGo.Caption"
-        android:textColor="?attr/secondaryTextColor"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_remove_feature_confirm_disable.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_remove_feature_confirm_disable.xml
deleted file mode 100644
index 189cddd91a6c..000000000000
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_remove_feature_confirm_disable.xml
+++ /dev/null
@@ -1,68 +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.
-  -->
-
-<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:orientation="vertical"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="?dialogBgColor"
-    android:padding="@dimen/keyline_4">
-
-    <TextView
-        style="@style/TextAppearance.DuckDuckGo.Headline2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:textAlignment="viewStart"
-        android:text="@string/atp_RemoveFeatureDialogTitle"/>
-
-    <TextView
-        style="@style/TextAppearance.DuckDuckGo.Body1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAlignment="viewStart"
-        android:textColor="?attr/settingsMinorTextColor"
-        android:layout_marginTop="@dimen/keyline_3"
-        android:text="@string/atp_RemoveFeatureDialogMessage"/>
-
-    <LinearLayout
-        android:layout_marginTop="@dimen/keyline_5"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="end">
-
-        <com.duckduckgo.mobile.android.ui.view.button.ButtonGhostSmall
-            android:id="@+id/vpnFeatureRemoveDialogCancel"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dialogButtonHeight"
-            android:text="@string/atp_RemoveFeatureDialogCancel"/>
-
-        <com.duckduckgo.mobile.android.ui.view.button.ButtonGhostSmall
-            android:id="@+id/vpnFeatureRemoveDialogRemove"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dialogButtonHeight"
-            android:textColor="@color/cornflowerBlue"
-            android:text="@string/atp_RemoveFeatureDialogRemove"/>
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_restore_defaults.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_restore_defaults.xml
index e07f1bdba9c0..4e3465db2c45 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_restore_defaults.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_restore_defaults.xml
@@ -16,102 +16,99 @@
   ~ 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"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingBottom="28dp"
-    android:background="?dialogBgColor">
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             style="@style/Widget.DuckDuckGo.Dialog.Content">
 
-    <ImageView
-        android:id="@+id/trackingProtectionAppIcon"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginTop="24dp"
-        android:importantForAccessibility="no"
-        android:src="@drawable/ic_apptb_default"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <androidx.core.widget.NestedScrollView
+            android:id="@+id/trackingProtectionScrollView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/trackingProtectionRestoreDefaultsTitle"
-        style="@style/TextAppearance.AppCompat.Title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:orientation="vertical"
-        android:textAlignment="center"
-        android:textColor="?normalTextColor"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/trackingProtectionAppIcon"
-        android:text="@string/atp_ExcludeAppsRestoreDefaultsTitle" />
+        <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-    <TextView
-        android:id="@+id/trackingProtectionRestoreDefaultsMessage"
-        style="@style/TextAppearance.DuckDuckGo.Body2"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="32dp"
-        android:orientation="vertical"
-        android:text="@string/atp_ExcludeAppsRestoreDefaultsMessage"
-        android:textAlignment="center"
-        android:textColor="?secondaryTextColor"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/trackingProtectionRestoreDefaultsTitle" />
+            <ImageView
+                    android:id="@+id/trackingProtectionAppIcon"
+                    android:layout_width="@dimen/listItemImageContainerSize"
+                    android:layout_height="@dimen/listItemImageContainerSize"
+                    android:importantForAccessibility="no"
+                    android:src="@drawable/ic_apptb_default"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/trackingProtectionRestoreDefaultsGuideline"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.50" />
+            <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+                    android:id="@+id/trackingProtectionRestoreDefaultsTitle"
+                    app:typography="h2"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/keyline_4"
+                    android:gravity="center"
+                    android:text="@string/atp_ExcludeAppsRestoreDefaultsTitle"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/trackingProtectionAppIcon" />
 
-    <com.duckduckgo.mobile.android.ui.view.button.ButtonPrimarySmall
-        android:id="@+id/trackingProtectionRestoreDefaultsRestore"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/dialogButtonHeight"
-        android:layout_marginTop="24dp"
-        android:layout_marginBottom="16dp"
-        android:gravity="center|center_horizontal"
-        android:text="@string/atp_ExcludeAppsManuallyCTARestore"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/trackingProtectionRestoreDefaultsGuideline"
-        app:layout_constraintTop_toBottomOf="@+id/trackingProtectionRestoreDefaultsMessage" />
+            <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+                    android:id="@+id/trackingProtectionRestoreDefaultsMessage"
+                    app:typography="body2"
+                    app:textType="secondary"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/keyline_2"
+                    android:gravity="center"
+                    android:text="@string/atp_ExcludeAppsRestoreDefaultsMessage"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/trackingProtectionRestoreDefaultsTitle" />
 
-    <com.duckduckgo.mobile.android.ui.view.button.ButtonGhostSmall
-        android:id="@+id/trackingProtectionRestoreDefaultsCancel"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/dialogButtonHeight"
-        android:layout_marginTop="24dp"
-        android:layout_marginBottom="16dp"
-        android:gravity="center|center_horizontal"
-        android:text="@string/atp_ExcludeAppsManuallyCTACancel"
-        android:textColor="@color/cornflowerBlue"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/trackingProtectionRestoreDefaultsGuideline"
-        app:layout_constraintTop_toBottomOf="@+id/trackingProtectionRestoreDefaultsMessage" />
+            <com.duckduckgo.mobile.android.ui.view.button.DaxButtonPrimary
+                    android:id="@+id/trackingProtectionRestoreDefaultsRestore"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/keyline_0"
+                    android:layout_marginTop="@dimen/keyline_4"
+                    android:gravity="center|center_horizontal"
+                    android:text="@string/atp_ExcludeAppsManuallyCTARestore"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintHorizontal_chainStyle="packed"
+                    app:layout_constraintStart_toEndOf="@id/trackingProtectionRestoreDefaultsCancel"
+                    app:layout_constraintTop_toBottomOf="@+id/trackingProtectionRestoreDefaultsMessage" />
 
-    <TextView
-        android:id="@+id/trackingProtectionRestoreDefaultsDisclaimer"
-        android:layout_width="0dp"
-        android:textSize="12sp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="32dp"
-        android:layout_marginEnd="32dp"
-        android:layout_marginTop="20dp"
-        android:textAlignment="center"
-        android:textColor="?secondaryTextColor"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/trackingProtectionRestoreDefaultsRestore"
-        android:text="@string/atp_ExcludeAppsRestoreDefaultsDisclaimer" />
+            <com.duckduckgo.mobile.android.ui.view.button.DaxButtonGhost
+                    android:id="@+id/trackingProtectionRestoreDefaultsCancel"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/keyline_4"
+                    android:layout_marginEnd="@dimen/keyline_2"
+                    android:gravity="center|center_horizontal"
+                    android:text="@string/atp_ExcludeAppsManuallyCTACancel"
+                    app:layout_constraintEnd_toStartOf="@id/trackingProtectionRestoreDefaultsRestore"
+                    app:layout_constraintHorizontal_chainStyle="packed"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/trackingProtectionRestoreDefaultsMessage" />
+
+            <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+                    android:id="@+id/trackingProtectionRestoreDefaultsDisclaimer"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    app:typography="caption"
+                    app:textType="secondary"
+                    android:layout_marginTop="@dimen/keyline_4"
+                    android:gravity="center"
+                    android:text="@string/atp_ExcludeAppsRestoreDefaultsDisclaimer"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/trackingProtectionRestoreDefaultsRestore" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+    </androidx.core.widget.NestedScrollView>
+
+</FrameLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_vpn_conflict.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_vpn_conflict.xml
deleted file mode 100644
index a1fe6b82a3e2..000000000000
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_vpn_conflict.xml
+++ /dev/null
@@ -1,72 +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.
-  -->
-
-<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:orientation="vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?dialogBgColor"
-        android:padding="@dimen/keyline_4">
-
-    <TextView
-            android:id="@+id/vpnConflictDialogTitle"
-            style="@style/TextAppearance.DuckDuckGo.Headline2"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:textAlignment="viewStart"
-            android:textColor="?normalTextColor"
-            android:text="@string/atp_VpnConflictDialogTitle"/>
-
-    <TextView
-            android:id="@+id/vpnConflictDialogMessage"
-            style="@style/TextAppearance.DuckDuckGo.Body1"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAlignment="viewStart"
-            android:textColor="?attr/settingsMinorTextColor"
-            android:layout_marginTop="@dimen/keyline_3"
-            android:text="@string/atp_VpnConflictDialogMessage"/>
-
-    <LinearLayout
-        android:layout_marginTop="@dimen/keyline_5"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal"
-        android:gravity="end">
-
-        <com.duckduckgo.mobile.android.ui.view.button.ButtonGhostSmall
-            android:id="@+id/vpnConflictDialogStartCta"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dialogButtonHeight"
-            android:text="@string/atp_VpnConflictDialogCancel"/>
-
-        <com.duckduckgo.mobile.android.ui.view.button.ButtonGhostSmall
-            android:id="@+id/vpnConflictDialogEndCta"
-            android:layout_width="wrap_content"
-            android:layout_height="@dimen/dialogButtonHeight"
-            android:textColor="@color/cornflowerBlue"
-            android:text="@string/atp_VpnConflictDialogOpenSettings"/>
-
-
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/fragment_device_shield_cta.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/fragment_device_shield_cta.xml
index ecc9d26fe5f6..e4878d65e67d 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/fragment_device_shield_cta.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/fragment_device_shield_cta.xml
@@ -20,7 +20,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/deviceShieldCtaLayout"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:card_view="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -34,9 +33,9 @@
         android:id="@+id/deviceShieldCtaImage"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:layout_marginTop="24dp"
+        android:layout_marginTop="16dp"
         android:layout_marginEnd="16dp"
-        android:layout_marginBottom="24dp"
+        android:layout_marginBottom="16dp"
         android:scaleType="centerCrop"
         android:src="@drawable/ic_apptb_default"
         app:layout_constraintBottom_toTopOf="@+id/deviceShieldCtaSplitter"
@@ -44,9 +43,9 @@
         app:layout_constraintTop_toTopOf="parent"
         tools:ignore="ContentDescription" />
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/deviceShieldCtaHeader"
-        style="@style/DeviceShield.NewTab.TextStyle"
+        app:typography="body2"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="22dp"
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/include_company_trackers_toolbar.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/include_company_trackers_toolbar.xml
index d699e7b77c5c..51bcb6a0d4a7 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/include_company_trackers_toolbar.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/include_company_trackers_toolbar.xml
@@ -17,11 +17,11 @@
   -->
 
 <com.google.android.material.appbar.AppBarLayout 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:theme="@style/Widget.DuckDuckGo.ToolbarTheme">
+    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:theme="@style/Widget.DuckDuckGo.ToolbarTheme">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/default_toolbar"
@@ -29,7 +29,7 @@
         android:layout_height="?attr/actionBarSize"
         android:background="?attr/toolbarBgColor"
         android:theme="@style/Widget.DuckDuckGo.ToolbarTheme"
-        app:popupTheme="@style/Widget.DuckDuckGo.PopUpOverflowMenu" >
+        app:popupTheme="@style/Widget.DuckDuckGo.PopUpOverflowMenu">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/toolbarContainer"
@@ -41,33 +41,34 @@
                 android:id="@+id/app_icon"
                 android:layout_width="40dp"
                 android:layout_height="40dp"
-                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintBottom_toBottomOf="@id/app_tracked_ago"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintTop_toTopOf="@id/app_name"
                 app:srcCompat="@drawable/tracking_network_logo_google_llc" />
 
-            <TextView
+            <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
                 android:id="@+id/app_name"
-                style="@style/TextAppearance.DuckDuckGo.Body1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/keyline_3"
-                android:textStyle="bold"
+                app:layout_constraintBottom_toTopOf="@+id/app_tracked_ago"
                 app:layout_constraintStart_toEndOf="@+id/app_icon"
-                app:layout_constraintTop_toTopOf="@+id/app_icon"
-                tools:text="Uber"/>
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintVertical_chainStyle="packed"
+                app:typography="h2"
+                tools:text="Uber" />
 
-            <TextView
+            <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
                 android:id="@+id/app_tracked_ago"
-                style="@style/TextAppearance.DuckDuckGo.Body2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/keyline_3"
-                android:textColor="?secondaryTextColor"
-                app:layout_constraintBottom_toBottomOf="@+id/app_icon"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toEndOf="@+id/app_icon"
                 app:layout_constraintTop_toBottomOf="@+id/app_name"
-                tools:text="2m ago"/>
+                app:textType="secondary"
+                app:typography="body2"
+                tools:text="2m ago" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/item_apptp_company_details.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/item_apptp_company_details.xml
index 04922a7035a3..57e116de5d5d 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/item_apptp_company_details.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/item_apptp_company_details.xml
@@ -17,102 +17,103 @@
   -->
 
 <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:orientation="vertical"
-              android:paddingStart="16dp"
-              android:paddingTop="8dp"
-              android:paddingEnd="16dp">
+    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:orientation="vertical"
+    android:paddingStart="@dimen/keyline_4"
+    android:paddingTop="@dimen/keyline_2"
+    android:paddingEnd="@dimen/keyline_4">
 
     <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:paddingTop="@dimen/keyline_2"
-            android:paddingBottom="@dimen/keyline_1">
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingTop="@dimen/keyline_2"
+        android:paddingBottom="@dimen/keyline_1">
 
-        <TextView
-                android:id="@+id/tracking_company_name"
-                style="@style/TextAppearance.DuckDuckGo.Body1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:textColor="?normalTextColor"
-                android:textStyle="bold"
-                app:layout_constraintStart_toEndOf="@+id/tracking_company_icon"
-                app:layout_constraintTop_toTopOf="@+id/tracking_company_icon"
-                tools:text="Google"/>
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:id="@+id/tracking_company_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/keyline_4"
+            app:layout_constraintBottom_toTopOf="@+id/tracking_company_attempts"
+            app:layout_constraintStart_toEndOf="@+id/tracking_company_icon"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_chainStyle="packed"
+            app:typography="body1_bold"
+            tools:text="Google" />
 
         <ImageView
-                android:id="@+id/tracking_company_icon"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/tracking_network_logo_google_llc"/>
+            android:id="@+id/tracking_company_icon"
+            android:layout_width="@dimen/listItemImageContainerSize"
+            android:layout_height="@dimen/listItemImageContainerSize"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/tracking_network_logo_google_llc" />
 
         <ImageView
-                android:id="@+id/tracking_company_block"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="20dp"
-                android:layout_marginTop="20dp"
-                app:layout_constraintStart_toStartOf="@+id/tracking_company_icon"
-                app:layout_constraintTop_toTopOf="@+id/tracking_company_icon"
-                app:srcCompat="@drawable/ic_block"/>
+            android:id="@+id/tracking_company_block"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginTop="20dp"
+            app:layout_constraintStart_toStartOf="@+id/tracking_company_icon"
+            app:layout_constraintTop_toTopOf="@+id/tracking_company_icon"
+            app:srcCompat="@drawable/ic_block" />
 
-        <TextView
-                android:id="@+id/tracking_company_attempts"
-                style="@style/TextAppearance.DuckDuckGo.Body2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/tracking_company_icon"
-                tools:text="6 attempts. Known to collect:"/>
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:id="@+id/tracking_company_attempts"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/keyline_4"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/tracking_company_icon"
+            app:layout_constraintTop_toBottomOf="@+id/tracking_company_name"
+            app:typography="body2"
+            tools:text="6 attempts. Known to collect:" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
     <LinearLayout
-            android:id="@+id/tracking_company_top_signals"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="56dp"
-            android:layout_marginTop="@dimen/keyline_1"
-            android:orientation="vertical"/>
+        android:id="@+id/tracking_company_top_signals"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="56dp"
+        android:layout_marginTop="@dimen/keyline_1"
+        android:orientation="vertical" />
 
-    <TextView
-            android:id="@+id/tracking_company_show_more"
-            style="@style/TextAppearance.DuckDuckGo.Body2"
-            android:background="?selectableItemBackground"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="@dimen/keyline_1"
-            android:layout_marginTop="@dimen/keyline_2"
-            android:layout_marginStart="56dp"
-            tools:text="Show 7 more"/>
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+        android:id="@+id/tracking_company_show_more"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="56dp"
+        android:layout_marginTop="@dimen/keyline_2"
+        android:background="?selectableItemBackground"
+        android:padding="@dimen/keyline_1"
+        app:typography="body2"
+        tools:text="Show 7 more" />
 
     <LinearLayout
-            android:id="@+id/tracking_company_bottom_signals"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="56dp"
-            android:orientation="vertical"
-            android:visibility="gone"/>
+        android:id="@+id/tracking_company_bottom_signals"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="56dp"
+        android:orientation="vertical"
+        android:visibility="gone" />
 
-    <TextView
-            android:id="@+id/tracking_company_show_less"
-            style="@style/TextAppearance.DuckDuckGo.Body2"
-            android:background="?selectableItemBackground"
-            android:text="@string/atp_CompanyDetailsTrackingShowLess"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="@dimen/keyline_1"
-            android:layout_marginTop="@dimen/keyline_2"
-            android:layout_marginStart="56dp"
-            android:visibility="gone"/>
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+        android:id="@+id/tracking_company_show_less"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="56dp"
+        android:layout_marginTop="@dimen/keyline_2"
+        android:background="?selectableItemBackground"
+        android:padding="@dimen/keyline_1"
+        android:text="@string/atp_CompanyDetailsTrackingShowLess"
+        android:visibility="gone"
+        app:typography="body2" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/row_exclusion_list_app.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/row_exclusion_list_app.xml
index 0214179ef2ee..99729e262ac4 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/row_exclusion_list_app.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/row_exclusion_list_app.xml
@@ -15,16 +15,16 @@
   -->
 
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                                   xmlns:app="http://schemas.android.com/apk/res-auto"
-                                                   xmlns:tools="http://schemas.android.com/tools"
-                                                   android:layout_width="match_parent"
-                                                   android:layout_height="wrap_content"
-                                                   android:gravity="center"
-                                                   android:orientation="horizontal"
-                                                   android:paddingStart="16dp"
-                                                   android:paddingTop="8dp"
-                                                   android:paddingEnd="16dp"
-                                                   android:paddingBottom="8dp">
+    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:gravity="center"
+    android:orientation="horizontal"
+    android:paddingStart="16dp"
+    android:paddingTop="8dp"
+    android:paddingEnd="16dp"
+    android:paddingBottom="8dp">
 
     <ImageView
         android:id="@+id/deviceShieldAppEntryIcon"
@@ -35,9 +35,9 @@
         android:importantForAccessibility="no"
         android:paddingBottom="@dimen/keyline_1"
         android:src="@drawable/ic_globe_gray_16dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@id/deviceShieldAppExclusionReason"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="@id/deviceShieldAppEntryName" />
 
     <ImageView
         android:id="@+id/deviceShieldAppEntryWarningIcon"
@@ -48,18 +48,18 @@
         android:importantForAccessibility="no"
         android:src="@drawable/ic_apptp_alert"
         app:layout_constraintBottom_toBottomOf="@id/deviceShieldAppEntryIcon"
-        app:layout_constraintEnd_toEndOf="@id/deviceShieldAppEntryIcon"/>
+        app:layout_constraintEnd_toEndOf="@id/deviceShieldAppEntryIcon" />
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/deviceShieldAppExclusionReason"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.DuckDuckGo.Caption"
-        android:textColor="?attr/secondaryTextColor"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="@+id/deviceShieldAppEntryName"
         app:layout_constraintStart_toStartOf="@+id/deviceShieldAppEntryName"
         app:layout_constraintTop_toBottomOf="@+id/deviceShieldAppEntryName"
+        app:textType="secondary"
+        app:typography="caption"
         tools:text="App issues may occur if enabled" />
 
     <com.duckduckgo.mobile.android.ui.view.SwitchView
@@ -69,23 +69,27 @@
         android:layout_gravity="center"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" app:layout_constraintVertical_bias="0.562"/>
-    <TextView
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.562" />
+
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/deviceShieldAppEntryName"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginStart="@dimen/keyline_4"
+        android:layout_marginEnd="@dimen/keyline_4"
         android:layout_weight="1"
         android:ellipsize="end"
         android:maxLines="1"
         android:orientation="vertical"
         android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.DuckDuckGo.Body1"
         app:layout_constraintBottom_toTopOf="@+id/deviceShieldAppExclusionReason"
         app:layout_constraintEnd_toStartOf="@+id/deviceShieldAppEntryShieldEnabled"
         app:layout_constraintStart_toEndOf="@+id/deviceShieldAppEntryIcon"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.541" tools:text="Facebook"/>
+        app:layout_constraintVertical_bias="0.541"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:typography="body1"
+        tools:text="Facebook" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/row_exclusion_list_filter.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/row_exclusion_list_filter.xml
index 94da06ec7c4d..20187848d55a 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/row_exclusion_list_filter.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/row_exclusion_list_filter.xml
@@ -15,15 +15,15 @@
   -->
 
 
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:app="http://schemas.android.com/apk/res-auto"
-          xmlns:tools="http://schemas.android.com/tools"
-          android:id="@+id/excludedAppsFilterText"
-          style="@style/TextAppearance.DuckDuckGo.Body2"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:drawablePadding="@dimen/keyline_2"
-          android:layout_marginTop="@dimen/keyline_2"
-          android:padding="@dimen/keyline_4"
-          app:drawableEndCompat="@drawable/ic_arrow_down"
-          tools:text="Protection Enabled (11)"/>
+<com.duckduckgo.mobile.android.ui.view.text.DaxTextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/excludedAppsFilterText"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginTop="@dimen/keyline_2"
+    android:drawablePadding="@dimen/keyline_2"
+    android:padding="@dimen/keyline_4"
+    app:drawableEndCompat="@drawable/ic_arrow_down"
+    app:typography="body2"
+    tools:text="Protection Enabled (11)" />
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_apps.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_apps.xml
index 6a548fb52b48..5c6beafbae71 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_apps.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_apps.xml
@@ -43,9 +43,9 @@
         android:src="@drawable/ic_apptp_alert"
         app:layout_constraintBottom_toBottomOf="@id/activity_apps_image" app:layout_constraintEnd_toEndOf="@id/activity_apps_image"/>
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/activity_apps"
-        style="@style/DeviceShield.PrivacyReport.TrackerEntry"
+        app:typography="body1"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:drawablePadding="@dimen/keyline_4"
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_apps_protection.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_apps_protection.xml
index 99e2150ce7c1..4ccf2989b917 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_apps_protection.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_apps_protection.xml
@@ -21,12 +21,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <com.duckduckgo.mobile.android.ui.view.divider.HorizontalDivider
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/apps_protection_state_insetPadding"
-        app:defaultPadding="false" />
-
     <com.duckduckgo.mobile.android.vpn.ui.tracker_activity.view.AppsProtectionStateView
         android:id="@+id/protectedAppsState"
         android:layout_width="match_parent"
@@ -41,7 +35,6 @@
     <com.duckduckgo.mobile.android.vpn.ui.tracker_activity.view.AppsProtectionStateView
         android:id="@+id/unProtectedAppsState"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/keyline_3"/>
+        android:layout_height="wrap_content"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_description.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_description.xml
index 360b2b72d191..ca8793d7b4b1 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_description.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_description.xml
@@ -16,14 +16,14 @@
   ~ 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"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/activity_description"
-        style="@style/DeviceShield.PrivacyReport.TrackerEntry"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginEnd="@dimen/keyline_4"
@@ -32,7 +32,13 @@
         android:padding="@dimen/keyline_4"
         android:text="@string/atp_ActivityDescription"
         app:drawableStartCompat="@drawable/ic_green_key"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:typography="body1" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <com.duckduckgo.mobile.android.ui.view.divider.HorizontalDivider
+        android:id="@+id/entry_splitter"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="72dp"
+        app:defaultPadding="false" />
+
+</LinearLayout>
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_entry.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_entry.xml
index b44c82b5701e..a9246900e240 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_entry.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_entry.xml
@@ -32,9 +32,9 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/tracking_network_logo_google_llc" />
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/activity_message"
-        style="@style/DeviceShield.PrivacyReport.TrackerEntry"
+        app:typography="body1"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/keyline_4"
@@ -54,14 +54,16 @@
         app:layout_constraintEnd_toStartOf="@id/entry_chevron"
         app:layout_constraintStart_toStartOf="@id/activity_message"
         app:layout_constraintTop_toBottomOf="@id/activity_message"
-        tools:listItem="@layout/view_device_shield_activity_tracker_entry" />
+        tools:listItem="@layout/view_device_shield_activity_tracker_badge" />
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/activity_time_since"
-        style="@style/DeviceShield.PrivacyReport.Time"
+        app:typography="body2"
+        app:textType="secondary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/keyline_1"
+        android:paddingBottom="@dimen/keyline_4"
         app:layout_constraintEnd_toStartOf="@id/entry_chevron"
         app:layout_constraintStart_toStartOf="@id/tracker_badges"
         app:layout_constraintTop_toBottomOf="@id/tracker_badges"
@@ -83,7 +85,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="72dp"
-        android:layout_marginTop="@dimen/keyline_4"
         app:defaultPadding="false"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/activity_time_since" />
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_entry_header.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_entry_header.xml
index 85b498162b33..2e4c9bb51496 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_entry_header.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_entry_header.xml
@@ -15,16 +15,13 @@
   ~ limitations under the License.
   -->
 
-<com.duckduckgo.mobile.android.ui.view.text.SectionHeaderTextView
+<com.duckduckgo.mobile.android.ui.view.listitem.SectionHeaderListItem
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/timestamp_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?android:windowBackground"
-    android:paddingStart="16dp"
-    android:paddingTop="15dp"
-    android:paddingEnd="0dp"
-    android:paddingBottom="16dp"
+    android:paddingTop="@dimen/keyline_4"
     tools:text="Yesterday"
 />
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_tracker_badge.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_tracker_badge.xml
index c0e40ddd337a..976b79bbe3d1 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_tracker_badge.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_activity_tracker_badge.xml
@@ -16,38 +16,34 @@
   ~ limitations under the License.
   -->
 
-<FrameLayout
-    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"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_margin="2dp">
 
     <ImageView
         android:id="@+id/tracker_company_badge_icon"
-        android:visibility="gone"
         android:layout_width="@dimen/keyline_5"
-        android:layout_height="@dimen/keyline_5"/>
+        android:layout_height="@dimen/keyline_5"
+        android:visibility="gone" />
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/tracker_company_badge_text"
-        android:textSize="13sp"
-        android:fontFamily="sans-serif-medium"
-        android:background="@drawable/background_circular_text"
-        android:textColor="?accentTextColor"
-        android:textAlignment="center"
         android:layout_width="@dimen/keyline_5"
-        android:layout_height="@dimen/keyline_5"/>
+        android:layout_height="@dimen/keyline_5"
+        android:background="@drawable/background_tracker_badge"
+        android:textAlignment="center"
+        app:typography="h5" />
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/tracker_company_large_badge_text"
-        android:textSize="13sp"
-        android:fontFamily="sans-serif-medium"
-        android:background="@drawable/background_radius_text"
-        android:textColor="?accentTextColor"
-        android:textAlignment="center"
         android:layout_width="wrap_content"
+        android:layout_height="@dimen/keyline_5"
+        android:background="@drawable/background_radius_text"
         android:minWidth="@dimen/keyline_5"
-        android:layout_height="@dimen/keyline_5"/>
+        android:textAlignment="center"
+        app:typography="h5" />
 
 </FrameLayout>
 
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_past_week_activity_content.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_past_week_activity_content.xml
index b5632383d1a5..c48deacea140 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_past_week_activity_content.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_past_week_activity_content.xml
@@ -16,45 +16,38 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
-    >
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              xmlns:tools="http://schemas.android.com/tools" xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:orientation="vertical"
+>
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/content_title"
-        style="@style/DeviceShield.PrivacyReport.PastWeekCounters.Title"
+        app:typography="caption_allCaps"
+        app:textType="secondary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:paddingBottom="4dp"
         android:text="@string/atp_ActivityPastWeekBlocked"
-        tools:text="Blocked"
-        />
+        tools:text="Blocked"/>
 
-    <TextView
-        style="@style/DeviceShield.PrivacyReport.PastWeekCounters"
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+        app:typography="h2"
         android:id="@+id/content_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:textSize="20sp"
-        android:fontFamily="sans-serif-medium"
-        tools:text="31,306"
-        />
+        tools:text="31,306"/>
 
-    <TextView
-        style="@style/DeviceShield.PrivacyReport.PastWeekCounters"
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+        app:typography="body2"
         android:id="@+id/content_footer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:textSize="14sp"
         android:text="@string/atp_ActivityPastWeekAcross"
-        android:textAllCaps="false"
-        tools:text="Trackers"
-        />
-
+        tools:text="Trackers"/>
 
 </LinearLayout>
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_report_app_breakage_entry.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_report_app_breakage_entry.xml
index 4664410a1d28..d7269162993c 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_report_app_breakage_entry.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_report_app_breakage_entry.xml
@@ -15,49 +15,45 @@
   -->
 
 <LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:paddingStart="@dimen/keyline_2"
-    android:paddingTop="@dimen/keyline_2"
-    android:paddingEnd="@dimen/keyline_4"
-    android:paddingBottom="@dimen/keyline_2"
-    android:gravity="center"
-    android:background="?selectableItemBackground"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:orientation="horizontal"
+        android:paddingTop="@dimen/keyline_2"
+        android:paddingEnd="@dimen/keyline_4"
+        android:paddingBottom="@dimen/keyline_2"
+        android:gravity="center"
+        android:background="?selectableItemBackground"
 >
     <RadioButton
         android:id="@+id/deviceShieldInstalledAppSelector"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/keyline_2"
     />
 
     <ImageView
         android:id="@+id/deviceShieldInstalledAppEntryIcon"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginStart="@dimen/keyline_2"
+        android:layout_width="@dimen/listItemImageContainerSize"
+        android:layout_height="@dimen/listItemImageContainerSize"
         android:layout_marginTop="@dimen/keyline_2"
         android:layout_marginBottom="@dimen/keyline_2"
         android:importantForAccessibility="no"
         android:src="@drawable/ic_globe_gray_16dp"
     />
 
-    <TextView
-        android:id="@+id/deviceShieldInstalledAppEntryName"
-        style="@style/TextAppearance.AppCompat.Body1"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/keyline_4"
-        android:layout_marginEnd="@dimen/keyline_2"
-        android:layout_weight="1"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:orientation="vertical"
-        android:singleLine="true"
-        android:textColor="?normalTextColor"
-        tools:text="Facebook"/>
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
+            android:id="@+id/deviceShieldInstalledAppEntryName"
+            app:typography="body1"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/keyline_4"
+            android:layout_marginEnd="@dimen/keyline_2"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:orientation="vertical"
+            android:singleLine="true"
+            tools:text="Facebook"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_report_breakage_app_list_skeleton.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_report_breakage_app_list_skeleton.xml
index d7641b18a93e..9454ff7bbf42 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_report_breakage_app_list_skeleton.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/view_device_shield_report_breakage_app_list_skeleton.xml
@@ -23,9 +23,10 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingStart="16dp"
-    android:paddingTop="8dp"
-    android:paddingEnd="16dp">
+    android:paddingTop="@dimen/keyline_4"
+    android:paddingStart="@dimen/keyline_2"
+    android:paddingEnd="@dimen/keyline_4"
+    android:paddingBottom="@dimen/keyline_4">
 
     <TextView
         android:id="@+id/report_breakage_rbutton_entry_skeleton_imageView"
@@ -37,38 +38,24 @@
         app:layout_constraintTop_toTopOf="parent"/>
 
     <TextView
-        android:id="@+id/report_breakage_app_entry_skeleton_imageView"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginStart="16dp"
-        android:background="@drawable/background_skeleton_ui"
-        app:layout_constraintStart_toEndOf="@+id/report_breakage_rbutton_entry_skeleton_imageView"
-        app:layout_constraintTop_toTopOf="parent"/>
-
-    <TextView
-        android:id="@+id/report_breakage_app_entry_skeleton_top_text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="80dp"
-        android:background="@drawable/background_skeleton_ui"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/report_breakage_app_entry_skeleton_imageView"
-        app:layout_constraintTop_toTopOf="parent" />
+            android:id="@+id/report_breakage_app_entry_skeleton_imageView"
+            android:layout_width="@dimen/listItemImageContainerSize"
+            android:layout_height="@dimen/listItemImageContainerSize"
+            android:layout_marginStart="36dp"
+            android:background="@drawable/background_skeleton_ui"
+            app:layout_constraintStart_toEndOf="@+id/report_breakage_rbutton_entry_skeleton_imageView"
+            app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent"/>
 
     <TextView
-        android:id="@+id/report_breakage_app_entry_skeleton_bottom_text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="120dp"
-        android:background="@drawable/background_skeleton_ui"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/report_breakage_app_entry_skeleton_imageView"
-        app:layout_constraintTop_toBottomOf="@+id/report_breakage_app_entry_skeleton_top_text" />
+            android:id="@+id/report_breakage_app_entry_skeleton_top_text"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="80dp"
+            android:background="@drawable/background_skeleton_ui"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/report_breakage_app_entry_skeleton_imageView"
+            app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app-tracking-protection/vpn-impl/src/main/res/values/styles.xml b/app-tracking-protection/vpn-impl/src/main/res/values/styles.xml
deleted file mode 100644
index 99ec5f5643b6..000000000000
--- a/app-tracking-protection/vpn-impl/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,27 +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.
-  -->
-
-<resources>
-
-    <style name="AlwaysOnBottomSheetDialogTheme" parent="@style/ThemeOverlay.MaterialComponents.BottomSheetDialog">
-        <item name="bottomSheetStyle">@style/AlwaysOnBottomSheetStyle</item>
-    </style>
-
-    <style name="AlwaysOnBottomSheetStyle" parent="Widget.MaterialComponents.BottomSheet.Modal">
-        <item name="backgroundTint">@android:color/transparent</item>
-        <item name="behavior_skipCollapsed">true</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_autocomplete_bookmark_suggestion.xml b/app/src/main/res/layout/item_autocomplete_bookmark_suggestion.xml
index 91d0d1ee4261..274859ad80ea 100644
--- a/app/src/main/res/layout/item_autocomplete_bookmark_suggestion.xml
+++ b/app/src/main/res/layout/item_autocomplete_bookmark_suggestion.xml
@@ -64,7 +64,6 @@
         android:maxLines="1"
         android:textAlignment="textStart"
         android:textColor="?attr/autoCompleteSubtitleTextColor"
-        android:textSize="14sp"
         app:layout_constraintEnd_toStartOf="@id/goToBookmarkImage"
         app:layout_constraintStart_toEndOf="@id/bookmarkIndicator"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/autofill/autofill-impl/src/main/res/drawable/ic_autofill_keychain.xml b/autofill/autofill-impl/src/main/res/drawable/ic_autofill_keychain.xml
index c3ce28c8be13..fa360b16873c 100644
--- a/autofill/autofill-impl/src/main/res/drawable/ic_autofill_keychain.xml
+++ b/autofill/autofill-impl/src/main/res/drawable/ic_autofill_keychain.xml
@@ -6,7 +6,7 @@
   <path
       android:pathData="M151.019,50.064L146.453,49.128C137.268,47.181 129.491,41.401 125.457,33.54C116.874,16.556 96.343,7.399 76.894,11.784L64.924,14.496C44.105,19.248 31.123,37.914 35.157,57.503L36.353,63.462C38.42,73.756 34.001,84.047 24.906,90.043C12.598,98.073 9.288,113.655 17.275,125.825C25.316,138.069 41.831,143.299 55.874,137.908L100.634,120.852C104.2,119.464 108.046,118.777 111.97,118.823L144.443,118.973C167.42,119.091 184.635,100.586 181.138,79.709C178.711,65.164 166.674,53.321 151.019,50.064Z"
       android:strokeAlpha="0.5"
-      android:fillColor="?accentIconColor"
+      android:fillColor="?attr/daxColorPrimaryIcon"
       android:fillAlpha="0.5"/>
   <path
       android:pathData="M126.174,67.384C125.511,67.514 124.868,67.708 124.224,67.903C120.04,69.167 116.484,71.576 113.798,74.776C115.28,75.031 116.615,75.962 117.429,77.261C119.536,74.939 122.225,73.143 125.443,72.17C126.087,71.976 126.75,71.846 127.413,71.716C136.072,70.153 144.796,75.313 147.402,83.938C150.027,92.627 145.621,101.755 137.462,105.204C138.36,106.549 138.633,108.152 138.23,109.608C149.023,105.574 155.015,93.79 151.631,82.59C148.389,71.629 137.234,65.166 126.174,67.384Z"
diff --git a/common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/text/DaxTextInput.kt b/common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/text/DaxTextInput.kt
index 21193ec7ae04..a5a5a8aa8ef9 100644
--- a/common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/text/DaxTextInput.kt
+++ b/common-ui/src/main/java/com/duckduckgo/mobile/android/ui/view/text/DaxTextInput.kt
@@ -103,6 +103,9 @@ class DaxTextInput @JvmOverloads constructor(
                 }
             }
 
+            val minLines = getInt(R.styleable.DaxTextInput_android_minLines, 1)
+            binding.internalEditText.minLines = minLines
+
             recycle()
         }
     }
diff --git a/common-ui/src/main/res/drawable/background_radius_text.xml b/common-ui/src/main/res/drawable/background_radius_text.xml
index 1a32a3b84983..b9cd4309592d 100644
--- a/common-ui/src/main/res/drawable/background_radius_text.xml
+++ b/common-ui/src/main/res/drawable/background_radius_text.xml
@@ -18,7 +18,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
 
-    <solid android:color="?accentIconColor" />
+    <solid android:color="?attr/daxColorSurface" />
     <corners android:radius="12dp" />
     <padding android:top="1.5dp"
              android:right="6dp"
diff --git a/common-ui/src/main/res/drawable/background_skeleton_ui.xml b/common-ui/src/main/res/drawable/background_skeleton_ui.xml
index aac92035358a..6c8c6551030e 100644
--- a/common-ui/src/main/res/drawable/background_skeleton_ui.xml
+++ b/common-ui/src/main/res/drawable/background_skeleton_ui.xml
@@ -17,6 +17,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content">
-    <solid android:color="?splitterColor"/>
-    <corners android:radius="12dp"/>
+    <solid android:color="?attr/daxColorLines"/>
+    <corners android:radius="@dimen/mediumShapeCornerRadius"/>
 </shape>
\ No newline at end of file
diff --git a/common-ui/src/main/res/drawable/background_circular_text.xml b/common-ui/src/main/res/drawable/background_tracker_badge.xml
similarity index 93%
rename from common-ui/src/main/res/drawable/background_circular_text.xml
rename to common-ui/src/main/res/drawable/background_tracker_badge.xml
index e4fb23744935..a402fd576f57 100644
--- a/common-ui/src/main/res/drawable/background_circular_text.xml
+++ b/common-ui/src/main/res/drawable/background_tracker_badge.xml
@@ -18,7 +18,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="oval">
 
-    <solid android:color="?accentIconColor" />
+    <solid android:color="?attr/daxColorContainer" />
     <padding android:top="1.5dp"
              android:right="4dp"
              android:left="4dp"/>
diff --git a/common-ui/src/main/res/drawable/chip_background.xml b/common-ui/src/main/res/drawable/chip_background.xml
index e27037d9e822..0a459733c1e1 100644
--- a/common-ui/src/main/res/drawable/chip_background.xml
+++ b/common-ui/src/main/res/drawable/chip_background.xml
@@ -15,9 +15,6 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?attr/chipBackgroundColor" />
-    <stroke
-        android:width="1dp"
-        android:color="?attr/chipBackgroundColor" />
+    <solid android:color="?attr/daxColorContainer" />
     <corners android:radius="@dimen/keyline_5" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_chevron_down_24_small.xml b/common-ui/src/main/res/drawable/ic_chevron_down_24_small.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_chevron_down_24_small.xml
rename to common-ui/src/main/res/drawable/ic_chevron_down_24_small.xml
diff --git a/common-ui/src/main/res/layout/view_chip.xml b/common-ui/src/main/res/layout/view_chip.xml
index 967bca490ec7..d860c008c192 100644
--- a/common-ui/src/main/res/layout/view_chip.xml
+++ b/common-ui/src/main/res/layout/view_chip.xml
@@ -30,4 +30,5 @@
     android:layout_height="wrap_content"
     android:drawablePadding="@dimen/keyline_1"
     android:background="@drawable/chip_background"
-    android:textAppearance="@style/TextAppearance.DuckDuckGo.Body2"/>
+    android:textAppearance="@style/Typography.DuckDuckGo.Body2"
+    android:textColor="?attr/daxColorPrimaryText"/>
diff --git a/common-ui/src/main/res/layout/view_dax_text_input.xml b/common-ui/src/main/res/layout/view_dax_text_input.xml
index 7af12d5e15d0..5d38426f3fa4 100644
--- a/common-ui/src/main/res/layout/view_dax_text_input.xml
+++ b/common-ui/src/main/res/layout/view_dax_text_input.xml
@@ -34,6 +34,7 @@
             style="@style/Widget.DuckDuckGo.TextInputText"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:gravity="top"
             android:textColor="?attr/daxColorPrimaryText" />
 
     </com.google.android.material.textfield.TextInputLayout>
diff --git a/common-ui/src/main/res/layout/view_info_panel.xml b/common-ui/src/main/res/layout/view_info_panel.xml
index e1e058460cfc..5e8ab313f3dc 100644
--- a/common-ui/src/main/res/layout/view_info_panel.xml
+++ b/common-ui/src/main/res/layout/view_info_panel.xml
@@ -32,12 +32,12 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" app:srcCompat="@drawable/ic_info_panel_info"/>
 
-    <TextView
+    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
         android:id="@+id/infoPanelText"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:textAppearance="@style/TextAppearance.DuckDuckGo.Body2"
+        app:typography="body2"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/infoPanelImage"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/common-ui/src/main/res/values/attrs-chip.xml b/common-ui/src/main/res/values/attrs-chip.xml
index 3c34e4ed18af..1e2eccfef572 100644
--- a/common-ui/src/main/res/values/attrs-chip.xml
+++ b/common-ui/src/main/res/values/attrs-chip.xml
@@ -17,9 +17,6 @@
 
 <resources>
 
-    <!--Used by Chip view-->
-    <attr name="chipBackgroundColor" format="color" />
-
     <!--Chip view-->
     <declare-styleable name="Chip">
         <attr name="chipBackground" format="reference" />
diff --git a/common-ui/src/main/res/values/attrs-text-input.xml b/common-ui/src/main/res/values/attrs-text-input.xml
index 322e3a66ba12..813b6fb925a0 100644
--- a/common-ui/src/main/res/values/attrs-text-input.xml
+++ b/common-ui/src/main/res/values/attrs-text-input.xml
@@ -18,6 +18,7 @@
     <declare-styleable name="DaxTextInput">
         <attr name="android:hint" />
         <attr name="android:text" />
+        <attr name="android:minLines" />
         <attr name="editable" format="boolean" />
         <attr name="endIcon" format="reference" />
         <attr name="endIconContentDescription" format="string" />
diff --git a/common-ui/src/main/res/values/attrs.xml b/common-ui/src/main/res/values/attrs.xml
index b19e95c8442c..488b55f85fad 100644
--- a/common-ui/src/main/res/values/attrs.xml
+++ b/common-ui/src/main/res/values/attrs.xml
@@ -76,11 +76,9 @@
 
     <attr name="normalTextColor" format="color" />
     <attr name="secondaryTextColor" format="color"/>
-    <attr name="accentTextColor" format="color" />
     <attr name="primaryIconColor" format="color" />
     <attr name="primaryIconDisabledColor" format="color" />
     <attr name="secondaryIconColor" format="color" />
-    <attr name="accentIconColor" format="color" />
     <attr name="splitterColor" format="color" />
 
     <attr name="secondaryButtonPressedColor" format="color" />
diff --git a/common-ui/src/main/res/values/design-system-theming.xml b/common-ui/src/main/res/values/design-system-theming.xml
index 31ff9b7be8f6..6dd605e43147 100644
--- a/common-ui/src/main/res/values/design-system-theming.xml
+++ b/common-ui/src/main/res/values/design-system-theming.xml
@@ -155,12 +155,9 @@
         <item name="daxLogoTextColor">@color/white</item>
         <item name="normalTextColor">@color/white</item>
         <item name="secondaryTextColor">@color/gray50</item>
-        <item name="accentTextColor">@color/gray30</item>
         <item name="primaryIconColor">@color/gray20</item>
         <item name="primaryIconDisabledColor">@color/gray60</item>
         <item name="secondaryIconColor">@color/gray70</item>
-        <item name="accentIconColor">@color/gray80</item>
-        <item name="chipBackgroundColor">@color/gray90</item>
         <item name="listItemPrimaryTextColor">@color/white</item>
         <item name="listItemSecondaryTextColor">@color/grayishTwo</item>
         <item name="listItemDisabledColor">@color/warGreyTwo</item>
@@ -299,12 +296,9 @@
         <item name="daxLogoTextColor">@color/almostBlackDark</item>
         <item name="normalTextColor">@color/almostBlackDark</item>
         <item name="secondaryTextColor">@color/warmerGray</item>
-        <item name="accentTextColor">@color/gray70</item>
         <item name="primaryIconColor">@color/gray95</item>
         <item name="primaryIconDisabledColor">@color/gray50</item>
         <item name="secondaryIconColor">@color/gray40</item>
-        <item name="accentIconColor">@color/gray30</item>
-        <item name="chipBackgroundColor">@color/gray20</item>
         <item name="dialogBgColor">@color/white</item>
         <item name="browserIconColorSelector">@color/browser_icon_color_selector_light</item>
         <item name="browserMenuTextColor">@color/almostBlackDark</item>
diff --git a/common-ui/src/main/res/values/styles.xml b/common-ui/src/main/res/values/styles.xml
index 6df73a879a17..2fb06e866bfa 100644
--- a/common-ui/src/main/res/values/styles.xml
+++ b/common-ui/src/main/res/values/styles.xml
@@ -148,6 +148,12 @@
         <item name="android:textAlignment">viewStart</item>
     </style>
 
+    <style name="FeedbackFragmentStyle">
+        <item name="android:background">?attr/colorPrimaryDark</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">match_parent</item>
+    </style>
+
     <style name="TextInputEditTextTheme" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox">
         <item name="android:colorControlActivated">@color/cornflowerBlue</item>
     </style>
@@ -222,37 +228,6 @@
 
     <style name="DeviceShield" />
 
-    <style name="DeviceShield.PrivacyReport" />
-
-    <style name="DeviceShield.PrivacyReport.PastWeekCounters">
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textColor">?normalTextColor</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:selectable">false</item>
-    </style>
-
-    <style name="DeviceShield.PrivacyReport.PastWeekCounters.Title">
-        <item name="android:textColor">@color/warmerGray</item>
-        <item name="android:textSize">12sp</item>
-        <item name="android:textAllCaps">true</item>
-    </style>
-
-    <style name="DeviceShield.PrivacyReport.TrackerEntry">
-        <item name="android:fontFamily">sans-serif</item>
-        <item name="android:textColor">@color/primary_text_color_selector</item>
-        <item name="android:lineSpacingExtra">6sp</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:selectable">false</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="DeviceShield.PrivacyReport.Time">
-        <item name="android:textColor">?secondaryTextColor</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:selectable">false</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-
     <style name="DeviceShield.NewTab" />
 
     <style name="DeviceShield.NewTab.TextStyle">
diff --git a/common-ui/src/main/res/values/widgets.xml b/common-ui/src/main/res/values/widgets.xml
index cb765f2009e0..a26831c95be7 100644
--- a/common-ui/src/main/res/values/widgets.xml
+++ b/common-ui/src/main/res/values/widgets.xml
@@ -386,6 +386,15 @@
         <item name="android:backgroundTint">?attr/daxColorSurface</item>
     </style>
 
+    <style name="Widget.DuckDuckGo.BottomSheetDialogCollapsed" parent="ThemeOverlay.MaterialComponents.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/Widget.DuckDuckGo.ModalBottomSheetCollapsedStyle</item>
+    </style>
+
+    <style name="Widget.DuckDuckGo.ModalBottomSheetCollapsedStyle" parent="Widget.MaterialComponents.BottomSheet.Modal">
+        <item name="backgroundTint">@android:color/transparent</item>
+        <item name="behavior_skipCollapsed">true</item>
+    </style>
+
     <style name="Widget.DuckDuckGo.BottomSheetDialogCorners">
         <item name="cornerFamily">rounded</item>
         <item name="cornerSizeTopRight">@dimen/dialogBorderRadius</item>
diff --git a/lint-rules/src/main/java/com/duckduckgo/lint/ui/DaxTextViewStylingDetector.kt b/lint-rules/src/main/java/com/duckduckgo/lint/ui/DaxTextViewStylingDetector.kt
index 8a58eaa776e5..54de163f1e08 100644
--- a/lint-rules/src/main/java/com/duckduckgo/lint/ui/DaxTextViewStylingDetector.kt
+++ b/lint-rules/src/main/java/com/duckduckgo/lint/ui/DaxTextViewStylingDetector.kt
@@ -17,12 +17,15 @@
 package com.duckduckgo.lint.ui
 
 import com.android.SdkConstants.ANDROID_URI
+import com.android.SdkConstants.ATTR_FONT
+import com.android.SdkConstants.ATTR_FONT_FAMILY
 import com.android.SdkConstants.ATTR_LAYOUT_HEIGHT
 import com.android.SdkConstants.ATTR_LAYOUT_WIDTH
 import com.android.SdkConstants.ATTR_STYLE
 import com.android.SdkConstants.ATTR_TEXT_ALL_CAPS
 import com.android.SdkConstants.ATTR_TEXT_APPEARANCE
 import com.android.SdkConstants.ATTR_TEXT_COLOR
+import com.android.SdkConstants.ATTR_TEXT_SIZE
 import com.android.SdkConstants.ATTR_TEXT_STYLE
 import com.android.SdkConstants.ATTR_TINT
 import com.android.SdkConstants.VIEW
@@ -75,7 +78,8 @@ class DaxTextViewStylingDetector : LayoutDetector() {
 
         private const val DAX_TEXT_VIEW = "com.duckduckgo.mobile.android.ui.view.text.DaxTextView"
 
-        val INVALID_ATTRIBUTES = listOf(ATTR_TEXT_STYLE, ATTR_TEXT_APPEARANCE, ATTR_TEXT_ALL_CAPS, ATTR_TINT)
+        val INVALID_ATTRIBUTES = listOf(ATTR_TEXT_STYLE, ATTR_TEXT_APPEARANCE,
+            ATTR_TEXT_ALL_CAPS, ATTR_TINT, ATTR_TEXT_SIZE, ATTR_FONT, ATTR_FONT_FAMILY)
 
         val INVALID_DAX_TEXT_VIEW_PROPERTY = Issue
             .create(