diff --git a/app/src/main/res/layout/component_tabstray.xml b/app/src/main/res/layout/component_tabstray.xml
index 67ca09913..80fc324ce 100644
--- a/app/src/main/res/layout/component_tabstray.xml
+++ b/app/src/main/res/layout/component_tabstray.xml
@@ -12,14 +12,14 @@
     android:layout_width="match_parent"
     android:layout_marginTop="40dp"
     style="@style/BottomSheetModal"
-    android:backgroundTint="?foundation"
+    android:backgroundTint="@color/foundation_normal_theme"
     app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
     <View
         android:id="@+id/handle"
         android:layout_width="0dp"
         android:layout_height="3dp"
         android:layout_marginTop="8dp"
-        android:background="?secondaryText"
+        android:background="@color/secondary_text_normal_theme"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintWidth_percent="0.1"
@@ -28,9 +28,9 @@
         android:id="@+id/tab_layout"
         android:layout_width="0dp"
         android:layout_height="80dp"
-        app:tabSelectedTextColor="?accent"
-        app:tabTextColor="?secondaryText"
-        app:tabIndicatorColor="?accent"
+        app:tabSelectedTextColor="@color/accent_normal_theme"
+        app:tabTextColor="@color/secondary_text_normal_theme"
+        app:tabIndicatorColor="@color/accent_normal_theme"
         app:tabIconTint="@color/tab_icon"
         app:tabRippleColor="@android:color/transparent"
         app:layout_constraintWidth_percent="0.5"
@@ -73,10 +73,10 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tab_layout"
-        mozac:tabsTrayItemBackgroundColor="?foundation"
-        mozac:tabsTrayItemTextColor="?tabTrayItemText"
-        mozac:tabsTraySelectedItemBackgroundColor="?tabTrayItemSelectedBackground"
-        mozac:tabsTraySelectedItemTextColor="?tabTrayItemText"
-        mozac:tabsTrayItemUrlTextColor="?tabTrayItemUrl"
-        mozac:tabsTraySelectedItemUrlTextColor="?tabTrayItemUrl" />
+        mozac:tabsTrayItemBackgroundColor="@color/foundation_normal_theme"
+        mozac:tabsTrayItemTextColor="@color/tab_tray_item_text_normal_theme"
+        mozac:tabsTraySelectedItemBackgroundColor="@color/tab_tray_item_selected_background_normal_theme"
+        mozac:tabsTraySelectedItemTextColor="@color/tab_tray_item_selected_background_normal_theme"
+        mozac:tabsTrayItemUrlTextColor="@color/tab_tray_item_selected_background_normal_theme"
+        mozac:tabsTraySelectedItemUrlTextColor="@color/tab_tray_item_url_normal_theme" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/tab_tray_item.xml b/app/src/main/res/layout/tab_tray_item.xml
index 3af4b7145..d3c642678 100644
--- a/app/src/main/res/layout/tab_tray_item.xml
+++ b/app/src/main/res/layout/tab_tray_item.xml
@@ -58,7 +58,7 @@
         android:textSize="16sp"
         android:paddingTop="22dp"
         android:paddingStart="16dp"
-        android:textColor="?tabTrayItemText"
+        android:textColor="@color/tab_tray_item_text_normal_theme"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintEnd_toStartOf="@id/mozac_browser_tabstray_close"
         app:layout_constraintStart_toEndOf="@id/mozac_browser_tabstray_card"
@@ -73,7 +73,7 @@
         android:lines="1"
         android:textSize="14sp"
         android:paddingStart="16dp"
-        android:textColor="?tabTrayItemUrl"
+        android:textColor="@color/tab_tray_item_url_normal_theme"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintEnd_toStartOf="@id/mozac_browser_tabstray_close"
         app:layout_constraintStart_toEndOf="@id/mozac_browser_tabstray_card"
@@ -86,7 +86,7 @@
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        android:tint="?tabTrayItemText"
+        android:tint="@color/tab_tray_item_text_normal_theme"
         android:contentDescription="@string/close_tab"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         app:srcCompat="@drawable/mozac_ic_close" />
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 1a2dc014f..b994943af 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -51,8 +51,6 @@
     <attr name="addOnPrivateBrowsingInteriorIconBackground" format="reference"/>
 
     <!-- Tab tray -->
-    <attr name="tabTrayItemText" format="reference"/>
-    <attr name="tabTrayItemUrl" format="reference" />
     <attr name="tabTrayItemBackground" format="reference" />
     <attr name="tabTrayItemSelectedBackground" format="reference" />
     <attr name="tabTrayToolbarBackground" format="reference" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index df907190b..76808ea7c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -73,8 +73,6 @@
         <item name="addOnPrivateBrowsingExteriorCircleBackground">@color/add_on_private_browsing_exterior_circle_background_normal_theme</item>
         <item name="addOnPrivateBrowsingInteriorIconBackground">@color/add_on_private_browsing_interior_icon_background_normal_theme</item>
 
-        <item name="tabTrayItemText">@color/tab_tray_item_text_normal_theme</item>
-        <item name="tabTrayItemUrl">@color/tab_tray_item_url_normal_theme</item>
         <item name="tabTrayItemBackground">@color/tab_tray_item_background_normal_theme</item>
         <item name="tabTrayItemSelectedBackground">@color/tab_tray_item_selected_background_normal_theme</item>
         <item name="tabTrayToolbarBackground">@color/tab_tray_toolbar_background_normal_theme</item>
@@ -198,9 +196,7 @@
         <item name="addOnPrivateBrowsingInteriorIconBackground">@color/add_on_private_browsing_interior_icon_background_private_theme</item>
 
         <!-- Tab Tray -->
-        <item name="tabTrayItemText">@color/tab_tray_item_text_private_theme</item>
-        <item name="tabTrayItemUrl">@color/tab_tray_item_url_private_theme</item>
-        <item name="tabTrayItemBackground">@color/tab_tray_item_background_private_theme</item>
+        <item name="tabTrayItemBackground">@color/tab_tray_item_background_normal_theme</item>
         <item name="tabTrayItemSelectedBackground">@color/tab_tray_item_selected_background_private_theme</item>
         <item name="tabTrayToolbarBackground">@color/tab_tray_toolbar_background_private_theme</item>
         <item name="tabTrayItemDivider">@color/tab_tray_item_divider_private_theme</item>