diff --git a/includes/commerce.currency.inc b/includes/commerce.currency.inc
index 7e0973b..c7a0ab6 100644
--- a/includes/commerce.currency.inc
+++ b/includes/commerce.currency.inc
@@ -19,6 +19,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
+      'numeric_code' => '971',
       'minor_unit' => t('Pul'),
       'major_unit' => t('Afghani'),
     ),
@@ -28,7 +29,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Netherlands Antillean Guilder'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 532,
+      'numeric_code' => '532',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Guilder'),
     ),
@@ -38,7 +39,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Angolan Kwanza'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 973,
+      'numeric_code' => '973',
       'minor_unit' => t('Cêntimo'),
       'major_unit' => t('Kwanza'),
     ),
@@ -77,17 +78,17 @@ function commerce_commerce_currency_info() {
       'name' => t('Aruban Florin'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 533,
+      'numeric_code' => '533',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Guilder'),
     ),
     'AZN' => array(
       'code' => 'AZN',
       'symbol' => 'man.',
-      'name' => t('Azerbaijani Manat'),
+      'name' => t('Azerbaijanian Manat'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'minor_unit' => t('Q?pi'),
+      'minor_unit' => t('Qəpik'),
       'major_unit' => t('New Manat'),
     ),
     'BAM' => array(
@@ -96,7 +97,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Bosnia-Herzegovina Convertible Mark'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 977,
+      'numeric_code' => '977',
       'minor_unit' => t('Fening'),
       'major_unit' => t('Convertible Marka'),
     ),
@@ -138,7 +139,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 108,
+      'numeric_code' => '108',
       'minor_unit' => t('Centime'),
       'major_unit' => t('Franc'),
     ),
@@ -178,7 +179,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Brazilian Real'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 986,
+      'numeric_code' => '986',
       'minor_unit' => t('Centavo'),
       'major_unit' => t('Reais'),
     ),
@@ -228,7 +229,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Canadian Dollar'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 124,
+      'numeric_code' => '124',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Dollar'),
     ),
@@ -238,7 +239,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Congolese Franc'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 976,
+      'numeric_code' => '976',
       'minor_unit' => t('Centime'),
       'major_unit' => t('Franc'),
     ),
@@ -249,7 +250,7 @@ function commerce_commerce_currency_info() {
       'rounding_step' => '0.05',
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 756,
+      'numeric_code' => '756',
       'minor_unit' => t('Rappen'),
       'major_unit' => t('Franc'),
     ),
@@ -269,7 +270,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 152,
+      'numeric_code' => '152',
       'minor_unit' => t('Centavo'),
       'major_unit' => t('Peso'),
     ),
@@ -279,7 +280,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Chinese Yuan Renminbi'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 156,
+      'numeric_code' => '156',
       'minor_unit' => t('Fe'),
       'major_unit' => t('Yuan Renminbi'),
     ),
@@ -290,7 +291,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 170,
+      'numeric_code' => '170',
       'minor_unit' => t('Centavo'),
       'major_unit' => t('Peso'),
     ),
@@ -301,7 +302,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 188,
+      'numeric_code' => '188',
       'minor_unit' => t('Céntimo'),
       'major_unit' => t('Colón'),
     ),
@@ -320,7 +321,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Cuban Peso'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 192,
+      'numeric_code' => '192',
       'minor_unit' => t('Centavo'),
       'major_unit' => t('Peso'),
     ),
@@ -330,7 +331,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Cape Verdean Escudo'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 132,
+      'numeric_code' => '132',
       'minor_unit' => t('Centavo'),
       'major_unit' => t('Escudo'),
     ),
@@ -340,7 +341,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Czech Republic Koruna'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 203,
+      'numeric_code' => '203',
       'minor_unit' => t('Halér'),
       'major_unit' => t('Koruny'),
     ),
@@ -351,7 +352,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 262,
+      'numeric_code' => '262',
       'minor_unit' => t('Centime'),
       'major_unit' => t('Franc'),
     ),
@@ -361,7 +362,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Danish Krone'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 208,
+      'numeric_code' => '208',
       'minor_unit' => t('Øre'),
       'major_unit' => t('Kroner'),
     ),
@@ -371,7 +372,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Dominican Peso'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 214,
+      'numeric_code' => '214',
       'minor_unit' => t('Centavo'),
       'major_unit' => t('Peso'),
     ),
@@ -391,7 +392,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Estonian Kroon'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 233,
+      'numeric_code' => '233',
       'minor_unit' => t('Sent'),
       'major_unit' => t('Krooni'),
     ),
