diff --git a/aconfig/settings_globalintl_flag_declarations.aconfig b/aconfig/settings_globalintl_flag_declarations.aconfig
index 2e3aab560b3..0cf24dab840 100644
--- a/aconfig/settings_globalintl_flag_declarations.aconfig
+++ b/aconfig/settings_globalintl_flag_declarations.aconfig
@@ -28,10 +28,3 @@ flag {
     description: "Feature flag for regional preferences APIs"
     bug: "370379000"
 }
-
-flag {
-    name: "settings_expressive_design_enabled"
-    namespace: "globalintl"
-    description: "Feature flag for expressive design"
-    bug: "385659296"
-}
\ No newline at end of file
diff --git a/src/com/android/settings/localepicker/LocaleListEditor.java b/src/com/android/settings/localepicker/LocaleListEditor.java
index b1f005a79ab..7436b4869ac 100644
--- a/src/com/android/settings/localepicker/LocaleListEditor.java
+++ b/src/com/android/settings/localepicker/LocaleListEditor.java
@@ -54,7 +54,6 @@ import com.android.internal.app.LocalePicker;
 import com.android.internal.app.LocaleStore;
 import com.android.settings.R;
 import com.android.settings.RestrictedSettingsFragment;
-import com.android.settings.flags.Flags;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settingslib.search.SearchIndexable;
@@ -62,6 +61,7 @@ import com.android.settingslib.search.SearchIndexableRaw;
 import com.android.settingslib.utils.CustomDialogHelper;
 import com.android.settingslib.utils.StringUtil;
 import com.android.settingslib.widget.LayoutPreference;
+import com.android.settingslib.widget.SettingsThemeHelper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -286,7 +286,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View
     private void setRemoveMode(boolean mRemoveMode) {
         this.mRemoveMode = mRemoveMode;
         mAdapter.setRemoveMode(mRemoveMode);
-        if (Flags.settingsExpressiveDesignEnabled()) {
+        if (SettingsThemeHelper.isExpressiveTheme(getContext())) {
             mAddLanguagePreference.setVisible(!mRemoveMode);
         } else {
             mAddLanguage.setVisibility(mRemoveMode ? View.INVISIBLE : View.VISIBLE);
@@ -497,7 +497,7 @@ public class LocaleListEditor extends RestrictedSettingsFragment implements View
         list.setAdapter(mAdapter);
         list.setOnTouchListener(this);
         list.requestFocus();
-        if (Flags.settingsExpressiveDesignEnabled()) {
+        if (SettingsThemeHelper.isExpressiveTheme(getContext())) {
             mAddLanguagePreference = getPreferenceScreen().findPreference(KEY_ADD_A_LANGUAGE);
         } else {
             mAddLanguage = layout.findViewById(R.id.add_language);
diff --git a/src/com/android/settings/spa/system/AppLanguagesListModel.kt b/src/com/android/settings/spa/system/AppLanguagesListModel.kt
index 91a0a7ec79a..36ab4be8c89 100644
--- a/src/com/android/settings/spa/system/AppLanguagesListModel.kt
+++ b/src/com/android/settings/spa/system/AppLanguagesListModel.kt
@@ -33,7 +33,6 @@ import com.android.settings.R
 import com.android.settings.applications.AppLocaleUtil
 import com.android.settings.applications.appinfo.AppLocaleDetails
 import com.android.settings.core.SubSettingLauncher
-import com.android.settings.flags.Flags
 import com.android.settings.localepicker.AppLocalePickerActivity
 import com.android.settings.localepicker.AppLocalePickerFragment
 import com.android.settingslib.spa.framework.util.filterItem
@@ -43,6 +42,7 @@ import com.android.settingslib.spaprivileged.model.app.AppRecord
 import com.android.settingslib.spaprivileged.model.app.userHandle
 import com.android.settingslib.spaprivileged.template.app.AppListItem
 import com.android.settingslib.spaprivileged.template.app.AppListItemModel
+import com.android.settingslib.widget.SettingsThemeHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.combine
@@ -99,7 +99,7 @@ class AppLanguagesListModel(private val context: Context) : AppListModel<AppLang
     @Composable
     override fun AppListItemModel<AppLanguagesRecord>.AppItem() {
         AppListItem {
-            if (Flags.settingsExpressiveDesignEnabled()) {
+            if (SettingsThemeHelper.isExpressiveTheme(context)) {
                 val extra = Bundle()
                 extra.putString(AppLocalePickerFragment.ARG_PACKAGE_NAME, record.app.packageName)
                 extra.putInt(AppLocalePickerFragment.ARG_PACKAGE_UID, context.userId)