diff --git a/res/xml/cherish_settings_theme.xml b/res/xml/cherish_settings_theme.xml
index 854b09e..841b0be 100644
--- a/res/xml/cherish_settings_theme.xml
+++ b/res/xml/cherish_settings_theme.xml
@@ -55,6 +55,12 @@
                 android:targetPackage="com.android.wallpaper"
                 android:targetClass="com.android.customization.picker.LockClockPickerActivity" />
         </Preference>
+		
+		<com.android.settings.display.FontDialogPreference
+        android:key="custom_font"
+		android:icon="@drawable/ic_font"
+        android:title="@string/font_picker_title"
+        android:persistent="false" />
 
 		<ListPreference
             android:key="android.theme.customization.signal_icon"
diff --git a/src/com/cherish/settings/fragments/ThemeSettings.java b/src/com/cherish/settings/fragments/ThemeSettings.java
index 06a2ebd..6edf5fc 100644
--- a/src/com/cherish/settings/fragments/ThemeSettings.java
+++ b/src/com/cherish/settings/fragments/ThemeSettings.java
@@ -7,8 +7,8 @@ import static android.os.UserHandle.USER_SYSTEM;
 import android.app.UiModeManager;
 import android.graphics.Color;
 import android.os.Bundle;
+import android.content.BroadcastReceiver;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
@@ -21,6 +21,8 @@ import android.content.om.OverlayInfo;
 import android.os.RemoteException;
 import android.provider.SearchIndexableResource;
 import android.provider.Settings;
+import android.content.Context;
+import android.content.IntentFilter;
 import android.content.ContentResolver;
 import android.content.res.Resources;
 import androidx.preference.ListPreference;
@@ -33,6 +35,7 @@ import com.cherish.settings.preferences.CustomSeekBarPreference;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.SearchIndexable;
 import com.android.settings.display.OverlayCategoryPreferenceController;
+import com.android.settings.display.FontPickerPreferenceController;
 import com.android.settingslib.core.lifecycle.Lifecycle;
 import android.provider.Settings;
 import com.android.settings.R;
@@ -91,6 +94,19 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
     private ListPreference mQsHeaderStyle;
     private ListPreference mQsTileStyle;
 	private ListPreference mGesbar;
+	
+	private IntentFilter mIntentFilter;
+    private static FontPickerPreferenceController mFontPickerPreference;
+
+    private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action.equals("com.android.server.ACTION_FONT_CHANGED")) {
+                mFontPickerPreference.stopProgress();
+            }
+        }
+    };
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -101,6 +117,9 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
         PreferenceScreen prefScreen = getPreferenceScreen();
         ContentResolver resolver = getActivity().getContentResolver();
 		
+		mIntentFilter = new IntentFilter();
+        mIntentFilter.addAction("com.android.server.ACTION_FONT_CHANGED");
+		
 	mSwitchStyle = (SystemSettingListPreference)findPreference(SWITCH_STYLE);
         int switchStyle = Settings.System.getInt(resolver,Settings.System.SWITCH_STYLE, 2);
         int switchIndex = mSwitchStyle.findIndexOfValue(String.valueOf(switchStyle));
@@ -242,6 +261,7 @@ public class ThemeSettings extends SettingsPreferenceFragment implements
                 "android.theme.customization.signal_icon"));
         controllers.add(new OverlayCategoryPreferenceController(context,
                 "android.theme.customization.wifi_icon"));
+		controllers.add(mFontPickerPreference = new FontPickerPreferenceController(context, lifecycle));
         return controllers;
     }
 	
@@ -469,6 +489,21 @@ private int getOverlayPosition(String[] overlays) {
         return MetricsProto.MetricsEvent.CHERISH_SETTINGS;
     }
 	
+	@Override
+    public void onResume() {
+        super.onResume();
+        final Context context = getActivity();
+        context.registerReceiver(mIntentReceiver, mIntentFilter);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        final Context context = getActivity();
+        context.unregisterReceiver(mIntentReceiver);
+        mFontPickerPreference.stopProgress();
+    }
+	
 	/**
      * For Search.
      */