@@ -401,7 +402,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Egyptian Pound'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 818,
+      'numeric_code' => '818',
       'minor_unit' => t('Piastr'),
       'major_unit' => t('Pound'),
     ),
@@ -411,7 +412,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Eritrean Nakfa'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 232,
+      'numeric_code' => '232',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Nakfa'),
     ),
@@ -421,7 +422,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Ethiopian Birr'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 230,
+      'numeric_code' => '230',
       'minor_unit' => t('Santim'),
       'major_unit' => t('Birr'),
     ),
@@ -432,7 +433,7 @@ function commerce_commerce_currency_info() {
       'thousands_separator' => ' ',
       'decimal_separator' => ',',
       'symbol_placement' => 'after',
-      'numeric_code' => 978,
+      'numeric_code' => '978',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Euro'),
     ),
@@ -442,7 +443,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Fijian Dollar'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 242,
+      'numeric_code' => '242',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Dollar'),
     ),
@@ -452,7 +453,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Falkland Islands Pound'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 238,
+      'numeric_code' => '238',
       'minor_unit' => t('Penny'),
       'major_unit' => t('Pound'),
     ),
@@ -461,13 +462,13 @@ function commerce_commerce_currency_info() {
       'symbol' => '£',
       'name' => t('British Pound Sterling'),
       'symbol_placement' => 'before',
-      'numeric_code' => 826,
+      'numeric_code' => '826',
       'minor_unit' => t('Penny'),
       'major_unit' => t('Pound'),
     ),
     'GHS' => array(
       'code' => 'GHS',
-      'symbol' => 'GH?',
+      'symbol' => 'GH₵',
       'name' => t('Ghanaian Cedi'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
@@ -480,7 +481,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Gibraltar Pound'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 292,
+      'numeric_code' => '292',
       'minor_unit' => t('Penny'),
       'major_unit' => t('Pound'),
     ),
@@ -490,7 +491,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Gambian Dalasi'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 270,
+      'numeric_code' => '270',
       'minor_unit' => t('Butut'),
       'major_unit' => t('Dalasis'),
     ),
@@ -501,7 +502,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 324,
+      'numeric_code' => '324',
       'minor_unit' => t('Centime'),
       'major_unit' => t('Franc'),
     ),
@@ -511,7 +512,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Guatemalan Quetzal'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 320,
+      'numeric_code' => '320',
       'minor_unit' => t('Centavo'),
       'major_unit' => t('Quetzales'),
     ),
@@ -522,7 +523,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 328,
+      'numeric_code' => '328',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Dollar'),
     ),
@@ -532,7 +533,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Hong Kong Dollar'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 344,
+      'numeric_code' => '344',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Dollar'),
     ),
@@ -542,7 +543,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Honduran Lempira'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 340,
+      'numeric_code' => '340',
       'minor_unit' => t('Centavo'),
       'major_unit' => t('Lempiras'),
     ),
@@ -552,7 +553,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Croatian Kuna'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 191,
+      'numeric_code' => '191',
       'minor_unit' => t('Lipa'),
       'major_unit' => t('Kuna'),
     ),
@@ -562,7 +563,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Haitian Gourde'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 332,
+      'numeric_code' => '332',
       'minor_unit' => t('Centime'),
       'major_unit' => t('Gourde'),
     ),
@@ -573,7 +574,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 348,
+      'numeric_code' => '348',
       'minor_unit' => t('Fillér'),
       'major_unit' => t('Forint'),
     ),
@@ -584,17 +585,17 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 360,
+      'numeric_code' => '360',
       'minor_unit' => t('Sen'),
       'major_unit' => t('Rupiahs'),
     ),
     'ILS' => array(
       'code' => 'ILS',
-      'symbol' => '?',
+      'symbol' => '₪',
       'name' => t('Israeli New Sheqel'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 376,
+      'numeric_code' => '376',
       'minor_unit' => t('Agora'),
       'major_unit' => t('New Shekels'),
     ),
@@ -604,7 +605,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Indian Rupee'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 356,
+      'numeric_code' => '356',
       'minor_unit' => t('Paisa'),
       'major_unit' => t('Rupee'),
     ),
@@ -615,7 +616,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 352,
+      'numeric_code' => '352',
       'minor_unit' => t('Eyrir'),
       'major_unit' => t('Kronur'),
     ),
@@ -625,7 +626,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Jamaican Dollar'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 388,
+      'numeric_code' => '388',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Dollar'),
     ),
@@ -636,7 +637,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 3,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 400,
+      'numeric_code' => '400',
       'minor_unit' => t('Piastr'),
       'major_unit' => t('Dinar'),
     ),
