diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 5f0cb060b24..6e1ebe064b7 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -62,6 +62,7 @@
 import static com.android.launcher3.popup.SystemShortcut.KILL_APP;
 import static com.android.launcher3.popup.SystemShortcut.PRIVATE_PROFILE_INSTALL;
 import static com.android.launcher3.popup.SystemShortcut.REMOVE;
+import static com.android.launcher3.popup.SystemShortcut.RENAME_APP;
 import static com.android.launcher3.popup.SystemShortcut.UNINSTALL;
 import static com.android.launcher3.popup.SystemShortcut.UNINSTALL_APP;
 import static com.android.launcher3.popup.SystemShortcut.WIDGETS;
@@ -586,7 +587,8 @@ public View.OnClickListener getItemOnClickListener() {
     public Stream<SystemShortcut.Factory> getSupportedShortcuts(ItemInfo itemInfo) {
         // Order matters as it affects order of appearance in popup container
         List<SystemShortcut.Factory> shortcuts = new ArrayList(Arrays.asList(
-                APP_INFO, WellbeingModel.SHORTCUT_FACTORY, mHotseatPredictionController));
+                APP_INFO, WellbeingModel.SHORTCUT_FACTORY, mHotseatPredictionController,
+                RENAME_APP));
         int container = itemInfo.container;
         if (canPinAppWithContextMenu()
                 && DisplayController.showDesktopTaskbarForFreeformDisplay(this)
diff --git a/res/drawable/ic_edit.xml b/res/drawable/ic_edit.xml
new file mode 100644
index 00000000000..11d55bd6ec5
--- /dev/null
+++ b/res/drawable/ic_edit.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     SPDX-FileCopyrightText: crDroid Android Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25z"
+        android:strokeWidth="1" />
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
+</vector>
diff --git a/res/values-ar-rSA/cr_strings.xml b/res/values-ar-rSA/cr_strings.xml
index d56be9f9cd2..94f1fc7b1af 100644
--- a/res/values-ar-rSA/cr_strings.xml
+++ b/res/values-ar-rSA/cr_strings.xml
@@ -416,17 +416,17 @@
     <string name="dock_search_pixel_style_summary">ترتيب شريط البحث مع خلفية الطبقات</string>
     <string name="qsb_outer_opacity_title">شفافية الطبقة الخارجية</string>
     <!-- Trust apps -->
-    <string name="trust_apps_manager_name">إخفاء التطبيقات وحمايتها</string>
+    <string name="trust_apps_manager_name">إخفاء &amp; تطبيقات محمية</string>
     <string name="trust_apps_auth_manager">افتح لإدارة التطبيقات المخفية والمحمية</string>
     <string name="trust_apps_auth_open_app">يرجى مصادقة البصمة لفتح %1$s</string>
     <string name="trust_apps_loading">جارٍ التحميل…\u2026</string>
-    <string name="trust_apps_no_lock_error">يرجى إعداد شاشة قفل الجهاز لتقييد الوصول إلى التطبيق</string>
+    <string name="trust_apps_no_lock_error">يرجى إعداد فقل شاشة الجهاز لتقييد الوصول إلى التطبيق</string>
     <string name="trust_apps_help">مساعدة</string>
     <string name="trust_apps_info_hidden">التطبيقات المخفية و الأدوات الخاصة بها ستكون مخفية أيضاً من واجهة التشغيل</string>
     <string name="trust_apps_info_protected">التطبيقات المحمية تتطلب المصادقة لكي تُفتح</string>
     <!-- Recents style -->
     <string name="recents_style_title">نمط تخطيط التطبيقات الحديثة</string>
-    <string name="recents_style_default">الإفتراضي</string>
+    <string name="recents_style_default">افتراضي</string>
     <string name="recents_style_stock">تأثير المقياس</string>
     <string name="recents_style_staple">نمط الكامي</string>
     <string name="recents_style_ios">نمط iOS</string>
@@ -437,4 +437,19 @@
     <string name="lock_app">التطبيق المقفل في التطبيقات الحديثة</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">الإهتزاز اثناء التمرير</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-az-rAZ/cr_strings.xml b/res/values-az-rAZ/cr_strings.xml
index 5d4c5b09ece..7275cb4c470 100644
--- a/res/values-az-rAZ/cr_strings.xml
+++ b/res/values-az-rAZ/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-be-rBY/cr_strings.xml b/res/values-be-rBY/cr_strings.xml
index df80ce50aea..b1ea0b53e4c 100644
--- a/res/values-be-rBY/cr_strings.xml
+++ b/res/values-be-rBY/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-bg-rBG/cr_strings.xml b/res/values-bg-rBG/cr_strings.xml
index 8f0292e42fa..6f649720d2b 100644
--- a/res/values-bg-rBG/cr_strings.xml
+++ b/res/values-bg-rBG/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Заключено приложение в скорошните</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-ca-rES/cr_strings.xml b/res/values-ca-rES/cr_strings.xml
index 1dcddd49fd5..5899bde529c 100644
--- a/res/values-ca-rES/cr_strings.xml
+++ b/res/values-ca-rES/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-cs-rCZ/cr_strings.xml b/res/values-cs-rCZ/cr_strings.xml
index f2cbcd8a08d..6e16ff86a1d 100644
--- a/res/values-cs-rCZ/cr_strings.xml
+++ b/res/values-cs-rCZ/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Zamknutá aplikace v nedávných aplikacích</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Vibrace při posouvání</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Přejmenovat</string>
+    <string name="rename_app_title">Zadejte název aplikace</string>
+    <string name="app_renamed_successfully">Aplikace přejmenována</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Obnovit</string>
+    <string name="rename_app_reset_message">Název byl obnoven na původní</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-de-rDE/cr_strings.xml b/res/values-de-rDE/cr_strings.xml
index 67eae4f387a..d5e3c3e73e0 100644
--- a/res/values-de-rDE/cr_strings.xml
+++ b/res/values-de-rDE/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Gesperrte App im Anwendungsverlauf</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll-Vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Umbenennen</string>
+    <string name="rename_app_title">App-Name eingeben</string>
+    <string name="app_renamed_successfully">App umbenannt</string>
+    <string name="rename_app_empty_error">App-Name darf nicht leer sein</string>
+    <string name="rename_app_length_error">App-Name darf maximal %1$d Zeichen haben</string>
+    <string name="rename_app_reset">Zurücksetzen</string>
+    <string name="rename_app_reset_message">Name auf Original zurückgesetzt</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-el-rGR/cr_strings.xml b/res/values-el-rGR/cr_strings.xml
index 3cadd10c675..0b2fa6c8cfb 100644
--- a/res/values-el-rGR/cr_strings.xml
+++ b/res/values-el-rGR/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-es-rES/cr_strings.xml b/res/values-es-rES/cr_strings.xml
index 81241fb9156..f6a172ee896 100644
--- a/res/values-es-rES/cr_strings.xml
+++ b/res/values-es-rES/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Aplicación bloqueada en recientes</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Vibración de desplazamiento</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Renombrar</string>
+    <string name="rename_app_title">Introduzca el nombre de la aplicación</string>
+    <string name="app_renamed_successfully">Aplicación renombrada</string>
+    <string name="rename_app_empty_error">El nombre de la aplicación no puede estar vacío</string>
+    <string name="rename_app_length_error">El nombre de la aplicación debe tener %1$d caracteres o menos</string>
+    <string name="rename_app_reset">Restablecer</string>
+    <string name="rename_app_reset_message">Nombre restablecido al original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">Desenfoque al iniciar aplicación</string>
+    <string name="pref_app_launch_blur_summary">Mostrar desenfoque al iniciar aplicaciones</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Icono personalizado</string>
+    <string name="app_info_custom_icon_summary">Elige cualquier icono de cualquier paquete de iconos</string>
+    <string name="icon_picker_search_hint">Buscar iconos</string>
 </resources>
diff --git a/res/values-fa-rIR/cr_strings.xml b/res/values-fa-rIR/cr_strings.xml
index 25d7611a9fb..55d9ad1ef26 100644
--- a/res/values-fa-rIR/cr_strings.xml
+++ b/res/values-fa-rIR/cr_strings.xml
@@ -443,4 +443,19 @@ Remember the Lineage of the Unicorn</item>
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-fi-rFI/cr_strings.xml b/res/values-fi-rFI/cr_strings.xml
index 9eb5d5dd3f7..da055d2672a 100644
--- a/res/values-fi-rFI/cr_strings.xml
+++ b/res/values-fi-rFI/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-fr-rFR/cr_strings.xml b/res/values-fr-rFR/cr_strings.xml
index 924d8956077..230a67ef6c8 100644
--- a/res/values-fr-rFR/cr_strings.xml
+++ b/res/values-fr-rFR/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-hi-rIN/cr_strings.xml b/res/values-hi-rIN/cr_strings.xml
index c1212be30a3..00c21ba8c9a 100644
--- a/res/values-hi-rIN/cr_strings.xml
+++ b/res/values-hi-rIN/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-hu-rHU/cr_strings.xml b/res/values-hu-rHU/cr_strings.xml
index 8ce77d014f4..b7e94112c3b 100644
--- a/res/values-hu-rHU/cr_strings.xml
+++ b/res/values-hu-rHU/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Zárolt alkalmazások az előzményekben</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Rezgés görgetéskor</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Átnevezés</string>
+    <string name="rename_app_title">Írja be az alkalmazás nevét</string>
+    <string name="app_renamed_successfully">Az alkalmazás átnevezve</string>
+    <string name="rename_app_empty_error">Ez a mező nem lehet üres</string>
+    <string name="rename_app_length_error">Az alkalmazás neve legfeljebb %1$d karakter lehet</string>
+    <string name="rename_app_reset">Visszaállítás</string>
+    <string name="rename_app_reset_message">Visszaállítva az eredetire</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">A megnyíló alkalmazás homályossága</string>
+    <string name="pref_app_launch_blur_summary">Elmosó effektus alkamazás megnyitásakor</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Egyéni ikon</string>
+    <string name="app_info_custom_icon_summary">Bármelyik ikoncsomagból kijelölhet egy ikont</string>
+    <string name="icon_picker_search_hint">Ikonok keresése</string>
 </resources>
diff --git a/res/values-in-rID/cr_strings.xml b/res/values-in-rID/cr_strings.xml
index c0f07bec3b7..d00f0584d25 100644
--- a/res/values-in-rID/cr_strings.xml
+++ b/res/values-in-rID/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Aplikasi terkunci di daftar aplikasi terbaru</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Getaran gulir</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Ubah nama</string>
+    <string name="rename_app_title">Masukkan nama aplikasi</string>
+    <string name="app_renamed_successfully">Aplikasi berganti nama</string>
+    <string name="rename_app_empty_error">Nama aplikasi tidak boleh kosong</string>
+    <string name="rename_app_length_error">Nama aplikasi harus terdiri dari %1$d karakter atau kurang</string>
+    <string name="rename_app_reset">Atur ulang</string>
+    <string name="rename_app_reset_message">Nama diatur ulang ke nama asli</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-it-rIT/cr_strings.xml b/res/values-it-rIT/cr_strings.xml
index 1552b66e556..e5bcadac6a7 100644
--- a/res/values-it-rIT/cr_strings.xml
+++ b/res/values-it-rIT/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-iw-rIL/cr_strings.xml b/res/values-iw-rIL/cr_strings.xml
index f8e52f726ef..2583188f4f1 100644
--- a/res/values-iw-rIL/cr_strings.xml
+++ b/res/values-iw-rIL/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-ja-rJP/cr_strings.xml b/res/values-ja-rJP/cr_strings.xml
index 2902326e6f6..1989ed1342f 100644
--- a/res/values-ja-rJP/cr_strings.xml
+++ b/res/values-ja-rJP/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-ko-rKR/cr_strings.xml b/res/values-ko-rKR/cr_strings.xml
index 81f7cd3cdb1..cbb20766ad6 100644
--- a/res/values-ko-rKR/cr_strings.xml
+++ b/res/values-ko-rKR/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-ku-rTR/cr_strings.xml b/res/values-ku-rTR/cr_strings.xml
index 64251b9a568..95ac8872752 100644
--- a/res/values-ku-rTR/cr_strings.xml
+++ b/res/values-ku-rTR/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-nl-rNL/cr_strings.xml b/res/values-nl-rNL/cr_strings.xml
index 8767c598d67..696aae7b57e 100644
--- a/res/values-nl-rNL/cr_strings.xml
+++ b/res/values-nl-rNL/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Vergrendelde app in recente apps</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll trillen</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Hernoemen</string>
+    <string name="rename_app_title">Voer app naam in</string>
+    <string name="app_renamed_successfully">App hernoemd</string>
+    <string name="rename_app_empty_error">App naam kan niet leeg zijn</string>
+    <string name="rename_app_length_error">App-naam moet %1$d tekens of minder zijn</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Naam terugzetten naar origineel</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App start vervaging</string>
+    <string name="pref_app_launch_blur_summary">Laat vervaag effect zien bij het starten van apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Aangepast icoon</string>
+    <string name="app_info_custom_icon_summary">Kies een pictogram uit elk pictogrammenpakket</string>
+    <string name="icon_picker_search_hint">Zoek pictogrammen</string>
 </resources>
diff --git a/res/values-pl-rPL/cr_strings.xml b/res/values-pl-rPL/cr_strings.xml
index 8e0528c6c77..18ff56219f9 100644
--- a/res/values-pl-rPL/cr_strings.xml
+++ b/res/values-pl-rPL/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Zablokowana aplikacja w ostatnich aplikacjach</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Wibracje przewijania</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Zmień nazwę</string>
+    <string name="rename_app_title">Wprowadź nazwę aplikacji</string>
+    <string name="app_renamed_successfully">Zmieniono nazwę aplikacji</string>
+    <string name="rename_app_empty_error">Nazwa aplikacji nie może być pusta</string>
+    <string name="rename_app_length_error">Nazwa aplikacji musi mieć maksymalnie %1$d znaków</string>
+    <string name="rename_app_reset">Zresetuj</string>
+    <string name="rename_app_reset_message">Nazwa została przywrócona do domyślnej</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">Rozmycie aplikacji</string>
+    <string name="pref_app_launch_blur_summary">Pokazuj efekt rozmycia podczas uruchamiania aplikacji</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Własna ikona</string>
+    <string name="app_info_custom_icon_summary">Wybierz dowolną ikonę z dowolnej paczki ikon</string>
+    <string name="icon_picker_search_hint">Szukaj ikon</string>
 </resources>
diff --git a/res/values-pt-rBR/cr_strings.xml b/res/values-pt-rBR/cr_strings.xml
index 112060b1c58..803dba27553 100644
--- a/res/values-pt-rBR/cr_strings.xml
+++ b/res/values-pt-rBR/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-pt-rPT/cr_strings.xml b/res/values-pt-rPT/cr_strings.xml
index 21611aab11a..54e9d7a1892 100644
--- a/res/values-pt-rPT/cr_strings.xml
+++ b/res/values-pt-rPT/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Aplicação bloqueada em recentes</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Vibração ao rolar</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-ro-rRO/cr_strings.xml b/res/values-ro-rRO/cr_strings.xml
index 9334f2cfcdd..a3255c66334 100644
--- a/res/values-ro-rRO/cr_strings.xml
+++ b/res/values-ro-rRO/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-ru-rRU/cr_strings.xml b/res/values-ru-rRU/cr_strings.xml
index f85a764700e..fce0657dd8f 100644
--- a/res/values-ru-rRU/cr_strings.xml
+++ b/res/values-ru-rRU/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Заблокировано в недавних</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Вибрация прокрутки</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Переименовать</string>
+    <string name="rename_app_title">Введите название приложения</string>
+    <string name="app_renamed_successfully">Приложение переименовано</string>
+    <string name="rename_app_empty_error">Название приложения не может быть пустым</string>
+    <string name="rename_app_length_error">Название должно содержать не более %1$d символов</string>
+    <string name="rename_app_reset">Сброс</string>
+    <string name="rename_app_reset_message">Название сброшено на оригинальное</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-sat-rIN/cr_strings.xml b/res/values-sat-rIN/cr_strings.xml
index 413edd8ee2e..764cf45dc27 100644
--- a/res/values-sat-rIN/cr_strings.xml
+++ b/res/values-sat-rIN/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-sk-rSK/cr_strings.xml b/res/values-sk-rSK/cr_strings.xml
index 2bbb16f12e7..037bd06a5ee 100644
--- a/res/values-sk-rSK/cr_strings.xml
+++ b/res/values-sk-rSK/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-sr-rCS/cr_strings.xml b/res/values-sr-rCS/cr_strings.xml
index 32b581641b1..fc6b493e229 100644
--- a/res/values-sr-rCS/cr_strings.xml
+++ b/res/values-sr-rCS/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-ta-rIN/cr_strings.xml b/res/values-ta-rIN/cr_strings.xml
index 36e321edb9d..daa813df869 100644
--- a/res/values-ta-rIN/cr_strings.xml
+++ b/res/values-ta-rIN/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Locked app in recents</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-tr-rTR/cr_strings.xml b/res/values-tr-rTR/cr_strings.xml
index 39d9844b256..d8efdc0ffde 100644
--- a/res/values-tr-rTR/cr_strings.xml
+++ b/res/values-tr-rTR/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Yakın geçmişte kilitlenen uygulama</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Kaydırma titreşimi</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Adını değiştir</string>
+    <string name="rename_app_title">Uygulama adı girin</string>
+    <string name="app_renamed_successfully">Uygulamanın adı değiştirildi</string>
+    <string name="rename_app_empty_error">Uygulama adı boş olamaz</string>
+    <string name="rename_app_length_error">Uygulama adı %1$d karakter veya daha kısa olmalıdır</string>
+    <string name="rename_app_reset">Sıfırla</string>
+    <string name="rename_app_reset_message">Uygulama adı sıfırlandı</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-uk-rUA/cr_strings.xml b/res/values-uk-rUA/cr_strings.xml
index 80f501b5725..5cba2a1a5fd 100644
--- a/res/values-uk-rUA/cr_strings.xml
+++ b/res/values-uk-rUA/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">Заблокований додаток у списку останніх</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Вібрація при прокручуванні</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Перейменувати</string>
+    <string name="rename_app_title">Введіть назву програми</string>
+    <string name="app_renamed_successfully">Програму перейменовано</string>
+    <string name="rename_app_empty_error">Назва додатку не може бути порожньою</string>
+    <string name="rename_app_length_error">Назва програми повинна бути менше символів %1$d</string>
+    <string name="rename_app_reset">Скинути</string>
+    <string name="rename_app_reset_message">Ім\'я скидається на оригінал</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-vi-rVN/cr_strings.xml b/res/values-vi-rVN/cr_strings.xml
index 36a0196b5f3..196e5f4eb78 100644
--- a/res/values-vi-rVN/cr_strings.xml
+++ b/res/values-vi-rVN/cr_strings.xml
@@ -438,4 +438,19 @@ Gửi cho chúng tôi một cốc bia</item>
     <string name="lock_app">Ứng dụng đã khóa trong gần đây</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Rung khi cuộn</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Đổi tên</string>
+    <string name="rename_app_title">Nhập tên ứng dụng</string>
+    <string name="app_renamed_successfully">Đổi tên xong</string>
+    <string name="rename_app_empty_error">Không thể để trống</string>
+    <string name="rename_app_length_error">Tên ứng dụng phải là %1$d ký tự hoặc ít hơn</string>
+    <string name="rename_app_reset">Đặt lại</string>
+    <string name="rename_app_reset_message">Tên được đặt lại về tên gốc</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values-zh-rCN/cr_strings.xml b/res/values-zh-rCN/cr_strings.xml
index 0789f601cf7..7d5cdad282a 100644
--- a/res/values-zh-rCN/cr_strings.xml
+++ b/res/values-zh-rCN/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">已锁定应用</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">滚动触觉</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">重命名</string>
+    <string name="rename_app_title">输入应用名称</string>
+    <string name="app_renamed_successfully">应用名称已更改</string>
+    <string name="rename_app_empty_error">应用名称不能为空</string>
+    <string name="rename_app_length_error">应用名称最多可以包含 %1$d 个字符</string>
+    <string name="rename_app_reset">重置</string>
+    <string name="rename_app_reset_message">将应用名称恢复为默认</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">应用启动模糊</string>
+    <string name="pref_app_launch_blur_summary">启动应用时显示模糊效果</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">自定义图标</string>
+    <string name="app_info_custom_icon_summary">从任意图标包选取图标</string>
+    <string name="icon_picker_search_hint">搜索图标</string>
 </resources>
diff --git a/res/values-zh-rTW/cr_strings.xml b/res/values-zh-rTW/cr_strings.xml
index 8d1caa7086e..6cb2f966d5e 100644
--- a/res/values-zh-rTW/cr_strings.xml
+++ b/res/values-zh-rTW/cr_strings.xml
@@ -437,4 +437,19 @@
     <string name="lock_app">最近分頁中已鎖定的應用程式</string>
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">捲動震動</string>
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
+    <!-- App launch blur -->
+    <string name="pref_app_launch_blur_title">App launch blur</string>
+    <string name="pref_app_launch_blur_summary">Show blur effect when launching apps</string>
+    <!-- Custom icon -->
+    <string name="app_info_custom_icon_title">Custom icon</string>
+    <string name="app_info_custom_icon_summary">Pick any icon from any icon pack</string>
+    <string name="icon_picker_search_hint">Search icons</string>
 </resources>
diff --git a/res/values/cr_strings.xml b/res/values/cr_strings.xml
index a93815c0c13..2c1e61ed95b 100644
--- a/res/values/cr_strings.xml
+++ b/res/values/cr_strings.xml
@@ -500,4 +500,13 @@
 
     <!-- Recents style -->
     <string name="recents_scroll_vibrate_title">Scroll vibration</string>
+
+    <!-- Rename app shortcut -->
+    <string name="rename_app_label">Rename</string>
+    <string name="rename_app_title">Enter app name</string>
+    <string name="app_renamed_successfully">App renamed</string>
+    <string name="rename_app_empty_error">App name cannot be empty</string>
+    <string name="rename_app_length_error">App name must be %1$d characters or less</string>
+    <string name="rename_app_reset">Reset</string>
+    <string name="rename_app_reset_message">Name reset to original</string>
 </resources>
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index e281e8c4dcd..087ea9bd199 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -99,6 +99,7 @@
 import static com.android.launcher3.popup.SystemShortcut.APP_INFO;
 import static com.android.launcher3.popup.SystemShortcut.INSTALL;
 import static com.android.launcher3.popup.SystemShortcut.REMOVE;
+import static com.android.launcher3.popup.SystemShortcut.RENAME_APP;
 import static com.android.launcher3.popup.SystemShortcut.UNINSTALL;
 import static com.android.launcher3.popup.SystemShortcut.WIDGETS;
 import static com.android.launcher3.states.RotationHelper.REQUEST_LOCK;
@@ -2988,18 +2989,19 @@ protected RectF getPopupTarget(float x, float y) {
     public Stream<SystemShortcut.Factory> getSupportedShortcuts(ItemInfo itemInfo) {
         int container = itemInfo.container;
         if (container == CONTAINER_DESKTOP || container == CONTAINER_HOTSEAT) {
-            return Stream.of(APP_INFO, WIDGETS, INSTALL, REMOVE, UNINSTALL);
+            return Stream.of(APP_INFO, RENAME_APP, WIDGETS, INSTALL, REMOVE, UNINSTALL);
         } else if (container == CONTAINER_ALL_APPS || container == CONTAINER_ALL_APPS_PREDICTION) {
             // TODO(b/444744861): Update private space apps to have its own container.
             boolean isPinnable = itemInfo instanceof ItemInfoWithIcon info
                     && (info.runtimeStatusFlags & FLAG_NOT_PINNABLE) == 0;
             if (isPinnable) {
-                return Stream.of(APP_INFO, WIDGETS, INSTALL, ADD_TO_HOME_SCREEN, UNINSTALL);
+                return Stream.of(APP_INFO, RENAME_APP, WIDGETS, INSTALL,
+                        ADD_TO_HOME_SCREEN, UNINSTALL);
             } else {
-                return Stream.of(APP_INFO, WIDGETS, INSTALL, UNINSTALL);
+                return Stream.of(APP_INFO, RENAME_APP, WIDGETS, INSTALL, UNINSTALL);
             }
         }
-        return Stream.of(APP_INFO, WIDGETS, INSTALL, UNINSTALL);
+        return Stream.of(APP_INFO, RENAME_APP, WIDGETS, INSTALL, UNINSTALL);
     }
 
     /**
diff --git a/src/com/android/launcher3/LauncherModel.kt b/src/com/android/launcher3/LauncherModel.kt
index 8f4bee5d258..b22b781c0ae 100644
--- a/src/com/android/launcher3/LauncherModel.kt
+++ b/src/com/android/launcher3/LauncherModel.kt
@@ -15,6 +15,7 @@
  */
 package com.android.launcher3
 
+import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ShortcutInfo
@@ -43,6 +44,7 @@ import com.android.launcher3.model.ModelTaskController
 import com.android.launcher3.model.ModelWriter
 import com.android.launcher3.model.data.WorkspaceItemInfo
 import com.android.launcher3.model.tasks.CacheDataUpdatedTask
+import com.android.launcher3.model.tasks.CustomAppNameChangedTask
 import com.android.launcher3.model.tasks.UserAvailabilityChangedTask
 import com.android.launcher3.model.tasks.UserLockStateChangedTask
 import com.android.launcher3.pm.UserCache
@@ -397,6 +399,11 @@ constructor(
         }
     }
 
+    /** Called when a user-defined app display name has changed. */
+    fun onCustomAppNameChanged(component: ComponentName, user: UserHandle) {
+        enqueueModelUpdateTask(CustomAppNameChangedTask(component, user))
+    }
+
     fun enqueueModelUpdateTask(task: ModelUpdateTask) {
         if (mModelDestroyed) {
             return
diff --git a/src/com/android/launcher3/data/AppDatabase.kt b/src/com/android/launcher3/data/AppDatabase.kt
index a9f26b7efef..6b1db1cab3f 100644
--- a/src/com/android/launcher3/data/AppDatabase.kt
+++ b/src/com/android/launcher3/data/AppDatabase.kt
@@ -12,7 +12,7 @@ import com.android.launcher3.util.override.MainThreadInitializedObject
 
 import kotlinx.coroutines.runBlocking
 
-@Database(entities = [Wallpaper::class], version = 1)
+@Database(entities = [Wallpaper::class], version = 1, exportSchema = false)
 abstract class AppDatabase : RoomDatabase() {
 
     abstract fun wallpaperDao(): WallpaperDao
diff --git a/src/com/android/launcher3/icons/IconCache.java b/src/com/android/launcher3/icons/IconCache.java
index f17f788d7db..cc5c1e7b517 100644
--- a/src/com/android/launcher3/icons/IconCache.java
+++ b/src/com/android/launcher3/icons/IconCache.java
@@ -71,6 +71,7 @@
 import com.android.launcher3.util.ApplicationInfoWrapper;
 import com.android.launcher3.util.CancellableTask;
 import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.util.CustomAppNameStore;
 import com.android.launcher3.util.DaggerSingletonTracker;
 import com.android.launcher3.util.FlagOp;
 import com.android.launcher3.util.InstantAppResolver;
@@ -105,6 +106,7 @@ public class IconCache extends BaseIconCache {
     private static final String TAG = "Launcher.IconCache";
 
     private final LauncherApps mLauncherApps;
+    private final Context mContext;
     private final UserCache mUserManager;
     private final InstallSessionHelper mInstallSessionHelper;
     private final InstantAppResolver mInstantAppResolver;
@@ -128,6 +130,7 @@ public IconCache(
             DaggerSingletonTracker lifecycle) {
         super(context, dbFileName, MODEL_EXECUTOR.getLooper(),
                 idp.fillResIconDpi, idp.iconBitmapSize, true /* inMemoryCache */, iconProvider);
+        mContext = context;
         mLauncherApps = context.getSystemService(LauncherApps.class);
         mUserManager = userCache;
         mInstallSessionHelper = installSessionHelper;
@@ -623,6 +626,10 @@ private synchronized BitmapInfo getBadgedIcon(@Nullable final BitmapInfo bitmap,
     protected void applyCacheEntry(@NonNull final CacheEntry entry,
             @NonNull final ItemInfoWithIcon info) {
         info.title = Utilities.trim(entry.title);
+        String customTitle = CustomAppNameStore.getCustomName(mContext, info);
+        if (customTitle != null) {
+            info.title = customTitle;
+        }
         info.contentDescription = entry.contentDescription;
         info.bitmap = entry.bitmap;
         // Clear any previously set appTitle, if the packageOverride is no longer valid
@@ -647,6 +654,10 @@ protected void applyCacheEntry(@NonNull final CacheEntry entry,
         }
         info.appTitle = Utilities.trim(info.title);
         info.title = Utilities.trim(packageEntry.title);
+        customTitle = CustomAppNameStore.getCustomName(mContext, info);
+        if (customTitle != null) {
+            info.title = customTitle;
+        }
         info.contentDescription = packageEntry.contentDescription;
         info.bitmap = packageEntry.bitmap;
     }
diff --git a/src/com/android/launcher3/model/AllAppsList.java b/src/com/android/launcher3/model/AllAppsList.java
index a6039c87375..864c10be1d9 100644
--- a/src/com/android/launcher3/model/AllAppsList.java
+++ b/src/com/android/launcher3/model/AllAppsList.java
@@ -45,6 +45,7 @@
 import com.android.launcher3.pm.PackageInstallInfo;
 import com.android.launcher3.pm.UserCache;
 import com.android.launcher3.util.ApiWrapper;
+import com.android.launcher3.util.CustomAppNameStore;
 import com.android.launcher3.util.FlagOp;
 import com.android.launcher3.util.PackageManagerHelper;
 
@@ -262,6 +263,24 @@ public void updateIconsAndLabels(HashSet<String> packages, UserHandle user) {
         }
     }
 
+    /** Updates the display title for a single app after a custom rename. */
+    public void updateCustomAppTitle(Context context, IconCache iconCache,
+            ComponentName component, UserHandle user) {
+        for (AppInfo info : data) {
+            if (!info.user.equals(user) || !component.equals(info.componentName)) {
+                continue;
+            }
+            String customTitle = CustomAppNameStore.getCustomName(context, info);
+            if (customTitle != null) {
+                info.title = customTitle;
+            } else {
+                iconCache.updateTitleAndIcon(info);
+            }
+            info.sectionName = mIndex.computeSectionName(info.title);
+            mDataChanged = true;
+        }
+    }
+
     /**
      * Add and remove icons for this package which has been updated.
      * @param outRemovedComponents any component removed as a result of this update will
diff --git a/src/com/android/launcher3/model/tasks/CustomAppNameChangedTask.kt b/src/com/android/launcher3/model/tasks/CustomAppNameChangedTask.kt
new file mode 100644
index 00000000000..2b2144bb27f
--- /dev/null
+++ b/src/com/android/launcher3/model/tasks/CustomAppNameChangedTask.kt
@@ -0,0 +1,83 @@
+/*
+ * SPDX-FileCopyrightText: crDroid Android Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.launcher3.model.tasks
+
+import android.content.ComponentName
+import android.content.Intent
+import android.content.pm.LauncherApps
+import android.os.UserHandle
+import com.android.launcher3.LauncherModel.ModelUpdateTask
+import com.android.launcher3.LauncherSettings
+import com.android.launcher3.icons.IconCache
+import com.android.launcher3.model.AllAppsList
+import com.android.launcher3.model.BgDataModel
+import com.android.launcher3.model.ModelTaskController
+import com.android.launcher3.model.data.ItemInfoWithIcon
+import com.android.launcher3.util.CustomAppNameStore
+
+/** Rebinds launcher items after a custom app display name is changed. */
+class CustomAppNameChangedTask(
+    private val component: ComponentName,
+    private val user: UserHandle,
+) : ModelUpdateTask {
+
+    override fun execute(
+        taskController: ModelTaskController,
+        dataModel: BgDataModel,
+        apps: AllAppsList,
+    ) {
+        val context = taskController.context
+        val iconCache = taskController.iconCache
+        val launcherApps = context.getSystemService(LauncherApps::class.java)
+        val launchIntent =
+            Intent(Intent.ACTION_MAIN).apply {
+                addCategory(Intent.CATEGORY_LAUNCHER)
+                component = this@CustomAppNameChangedTask.component
+            }
+        val activityInfo = launcherApps.resolveActivity(launchIntent, user)
+
+        synchronized(dataModel) {
+            val updatedWorkspaceItems =
+                dataModel.updateAndCollectWorkspaceItemInfos(
+                    user,
+                    { item ->
+                        if (
+                            item.itemType != LauncherSettings.Favorites.ITEM_TYPE_APPLICATION ||
+                                item.targetComponent != component
+                        ) {
+                            return@updateAndCollectWorkspaceItemInfos false
+                        }
+                        applyDisplayTitle(context, iconCache, activityInfo, item)
+                        true
+                    },
+                    null,
+                )
+
+            apps.updateCustomAppTitle(context, iconCache, component, user)
+
+            taskController.bindUpdatedWorkspaceItems(updatedWorkspaceItems)
+            taskController.bindApplicationsIfNeeded()
+        }
+    }
+
+    companion object {
+        private fun applyDisplayTitle(
+            context: android.content.Context,
+            iconCache: IconCache,
+            activityInfo: android.content.pm.LauncherActivityInfo?,
+            info: ItemInfoWithIcon,
+        ) {
+            val customTitle = CustomAppNameStore.getCustomName(context, info)
+            if (customTitle != null) {
+                info.title = customTitle
+                return
+            }
+            if (activityInfo != null) {
+                iconCache.getTitleAndIcon(info, activityInfo, info.matchingLookupFlag)
+            }
+        }
+    }
+}
diff --git a/src/com/android/launcher3/popup/SystemShortcut.java b/src/com/android/launcher3/popup/SystemShortcut.java
index 293b0fbc856..650a88db502 100644
--- a/src/com/android/launcher3/popup/SystemShortcut.java
+++ b/src/com/android/launcher3/popup/SystemShortcut.java
@@ -14,6 +14,7 @@
 import static com.android.launcher3.widget.picker.model.data.WidgetPickerDataUtils.findAllWidgetsForPackageUser;
 
 import android.app.ActivityManagerNative;
+import android.app.AlertDialog;
 import android.app.IActivityManager;
 import android.content.ComponentName;
 import android.content.Context;
@@ -27,10 +28,13 @@
 import android.os.Process;
 import android.os.RemoteException;
 import android.os.UserHandle;
+import android.text.InputFilter;
 import android.util.Log;
 import android.view.InflateException;
 import android.view.View;
 import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -44,6 +48,7 @@
 import com.android.launcher3.DropTargetHandler;
 import com.android.launcher3.Flags;
 import com.android.launcher3.Launcher;
+import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherPrefs;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
@@ -61,6 +66,7 @@
 import com.android.launcher3.util.ApiWrapper;
 import com.android.launcher3.util.ApplicationInfoWrapper;
 import com.android.launcher3.util.ComponentKey;
+import com.android.launcher3.util.CustomAppNameStore;
 import com.android.launcher3.util.InstantAppResolver;
 import com.android.launcher3.util.PackageManagerHelper;
 import com.android.launcher3.util.PackageUserKey;
@@ -734,4 +740,147 @@ public void onClick(View view) {
             }
         }
     }
+
+    public static final Factory<ActivityContext> RENAME_APP =
+            (activity, itemInfo, originalView) -> {
+                if (itemInfo.itemType == ITEM_TYPE_APPLICATION
+                        && itemInfo.getTargetComponent() != null) {
+                    return new RenameApp<>(activity, itemInfo, originalView);
+                }
+                return null;
+            };
+
+    public static class RenameApp<T extends ActivityContext> extends SystemShortcut<T> {
+        private static final int MAX_APP_NAME_LENGTH = 32;
+
+        public RenameApp(T target, ItemInfo itemInfo, @NonNull View originalView) {
+            super(getDrawableId(), R.string.rename_app_label, target,
+                    itemInfo, originalView);
+        }
+
+        public static int getDrawableId() {
+            return R.drawable.ic_edit;
+        }
+
+        @Override
+        public void onClick(View view) {
+            dismissTaskMenuView();
+
+            Context context = view.getContext();
+
+            AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setTitle(R.string.rename_app_title);
+
+            final EditText input = new EditText(context);
+            input.setText(mItemInfo.title);
+            input.setSelection(0, mItemInfo.title != null ? mItemInfo.title.length() : 0);
+            input.setFilters(new InputFilter[]{new InputFilter.LengthFilter(MAX_APP_NAME_LENGTH)});
+            input.setInputType(android.text.InputType.TYPE_CLASS_TEXT);
+
+            builder.setView(input);
+
+            builder.setPositiveButton(android.R.string.ok, (dialog, which) -> {
+                String newName = input.getText().toString().trim();
+                if (validateAndUpdateName(newName, context)) {
+                    Toast.makeText(context,
+                            R.string.app_renamed_successfully,
+                            Toast.LENGTH_SHORT).show();
+                } else if (newName.isEmpty()) {
+                    Toast.makeText(context,
+                            R.string.rename_app_empty_error,
+                            Toast.LENGTH_SHORT).show();
+                } else {
+                    Toast.makeText(context,
+                            context.getString(R.string.rename_app_length_error,
+                                    MAX_APP_NAME_LENGTH),
+                            Toast.LENGTH_SHORT).show();
+                }
+            });
+
+            builder.setNegativeButton(android.R.string.cancel, (dialog, which) -> dialog.cancel());
+
+            if (CustomAppNameStore.getCustomName((Context) mTarget, mItemInfo) != null) {
+                builder.setNeutralButton(R.string.rename_app_reset, (dialog2, which2) -> {
+                    resetToOriginalName(context);
+                    Toast.makeText(context,
+                            R.string.rename_app_reset_message,
+                            Toast.LENGTH_SHORT).show();
+                });
+            }
+
+            AlertDialog dialog = builder.create();
+            dialog.show();
+
+            input.requestFocus();
+            InputMethodManager imm = (InputMethodManager)
+                    context.getSystemService(Context.INPUT_METHOD_SERVICE);
+            if (imm != null) {
+                imm.showSoftInput(input, InputMethodManager.SHOW_IMPLICIT);
+            }
+        }
+
+        private boolean validateAndUpdateName(String newName, Context context) {
+            if (newName.isEmpty()) {
+                return false;
+            }
+
+            if (newName.length() > MAX_APP_NAME_LENGTH) {
+                return false;
+            }
+
+            mItemInfo.title = newName;
+
+            CustomAppNameStore.saveCustomName(context, mItemInfo, newName);
+            if (mItemInfo instanceof WorkspaceItemInfo) {
+                WorkspaceItemInfo wsInfo = (WorkspaceItemInfo) mItemInfo;
+                LauncherAppState.getInstance(context).getModel().getWriter(false, null, null)
+                        .updateItemInDatabase(wsInfo);
+            }
+
+            forceUiUpdate(context);
+
+            return true;
+        }
+
+        private void resetToOriginalName(Context context) {
+            CustomAppNameStore.saveCustomName(context, mItemInfo, null);
+            CharSequence systemTitle = getSystemTitle(context, mItemInfo);
+            if (systemTitle != null) {
+                mItemInfo.title = systemTitle;
+            }
+
+            if (mItemInfo instanceof WorkspaceItemInfo && systemTitle != null) {
+                WorkspaceItemInfo wsInfo = (WorkspaceItemInfo) mItemInfo;
+                LauncherAppState.getInstance(context).getModel().getWriter(false, null, null)
+                        .updateItemInDatabase(wsInfo);
+            }
+
+            forceUiUpdate(context);
+        }
+
+        @Nullable
+        private static CharSequence getSystemTitle(Context context, ItemInfo info) {
+            ComponentName cn = info.getTargetComponent();
+            if (cn == null) {
+                return null;
+            }
+            Intent intent = new Intent(Intent.ACTION_MAIN);
+            intent.addCategory(Intent.CATEGORY_LAUNCHER);
+            intent.setComponent(cn);
+            LauncherActivityInfo activityInfo = context.getSystemService(LauncherApps.class)
+                    .resolveActivity(intent, info.user);
+            if (activityInfo != null) {
+                return Utilities.trim(activityInfo.getLabel());
+            }
+            return null;
+        }
+
+        private void forceUiUpdate(Context context) {
+            ComponentName cn = mItemInfo.getTargetComponent();
+            if (cn != null) {
+                LauncherAppState.getInstance(context).getModel()
+                        .onCustomAppNameChanged(cn, mItemInfo.user);
+            }
+        }
+    }
 }
diff --git a/src/com/android/launcher3/util/CustomAppNameStore.java b/src/com/android/launcher3/util/CustomAppNameStore.java
new file mode 100644
index 00000000000..4635308c7f4
--- /dev/null
+++ b/src/com/android/launcher3/util/CustomAppNameStore.java
@@ -0,0 +1,55 @@
+/*
+ * SPDX-FileCopyrightText: crDroid Android Project
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.android.launcher3.util;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.SharedPreferences;
+
+import androidx.annotation.Nullable;
+
+import com.android.launcher3.model.data.ItemInfo;
+
+/** Persists user-defined app display names for launcher items. */
+public final class CustomAppNameStore {
+
+    private static final String CUSTOM_NAMES_PREFS = "custom_app_names";
+
+    private CustomAppNameStore() { }
+
+    @Nullable
+    public static String customNameKey(ItemInfo info) {
+        ComponentName cn = info.getTargetComponent();
+        if (cn == null) {
+            return null;
+        }
+        return cn.getPackageName() + "/" + cn.getClassName() + "/" + info.user.hashCode();
+    }
+
+    public static void saveCustomName(Context context, ItemInfo info, @Nullable String name) {
+        String key = customNameKey(info);
+        if (key == null) {
+            return;
+        }
+        SharedPreferences prefs = context.getSharedPreferences(CUSTOM_NAMES_PREFS,
+                Context.MODE_PRIVATE);
+        if (name == null) {
+            prefs.edit().remove(key).apply();
+        } else {
+            prefs.edit().putString(key, name).apply();
+        }
+    }
+
+    @Nullable
+    public static String getCustomName(Context context, ItemInfo info) {
+        String key = customNameKey(info);
+        if (key == null) {
+            return null;
+        }
+        return context.getSharedPreferences(CUSTOM_NAMES_PREFS, Context.MODE_PRIVATE)
+                .getString(key, null);
+    }
+}