diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3e0de8c1f..ba121514b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -49,7 +49,7 @@
             android:name=".settings.SettingsActivity"
             android:label="@string/settings"
             android:parentActivityName=".HomeActivity"
-            android:theme="@style/AppTheme" />
+            android:theme="@style/LightAppTheme" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml
index e6eddf1e9..f004a94cc 100644
--- a/app/src/main/res/values/preference_keys.xml
+++ b/app/src/main/res/values/preference_keys.xml
@@ -1,7 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
+<?xml version="1.0" encoding="utf-8"?><!-- 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/. -->
 <resources>
     <string name="pref_key_make_default_browser" translatable="false">pref_key_make_default_browser</string>
+    <string name="pref_key_search_engine" translatable="false">pref_key_search_engine</string>
+    <string name="pref_key_passwords" translatable="false">pref_key_passwords</string>
+    <string name="pref_key_credit_cards_addresses" translatable="false">pref_key_credit_cards_addresses</string>
+    <string name="pref_key_site_permissions" translatable="false">pref_key_site_permissions</string>
+    <string name="pref_key_accessibility" translatable="false">pref_key_accessibility</string>
+    <string name="pref_key_language" translatable="false">pref_key_language</string>
+    <string name="pref_key_data_choices" translatable="false">pref_key_data_choices</string>
+    <string name="pref_key_help" translatable="false">pref_key_help</string>
+    <string name="pref_key_rate" translatable="false">pref_key_rate</string>
+    <string name="pref_key_feedback" translatable="false">pref_key_feedback</string>
+    <string name="pref_key_about" translatable="false">pref_key_about</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dce18d9b2..b0f386528 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -24,8 +24,20 @@
     <string name="search_scan_button">Scan</string>
     <string name="search_shortcuts_button">Shortcuts</string>
 
+    <!-- Preference category for basic settings -->
+    <string name="preferences_category_basics">Basics</string>
+
+    <!-- Preference for settings related to changing the default search engine -->
+    <string name="preferences_search_engine">Search engine</string>
+
+    <!-- Preference for settings related to saved passwords -->
+    <string name="preferences_passwords">Passwords</string>
+
+    <!-- Preference for settings related to saved credit cards and addresses -->
+    <string name="preferences_credit_cards_addresses">Credit cards and addresses</string>
+
     <!-- Preference for settings related to changing the default browser -->
-    <string name="preferences_make_default_browser">Make default browser</string>
+    <string name="preferences_set_as_default_browser">Set as default browser</string>
 
     <!-- Menu option on the toolbar that takes you to settings page-->
     <string name="settings">Settings</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1983c6d6e..eec633bc4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,17 +3,11 @@
    - 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/. -->
 <resources>
-    <style name="LightAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="LightAppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
-
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
-    </style>
-
-    <style name="AppTheme" parent="Theme.AppCompat.Light">
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
     </style>
 
     <style name="search_pill" parent="Widget.AppCompat.Button.Borderless">
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index b28958592..44e86a467 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -5,8 +5,25 @@
 
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <androidx.preference.Preference
-        android:key="@string/pref_key_make_default_browser"
-        android:title="@string/preferences_make_default_browser" />
+    <PreferenceCategory android:title="Basics">
+        <androidx.preference.Preference
+            android:icon="@drawable/mozac_ic_search"
+            android:key="@string/pref_key_search_engine"
+            android:title="@string/preferences_search_engine" />
 
+        <androidx.preference.Preference
+            android:icon="@drawable/ic_login"
+            android:key="@string/pref_key_passwords"
+            android:title="@string/preferences_passwords" />
+
+        <androidx.preference.Preference
+            android:icon="@drawable/ic_formfill"
+            android:key="@string/pref_key_credit_cards_addresses"
+            android:title="@string/preferences_credit_cards_addresses" />
+
+        <androidx.preference.Preference
+            android:key="@string/pref_key_make_default_browser"
+            android:title="@string/preferences_set_as_default_browser" />
+
+    </PreferenceCategory>
 </androidx.preference.PreferenceScreen>
\ No newline at end of file