@@ -647,7 +648,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 392,
+      'numeric_code' => '392',
       'minor_unit' => t('Sen'),
       'major_unit' => t('Yen'),
     ),
@@ -657,7 +658,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Kenyan Shilling'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 404,
+      'numeric_code' => '404',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Shilling'),
     ),
@@ -668,18 +669,18 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 174,
+      'numeric_code' => '174',
       'minor_unit' => t('Centime'),
       'major_unit' => t('Franc'),
     ),
     'KRW' => array(
       'code' => 'KRW',
-      'symbol' => '?',
+      'symbol' => '₩',
       'name' => t('South Korean Won'),
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 410,
+      'numeric_code' => '410',
       'minor_unit' => t('Jeon'),
       'major_unit' => t('Won'),
     ),
@@ -690,7 +691,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 3,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 414,
+      'numeric_code' => '414',
       'minor_unit' => t('Fils'),
       'major_unit' => t('Dinar'),
     ),
@@ -700,18 +701,18 @@ function commerce_commerce_currency_info() {
       'name' => t('Cayman Islands Dollar'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 136,
+      'numeric_code' => '136',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Dollar'),
     ),
     'LAK' => array(
       'code' => 'LAK',
-      'symbol' => '?',
+      'symbol' => '₭N',
       'name' => t('Laotian Kip'),
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 418,
+      'numeric_code' => '418',
       'minor_unit' => t('Att'),
       'major_unit' => t('Kips'),
     ),
@@ -722,7 +723,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 422,
+      'numeric_code' => '422',
       'minor_unit' => t('Piastre'),
       'major_unit' => t('Pound'),
     ),
@@ -732,7 +733,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Sri Lanka Rupee'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 144,
+      'numeric_code' => '144',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Rupee'),
     ),
@@ -742,7 +743,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Liberian Dollar'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 430,
+      'numeric_code' => '430',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Dollar'),
     ),
@@ -752,7 +753,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Lesotho Loti'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 426,
+      'numeric_code' => '426',
       'minor_unit' => t('Sente'),
       'major_unit' => t('Loti'),
     ),
@@ -762,7 +763,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Lithuanian Litas'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 440,
+      'numeric_code' => '440',
       'minor_unit' => t('Centas'),
       'major_unit' => t('Litai'),
     ),
@@ -772,7 +773,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Latvian Lats'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 428,
+      'numeric_code' => '428',
       'minor_unit' => t('Santims'),
       'major_unit' => t('Lati'),
     ),
@@ -783,7 +784,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 3,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 434,
+      'numeric_code' => '434',
       'minor_unit' => t('Dirham'),
       'major_unit' => t('Dinar'),
     ),
@@ -794,18 +795,18 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 104,
+      'numeric_code' => '104',
       'minor_unit' => t('Pya'),
       'major_unit' => t('Kyat'),
     ),
     'MNT' => array(
       'code' => 'MNT',
-      'symbol' => '?',
+      'symbol' => '₮',
       'name' => t('Mongolian Tugrik'),
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 496,
+      'numeric_code' => '496',
       'minor_unit' => t('Möngö'),
       'major_unit' => t('Tugriks'),
     ),
@@ -815,7 +816,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Macanese Pataca'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 446,
+      'numeric_code' => '446',
       'minor_unit' => t('Avo'),
       'major_unit' => t('Pataca'),
     ),
@@ -826,7 +827,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 478,
+      'numeric_code' => '478',
       'minor_unit' => t('Khoums'),
       'major_unit' => t('Ouguiya'),
     ),
@@ -846,7 +847,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 480,
+      'numeric_code' => '480',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Rupee'),
     ),
@@ -865,7 +866,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Malaysian Ringgit'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 458,
+      'numeric_code' => '458',
       'minor_unit' => t('Sen'),
       'major_unit' => t('Ringgits'),
     ),
@@ -884,17 +885,17 @@ function commerce_commerce_currency_info() {
       'name' => t('Namibian Dollar'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 516,
+      'numeric_code' => '516',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Dollar'),
     ),
     'NGN' => array(
       'code' => 'NGN',
-      'symbol' => '?',
+      'symbol' => '₦',
       'name' => t('Nigerian Naira'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 566,
+      'numeric_code' => '566',
       'minor_unit' => t('Kobo'),
       'major_unit' => t('Naira'),
     ),
@@ -904,7 +905,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Nicaraguan Cordoba Oro'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 558,
+      'numeric_code' => '558',
       'minor_unit' => t('Centavo'),
       'major_unit' => t('Cordoba'),
     ),
@@ -914,7 +915,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Norwegian Krone'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 578,
+      'numeric_code' => '578',
       'minor_unit' => t('Øre'),
       'major_unit' => t('Krone'),
     ),
