diff --git a/app/src/main/res/layout/onboarding_automatic_signin.xml b/app/src/main/res/layout/onboarding_automatic_signin.xml
index b3579afa65..e7cfbfb537 100644
--- a/app/src/main/res/layout/onboarding_automatic_signin.xml
+++ b/app/src/main/res/layout/onboarding_automatic_signin.xml
@@ -2,26 +2,25 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        style="@style/OnboardingCardDark"
-        android:id="@+id/onboarding_card"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/onboarding_card"
+    style="@style/OnboardingCardDark"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@+id/header_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="14dp"
-        tools:text="@string/onboarding_firefox_account_auto_signin_header_2"
         android:drawableStart="@drawable/ic_onboarding_avatar_anonymous"
         android:drawablePadding="12dp"
         android:textAppearance="@style/Header16TextStyle"
-        android:textColor="@color/onboarding_card_primary_text_dark" />
+        android:textColor="@color/onboarding_card_primary_text_dark"
+        tools:text="@string/onboarding_firefox_account_auto_signin_header_2" />
 
     <Button
         android:id="@+id/turn_on_sync_button"
diff --git a/app/src/main/res/layout/onboarding_manual_signin.xml b/app/src/main/res/layout/onboarding_manual_signin.xml
index 73082dcaed..23773c5d41 100644
--- a/app/src/main/res/layout/onboarding_manual_signin.xml
+++ b/app/src/main/res/layout/onboarding_manual_signin.xml
@@ -2,26 +2,25 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        style="@style/OnboardingCardDark"
-        android:id="@+id/onboarding_card"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/onboarding_card"
+    style="@style/OnboardingCardDark"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
-    <androidx.appcompat.widget.AppCompatTextView
+    <TextView
         android:id="@+id/header_text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="14dp"
-        tools:text="@string/onboarding_firefox_account_header"
         android:drawableStart="@drawable/ic_onboarding_firefox_accounts"
         android:drawablePadding="12dp"
         android:textAppearance="@style/Header16TextStyle"
-        android:textColor="@color/onboarding_card_primary_text_dark" />
+        android:textColor="@color/onboarding_card_primary_text_dark"
+        tools:text="@string/onboarding_firefox_account_header" />
 
     <Button
         android:id="@+id/turn_on_sync_button"