diff --git a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt
index 96435259e..ed6c81444 100644
--- a/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt
+++ b/app/src/main/java/org/mozilla/fenix/library/bookmarks/BookmarkAdapter.kt
@@ -184,7 +184,7 @@ class BookmarkAdapter(val emptyView: View, val actionEmitter: Observer<BookmarkA
         private fun setColorsAndIcons(selected: Boolean, item: BookmarkNode) {
             val backgroundTint =
                 if (selected) {
-                    DefaultThemeManager.resolveAttribute(R.attr.accent, containerView!!.context)
+                    DefaultThemeManager.resolveAttribute(R.attr.accentHighContrast, containerView!!.context)
                 } else {
                     DefaultThemeManager.resolveAttribute(R.attr.neutral, containerView!!.context)
                 }
@@ -256,7 +256,7 @@ class BookmarkAdapter(val emptyView: View, val actionEmitter: Observer<BookmarkA
             setMenu(item, containerView!!)
 
             val backgroundTint = if (selected) {
-                DefaultThemeManager.resolveAttribute(R.attr.accent, containerView.context)
+                DefaultThemeManager.resolveAttribute(R.attr.accentHighContrast, containerView.context)
             } else {
                 DefaultThemeManager.resolveAttribute(R.attr.neutral, containerView.context)
             }
diff --git a/app/src/main/res/drawable/ic_folder_icon.xml b/app/src/main/res/drawable/ic_folder_icon.xml
index 98ac87a1b..bf3aef801 100644
--- a/app/src/main/res/drawable/ic_folder_icon.xml
+++ b/app/src/main/res/drawable/ic_folder_icon.xml
@@ -1,6 +1,6 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="17" android:viewportWidth="20"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="?primaryText"
+    <path android:fillColor="@color/primary_text_light_theme"
         android:pathData="M17.5,3L10.719,3L8.23,0.674C7.7673,0.2413 7.1575,0.0004 6.524,0L2.5,0C1.8361,0 1.1994,0.2641 0.7305,0.734C0.2615,1.2039 -0.0013,1.8411 0,2.505L0,14.5C0,15.8807 1.1193,17 2.5,17L17.5,17C18.8807,17 20,15.8807 20,14.5L20,5.505C20.0013,4.8411 19.7385,4.2039 19.2695,3.734C18.8006,3.2641 18.1639,3 17.5,3ZM2.5,2L6.524,2C6.6503,2.0004 6.7718,2.0487 6.864,2.135L8.86,4L2,4L2,2.505C1.9987,2.3715 2.0508,2.2431 2.1447,2.1482C2.2386,2.0534 2.3665,2 2.5,2ZM18,14.5C18,14.7761 17.7761,15 17.5,15L2.5,15C2.2239,15 2,14.7761 2,14.5L2,5L17.5,5C17.6335,5 17.7614,5.0534 17.8553,5.1482C17.9492,5.2431 18.0013,5.3715 18,5.505L18,14.5Z" />
 </vector>
diff --git a/app/src/main/res/drawable/toolbar_background.xml b/app/src/main/res/drawable/toolbar_background.xml
index f68e7f091..b16e08a04 100644
--- a/app/src/main/res/drawable/toolbar_background.xml
+++ b/app/src/main/res/drawable/toolbar_background.xml
@@ -11,13 +11,13 @@
     <item android:gravity="top">
         <shape android:shape="rectangle">
             <size android:height="1dp" />
-            <solid android:color="?neutral" />
+            <solid android:color="?neutralFaded" />
         </shape>
     </item>
     <item android:gravity="bottom">
         <shape android:shape="rectangle">
             <size android:height="1dp" />
-            <solid android:color="?neutral" />
+            <solid android:color="?neutralFaded" />
         </shape>
     </item>
 </layer-list>
diff --git a/app/src/main/res/layout/bookmark_row.xml b/app/src/main/res/layout/bookmark_row.xml
index 809fab12e..ba7ade1e8 100644
--- a/app/src/main/res/layout/bookmark_row.xml
+++ b/app/src/main/res/layout/bookmark_row.xml
@@ -28,7 +28,6 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintDimensionRatio="1:1"
-        android:foregroundTint="?primaryText"
         tools:src="@drawable/ic_folder_icon" />
 
     <TextView
@@ -40,7 +39,7 @@
         android:ellipsize="end"
         android:lines="1"
         android:textSize="16sp"
-        android:textColor="?secondaryText"
+        android:textColor="?primaryText"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@id/bookmark_overflow"
         app:layout_constraintHorizontal_bias="0"
@@ -72,7 +71,7 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toStartOf="@id/bookmark_overflow"
-        android:background="?neutral"
+        android:background="?neutralFaded"
         android:visibility="gone"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/delete_tabs_button.xml b/app/src/main/res/layout/delete_tabs_button.xml
index 5dae28b50..c103d3830 100644
--- a/app/src/main/res/layout/delete_tabs_button.xml
+++ b/app/src/main/res/layout/delete_tabs_button.xml
@@ -28,6 +28,6 @@
         android:textStyle="bold"
         android:gravity="center"
         android:text="@string/session_delete"
-        android:textColor="@color/primary_text_light_theme"
+        android:textColor="?contrastText"
         android:textSize="16sp" />
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_crash_reporter.xml b/app/src/main/res/layout/fragment_crash_reporter.xml
index 4d115fc0c..80fb1aeed 100644
--- a/app/src/main/res/layout/fragment_crash_reporter.xml
+++ b/app/src/main/res/layout/fragment_crash_reporter.xml
@@ -27,7 +27,7 @@
             android:layout_marginTop="6dp"
             android:lineSpacingExtra="8sp"
             android:singleLine="false"
-            android:textColor="@color/primary_text_normal_theme"
+            android:textColor="?primaryText"
             android:textSize="24sp"
             android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
@@ -42,7 +42,7 @@
             android:buttonTint="?accentHighContrast"
             android:checked="true"
             android:text="@string/tab_crash_send_report"
-            android:textColor="@color/primary_text_normal_theme"
+            android:textColor="?primaryText"
             android:textSize="15sp"
             app:layout_constraintBottom_toTopOf="@id/close_tab_button"
             app:layout_constraintEnd_toEndOf="parent"
@@ -59,7 +59,7 @@
             android:backgroundTint="?accentHighContrast"
             android:text="@string/tab_crash_restore"
             android:fontFamily="Sharp Sans"
-            android:textColor="@color/foundation_normal_theme"
+            android:textColor="?contrastText"
             android:textStyle="bold"
             android:textAllCaps="false"
             android:textSize="14sp"
@@ -78,7 +78,7 @@
             android:backgroundTint="?neutral"
             android:text="@string/tab_crash_close"
             android:fontFamily="Sharp Sans"
-            android:textColor="?primaryText"
+            android:textColor="@color/primary_text_light_theme"
             android:textStyle="bold"
             android:textAllCaps="false"
             android:textSize="14sp"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index d4c343a57..599f32955 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -81,7 +81,7 @@
             android:id="@+id/homeDivider"
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="?neutral"
+            android:background="?neutralFaded"
             app:layout_constraintTop_toBottomOf="@id/toolbar_wrapper"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_quick_settings_dialog_sheet.xml b/app/src/main/res/layout/fragment_quick_settings_dialog_sheet.xml
index 128275bb0..b94818165 100644
--- a/app/src/main/res/layout/fragment_quick_settings_dialog_sheet.xml
+++ b/app/src/main/res/layout/fragment_quick_settings_dialog_sheet.xml
@@ -40,7 +40,7 @@
         android:layout_height="1dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
-        android:background="?neutral"
+        android:background="?neutralFaded"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/security_info" />
 
@@ -75,7 +75,7 @@
         android:layout_height="1dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
-        android:background="?neutral"
+        android:background="?neutralFaded"
         app:layout_constraintBottom_toTopOf="@id/camera_icon"
         app:layout_constraintStart_toStartOf="parent" />
 
diff --git a/app/src/main/res/layout/save_tab_group_button.xml b/app/src/main/res/layout/save_tab_group_button.xml
index 325f67e52..fff8cedf8 100644
--- a/app/src/main/res/layout/save_tab_group_button.xml
+++ b/app/src/main/res/layout/save_tab_group_button.xml
@@ -22,12 +22,12 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:clickable="false"
-        android:drawableTint="@color/foundation_light_theme"
+        android:drawableTint="?foundation"
         android:drawableStart="@drawable/ic_archive"
         android:drawablePadding="8dp"
         android:focusable="false"
         android:gravity="center"
         android:textStyle="bold"
         android:text="@string/save_tab_group"
-        android:textColor="@color/foundation_light_theme"/>
+        android:textColor="?contrastText"/>
 </FrameLayout>
diff --git a/app/src/main/res/layout/session_bottom_sheet.xml b/app/src/main/res/layout/session_bottom_sheet.xml
index f0e2c5ad0..668349852 100644
--- a/app/src/main/res/layout/session_bottom_sheet.xml
+++ b/app/src/main/res/layout/session_bottom_sheet.xml
@@ -93,7 +93,7 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:background="?neutral" />
+        android:background="?neutralFaded"/>
 
     <TextView
         android:id="@+id/archive_session_button"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index a72e8ed3a..3079501e1 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -6,6 +6,7 @@
     <!-- Normal theme colors for dark mode -->
     <color name="primary_text_normal_theme">@color/primary_text_dark_theme</color>
     <color name="secondary_text_normal_theme">@color/secondary_text_dark_theme</color>
+    <color name="contrast_text_normal_theme">@color/contrast_text_dark_theme</color>
     <color name="foundation_normal_theme">@color/foundation_dark_theme</color>
     <color name="above_normal_theme">@color/above_dark_theme</color>
     <color name="inset_normal_theme">@color/inset_dark_theme</color>
@@ -13,6 +14,7 @@
     <color name="accent_bright_normal_theme">@color/accent_bright_dark_theme</color>
     <color name="accent_high_contrast_normal_theme">@color/accent_high_contrast_dark_theme</color>
     <color name="neutral_normal_theme">@color/neutral_dark_theme</color>
+    <color name="neutral_faded_normal_theme">@color/neutral_faded_dark_theme</color>
     <color name="shadow_normal_theme">@color/shadow_dark_theme</color>
     <color name="destructive_normal_theme">@color/destructive_dark_theme</color>
 </resources>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 339694828..ea698ff30 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -6,6 +6,7 @@
     <!-- Color palette attributes -->
     <attr name="primaryText" format="reference" />
     <attr name="secondaryText" format="reference" />
+    <attr name="contrastText" format="reference" />
     <attr name="accent" format="reference" />
     <attr name="accentBright" format="reference" />
     <attr name="accentHighContrast" format="reference" />
@@ -13,6 +14,7 @@
     <attr name="above" format="reference" />
     <attr name="inset" format="reference" />
     <attr name="neutral" format="reference" />
+    <attr name="neutralFaded" format="reference" />
     <attr name="shadow" format="reference" />
     <attr name="destructive" format="reference"/>
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5c8e755ac..2b4d33d5f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,45 +6,52 @@
     <!-- Light theme color palette -->
     <color name="primary_text_light_theme">#20123A</color>
     <color name="secondary_text_light_theme">@color/photonGrey50</color>
+    <color name="contrast_text_light_theme">@color/primary_text_dark_theme</color>
     <color name="foundation_light_theme">#F9F9FB</color>
     <color name="inset_light_theme">#F2F2F5</color>
     <color name="above_light_theme">#FFF</color>
     <color name="accent_light_theme">#312A65</color>
     <color name="accent_bright_light_theme">#592ACB</color>
     <color name="accent_high_contrast_light_theme">@color/accent_light_theme</color>
-    <color name="neutral_light_theme">#1F000000</color>
+    <color name="neutral_light_theme">@color/photonGrey30</color>
+    <color name="neutral_faded_light_theme">@color/photonGrey20</color>
     <color name="shadow_light_theme">#1F000000</color>
     <color name="destructive_light_theme">@color/photonRed60</color>
 
     <!-- Dark theme color palette -->
     <color name="primary_text_dark_theme">#FBFBFE</color>
     <color name="secondary_text_dark_theme">#A7A2B7</color>
+    <color name="contrast_text_dark_theme">@color/primary_text_light_theme</color>
     <color name="foundation_dark_theme">#1C1B22</color>
     <color name="inset_dark_theme">#3F3E46</color>
     <color name="above_dark_theme">#32313C</color>
-    <color name="accent_dark_theme">#e6e6ea</color>
+    <color name="accent_dark_theme">#E6E6EA</color>
     <color name="accent_bright_dark_theme">#592ACB</color>
     <color name="accent_high_contrast_dark_theme">#AB71FF</color>
-    <color name="neutral_dark_theme">#1FFBFBFE</color>
+    <color name="neutral_dark_theme">@color/photonGrey20</color>
+    <color name="neutral_faded_dark_theme">#1FEDEDF0</color>
     <color name="shadow_dark_theme">#050505</color>
     <color name="destructive_dark_theme">#FF4F5E</color>
 
     <!-- Private theme color palette -->
     <color name="primary_text_private_theme">#FBFBFE</color>
     <color name="secondary_text_private_theme">#A7A2B7</color>
+    <color name="contrast_text_private_theme">@color/primary_text_light_theme</color>
     <color name="foundation_private_theme">#492E85</color>
     <color name="inset_private_theme">#362A5C</color>
     <color name="above_private_theme">#291D4F</color>
     <color name="accent_private_theme">#E6E6EA</color>
-    <color name="accent_bright_private_theme">#F565FF</color>
-    <color name="accent_high_contrast_private_theme">#F565FF</color>
-    <color name="neutral_private_theme">#1FFBFBFE</color>
+    <color name="accent_bright_private_theme">#AA71FF</color>
+    <color name="accent_high_contrast_private_theme">#AA71FF</color>
+    <color name="neutral_private_theme">@color/photonGrey20</color>
+    <color name="neutral_faded_private_theme">#1FEDEDF0</color>
     <color name="shadow_private_theme">#2B1067</color>
     <color name="destructive_private_theme">#FF4F5E</color>
 
     <!-- Normal theme colors for light mode -->
     <color name="primary_text_normal_theme">@color/primary_text_light_theme</color>
     <color name="secondary_text_normal_theme">@color/secondary_text_light_theme</color>
+    <color name="contrast_text_normal_theme">@color/contrast_text_light_theme</color>
     <color name="foundation_normal_theme">@color/foundation_light_theme</color>
     <color name="above_normal_theme">@color/above_light_theme</color>
     <color name="inset_normal_theme">@color/inset_light_theme</color>
@@ -52,6 +59,7 @@
     <color name="accent_bright_normal_theme">@color/accent_bright_light_theme</color>
     <color name="accent_high_contrast_normal_theme">@color/accent_high_contrast_light_theme</color>
     <color name="neutral_normal_theme">@color/neutral_light_theme</color>
+    <color name="neutral_faded_normal_theme">@color/neutral_faded_light_theme</color>
     <color name="shadow_normal_theme">@color/shadow_light_theme</color>
     <color name="destructive_normal_theme">@color/destructive_light_theme</color>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 16a5394a7..22e659f4c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -17,12 +17,15 @@
         <!-- Updated color attributes -->
         <item name="primaryText">@color/primary_text_normal_theme</item>
         <item name="secondaryText">@color/secondary_text_normal_theme</item>
+        <item name="contrastText">@color/contrast_text_normal_theme</item>
         <item name="accent">@color/accent_normal_theme</item>
         <item name="accentBright">@color/accent_bright_normal_theme</item>
+        <item name="accentHighContrast">@color/accent_high_contrast_normal_theme</item>
         <item name="foundation">@color/foundation_normal_theme</item>
         <item name="above">@color/above_normal_theme</item>
         <item name="inset">@color/inset_normal_theme</item>
         <item name="neutral">@color/neutral_normal_theme</item>
+        <item name="neutralFaded">@color/neutral_faded_normal_theme</item>
         <item name="shadow">@color/shadow_normal_theme</item>
         <item name="destructive">@color/destructive_normal_theme</item>
 
@@ -48,12 +51,15 @@
         <!-- Updated color attributes -->
         <item name="primaryText">@color/primary_text_private_theme</item>
         <item name="secondaryText">@color/secondary_text_private_theme</item>
+        <item name="contrastText">@color/contrast_text_private_theme</item>
         <item name="accent">@color/accent_private_theme</item>
         <item name="accentBright">@color/accent_bright_private_theme</item>
+        <item name="accentHighContrast">@color/accent_high_contrast_private_theme</item>
         <item name="foundation">@color/foundation_private_theme</item>
         <item name="above">@color/above_private_theme</item>
         <item name="inset">@color/inset_private_theme</item>
         <item name="neutral">@color/neutral_private_theme</item>
+        <item name="neutralFaded">@color/neutral_faded_private_theme</item>
         <item name="shadow">@color/shadow_private_theme</item>
         <item name="destructive">@color/destructive_private_theme</item>