diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldActivityFeedFragment.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldActivityFeedFragment.kt
index 6c0084c37c6d..e3d7bcbac811 100644
--- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldActivityFeedFragment.kt
+++ b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldActivityFeedFragment.kt
@@ -22,11 +22,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.get
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.flowWithLifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.recyclerview.widget.LinearLayoutManager
 import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.app.global.DuckDuckGoFragment
 import com.duckduckgo.app.global.FragmentViewModelFactory
@@ -44,6 +46,7 @@ import com.duckduckgo.mobile.android.vpn.ui.tracker_activity.DeviceShieldActivit
 import com.duckduckgo.mobile.android.vpn.ui.tracker_activity.DeviceShieldActivityFeedViewModel.Command.TrackerListDisplayed
 import com.duckduckgo.mobile.android.vpn.ui.tracker_activity.DeviceShieldActivityFeedViewModel.TrackerFeedViewState
 import com.duckduckgo.mobile.android.vpn.ui.tracker_activity.model.TrackerFeedItem
+import com.google.android.material.divider.MaterialDividerItemDecoration
 import com.google.android.material.snackbar.Snackbar
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -82,6 +85,10 @@ class DeviceShieldActivityFeedFragment : DuckDuckGoFragment() {
         with(binding.activityRecyclerView) {
             layoutManager = StickyHeadersLinearLayoutManager<TrackerFeedAdapter>(this@DeviceShieldActivityFeedFragment.requireContext())
             adapter = trackerFeedAdapter
+            val divider = MaterialDividerItemDecoration(requireActivity(), LinearLayoutManager.VERTICAL)
+            divider.isLastItemDecorated = false
+            divider.dividerInsetStart = resources.getDimensionPixelSize(R.dimen.apps_protection_state_insetPadding)
+            addItemDecoration(divider)
         }
 
         lifecycleScope.launch {
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 4ccf2989b917..449e7585f7eb 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
@@ -26,11 +26,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-    <com.duckduckgo.mobile.android.ui.view.divider.HorizontalDivider
+    <com.google.android.material.divider.MaterialDivider
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/apps_protection_state_insetPadding"
-        app:defaultPadding="false" />
+        android:layout_height="@dimen/horizontalDividerHeight"
+        app:dividerInsetStart="@dimen/apps_protection_state_insetPadding"/>
 
     <com.duckduckgo.mobile.android.vpn.ui.tracker_activity.view.AppsProtectionStateView
         android:id="@+id/unProtectedAppsState"
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 ca8793d7b4b1..915362a67366 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,29 +16,16 @@
   ~ limitations under the License.
   -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
+    android:id="@+id/activity_description"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    android:layout_marginEnd="@dimen/keyline_4"
+    android:drawablePadding="@dimen/keyline_4"
+    android:gravity="center_vertical"
+    android:padding="@dimen/keyline_4"
+    android:text="@string/atp_ActivityDescription"
+    app:drawableStartCompat="@drawable/ic_green_key"
+    app:typography="body1" />
 
-    <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
-        android:id="@+id/activity_description"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/keyline_4"
-        android:drawablePadding="@dimen/keyline_4"
-        android:gravity="center_vertical"
-        android:padding="@dimen/keyline_4"
-        android:text="@string/atp_ActivityDescription"
-        app:drawableStartCompat="@drawable/ic_green_key"
-        app:typography="body1" />
-
-    <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 a9246900e240..0fe555553060 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
@@ -21,7 +21,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/default_selectable_bg">
+    android:background="?attr/selectableItemBackground">
 
     <ImageView
         android:id="@+id/tracking_app_icon"
@@ -80,13 +80,4 @@
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_chevron_forward_small_24" />
 
-    <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"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/activity_time_since" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt b/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt
index 6bb6ba0587bd..9d181a79f93f 100644
--- a/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/settings/SettingsActivity.kt
@@ -163,7 +163,7 @@ class SettingsActivity : DuckDuckGoActivity() {
 
         with(viewsAppearance) {
             selectedThemeSetting.setClickListener { viewModel.userRequestedToChangeTheme() }
-            changeAppIconLabel.setClickListener { viewModel.userRequestedToChangeIcon() }
+            changeAppIconSetting.setOnClickListener { viewModel.userRequestedToChangeIcon() }
             selectedFireAnimationSetting.setClickListener { viewModel.userRequestedToChangeFireAnimation() }
             accessibilitySetting.setClickListener { viewModel.onAccessibilitySettingClicked() }
         }
diff --git a/app/src/main/res/layout/activity_widget_configuration.xml b/app/src/main/res/layout/activity_widget_configuration.xml
index d43cc17a89b5..f6194de6f495 100644
--- a/app/src/main/res/layout/activity_widget_configuration.xml
+++ b/app/src/main/res/layout/activity_widget_configuration.xml
@@ -15,6 +15,8 @@
   -->
 
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -22,25 +24,22 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:background="@color/white"
-        android:padding="16dp"
-        android:orientation="vertical">
+        android:background="?attr/daxColorSurface"
+        android:orientation="vertical"
+        android:padding="16dp">
 
-        <TextView
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textColor="@color/almostBlackDark"
-            android:fontFamily="sans-serif-medium"
-            android:textStyle="normal"
-            android:textSize="20sp"
-            android:text="@string/widgetConfigurationTitleText" />
+            android:text="@string/widgetConfigurationTitleText"
+            app:typography="h2" />
 
         <ImageView
             android:id="@+id/widgetConfigPreview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
             android:layout_gravity="center_horizontal"
+            android:layout_marginTop="@dimen/keyline_4"
             android:src="@drawable/search_favorites_widget_light_preview" />
 
         <RadioGroup
@@ -53,33 +52,28 @@
                 android:id="@+id/widgetConfigThemeSystem"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
-                android:textColor="@color/almostBlackDark"
                 android:fontFamily="sans-serif-medium"
-                android:textStyle="normal"
+                android:text="@string/widgetConfigurationSystemThemeOption"
+                android:textColor="?attr/daxColorPrimaryText"
                 android:visibility="gone"
-                android:textSize="16sp"
-                android:text="@string/widgetConfigurationSystemThemeOption" />
+                tools:visibility="visible" />
 
             <RadioButton
                 android:id="@+id/widgetConfigThemeLight"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
-                android:textColor="@color/almostBlackDark"
-                android:fontFamily="sans-serif-medium"
-                android:textStyle="normal"
-                android:textSize="16sp"
                 android:checked="true"
-                android:text="@string/widgetConfigurationLightThemeOption" />
+                android:fontFamily="sans-serif-medium"
+                android:text="@string/widgetConfigurationLightThemeOption"
+                android:textColor="?attr/daxColorPrimaryText" />
 
             <RadioButton
                 android:id="@+id/widgetConfigThemeDark"
                 android:layout_width="match_parent"
                 android:layout_height="48dp"
-                android:textColor="@color/almostBlackDark"
                 android:fontFamily="sans-serif-medium"
-                android:textStyle="normal"
-                android:textSize="16sp"
-                android:text="@string/widgetConfigurationDarkThemeOption" />
+                android:text="@string/widgetConfigurationDarkThemeOption"
+                android:textColor="?attr/daxColorPrimaryText" />
         </RadioGroup>
 
         <com.duckduckgo.mobile.android.ui.view.button.DaxButtonPrimary
@@ -87,8 +81,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
-            android:layout_marginEnd="8dp"
             android:layout_marginTop="16dp"
-            android:text="@string/widgetConfigurationAddWidgetOption"/>
+            android:layout_marginEnd="8dp"
+            android:text="@string/widgetConfigurationAddWidgetOption" />
     </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_settings_appearance.xml b/app/src/main/res/layout/content_settings_appearance.xml
index 7f6a74f56bd1..13dad38ab730 100644
--- a/app/src/main/res/layout/content_settings_appearance.xml
+++ b/app/src/main/res/layout/content_settings_appearance.xml
@@ -41,16 +41,25 @@
         app:secondaryText="@string/settingsSystemTheme" />
 
     <LinearLayout
+        android:id="@+id/changeAppIconSetting"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="?attr/selectableItemBackground"
+        android:clickable="true"
+        android:focusable="true"
         android:orientation="horizontal">
 
-        <com.duckduckgo.mobile.android.ui.view.listitem.OneLineListItem
+        <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:id="@+id/changeAppIconLabel"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/oneLineItemHeight"
+            android:layout_marginStart="@dimen/keyline_4"
+            android:layout_marginEnd="@dimen/keyline_4"
+            android:gravity="center_vertical"
             android:layout_weight="1"
-            app:primaryText="@string/changeIconCtaLabel" />
+            android:textColor="@color/primary_text_color_selector"
+            android:text="@string/changeIconCtaLabel"
+            app:typography="body1" />
 
         <ImageView
             android:id="@+id/changeAppIcon"
diff --git a/app/src/main/res/layout/item_tab.xml b/app/src/main/res/layout/item_tab.xml
index 780425e02e63..b3108e642c01 100644
--- a/app/src/main/res/layout/item_tab.xml
+++ b/app/src/main/res/layout/item_tab.xml
@@ -26,8 +26,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/cardContentsContainer"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
+        android:layout_height="match_parent">
 
         <ImageView
             android:id="@+id/favicon"
@@ -41,21 +40,21 @@
             app:layout_constraintTop_toTopOf="parent" />
 
         <ImageView
-            android:importantForAccessibility="no"
             android:id="@+id/tabUnread"
             android:layout_width="9dp"
             android:layout_height="9dp"
-            android:src="@drawable/tab_unread_indicator"
-            android:elevation="30dp"
             android:layout_marginEnd="2dp"
             android:layout_marginBottom="2dp"
+            android:elevation="30dp"
+            android:importantForAccessibility="no"
+            android:src="@drawable/tab_unread_indicator"
+            app:layout_constraintBottom_toBottomOf="@id/favicon"
             app:layout_constraintCircle="@id/favicon"
-            app:layout_constraintCircleRadius="8dp"
             app:layout_constraintCircleAngle="135"
+            app:layout_constraintCircleRadius="8dp"
+            app:layout_constraintEnd_toEndOf="@id/favicon"
             app:layout_constraintStart_toEndOf="@id/favicon"
-            app:layout_constraintTop_toBottomOf="@id/favicon"
-            app:layout_constraintBottom_toBottomOf="@id/favicon"
-            app:layout_constraintEnd_toEndOf="@id/favicon" />
+            app:layout_constraintTop_toBottomOf="@id/favicon" />
 
         <ImageView
             android:id="@+id/close"
@@ -64,14 +63,13 @@
             android:background="?selectableItemBackground"
             android:contentDescription="@string/closeContentDescription"
             android:scaleType="center"
-            android:src="@drawable/ic_close_24"
+            android:src="@drawable/ic_close_24_small"
             app:layout_constraintBottom_toBottomOf="@id/favicon"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/favicon" />
 
         <com.duckduckgo.mobile.android.ui.view.text.DaxTextView
             android:id="@+id/title"
-            app:typography="h5"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
@@ -82,6 +80,7 @@
             app:layout_constraintEnd_toStartOf="@id/close"
             app:layout_constraintStart_toEndOf="@id/favicon"
             app:layout_constraintTop_toTopOf="@id/favicon"
+            app:typography="h5"
             tools:text="Slashdot" />
 
         <ImageView
diff --git a/common-ui/src/main/res/color/primary_icon_color_selector.xml b/common-ui/src/main/res/color/primary_icon_color_selector.xml
index 97ec66aa9777..57094c6d78f0 100644
--- a/common-ui/src/main/res/color/primary_icon_color_selector.xml
+++ b/common-ui/src/main/res/color/primary_icon_color_selector.xml
@@ -15,6 +15,6 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="?attr/daxColorContainerDisabled" />
-    <item android:color="?attr/daxColorIconDisabled"/>
+    <item android:state_enabled="false" android:color="?attr/daxColorIconDisabled" />
+    <item android:color="?attr/daxColorPrimaryIcon"/>
 </selector>
\ No newline at end of file
diff --git a/common-ui/src/main/res/color/red_text_color_selector.xml b/common-ui/src/main/res/color/red_text_color_selector.xml
index 43e8c9737514..f4b8fd86409f 100644
--- a/common-ui/src/main/res/color/red_text_color_selector.xml
+++ b/common-ui/src/main/res/color/red_text_color_selector.xml
@@ -16,6 +16,6 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="false" android:color="@color/red50" />
-    <item android:state_enabled="true" android:color="@color/red50"/>
+    <item android:state_enabled="false" android:color="?attr/daxColorDestructive" />
+    <item android:state_enabled="true" android:color="?attr/daxColorDestructive"/>
 </selector>
\ No newline at end of file
diff --git a/common-ui/src/main/res/drawable/default_list_divider.xml b/common-ui/src/main/res/drawable/default_list_divider.xml
deleted file mode 100644
index 147665461ffb..000000000000
--- a/common-ui/src/main/res/drawable/default_list_divider.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ 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.
-  -->
-
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <size
-        android:width="1dp"
-        android:height="1dp" />
-
-    <solid android:color="?splitterColor" />
-
-</shape>
\ No newline at end of file
diff --git a/common-ui/src/main/res/drawable/default_selectable_bg.xml b/common-ui/src/main/res/drawable/default_selectable_bg.xml
deleted file mode 100644
index cbd1dcda9dea..000000000000
--- a/common-ui/src/main/res/drawable/default_selectable_bg.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ 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.
-  -->
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/gray50">
-    <item
-        android:id="@android:id/mask"
-        android:drawable="?android:windowBackground" />
-</ripple>
\ No newline at end of file
diff --git a/common-ui/src/main/res/drawable/ic_close_24_small.xml b/common-ui/src/main/res/drawable/ic_close_24_small.xml
new file mode 100644
index 000000000000..0a9828442081
--- /dev/null
+++ b/common-ui/src/main/res/drawable/ic_close_24_small.xml
@@ -0,0 +1,26 @@
+<!--
+  ~ Copyright (c) 2023 DuckDuckGo
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M6.293,6.293C6.683,5.902 7.317,5.902 7.707,6.293L12,10.586L16.293,6.293C16.683,5.902 17.317,5.902 17.707,6.293C18.098,6.683 18.098,7.317 17.707,7.707L13.414,12L17.707,16.293C18.098,16.683 18.098,17.317 17.707,17.707C17.317,18.098 16.683,18.098 16.293,17.707L12,13.414L7.707,17.707C7.317,18.098 6.683,18.098 6.293,17.707C5.902,17.317 5.902,16.683 6.293,16.293L10.586,12L6.293,7.707C5.902,7.317 5.902,6.683 6.293,6.293Z"
+      android:fillColor="?attr/daxColorPrimaryIcon"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/common-ui/src/main/res/drawable/omnibar_field_background.xml b/common-ui/src/main/res/drawable/omnibar_field_background.xml
index 6b05d05321c5..e3470f4765b2 100644
--- a/common-ui/src/main/res/drawable/omnibar_field_background.xml
+++ b/common-ui/src/main/res/drawable/omnibar_field_background.xml
@@ -16,8 +16,5 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="?attr/daxColorContainer" />
-    <stroke
-        android:width="1dp"
-        android:color="?attr/daxColorContainer" />
     <corners android:radius="@dimen/smallShapeCornerRadius" />
 </shape>
\ No newline at end of file
diff --git a/common-ui/src/main/res/layout/include_default_toolbar.xml b/common-ui/src/main/res/layout/include_default_toolbar.xml
index 82f48162802a..7a589d47bd70 100644
--- a/common-ui/src/main/res/layout/include_default_toolbar.xml
+++ b/common-ui/src/main/res/layout/include_default_toolbar.xml
@@ -17,13 +17,11 @@
   ~ limitations under the License.
   -->
 
-<com.google.android.material.appbar.AppBarLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/appBarLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:id="@+id/appBarLayout"
     android:theme="@style/Widget.DuckDuckGo.ToolbarTheme">
 
     <androidx.appcompat.widget.Toolbar
@@ -32,7 +30,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" />
 
 </com.google.android.material.appbar.AppBarLayout>
 
diff --git a/common-ui/src/main/res/values/attrs.xml b/common-ui/src/main/res/values/attrs.xml
index bb58bf00539a..0a084b84c367 100644
--- a/common-ui/src/main/res/values/attrs.xml
+++ b/common-ui/src/main/res/values/attrs.xml
@@ -38,7 +38,6 @@
     <attr name="settingsItemTextColor" format="color" />
     <attr name="settingsItemTextColorDisabled" format="color" />
     <attr name="settingsMinorTextColor" format="color" />
-    <attr name="sectionDividerColor" format="color" />
     <attr name="buttonOutlinedBorderColor" format="color" />
     <attr name="buttonOutlinedTextColor" format="color" />
     <attr name="callToActionTitleColor" format="color" />
diff --git a/common-ui/src/main/res/values/design-system-colors.xml b/common-ui/src/main/res/values/design-system-colors.xml
index b98b50d69287..b3be5ec4c750 100644
--- a/common-ui/src/main/res/values/design-system-colors.xml
+++ b/common-ui/src/main/res/values/design-system-colors.xml
@@ -150,6 +150,7 @@
     <color name="black35">#35000000</color>
     <color name="black18">#2E000000</color>
     <color name="black12">#1F000000</color>
+    <color name="black9">#17000000</color>
     <color name="black6">#0F000000</color>
     <color name="black3">#08000000</color>
     <color name="black">#000000</color>
diff --git a/common-ui/src/main/res/values/design-system-dimensions.xml b/common-ui/src/main/res/values/design-system-dimensions.xml
index 7b6031480a5c..9fa5b2f185af 100644
--- a/common-ui/src/main/res/values/design-system-dimensions.xml
+++ b/common-ui/src/main/res/values/design-system-dimensions.xml
@@ -99,7 +99,7 @@
 
     <!-- Dax Dialog  -->
     <dimen name="daxDialogContentPaddingTop">20dp</dimen>
-    <dimen name="daxDialogButtonSpacing">14dp</dimen>
+    <dimen name="daxDialogButtonSpacing">10dp</dimen>
 
     <!-- Card -->
     <dimen name="daxBubbleDialogDistanceFromEdge">22dp</dimen>
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 8e47daf24302..20c4c202f1bd 100644
--- a/common-ui/src/main/res/values/design-system-theming.xml
+++ b/common-ui/src/main/res/values/design-system-theming.xml
@@ -81,6 +81,7 @@
         <item name="materialButtonOutlinedStyle">@style/Widget.DuckDuckGo.DaxButton.Secondary</item>
         <item name="borderlessButtonStyle">@style/Widget.DuckDuckGo.DaxButton.Ghost</item>
         <item name="materialCardViewStyle">@style/Widget.DuckDuckGo.CardView</item>
+        <item name="materialDividerStyle">@style/Widget.DuckDuckGo.ListDivider</item>
 
         <!-- Design System Components -->
         <item name="daxButtonPrimary">@style/Widget.DuckDuckGo.DaxButton.TextButton.Primary</item>
@@ -223,7 +224,6 @@
         <item name="dialogPrimaryButtonColor">@color/cornflowerBlue</item>
         <item name="dialogSecondaryButtonColor">?attr/dialogBgColor</item>
 
-        <item name="sectionDividerColor">@color/gray80</item>
         <item name="bottomShadowBackground">@null</item>
         <item name="appTPHeaderBackground">@color/darkThemePrimaryDark</item>
 
@@ -239,6 +239,7 @@
         <item name="daxColorBackgroundInverted">@color/gray0</item>
         <item name="daxColorSurface">@color/gray90</item>
         <item name="daxColorContainer">@color/white12</item>
+        <item name="daxColorWindow">@color/gray85</item>
         <item name="daxColorPrimaryText">@color/white84</item>
         <item name="daxColorPrimaryInvertedText">@color/black84</item>
         <item name="daxColorSecondaryText">@color/white60</item>
@@ -252,7 +253,6 @@
         <item name="daxColorAccentBlue">@color/blue30</item>
         <item name="daxColorAccentYellow">@color/yellow50</item>
         <item name="daxColorRipple">@color/white12</item>
-        <item name="daxColorWindow">@color/gray85</item>
 
         <!-- Design System Component Colors Dark -->
         <!-- Buttons -->
@@ -363,7 +363,6 @@
         <item name="dialogPrimaryButtonColor">@color/cornflowerBlue</item>
         <item name="dialogSecondaryButtonColor">?attr/dialogBgColor</item>
 
-        <item name="sectionDividerColor">@color/gray30</item>
         <item name="bottomShadowBackground">@drawable/divider_shadow_background</item>
 
         <item name="tooltipPanelBackgroundColor">@color/tooltipPanelBackgroundColorLight</item>
@@ -379,6 +378,7 @@
         <item name="daxColorBackgroundInverted">@color/gray100</item>
         <item name="daxColorSurface">@color/white</item>
         <item name="daxColorContainer">@color/black6</item>
+        <item name="daxColorWindow">@color/white</item>
         <item name="daxColorPrimaryText">@color/black84</item>
         <item name="daxColorPrimaryInvertedText">@color/white84</item>
         <item name="daxColorSecondaryText">@color/black60</item>
@@ -388,11 +388,10 @@
         <item name="daxColorDestructive">@color/alertRedOnLightDefault</item>
         <item name="daxColorContainerDisabled">@color/black6</item>
         <item name="daxColorTextDisabled">@color/black36</item>
-        <item name="daxColorLines">@color/black18</item>
+        <item name="daxColorLines">@color/black9</item>
         <item name="daxColorAccentBlue">@color/blue50</item>
         <item name="daxColorAccentYellow">@color/yellow50</item>
         <item name="daxColorRipple">@color/black6</item>
-        <item name="daxColorWindow">@color/white</item>
 
         <!-- Design System Component Colors Light -->
         <!-- Buttons -->
diff --git a/common-ui/src/main/res/values/widgets.xml b/common-ui/src/main/res/values/widgets.xml
index 219d1dbef069..20540f163dd2 100644
--- a/common-ui/src/main/res/values/widgets.xml
+++ b/common-ui/src/main/res/values/widgets.xml
@@ -26,11 +26,11 @@
     <style name="Widget.DuckDuckGo.ToolbarTheme" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
         <item name="colorControlNormal">?attr/daxColorPrimaryIcon</item>
         <item name="android:textColorPrimary">?attr/daxColorPrimaryText</item>
-        <item name="colorControlHighlight">@color/subtleGrayTwo</item>
+        <item name="colorControlHighlight">?attr/daxColorRipple</item>
         <item name="colorAccent">?attr/daxColorAccentBlue</item>
         <item name="colorControlActivated">?attr/daxColorAccentBlue</item>
         <item name="colorSwitchThumbNormal">?attr/daxColorAccentBlue</item>
-        <item name="android:colorForeground">@color/subtleGrayTwo</item>
+        <item name="android:colorForeground">?attr/daxColorRipple</item>
     </style>
 
     <style name="Widget.DuckDuckGo.PopUpOverflowMenu" parent="@style/Widget.MaterialComponents.PopupMenu.Overflow">
@@ -436,13 +436,18 @@
     <style name="Widget.DuckDuckGo.HorizontalDivider">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">@dimen/horizontalDividerHeight</item>
-        <item name="android:background">?attr/sectionDividerColor</item>
+        <item name="android:background">?attr/daxColorLines</item>
     </style>
 
     <style name="Widget.DuckDuckGo.VerticalDivider">
         <item name="android:layout_width">@dimen/verticalDividerWidth</item>
         <item name="android:layout_height">match_parent</item>
-        <item name="android:background">?attr/sectionDividerColor</item>
+        <item name="android:background">?attr/daxColorLines</item>
+    </style>
+
+    <style name="Widget.DuckDuckGo.ListDivider" parent="Widget.MaterialComponents.MaterialDivider">
+        <item name="dividerColor">?attr/daxColorLines</item>
+        <item name="dividerThickness">@dimen/horizontalDividerHeight</item>
     </style>
 
     <!-- Cards -->
@@ -450,4 +455,5 @@
         <item name="cardBackgroundColor">?attr/daxColorSurface</item>
         <item name="shapeAppearance">@style/ShapeAppearance.DuckDuckGo.MediumComponent</item>
     </style>
+
 </resources>
\ No newline at end of file