diff --git a/res/values/styles.xml b/res/values/styles.xml
index e75766d36e2..3892c5e4c20 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -314,7 +314,7 @@
 
     <style name="TextAppearance.HomepagePreferenceTitle"
            parent="@*android:style/TextAppearance.DeviceDefault">
-        <item name="android:fontFamily">google-sans</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
         <item name="android:textSize">20sp</item>
     </style>
 
diff --git a/res/xml/top_level_settings_grouped.xml b/res/xml/top_level_settings_grouped.xml
index 9f87ffcef7c..ad634ed62f3 100644
--- a/res/xml/top_level_settings_grouped.xml
+++ b/res/xml/top_level_settings_grouped.xml
@@ -20,7 +20,7 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="top_level_settings_grouped">
 
-    <com.android.settings.homepage.HomePagePreference
+    <com.android.settings.homepage.HomepagePreference
         android:fragment="com.android.settings.network.NetworkDashboardFragment"
         android:icon="@drawable/ic_homepage_network_v2"
         android:key="top_level_network"
@@ -28,7 +28,7 @@
         android:title="@string/network_dashboard_title"
         settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"/>
 
-    <com.android.settings.homepage.HomePagePreference
+    <com.android.settings.homepage.HomepagePreference
         android:fragment="com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment"
         android:icon="@drawable/ic_homepage_connected_device_v2"
         android:key="top_level_connected_devices"
@@ -40,14 +40,14 @@
         android:key="apps"
         android:order="-120"
         settings:allowDividerAbove="false">
-        <com.android.settings.homepage.HomePagePreference
+        <com.android.settings.homepage.HomepagePreference
             android:fragment="com.android.settings.applications.AppAndNotificationDashboardFragment"
             android:icon="@drawable/ic_homepage_apps_v2"
             android:key="top_level_apps_and_notifs"
             android:order="-120"
             android:title="@string/apps_dashboard_title"/>
 
-        <com.android.settings.homepage.HomePagePreference
+        <com.android.settings.homepage.HomepagePreference
             android:fragment="com.android.settings.notification.ConfigureNotificationSettings"
             android:icon="@drawable/ic_homepage_notification_v2"
             android:key="top_level_notification"
@@ -61,7 +61,7 @@
         android:key="phone_essential"
         android:order="-100"
         settings:allowDividerAbove="false">
-        <com.android.settings.homepage.HomePagePreference
+        <com.android.settings.homepage.HomepagePreference
             android:fragment="com.android.settings.fuelgauge.PowerUsageSummary"
             android:icon="@drawable/ic_homepage_battery_v2"
             android:key="top_level_battery"
@@ -69,7 +69,7 @@
             android:title="@string/power_usage_summary_title"
             settings:controller="com.android.settings.fuelgauge.TopLevelBatteryPreferenceController"/>
 
-        <com.android.settings.homepage.HomePagePreference
+        <com.android.settings.homepage.HomepagePreference
             android:fragment="com.android.settings.deviceinfo.StorageSettings"
             android:icon="@drawable/ic_homepage_storage_v2"
             android:key="top_level_storage"
@@ -77,14 +77,14 @@
             android:title="@string/storage_settings"
             settings:controller="com.android.settings.deviceinfo.TopLevelStoragePreferenceController"/>
 
-        <com.android.settings.homepage.HomePagePreference
+        <com.android.settings.homepage.HomepagePreference
             android:fragment="com.android.settings.notification.SoundSettings"
             android:icon="@drawable/ic_homepage_sound_v2"
             android:key="top_level_sound"
             android:order="-80"
             android:title="@string/sound_settings"/>
 
-        <com.android.settings.homepage.HomePagePreference
+        <com.android.settings.homepage.HomepagePreference
             android:fragment="com.android.settings.DisplaySettings"
             android:icon="@drawable/ic_homepage_display_v2"
             android:key="top_level_display"
@@ -99,7 +99,7 @@
             android:title="@string/wallpaper_settings_title"
             settings:controller="com.android.settings.display.TopLevelWallpaperPreferenceController"/>
 
-        <com.android.settings.homepage.HomePagePreference
+        <com.android.settings.homepage.HomepagePreference
             android:fragment="com.android.settings.accessibility.AccessibilitySettings"
             android:icon="@drawable/ic_homepage_accessibility_v2"
             android:key="top_level_accessibility"
@@ -112,14 +112,14 @@
         android:key="privacy_and_security"
         android:order="-40"
         settings:allowDividerAbove="false">
-        <com.android.settings.homepage.HomePagePreference
+        <com.android.settings.homepage.HomepagePreference
             android:fragment="com.android.settings.privacy.PrivacyDashboardFragment"
             android:icon="@drawable/ic_homepage_privacy_v2"
             android:key="top_level_privacy"
             android:order="-40"
             android:title="@string/privacy_dashboard_title"/>
 
-        <com.android.settings.homepage.HomePagePreference
+        <com.android.settings.homepage.HomepagePreference
             android:fragment="com.android.settings.location.LocationSettings"
             android:icon="@drawable/ic_homepage_location_v2"
             android:key="top_level_location"
