diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayMenu.kt b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayMenu.kt
index 0db8459314..5b001f34e6 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/TabsTrayMenu.kt
@@ -54,14 +54,14 @@ class TabsTrayMenu(
         listOf(
             SimpleBrowserMenuItem(
                 context.getString(R.string.tabs_tray_select_tabs),
-                textColorResource = R.color.primary_text_normal_theme
+                textColorResource = R.color.fx_mobile_text_color_primary
             ) {
                 onItemTapped.invoke(Item.SelectTabs)
             }.apply { visible = shouldShowSelectOrShare },
 
             SimpleBrowserMenuItem(
                 context.getString(R.string.tab_tray_menu_item_share),
-                textColorResource = R.color.primary_text_normal_theme
+                textColorResource = R.color.fx_mobile_text_color_primary
             ) {
                 context.components.analytics.metrics.track(Event.TabsTrayShareAllTabsPressed)
                 onItemTapped.invoke(Item.ShareAllTabs)
@@ -69,28 +69,28 @@ class TabsTrayMenu(
 
             SimpleBrowserMenuItem(
                 context.getString(R.string.tab_tray_menu_account_settings),
-                textColorResource = R.color.primary_text_normal_theme
+                textColorResource = R.color.fx_mobile_text_color_primary
             ) {
                 onItemTapped.invoke(Item.OpenAccountSettings)
             }.apply { visible = shouldShowAccountSetting },
 
             SimpleBrowserMenuItem(
                 context.getString(R.string.tab_tray_menu_tab_settings),
-                textColorResource = R.color.primary_text_normal_theme
+                textColorResource = R.color.fx_mobile_text_color_primary
             ) {
                 onItemTapped.invoke(Item.OpenTabSettings)
             }.apply { visible = shouldShowTabSetting },
 
             SimpleBrowserMenuItem(
                 context.getString(R.string.tab_tray_menu_recently_closed),
-                textColorResource = R.color.primary_text_normal_theme
+                textColorResource = R.color.fx_mobile_text_color_primary
             ) {
                 onItemTapped.invoke(Item.OpenRecentlyClosed)
             },
 
             SimpleBrowserMenuItem(
                 context.getString(R.string.tab_tray_menu_item_close),
-                textColorResource = R.color.primary_text_normal_theme
+                textColorResource = R.color.fx_mobile_text_color_primary
             ) {
                 context.components.analytics.metrics.track(Event.TabsTrayCloseAllTabsPressed)
                 onItemTapped.invoke(Item.CloseAllTabs)
diff --git a/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionMenu.kt b/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionMenu.kt
index 0285fa59c3..68813ec214 100644
--- a/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionMenu.kt
+++ b/app/src/main/java/org/mozilla/fenix/tabstray/browser/SelectionMenu.kt
@@ -27,21 +27,21 @@ class SelectionMenu(
         listOf(
             SimpleBrowserMenuItem(
                 context.getString(R.string.tab_tray_multiselect_menu_item_bookmark),
-                textColorResource = R.color.primary_text_normal_theme
+                textColorResource = R.color.fx_mobile_text_color_primary
             ) {
                 onItemTapped.invoke(Item.BookmarkTabs)
             },
 
             SimpleBrowserMenuItem(
                 context.getString(R.string.tab_tray_multiselect_menu_item_close),
-                textColorResource = R.color.primary_text_normal_theme
+                textColorResource = R.color.fx_mobile_text_color_primary
             ) {
                 onItemTapped.invoke(Item.DeleteTabs)
             },
             // This item is only visible for debugging.
             SimpleBrowserMenuItem(
                 context.getString(R.string.inactive_tabs_menu_item),
-                textColorResource = R.color.primary_text_normal_theme
+                textColorResource = R.color.fx_mobile_text_color_primary
             ) {
                 onItemTapped.invoke(Item.MakeInactive)
             }.apply {
diff --git a/app/src/main/res/layout/sync_tabs_error_row.xml b/app/src/main/res/layout/sync_tabs_error_row.xml
index 141594e2a4..4b4a78ce6f 100644
--- a/app/src/main/res/layout/sync_tabs_error_row.xml
+++ b/app/src/main/res/layout/sync_tabs_error_row.xml
@@ -19,7 +19,7 @@
         android:layout_marginTop="4dp"
         android:textSize="14sp"
         android:textAlignment="viewStart"
-        android:textColor="@color/primary_text_normal_theme"
+        android:textColor="@color/fx_mobile_text_color_primary"
         tools:text="@string/synced_tabs_no_tabs"/>
 
     <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/sync_tabs_list_item.xml b/app/src/main/res/layout/sync_tabs_list_item.xml
index cbbf63e5d8..4a43737c18 100644
--- a/app/src/main/res/layout/sync_tabs_list_item.xml
+++ b/app/src/main/res/layout/sync_tabs_list_item.xml
@@ -20,7 +20,7 @@
         android:layout_marginEnd="16dp"
         android:singleLine="true"
         android:textAlignment="viewStart"
-        android:textColor="@color/primary_text_normal_theme"
+        android:textColor="@color/fx_mobile_text_color_primary"
         android:textSize="16sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/tab_group_item.xml b/app/src/main/res/layout/tab_group_item.xml
index 752db3c651..18cc8d0604 100644
--- a/app/src/main/res/layout/tab_group_item.xml
+++ b/app/src/main/res/layout/tab_group_item.xml
@@ -17,7 +17,7 @@
         android:layout_marginStart="16dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="@color/primary_text_normal_theme"
+        app:tint="@color/fx_mobile_icon_color_primary"
         app:srcCompat="@drawable/ic_search" />
 
     <TextView
@@ -29,7 +29,7 @@
         android:gravity="start"
         android:maxLines="1"
         android:textAppearance="@style/Header16TextStyle"
-        android:textColor="@color/primary_text_normal_theme"
+        android:textColor="@color/fx_mobile_text_color_primary"
         app:layout_constraintBottom_toBottomOf="@id/group_icon"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
diff --git a/app/src/main/res/layout/tab_tray_grid_item.xml b/app/src/main/res/layout/tab_tray_grid_item.xml
index e74c290b93..869b12ef38 100644
--- a/app/src/main/res/layout/tab_tray_grid_item.xml
+++ b/app/src/main/res/layout/tab_tray_grid_item.xml
@@ -60,7 +60,7 @@ A FrameLayout here is an efficient way of having a views stack while allowing:
                 android:paddingVertical="5dp"
                 android:requiresFadingEdge="horizontal"
                 android:singleLine="true"
-                android:textColor="@color/primary_text_normal_theme"
+                android:textColor="@color/fx_mobile_text_color_primary"
                 android:textSize="14sp"
                 android:visibility="visible"
                 app:layout_constraintEnd_toStartOf="@id/mozac_browser_tabstray_close"
@@ -78,7 +78,7 @@ A FrameLayout here is an efficient way of having a views stack while allowing:
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/ic_close"
-                app:tint="@color/primary_text_normal_theme" />
+                app:tint="@color/fx_mobile_text_color_primary" />
 
             <View
                 android:id="@+id/horizonatal_divider"
diff --git a/app/src/main/res/layout/tab_tray_item.xml b/app/src/main/res/layout/tab_tray_item.xml
index c302234aa4..9e32661713 100644
--- a/app/src/main/res/layout/tab_tray_item.xml
+++ b/app/src/main/res/layout/tab_tray_item.xml
@@ -67,7 +67,7 @@
         android:layout_marginTop="24dp"
         android:layout_marginStart="12dp"
         android:ellipsize="end"
-        android:textColor="@color/primary_text_normal_theme"
+        android:textColor="@color/fx_mobile_text_color_primary"
         android:textSize="16sp"
         android:maxLines="2"
         tools:text="Firefox"
@@ -104,6 +104,6 @@
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_close"
-        app:tint="@color/primary_text_normal_theme" />
+        app:tint="@color/fx_mobile_icon_color_primary" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/tab_tray_title_header_item.xml b/app/src/main/res/layout/tab_tray_title_header_item.xml
index 97c9d193a2..cd58a0fe1d 100644
--- a/app/src/main/res/layout/tab_tray_title_header_item.xml
+++ b/app/src/main/res/layout/tab_tray_title_header_item.xml
@@ -19,7 +19,7 @@
     android:maxLines="1"
     android:text="@string/tab_tray_header_title_1"
     android:textAppearance="@style/Header16TextStyle"
-    android:textColor="@color/primary_text_normal_theme"
+    android:textColor="@color/fx_mobile_text_color_primary"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     app:layout_constraintTop_toTopOf="parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_synced_tabs_group.xml b/app/src/main/res/layout/view_synced_tabs_group.xml
index 987ce8df7f..0746db267e 100644
--- a/app/src/main/res/layout/view_synced_tabs_group.xml
+++ b/app/src/main/res/layout/view_synced_tabs_group.xml
@@ -19,7 +19,7 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical|start"
         android:textAppearance="@style/Header14TextStyle"
-        android:textColor="@color/primary_text_normal_theme"
+        android:textColor="@color/fx_mobile_text_color_primary"
         android:textSize="12sp"
         android:letterSpacing="0.04"
         android:textDirection="locale"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 66d872601c..0b035c3a5c 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -117,9 +117,8 @@
     <color name="fx_mobile_border_color_warning" tools:ignore="UnusedResources">@color/photonRed40</color>
 
     <!-- Normal theme colors for dark mode -->
-    <color name="primary_text_normal_theme">@color/fx_mobile_text_color_primary</color>
     <color name="secondary_text_normal_theme">#A7A2B7</color>
-    <color name="contrast_text_normal_theme">@color/primary_text_normal_theme</color>
+    <color name="contrast_text_normal_theme">@color/fx_mobile_text_color_primary</color>
     <color name="caption_text_normal_theme">@color/photonLightGrey70</color>
     <color name="inset_normal_theme">@color/photonDarkGrey50</color>
     <color name="accent_normal_theme">@color/photonViolet50</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 61cb23e7aa..057d58d48b 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -191,7 +191,6 @@
     <color name="tab_tray_item_media_background_private_theme">@color/photonViolet50</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/photonGrey50</color>
     <color name="contrast_text_normal_theme">@color/photonLightGrey05</color>
     <color name="caption_text_normal_theme">@color/photonLightGrey90</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e0eb172916..40f9ce8dbd 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -14,7 +14,7 @@
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowBackground">@color/fx_mobile_layer_color_1</item>
         <item name="android:colorEdgeEffect">@color/accent_normal_theme</item>
-        <item name="android:colorAccent">@color/primary_text_normal_theme</item>
+        <item name="android:colorAccent">@color/fx_mobile_text_color_primary</item>
         <item name="android:textColorPrimary">@color/state_list_text_color</item>
         <item name="android:textColorSecondary">@color/secondary_state_list_text_color</item>
         <item name="alertDialogStyle">@style/DialogStyleNormal</item>
@@ -44,10 +44,10 @@
         <!-- Inactive track color(30% transparency) -->
         <item name="android:colorForeground">@color/toggle_off_track_normal_theme</item>
         <!-- sets the toolbar back button color, radio buttons / unselected checkboxes -->
-        <item name="colorControlNormal">@color/primary_text_normal_theme</item>
+        <item name="colorControlNormal">@color/fx_mobile_text_color_primary</item>
 
         <!-- Updated color attributes -->
-        <item name="primaryText">@color/primary_text_normal_theme</item>
+        <item name="primaryText">@color/fx_mobile_text_color_primary</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>
@@ -87,7 +87,7 @@
         <item name="recentlyUsedShareMenu">@color/recently_used_share_theme</item>
 
         <!-- Shared widget colors -->
-        <item name="mozac_primary_text_color">@color/primary_text_normal_theme</item>
+        <item name="mozac_primary_text_color">@color/fx_mobile_text_color_primary</item>
         <item name="mozac_caption_text_color">@color/caption_text_normal_theme</item>
         <item name="mozac_widget_favicon_background_color">@color/fx_mobile_layer_color_2</item>
         <item name="mozac_widget_favicon_border_color">@color/fx_mobile_border_color_primary</item>
@@ -105,7 +105,7 @@
         <item name="bottomBarBackground">@drawable/home_bottom_bar_background</item>
         <item name="bottomBarBackgroundTop">@drawable/home_bottom_bar_background_top</item>
         <item name="privateBrowsingButtonBackground">@android:color/transparent</item>
-        <item name="privateBrowsingButtonAccent">@color/primary_text_normal_theme</item>
+        <item name="privateBrowsingButtonAccent">@color/fx_mobile_text_color_primary</item>
 
         <item name="tabCounterTintColor">?primaryText</item>
     </style>