diff --git a/icu4c/source/data/locales/fa.txt b/icu4c/source/data/locales/fa.txt
index 1b59457651..98578912c1 100644
--- a/icu4c/source/data/locales/fa.txt
+++ b/icu4c/source/data/locales/fa.txt
@@ -9,10 +9,6 @@
 
 fa {
     Version { "3.0" }
-    AmPmMarkers { 
-        "\u0642.\u0638.",
-        "\u0628.\u0638.",
-    }
     CollationElements {
         Version { "2.0" }
         Sequence { "[normalization on]"
@@ -24,109 +20,15 @@ fa {
            "&\u06cc<<\u0649<<\u06d2<<\u064a<<\u06d0<<\u06d1<<\u06cd<<\u06ce"
          }
     }
-    LocaleScript:array { 
-        "Arab"   // ISO 15924 Name 
+    AmPmMarkers { 
+        "\u0642.\u0638.",
+        "\u0628.\u0638.",
     }
-    DateTimePatterns { 
-        "HH:mm:ss (z)",
-        "HH:mm:ss (z)",
-        "HH:mm:ss",
-        "HH:mm",
-        "EEEE\u060c d MMMM yyyy",
-        "d MMMM yyyy",
-        "yyyy/MM/d",
-        "yyyy/MM/d",
-        "{1} {0}",
-    }
-    ExemplarCharacters{"[\u0621-\u0624\u0626-\u063a\u0641\u0642\u0644-\u0648\u064b-\u0652\u0654\u0670\u067e\u0686\u0698\u06a9\u06af\u06cc\u200c\u200d\u200f\u200e]"}
-    DayAbbreviations { 
-        "\u06cc.",
-        "\u062f.",
-        "\u0633.",
-        "\u0686.",
-        "\u067e.",
-        "\u062c.",
-        "\u0634.",
-    }
-    DayNames { 
-        "\u06cc\u06a9\u200c\u0634\u0646\u0628\u0647",
-        "\u062f\u0648\u0634\u0646\u0628\u0647",
-        "\u0633\u0647\u200c\u0634\u0646\u0628\u0647",
-        "\u0686\u0647\u0627\u0631\u0634\u0646\u0628\u0647",
-        "\u067e\u0646\u062c\u200c\u0634\u0646\u0628\u0647",
-        "\u062c\u0645\u0639\u0647",
-        "\u0634\u0646\u0628\u0647",
-    }
-    MonthAbbreviations { 
-        "\u0698\u0627\u0646",
-        "\u0641\u0648\u0631",
-        "\u0645\u0627\u0631",
-        "\u0622\u0648\u0631",
-        "\u0645\u0640\u0647",
-        "\u0698\u0648\u0646",
-        "\u0698\u0648\u06cc",
-        "\u0627\u0648\u062a",
-        "\u0633\u067e\u062a",
-        "\u0627\u06a9\u062a",
-        "\u0646\u0648\u0627",
-        "\u062f\u0633\u0627",
-    }
-    MonthNames { 
-        "\u0698\u0627\u0646\u0648\u06cc\u0647",
-        "\u0641\u0648\u0631\u06cc\u0647",
-        "\u0645\u0627\u0631\u0633",
-        "\u0622\u0648\u0631\u06cc\u0644",
-        "\u0645\u0647",
-        "\u0698\u0648\u0626\u0646",
-        "\u0698\u0648\u0626\u06cc\u0647",
-        "\u0627\u0648\u062a",
-        "\u0633\u067e\u062a\u0627\u0645\u0628\u0631",
-        "\u0627\u06a9\u062a\u0628\u0631",
-        "\u0646\u0648\u0627\u0645\u0628\u0631",
-        "\u062f\u0633\u0627\u0645\u0628\u0631",
-    }
-    Eras { 
-        "\u0642.\u0645.",
-        "\u0645.",
-    }
-    zoneStrings {
-        {
-            "Asia/Tehran",
-            "\u0648\u0642\u062a \u0627\u0633\u062a\u0627\u0646\u062f\u0627\u0631\u062f \u062a\u0647\u0631\u0627\u0646",
-            "IRST",
-            "\u0648\u0642\u062a \u062a\u0627\u0628\u0633\u062a\u0627\u0646\u06cc \u062a\u0647\u0631\u0627\u0646",
-            "IRDT",
-            "\u062a\u0647\u0631\u0627\u0646",
-        }
-    }
-    SpelloutRules {
-        "%main:\n"
-        "    -x: \u0645\u0646\u0641\u06cc >>;\n"
-        "    x.x: << \u0645\u0645\u06cc\u0632 >>;\n"
-        "    \u0635\u0641\u0631; \u06cc\u06a9; \u062f\u0648; \u0633\u0647; \u0686\u0647\u0627\u0631; \u067e\u0646\u062c; \u0634\u0634; \u0647\u0641\u062a; \u0647\u0634\u062a; \u0646\u0647;\n"
-        "    \u062f\u0647; \u06cc\u0627\u0632\u062f\u0647; \u062f\u0648\u0627\u0632\u062f\u0647; \u0633\u06cc\u0632\u062f\u0647; \u0686\u0647\u0627\u0631\u062f\u0647; \u067e\u0627\u0646\u0632\u062f\u0647; \u0634\u0627\u0646\u0632\u062f\u0647;\n"
-        "        \u0647\u0641\u062f\u0647; \u0647\u062c\u062f\u0647; \u0646\u0648\u0632\u062f\u0647;\n"
-        "    20: \u0628\u06cc\u0633\u062a[ \u0648 >>];\n"
-        "    30: \u0633\u06cc[ \u0648 >>];\n"
-        "    40: \u0686\u0647\u0644[ \u0648 >>];\n"
-        "    50: \u067e\u0646\u062c\u0627\u0647[ \u0648 >>];\n"
-        "    60: \u0634\u0635\u062a[ \u0648 >>];\n"
-        "    70: \u0647\u0641\u062a\u0627\u062f[ \u0648 >>];\n"
-        "    80: \u0647\u0634\u062a\u0627\u062f[ \u0648 >>];\n"
-        "    90: \u0646\u0648\u062f[ \u0648 >>];\n"
-        "    100: \u0635\u062f[ \u0648 >>];\n"
-        "    200: \u062f\u0648\u06cc\u0633\u062a[ \u0648 >>];\n"
-        "    300: \u0633\u06cc\u0635\u062f[ \u0648 >>];\n"
-        "    400: \u0686\u0647\u0627\u0631\u0635\u062f[ \u0648 >>];\n"
-        "    500: \u067e\u0627\u0646\u0635\u062f[ \u0648 >>];\n"
-        "    600: \u0634\u0634\u0635\u062f[ \u0648 >>];\n"
-        "    700: \u0647\u0641\u062a\u0635\u062f[ \u0648 >>];\n"
-        "    800: \u0647\u0634\u062a\u0635\u062f[ \u0648 >>];\n"
-        "    900: \u0646\u0647\u0635\u062f[ \u0648 >>];\n"
-        "    1000: << \u0647\u0632\u0627\u0631[ \u0648 >>];\n"
-        "    1,000,000: << \u0645\u06cc\u0644\u06cc\u0648\u0646[ \u0648 >>];\n"
-        "    1,000,000,000: << \u0645\u06cc\u0644\u06cc\u0627\u0631\u062f[ \u0648 >>];\n"
-        "    1,000,000,000,000: =#,##0=;\n"
+    // Currency display names
+    Currencies {
+        // The Afghani symbol doesn't exist in Unicode. So we use the long name
+        AFA { "\u0627\u0641\u063a\u0627\u0646\u06cc", "\u0627\u0641\u063a\u0627\u0646\u06cc" }
+        IRR { "\uFDFC", "IRR" }
     }
 
     Countries {
@@ -395,6 +297,40 @@ fa {
         ZM { "\u0632\u0627\u0645\u0628\u06cc\u0627" }
         ZW { "\u0632\u06cc\u0645\u0628\u0627\u0628\u0648\u0647" }
     }
+    DateTimePatterns { 
+        "HH:mm:ss (z)",
+        "HH:mm:ss (z)",
+        "HH:mm:ss",
+        "HH:mm",
+        "EEEE\u060c d MMMM yyyy",
+        "d MMMM yyyy",
+        "yyyy/MM/d",
+        "yyyy/MM/d",
+        "{1} {0}",
+    }
+    DayAbbreviations { 
+        "\u06cc.",
+        "\u062f.",
+        "\u0633.",
+        "\u0686.",
+        "\u067e.",
+        "\u062c.",
+        "\u0634.",
+    }
+    DayNames { 
+        "\u06cc\u06a9\u200c\u0634\u0646\u0628\u0647",
+        "\u062f\u0648\u0634\u0646\u0628\u0647",
+        "\u0633\u0647\u200c\u0634\u0646\u0628\u0647",
+        "\u0686\u0647\u0627\u0631\u0634\u0646\u0628\u0647",
+        "\u067e\u0646\u062c\u200c\u0634\u0646\u0628\u0647",
+        "\u062c\u0645\u0639\u0647",
+        "\u0634\u0646\u0628\u0647",
+    }
+    Eras { 
+        "\u0642.\u0645.",
+        "\u0645.",
+    }
+    ExemplarCharacters {"[\u0621-\u0624\u0626-\u063a\u0641\u0642\u0644-\u0648\u064b-\u0652\u0654\u0670\u067e\u0686\u0698\u06a9\u06af\u06cc\u200c\u200d\u200f\u200e]"}
     Languages {
         root  { "\u0631\u06cc\u0634\u0647" }
         aa  { "\u0622\u0641\u0627\u0631\u06cc" }
@@ -669,6 +605,37 @@ fa {
         zh  { "\u0686\u06cc\u0646\u06cc" }
         zu  { "\u0632\u0648\u0644\u0648\u06cc\u06cc" }
     }
+    LocaleScript:array { 
+        "Arab"   // ISO 15924 Name 
+    }
+    MonthAbbreviations { 
+        "\u0698\u0627\u0646",
+        "\u0641\u0648\u0631",
+        "\u0645\u0627\u0631",
+        "\u0622\u0648\u0631",
+        "\u0645\u0640\u0647",
+        "\u0698\u0648\u0646",
+        "\u0698\u0648\u06cc",
+        "\u0627\u0648\u062a",
+        "\u0633\u067e\u062a",
+        "\u0627\u06a9\u062a",
+        "\u0646\u0648\u0627",
+        "\u062f\u0633\u0627",
+    }
+    MonthNames { 
+        "\u0698\u0627\u0646\u0648\u06cc\u0647",
+        "\u0641\u0648\u0631\u06cc\u0647",
+        "\u0645\u0627\u0631\u0633",
+        "\u0622\u0648\u0631\u06cc\u0644",
+        "\u0645\u0647",
+        "\u0698\u0648\u0626\u0646",
+        "\u0698\u0648\u0626\u06cc\u0647",
+        "\u0627\u0648\u062a",
+        "\u0633\u067e\u062a\u0627\u0645\u0628\u0631",
+        "\u0627\u06a9\u062a\u0628\u0631",
+        "\u0646\u0648\u0627\u0645\u0628\u0631",
+        "\u062f\u0633\u0627\u0645\u0628\u0631",
+    }
     Scripts { 
         ARAB { "\u0639\u0631\u0628\u06cc" }
         ARMN { "\u0627\u0631\u0645\u0646\u06cc" }
@@ -714,8 +681,43 @@ fa {
         ZYYY { "\u0645\u0634\u062a\u0631\u06a9" }
     }
 
-    // Currency display names
-    Currencies {
-        IRR { "\uFDFC", "IRR" }
+    SpelloutRules {
+        "%main:\n"
+        "    -x: \u0645\u0646\u0641\u06cc >>;\n"
+        "    x.x: << \u0645\u0645\u06cc\u0632 >>;\n"
+        "    \u0635\u0641\u0631; \u06cc\u06a9; \u062f\u0648; \u0633\u0647; \u0686\u0647\u0627\u0631; \u067e\u0646\u062c; \u0634\u0634; \u0647\u0641\u062a; \u0647\u0634\u062a; \u0646\u0647;\n"
+        "    \u062f\u0647; \u06cc\u0627\u0632\u062f\u0647; \u062f\u0648\u0627\u0632\u062f\u0647; \u0633\u06cc\u0632\u062f\u0647; \u0686\u0647\u0627\u0631\u062f\u0647; \u067e\u0627\u0646\u0632\u062f\u0647; \u0634\u0627\u0646\u0632\u062f\u0647;\n"
+        "        \u0647\u0641\u062f\u0647; \u0647\u062c\u062f\u0647; \u0646\u0648\u0632\u062f\u0647;\n"
+        "    20: \u0628\u06cc\u0633\u062a[ \u0648 >>];\n"
+        "    30: \u0633\u06cc[ \u0648 >>];\n"
+        "    40: \u0686\u0647\u0644[ \u0648 >>];\n"
+        "    50: \u067e\u0646\u062c\u0627\u0647[ \u0648 >>];\n"
+        "    60: \u0634\u0635\u062a[ \u0648 >>];\n"
+        "    70: \u0647\u0641\u062a\u0627\u062f[ \u0648 >>];\n"
+        "    80: \u0647\u0634\u062a\u0627\u062f[ \u0648 >>];\n"
+        "    90: \u0646\u0648\u062f[ \u0648 >>];\n"
+        "    100: \u0635\u062f[ \u0648 >>];\n"
+        "    200: \u062f\u0648\u06cc\u0633\u062a[ \u0648 >>];\n"
+        "    300: \u0633\u06cc\u0635\u062f[ \u0648 >>];\n"
+        "    400: \u0686\u0647\u0627\u0631\u0635\u062f[ \u0648 >>];\n"
+        "    500: \u067e\u0627\u0646\u0635\u062f[ \u0648 >>];\n"
+        "    600: \u0634\u0634\u0635\u062f[ \u0648 >>];\n"
+        "    700: \u0647\u0641\u062a\u0635\u062f[ \u0648 >>];\n"
+        "    800: \u0647\u0634\u062a\u0635\u062f[ \u0648 >>];\n"
+        "    900: \u0646\u0647\u0635\u062f[ \u0648 >>];\n"
+        "    1000: << \u0647\u0632\u0627\u0631[ \u0648 >>];\n"
+        "    1,000,000: << \u0645\u06cc\u0644\u06cc\u0648\u0646[ \u0648 >>];\n"
+        "    1,000,000,000: << \u0645\u06cc\u0644\u06cc\u0627\u0631\u062f[ \u0648 >>];\n"
+        "    1,000,000,000,000: =#,##0=;\n"
+    }
+    zoneStrings {
+        {
+            "Asia/Tehran",
+            "\u0648\u0642\u062a \u0627\u0633\u062a\u0627\u0646\u062f\u0627\u0631\u062f \u062a\u0647\u0631\u0627\u0646",
+            "IRST",
+            "\u0648\u0642\u062a \u062a\u0627\u0628\u0633\u062a\u0627\u0646\u06cc \u062a\u0647\u0631\u0627\u0646",
+            "IRDT",
+            "\u062a\u0647\u0631\u0627\u0646",
+        }
     }
 }