@@ -127,7 +127,7 @@
             android:title="@string/location_settings_title"
             settings:controller="com.android.settings.location.TopLevelLocationPreferenceController"/>
 
-        <com.android.settings.homepage.HomePagePreference
+        <com.android.settings.homepage.HomepagePreference
             android:fragment="com.android.settings.security.SecuritySettings"
             android:icon="@drawable/ic_homepage_security_v2"
             android:key="top_level_security"
@@ -135,7 +135,7 @@
             android:title="@string/security_settings_title"
             settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>
 
-        <com.android.settings.homepage.HomePagePreference
+        <com.android.settings.homepage.HomepagePreference
             android:key="top_level_emergency"
             android:title="@string/emergency_settings_preference_title"
             android:icon="@drawable/ic_homepage_emergency_v2"
@@ -147,7 +147,7 @@
         android:key="accounts"
         android:order="-10"
         settings:allowDividerAbove="false">
-        <com.android.settings.homepage.HomePagePreference
+        <com.android.settings.homepage.HomepagePreference
             android:fragment="com.android.settings.accounts.AccountDashboardFragment"
             android:icon="@drawable/ic_homepage_accounts_v2"
             android:key="top_level_accounts"
@@ -160,14 +160,14 @@
         android:key="system"
         android:order="10"
         settings:allowDividerAbove="false">
-        <com.android.settings.homepage.HomePagePreference
+        <com.android.settings.homepage.HomepagePreference
             android:fragment="com.android.settings.system.SystemDashboardFragment"
             android:icon="@drawable/ic_homepage_system_dashboard_v2"
             android:key="top_level_system"
             android:order="10"
             android:title="@string/header_category_system"/>
 
-        <com.android.settings.homepage.HomePagePreference
+        <com.android.settings.homepage.HomepagePreference
             android:fragment="com.android.settings.deviceinfo.aboutphone.MyDeviceInfoFragment"
             android:icon="@drawable/ic_homepage_about_v2"
             android:key="top_level_about_device"
@@ -175,7 +175,7 @@
             android:title="@string/about_settings"
             settings:controller="com.android.settings.deviceinfo.aboutphone.TopLevelAboutDevicePreferenceController"/>
 
-        <com.android.settings.homepage.HomePagePreference
+        <com.android.settings.homepage.HomepagePreference
             android:icon="@drawable/ic_homepage_support_v2"
             android:key="top_level_support"
             android:order="100"
diff --git a/src/com/android/settings/homepage/HomePagePreference.java b/src/com/android/settings/homepage/HomepagePreference.java
similarity index 82%
rename from src/com/android/settings/homepage/HomePagePreference.java
rename to src/com/android/settings/homepage/HomepagePreference.java
index 41d59b72d29..6086b9fa657 100644
--- a/src/com/android/settings/homepage/HomePagePreference.java
+++ b/src/com/android/settings/homepage/HomepagePreference.java
@@ -24,24 +24,24 @@ import androidx.preference.Preference;
 import com.android.settings.R;
 
 /** A customized layout for homepage preference. */
-public class HomePagePreference extends Preference {
+public class HomepagePreference extends Preference {
 
-    public HomePagePreference(Context context) {
+    public HomepagePreference(Context context) {
         super(context);
         setLayoutResource(R.layout.homepage_preference);
     }
 
-    public HomePagePreference(Context context, AttributeSet attrs) {
+    public HomepagePreference(Context context, AttributeSet attrs) {
         super(context, attrs);
         setLayoutResource(R.layout.homepage_preference);
     }
 
-    public HomePagePreference(Context context, AttributeSet attrs, int defStyleAttr) {
+    public HomepagePreference(Context context, AttributeSet attrs, int defStyleAttr) {
         this(context, attrs, defStyleAttr, /* defStyleRes= */ 0);
         setLayoutResource(R.layout.homepage_preference);
     }
 
-    public HomePagePreference(Context context, AttributeSet attrs,
+    public HomepagePreference(Context context, AttributeSet attrs,
             int defStyleAttr, int defStyleRes) {
         super(context, attrs, defStyleAttr, defStyleRes);
         setLayoutResource(R.layout.homepage_preference);
diff --git a/src/com/android/settings/homepage/RestrictedHomepagePreference.java b/src/com/android/settings/homepage/RestrictedHomepagePreference.java
index 47b552c1ee2..bee52ec25f8 100644
--- a/src/com/android/settings/homepage/RestrictedHomepagePreference.java
+++ b/src/com/android/settings/homepage/RestrictedHomepagePreference.java
@@ -30,7 +30,7 @@ import com.android.settings.R;
 import com.android.settingslib.RestrictedPreferenceHelper;
 
 /** Homepage preference that can be disabled by a device admin using a user restriction. */
-public class RestrictedHomepagePreference extends HomePagePreference {
+public class RestrictedHomepagePreference extends HomepagePreference {
     private RestrictedPreferenceHelper mHelper;
 
     public RestrictedHomepagePreference(Context context, AttributeSet attrs,