diff --git a/core/jni/android/graphics/TextLayoutCache.cpp b/core/jni/android/graphics/TextLayoutCache.cpp
index 2bd36c30409a1..2c388935148fe 100644
--- a/core/jni/android/graphics/TextLayoutCache.cpp
+++ b/core/jni/android/graphics/TextLayoutCache.cpp
@@ -30,7 +30,7 @@ extern "C" {
 namespace android {
 
 //--------------------------------------------------------------------------------------------------
-#define TYPEFACE_ARABIC "/system/fonts/DroidNaskh-Regular-Shift.ttf"
+#define TYPEFACE_ARABIC "/system/fonts/DroidNaskh-Regular-SystemUI.ttf"
 #define TYPE_FACE_HEBREW_REGULAR "/system/fonts/DroidSansHebrew-Regular.ttf"
 #define TYPE_FACE_HEBREW_BOLD "/system/fonts/DroidSansHebrew-Bold.ttf"
 #define TYPEFACE_BENGALI "/system/fonts/Lohit-Bengali.ttf"
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk
index 85a77d6e6f3d5..8ad15b6bc01ca 100644
--- a/data/fonts/Android.mk
+++ b/data/fonts/Android.mk
@@ -125,7 +125,7 @@ font_src_files := \
     Roboto-Italic.ttf \
     Roboto-BoldItalic.ttf \
     DroidNaskh-Regular.ttf \
-    DroidNaskh-Regular-Shift.ttf \
+    DroidNaskh-Regular-SystemUI.ttf \
     DroidSansHebrew-Regular.ttf \
     DroidSansHebrew-Bold.ttf \
     DroidSansThai.ttf \
diff --git a/data/fonts/DroidNaskh-Regular-Shift.ttf b/data/fonts/DroidNaskh-Regular-Shift.ttf
deleted file mode 100644
index de475ca6afb7b..0000000000000
Binary files a/data/fonts/DroidNaskh-Regular-Shift.ttf and /dev/null differ
diff --git a/data/fonts/DroidNaskh-Regular-SystemUI.ttf b/data/fonts/DroidNaskh-Regular-SystemUI.ttf
new file mode 100755
index 0000000000000..5818b4969efd5
Binary files /dev/null and b/data/fonts/DroidNaskh-Regular-SystemUI.ttf differ
diff --git a/data/fonts/fallback_fonts-ja.xml b/data/fonts/fallback_fonts-ja.xml
index db998d3317127..a182e31894c87 100644
--- a/data/fonts/fallback_fonts-ja.xml
+++ b/data/fonts/fallback_fonts-ja.xml
@@ -34,7 +34,7 @@
 <familyset>
     <family>
         <fileset>
-            <file>DroidNaskh-Regular-Shift.ttf</file>
+            <file>DroidNaskh-Regular-SystemUI.ttf</file>
         </fileset>
     </family>
     <family>
diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml
index a4b5212aea48e..69d223e3de3d6 100644
--- a/data/fonts/fallback_fonts.xml
+++ b/data/fonts/fallback_fonts.xml
@@ -34,7 +34,7 @@
 <familyset>
     <family>
         <fileset>
-            <file>DroidNaskh-Regular-Shift.ttf</file>
+            <file>DroidNaskh-Regular-SystemUI.ttf</file>
         </fileset>
     </family>
     <family>
diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk
index 702b06967f5bc..0eec616df0ed7 100644
--- a/data/fonts/fonts.mk
+++ b/data/fonts/fonts.mk
@@ -25,7 +25,7 @@ PRODUCT_PACKAGES := \
     Roboto-Italic.ttf \
     Roboto-BoldItalic.ttf \
     DroidNaskh-Regular.ttf \
-    DroidNaskh-Regular-Shift.ttf \
+    DroidNaskh-Regular-SystemUI.ttf \
     DroidSansHebrew-Regular.ttf \
     DroidSansHebrew-Bold.ttf \
     DroidSansThai.ttf \