diff --git a/app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt b/app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt
index 909d035c1..ad5deaf87 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/screenshots/MenuScreenShotTest.kt
@@ -206,7 +206,7 @@ fun settingsAccountPreferences() = onView(withText(R.string.preferences_sync)).c
 
 fun settingsSearch() = onView(withText(R.string.preferences_search)).click()
 
-fun settingsTheme() = onView(withText(R.string.preferences_theme)).click()
+fun settingsTheme() = onView(withText(R.string.preferences_customize)).click()
 
 fun settingsAccessibility() = onView(withText(R.string.preferences_accessibility)).click()
 
diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
index 581c6f3d7..22c9d0bd8 100644
--- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
+++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/SettingsRobot.kt
@@ -36,10 +36,10 @@ import org.mozilla.fenix.helpers.click
 class SettingsRobot {
 
     // BASICS SECTION
-    fun verifyBasicsHeading() = assertBasicsHeading()
+    fun verifyBasicsHeading() = assertGeneralHeading()
 
     fun verifySearchEngineButton() = assertSearchEngineButton()
-    fun verifyThemeButton() = assertThemeButton()
+    fun verifyThemeButton() = assertCustomizeButton()
     fun verifyThemeSelected() = assertThemeSelected()
     fun verifyAccessibilityButton() = assertAccessibilityButton()
     fun verifySetAsDefaultBrowserButton() = assertSetAsDefaultBrowserButton()
@@ -159,14 +159,14 @@ class SettingsRobot {
 
 private fun assertSettingsView() {
     // verify that we are in the correct library view
-    assertBasicsHeading()
+    assertGeneralHeading()
     assertPrivacyHeading()
     assertDeveloperToolsHeading()
     assertAboutHeading()
 }
 
-// BASICS SECTION
-private fun assertBasicsHeading() = onView(ViewMatchers.withText("Basics"))
+// GENERAL SECTION
+private fun assertGeneralHeading() = onView(ViewMatchers.withText("General"))
     .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
 
 private fun assertSearchEngineButton() {
@@ -175,7 +175,7 @@ private fun assertSearchEngineButton() {
         .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
 }
 
-private fun assertThemeButton() = onView(ViewMatchers.withText("Theme"))
+private fun assertCustomizeButton() = onView(ViewMatchers.withText("Customize"))
     .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
 
 private fun assertThemeSelected() = onView(ViewMatchers.withText("Light"))
@@ -190,7 +190,7 @@ private fun assertSetAsDefaultBrowserButton() =
 
 // PRIVACY SECTION
 private fun assertPrivacyHeading() {
-    onView(ViewMatchers.withText("Privacy"))
+    onView(ViewMatchers.withText("Privacy and security"))
         .check(matches(withEffectiveVisibility(Visibility.VISIBLE)))
 }