diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index d0251dd2b5..e96be5a2f2 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -3,8 +3,7 @@
    - 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/. -->
 
-<androidx.preference.PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.preference.Preference
@@ -12,14 +11,14 @@
         android:layout="@layout/sign_in_preference"
         android:summary="@string/preferences_sign_in_description"
         android:title="@string/preferences_sync"
-        app:allowDividerBelow="false"/>
+        app:allowDividerBelow="false" />
 
     <androidx.preference.PreferenceCategory
         android:key="@string/pref_key_account_category"
         android:title="@string/preferences_category_account"
         app:iconSpaceReserved="false"
         app:isPreferenceVisible="false"
-        android:layout="@layout/preference_cat_style" >
+        android:layout="@layout/preference_cat_style">
 
         <org.mozilla.fenix.settings.account.AccountPreference
             android:icon="@drawable/ic_account"
@@ -27,7 +26,7 @@
 
         <org.mozilla.fenix.settings.account.AccountAuthErrorPreference
             android:icon="@drawable/ic_account_warning"
-            android:key="@string/pref_key_account_auth_error"/>
+            android:key="@string/pref_key_account_auth_error" />
     </androidx.preference.PreferenceCategory>
 
     <androidx.preference.EditTextPreference
@@ -35,19 +34,19 @@
         android:title="@string/preferences_override_fxa_server"
         android:inputType="textUri"
         app:iconSpaceReserved="false"
-        app:isPreferenceVisible="false"/>
+        app:isPreferenceVisible="false" />
 
     <androidx.preference.EditTextPreference
         android:key="@string/pref_key_override_sync_tokenserver"
         android:title="@string/preferences_override_sync_tokenserver"
         android:inputType="textUri"
         app:iconSpaceReserved="false"
-        app:isPreferenceVisible="false"/>
+        app:isPreferenceVisible="false" />
 
     <androidx.preference.PreferenceCategory
         android:title="@string/preferences_category_general"
         app:iconSpaceReserved="false"
-        android:layout="@layout/preference_cat_style" >
+        android:layout="@layout/preference_cat_style">
         <androidx.preference.Preference
             android:icon="@drawable/ic_search"
             android:key="@string/pref_key_search_settings"
@@ -71,7 +70,8 @@
         <androidx.preference.Preference
             android:icon="@drawable/ic_formfill"
             android:key="@string/pref_key_credit_cards"
-            android:title="@string/preferences_credit_cards" />
+            android:title="@string/preferences_credit_cards"
+            app:isPreferenceVisible="false" />
 
         <androidx.preference.Preference
             android:icon="@drawable/ic_accessibility"
@@ -97,7 +97,7 @@
         <androidx.preference.Preference
             android:icon="@drawable/ic_private_browsing"
             android:key="@string/pref_key_private_browsing"
-            android:title="@string/preferences_private_browsing_options"/>
+            android:title="@string/preferences_private_browsing_options" />
 
         <androidx.preference.Preference
             android:icon="@drawable/ic_tracking_protection_enabled"
@@ -144,7 +144,7 @@
         <androidx.preference.Preference
             android:icon="@drawable/ic_addons_extensions"
             android:key="@string/pref_key_override_amo_collection"
-            android:title="@string/preferences_customize_amo_collection"/>
+            android:title="@string/preferences_customize_amo_collection" />
 
         <androidx.preference.SwitchPreference
             android:defaultValue="false"
@@ -156,7 +156,7 @@
             android:defaultValue="false"
             android:icon="@drawable/ic_download"
             android:key="@string/pref_key_external_download_manager"
-            android:title="@string/preferences_external_download_manager"/>
+            android:title="@string/preferences_external_download_manager" />
 
         <androidx.preference.SwitchPreference
             android:defaultValue="true"