diff --git a/client/resources/felica_ic_code_list.json b/client/resources/felica_ic_code_list.json
index 58337024e..a930c3ed8 100644
--- a/client/resources/felica_ic_code_list.json
+++ b/client/resources/felica_ic_code_list.json
@@ -24,6 +24,15 @@
       "https://github.com/nfcpy/nfcpy/"
     ]
   },
+  {
+    "ic": "00",
+    "rom": "03",
+    "name": "RC-S830 (Export version)",
+    "description": "Used with old Shenzhen Tong and EZLink cards. Does not support SearchServiceCode.",
+    "sources": [
+      "https://github.com/kormax/felica-tool#supported-felica-commands"
+    ]
+  },
   {
     "ic": "06",
     "name": "Mobile FeliCa 1.0",
@@ -240,16 +249,30 @@
   },
   {
     "ic": "24",
-    "name": "Mobile FeliCa Hong Kong version",
-    "description": "Lacks support for some commands supported by previous cards.",
+    "rom": "02",
+    "name": "FeliCa Standard China/Hong Kong version",
+    "description": "Lacks support for SearchServiceCode and Echo commands supported by previous cards.",
     "sources": [
       "https://github.com/kormax/felica-tool#supported-felica-commands"
     ]
   },
   {
     "ic": "31",
-    "name": "Suica card (FeliCa Standard RC-S ?)",
-    "description": "Observed Suica card IC type"
+    "rom": "05",
+    "name": "FeliCa Standard RC-S1XX",
+    "description": "Used on 2-in-1 Suica regional collaboration cards.",
+    "sources": [
+      "https://nullablevoidptr.github.io/nfcf-info/IC-chips/card/"
+    ]
+  },
+  {
+    "ic": "31",
+    "rom": "06",
+    "name": "FeliCa Standard RC-S1XX (Collaboration version)",
+    "description": "Used on 2-in-1 Suica regional collaboration cards. Supports Extended Overlap feature.",
+    "sources": [
+      "https://github.com/kormax/felica-tool#supported-felica-commands"
+    ]
   },
   {
     "ic": "32",
diff --git a/client/src/cmdhffelica.c b/client/src/cmdhffelica.c
index 873f7703d..eee64f796 100644
--- a/client/src/cmdhffelica.c
+++ b/client/src/cmdhffelica.c
@@ -644,29 +644,41 @@ static json_t *felica_get_ic_code_list(void) {
     return felica_ic_code_list;
 }
 
-static const json_t *felica_find_ic_annotation(uint8_t ic_type) {
+static const json_t *felica_find_ic_annotation(uint8_t rom_type, uint8_t ic_type) {
     json_t *ic_code_list = felica_get_ic_code_list();
     if (ic_code_list == NULL) {
         return NULL;
     }
 
+    char rom_hex[3] = {0};
     char ic_hex[3] = {0};
+    snprintf(rom_hex, sizeof(rom_hex), "%02X", rom_type);
     snprintf(ic_hex, sizeof(ic_hex), "%02X", ic_type);
 
     size_t index = 0;
     json_t *entry = NULL;
+    const json_t *ic_fallback = NULL;
     json_array_foreach(ic_code_list, index, entry) {
         if (json_is_object(entry) == false) {
             continue;
         }
 
         const char *entry_ic = felica_get_json_string(entry, "ic");
-        if (entry_ic && strcmp(entry_ic, ic_hex) == 0) {
+        if (entry_ic == NULL || strcmp(entry_ic, ic_hex) != 0) {
+            continue;
+        }
+
+        if (ic_fallback == NULL) {
+            ic_fallback = entry;
+        }
+
+        const char *entry_rom = felica_get_json_string(entry, "rom");
+        if (entry_rom != NULL && strcmp(entry_rom, rom_hex) == 0) {
             return entry;
         }
     }
 
-    return NULL;
+    return ic_fallback;
 }
 
 static const char *felica_ic_code_name(uint8_t rom_type, uint8_t ic_type) {
@@ -674,7 +686,7 @@ static const char *felica_ic_code_name(uint8_t rom_type, uint8_t ic_type) {
         return "Unknown IC Type";
     }
 
-    const json_t *entry = felica_find_ic_annotation(ic_type);
+    const json_t *entry = felica_find_ic_annotation(rom_type, ic_type);
     const char *name = felica_get_json_string(entry, "name");
     return name ? name : "Unknown IC Type";
 }