@@ -924,7 +925,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Nepalese Rupee'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 524,
+      'numeric_code' => '524',
       'minor_unit' => t('Paisa'),
       'major_unit' => t('Rupee'),
     ),
@@ -934,7 +935,7 @@ function commerce_commerce_currency_info() {
       'name' => t('New Zealand Dollar'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 554,
+      'numeric_code' => '554',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Dollar'),
     ),
@@ -944,7 +945,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Panamanian Balboa'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 590,
+      'numeric_code' => '590',
       'minor_unit' => t('Centésimo'),
       'major_unit' => t('Balboa'),
     ),
@@ -963,7 +964,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Peruvian Nuevo Sol'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 604,
+      'numeric_code' => '604',
       'minor_unit' => t('Céntimo'),
       'major_unit' => t('Nuevos Sole'),
     ),
@@ -973,17 +974,17 @@ function commerce_commerce_currency_info() {
       'name' => t('Papua New Guinean Kina'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 598,
+      'numeric_code' => '598',
       'minor_unit' => t('Toea'),
       'major_unit' => t('Kina '),
     ),
     'PHP' => array(
       'code' => 'PHP',
-      'symbol' => '?',
+      'symbol' => '₱',
       'name' => t('Philippine Peso'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 608,
+      'numeric_code' => '608',
       'minor_unit' => t('Centavo'),
       'major_unit' => t('Peso'),
     ),
@@ -994,7 +995,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 586,
+      'numeric_code' => '586',
       'minor_unit' => t('Paisa'),
       'major_unit' => t('Rupee'),
     ),
@@ -1004,18 +1005,18 @@ function commerce_commerce_currency_info() {
       'name' => t('Polish Zloty'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 985,
+      'numeric_code' => '985',
       'minor_unit' => t('Grosz'),
       'major_unit' => t('Zlotych'),
     ),
     'PYG' => array(
       'code' => 'PYG',
-      'symbol' => '?',
+      'symbol' => '₲',
       'name' => t('Paraguayan Guarani'),
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 600,
+      'numeric_code' => '600',
       'minor_unit' => t('Céntimo'),
       'major_unit' => t('Guarani'),
     ),
@@ -1025,7 +1026,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Qatari Rial'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 634,
+      'numeric_code' => '634',
       'minor_unit' => t('Dirham'),
       'major_unit' => t('Rial'),
     ),
@@ -1063,7 +1064,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Saudi Riyal'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 682,
+      'numeric_code' => '682',
       'minor_unit' => t('Hallallah'),
       'major_unit' => t('Riyals'),
     ),
@@ -1083,7 +1084,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Seychellois Rupee'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 690,
+      'numeric_code' => '690',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Rupee'),
     ),
@@ -1093,7 +1094,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Old Sudanese Dinar'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 736,
+      'numeric_code' => '736',
       'minor_unit' => t('None'),
       'major_unit' => t('Dinar'),
     ),
@@ -1103,7 +1104,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Swedish Krona'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 752,
+      'numeric_code' => '752',
       'minor_unit' => t('Öre'),
       'major_unit' => t('Kronor'),
     ),
@@ -1113,7 +1114,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Singapore Dollar'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 702,
+      'numeric_code' => '702',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Dollar'),
     ),
@@ -1123,7 +1124,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Saint Helena Pound'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 654,
+      'numeric_code' => '654',
       'minor_unit' => t('Penny'),
       'major_unit' => t('Pound'),
     ),
@@ -1134,7 +1135,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 694,
+      'numeric_code' => '694',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Leone'),
     ),
@@ -1145,7 +1146,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 706,
+      'numeric_code' => '706',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Shilling'),
     ),
@@ -1164,7 +1165,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Suriname Guilder'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 740,
+      'numeric_code' => '740',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Guilder'),
     ),
@@ -1175,7 +1176,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 678,
+      'numeric_code' => '678',
       'minor_unit' => t('Cêntimo'),
       'major_unit' => t('Dobra'),
     ),
@@ -1186,7 +1187,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 760,
+      'numeric_code' => '760',
       'minor_unit' => t('Piastre'),
       'major_unit' => t('Pound'),
     ),
