diff --git a/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt b/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
index 56e05066e..bab745383 100644
--- a/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
+++ b/app/src/main/java/org/mozilla/fenix/theme/FirefoxTheme.kt
@@ -83,7 +83,7 @@ private val darkColorPalette = FirefoxColors(
     iconGradientEnd = PhotonColors.Blue20,
     borderDefault = PhotonColors.DarkGrey05,
     borderFormDefault = PhotonColors.LightGrey05,
-    borderSelected = PhotonColors.Violet40,
+    borderAccent = PhotonColors.Violet40,
     borderDisabled = PhotonColors.LightGrey70,
     borderWarning = PhotonColors.Red40
 )
@@ -131,7 +131,7 @@ private val lightColorPalette = FirefoxColors(
     iconGradientEnd = PhotonColors.Blue60,
     borderDefault = PhotonColors.LightGrey30,
     borderFormDefault = PhotonColors.DarkGrey90,
-    borderSelected = PhotonColors.Ink20,
+    borderAccent = PhotonColors.Ink20,
     borderDisabled = PhotonColors.LightGrey70,
     borderWarning = PhotonColors.Red80
 )
@@ -184,7 +184,7 @@ class FirefoxColors(
     iconGradientEnd: Color,
     borderDefault: Color,
     borderFormDefault: Color,
-    borderSelected: Color,
+    borderAccent: Color,
     borderDisabled: Color,
     borderWarning: Color
 ) {
@@ -319,8 +319,8 @@ class FirefoxColors(
     // Form parts
     var borderFormDefault by mutableStateOf(borderFormDefault)
         private set
-    // Selected tab
-    var borderSelected by mutableStateOf(borderSelected)
+    // Active tab (Nav), Selected tab, Active form
+    var borderAccent by mutableStateOf(borderAccent)
         private set
     // Form parts
     var borderDisabled by mutableStateOf(borderDisabled)
@@ -372,7 +372,7 @@ class FirefoxColors(
         iconGradientEnd = other.iconGradientEnd
         borderDefault = other.borderDefault
         borderFormDefault = other.borderFormDefault
-        borderSelected = other.borderSelected
+        borderAccent = other.borderAccent
         borderDisabled = other.borderDisabled
         borderWarning = other.borderWarning
     }
@@ -420,7 +420,7 @@ class FirefoxColors(
         iconGradientEnd = iconGradientEnd,
         borderDefault = borderDefault,
         borderFormDefault = borderFormDefault,
-        borderSelected = borderSelected,
+        borderAccent = borderAccent,
         borderDisabled = borderDisabled,
         borderWarning = borderWarning
     )
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index cef47c39c..877281ba6 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -89,8 +89,8 @@
     <color name="fx_mobile_border_color_default" tools:ignore="UnusedResources">@color/photonDarkGrey05</color>
     <!-- Form parts -->
     <color name="fx_mobile_border_color_form_default" tools:ignore="UnusedResources">@color/photonLightGrey05</color>
-    <!-- Selected tab -->
-    <color name="fx_mobile_border_color_selected" tools:ignore="UnusedResources">@color/photonViolet40</color>
+    <!-- Active tab (Nav), Selected tab, Active form -->
+    <color name="fx_mobile_border_color_accent" tools:ignore="UnusedResources">@color/photonViolet40</color>
     <!-- Form parts -->
     <color name="fx_mobile_border_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey70</color>
     <!-- Form parts -->
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 83aea24c9..6d3939e2a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -89,8 +89,8 @@
     <color name="fx_mobile_border_color_default" tools:ignore="UnusedResources">@color/photonLightGrey30</color>
     <!-- Form parts -->
     <color name="fx_mobile_border_color_form_default" tools:ignore="UnusedResources">@color/photonDarkGrey90</color>
-    <!-- Selected tab -->
-    <color name="fx_mobile_border_color_selected" tools:ignore="UnusedResources">@color/photonInk20</color>
+    <!-- Active tab (Nav), Selected tab, Active form -->
+    <color name="fx_mobile_border_color_accent" tools:ignore="UnusedResources">@color/photonInk20</color>
     <!-- Form parts -->
     <color name="fx_mobile_border_color_disabled" tools:ignore="UnusedResources">@color/photonLightGrey70</color>
     <!-- Form parts -->