@@ -1196,17 +1197,17 @@ function commerce_commerce_currency_info() {
       'name' => t('Swazi Lilangeni'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 748,
+      'numeric_code' => '748',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Lilangeni'),
     ),
     'THB' => array(
       'code' => 'THB',
-      'symbol' => '?',
+      'symbol' => '฿',
       'name' => t('Thai Baht'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 764,
+      'numeric_code' => '764',
       'minor_unit' => t('Satang'),
       'major_unit' => t('Baht'),
     ),
@@ -1217,19 +1218,19 @@ function commerce_commerce_currency_info() {
       'decimals' => 3,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 788,
+      'numeric_code' => '788',
       'minor_unit' => t('Millime'),
       'major_unit' => t('Dinar'),
     ),
     'TOP' => array(
       'code' => 'TOP',
       'symbol' => 'T$',
-      'name' => t('Tongan Pa?anga'),
+      'name' => t('Tongan Paʻanga'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 776,
+      'numeric_code' => '776',
       'minor_unit' => t('Senit'),
-      'major_unit' => t('Pa?anga'),
+      'major_unit' => t('Paʻanga'),
     ),
     'TRY' => array(
       'code' => 'TRY',
@@ -1246,7 +1247,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Trinidad and Tobago Dollar'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 780,
+      'numeric_code' => '780',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Dollar'),
     ),
@@ -1256,7 +1257,7 @@ function commerce_commerce_currency_info() {
       'name' => t('New Taiwan Dollar'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 901,
+      'numeric_code' => '901',
       'minor_unit' => t('Cent'),
       'major_unit' => t('New Dollar'),
     ),
@@ -1267,17 +1268,17 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 834,
+      'numeric_code' => '834',
       'minor_unit' => t('Senti'),
       'major_unit' => t('Shilling'),
     ),
     'UAH' => array(
       'code' => 'UAH',
-      'symbol' => '?',
+      'symbol' => '₴',
       'name' => t('Ukrainian Hryvnia'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 980,
+      'numeric_code' => '980',
       'minor_unit' => t('Kopiyka'),
       'major_unit' => t('Hryvnia'),
     ),
@@ -1288,7 +1289,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 800,
+      'numeric_code' => '800',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Shilling'),
     ),
@@ -1297,7 +1298,7 @@ function commerce_commerce_currency_info() {
       'symbol' => '$',
       'name' => t('United States Dollar'),
       'symbol_placement' => 'before',
-      'numeric_code' => 840,
+      'numeric_code' => '840',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Dollar'),
     ),
@@ -1307,7 +1308,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Uruguayan Peso'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 858,
+      'numeric_code' => '858',
       'minor_unit' => t('Centésimo'),
       'major_unit' => t('Peso'),
     ),
@@ -1322,12 +1323,12 @@ function commerce_commerce_currency_info() {
     ),
     'VND' => array(
       'code' => 'VND',
-      'symbol' => '?',
+      'symbol' => '₫',
       'name' => t('Vietnamese Dong'),
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 704,
+      'numeric_code' => '704',
       'minor_unit' => t('Hà'),
       'major_unit' => t('Dong'),
     ),
@@ -1338,7 +1339,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 548,
+      'numeric_code' => '548',
       'minor_unit' => t('None'),
       'major_unit' => t('Vatu'),
     ),
@@ -1348,7 +1349,7 @@ function commerce_commerce_currency_info() {
       'name' => t('Samoan Tala'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 882,
+      'numeric_code' => '882',
       'minor_unit' => t('Sene'),
       'major_unit' => t('Tala'),
     ),
@@ -1359,7 +1360,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 950,
+      'numeric_code' => '950',
       'minor_unit' => t('Centime'),
       'major_unit' => t('Franc'),
     ),
@@ -1369,7 +1370,7 @@ function commerce_commerce_currency_info() {
       'name' => t('East Caribbean Dollar'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 951,
+      'numeric_code' => '951',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Dollar'),
     ),
@@ -1380,7 +1381,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 952,
+      'numeric_code' => '952',
       'minor_unit' => t('Centime'),
       'major_unit' => t('Franc'),
     ),
@@ -1391,7 +1392,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 953,
+      'numeric_code' => '953',
       'minor_unit' => t('Centime'),
       'major_unit' => t('Franc'),
     ),
@@ -1402,7 +1403,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 886,
+      'numeric_code' => '886',
       'minor_unit' => t('Fils'),
       'major_unit' => t('Rial'),
     ),
@@ -1412,7 +1413,7 @@ function commerce_commerce_currency_info() {
       'name' => t('South African Rand'),
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 710,
+      'numeric_code' => '710',
       'minor_unit' => t('Cent'),
       'major_unit' => t('Rand'),
     ),
@@ -1423,7 +1424,7 @@ function commerce_commerce_currency_info() {
       'decimals' => 0,
       'symbol_placement' => 'before',
       'code_placement' => 'before',
-      'numeric_code' => 894,
+      'numeric_code' => '894',
       'minor_unit' => t('Ngwee'),
       'major_unit' => t('Kwacha'),
     ),