diff --git a/doc-img/shield_map_world.svg b/doc-img/shield_map_world.svg
index ccd088d18..712c21ab5 100644
--- a/doc-img/shield_map_world.svg
+++ b/doc-img/shield_map_world.svg
@@ -119,6 +119,7 @@ See the end of this file for a list of available jurisdictions and their codes.
 .bd,
 .cn,
 .hk,
+.jp,
 .my,
 .np,
 .ph,
diff --git a/style/icons/shield40_jp_national_2.svg b/style/icons/shield40_jp_national_2.svg
new file mode 100644
index 000000000..acdc38709
--- /dev/null
+++ b/style/icons/shield40_jp_national_2.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 5.292 5.292" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2.6458 5.1594c0.29093 0 0.55909-0.11648 0.76676-0.30987 0.79854-0.83547 1.3894-1.8743 1.6942-3.0174 0.031728-0.10042 0.052541-0.2267 0.052541-0.35802 0-0.54278-0.35555-0.99956-0.85739-1.1352-0.53327-0.13701-1.0687-0.20663-1.6562-0.20663-0.58748 0-1.1229 0.069619-1.6562 0.20663-0.50184 0.13564-0.85739 0.59242-0.85739 1.1352 0 0.13132 0.020812 0.2576 0.05254 0.35802 0.30481 1.1431 0.89571 2.1819 1.6942 3.0174 0.20766 0.19339 0.47583 0.30987 0.76676 0.30987z" fill="#003f87" stroke="#fff" stroke-linejoin="round" stroke-width=".265"/>
+</svg>
diff --git a/style/icons/shield40_jp_national_3.svg b/style/icons/shield40_jp_national_3.svg
new file mode 100644
index 000000000..faf5ec0a7
--- /dev/null
+++ b/style/icons/shield40_jp_national_3.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="20" viewBox="0 0 6.615 5.292" xmlns="http://www.w3.org/2000/svg">
+ <path d="m 3.3072864,5.1593744 c 0.3674879,0 0.7062199,-0.1164765 0.9685344,-0.3098695 C 5.2845007,4.0140331 6.030901,2.9752244 6.4159235,1.8321451 6.456001,1.7317238 6.4822911,1.605447 6.4822911,1.4741245 6.4822911,0.93134447 6.0331737,0.47456062 5.399273,0.33892521 4.7256714,0.20191397 4.0493675,0.13229224 3.3072917,0.13229224 c -0.7420766,0 -1.4183794,0.0696188 -2.0919812,0.20663297 -0.63390111,0.13563541 -1.08301828,0.59241926 -1.08301828,1.13519929 0,0.1313225 0.0262888,0.2575993 0.0663669,0.3580206 0.38502355,1.1430793 1.13142278,2.181888 2.14010408,3.0173598 0.2623134,0.193393 0.6010451,0.3098695 0.9685345,0.3098695 z" style="display:inline;fill:#003f87;fill-opacity:1;stroke:#fff;stroke-width:.26458333;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+</svg>
diff --git a/style/icons/shield40_jp_prefectural.svg b/style/icons/shield40_jp_prefectural.svg
new file mode 100644
index 000000000..dd6820c59
--- /dev/null
+++ b/style/icons/shield40_jp_prefectural.svg
@@ -0,0 +1,3 @@
+<svg width="25" height="20" viewBox="0 0 6.615 5.292" xmlns="http://www.w3.org/2000/svg">
+ <path d="m 6.4066373,2.4070146 c 0.100872,0.1464051 0.100872,0.3312308 0,0.477637 L 5.0856053,4.9316662 C 4.9918314,5.0773049 4.815983,5.1647685 4.6283247,5.159112 H 1.9862594 C 1.7986,5.164812 1.6227551,5.0773009 1.5289789,4.9316662 L 0.20794568,2.8846516 c -0.10087151,-0.1464062 -0.10087151,-0.3312319 0,-0.477637 L 1.5035739,0.36000008 C 1.5973478,0.21436137 1.7731961,0.12689774 1.9608545,0.13255427 h 2.6674702 c 0.1876583,-0.005696 0.3635043,0.0818114 0.4572806,0.22744581 z" style="fill:#003f87;fill-opacity:1;stroke:#fff;stroke-width:.26458333;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+</svg>
diff --git a/style/icons/shield40_jp_urban_expressway.svg b/style/icons/shield40_jp_urban_expressway.svg
new file mode 100644
index 000000000..33eee0e51
--- /dev/null
+++ b/style/icons/shield40_jp_urban_expressway.svg
@@ -0,0 +1,3 @@
+<svg width="20" height="20" viewBox="0 0 5.292 5.292" xmlns="http://www.w3.org/2000/svg">
+ <path d="m0.60707 0.13229c-0.26207 0-0.47478 0.21271-0.47478 0.47478v2.0388c0 1.3875 1.1261 2.5135 2.5135 2.5135 1.3875 0 2.5135-1.1261 2.5135-2.5135v-2.0388c0-0.26207-0.2127-0.47478-0.47478-0.47478h-2.0388z" fill="#006747" stroke="#fff" stroke-linejoin="round" stroke-width=".265"/>
+</svg>
diff --git a/style/js/shield_defs.js b/style/js/shield_defs.js
index 007eb4714..be52eaae7 100644
--- a/style/js/shield_defs.js
+++ b/style/js/shield_defs.js
@@ -918,6 +918,100 @@ export function loadShields(shieldImages) {
     },
   };
 
+  shields["JP:E"] = roundedRectShield("#006747", "white", "white", 2, 1);
+  [
+    "首都高速道路", // Shuto
+    "名古屋高速道路", // Nagoya
+  ].forEach((network) => {
+    shields[network] = {
+      backgroundImage: shieldImages.shield40_jp_urban_expressway,
+      textLayoutConstraint: ShieldText.southHalfellipseTextConstraint,
+      textColor: "white",
+      padding: {
+        left: 3,
+        right: 3,
+        top: 2,
+        bottom: 6,
+      },
+    };
+  });
+  shields["JP:national"] = {
+    backgroundImage: [
+      shieldImages.shield40_jp_national_2,
+      shieldImages.shield40_jp_national_3,
+    ],
+    textLayoutConstraint: ShieldText.ellipseTextConstraint,
+    textColor: "white",
+    padding: {
+      left: 2,
+      right: 2,
+      top: 1,
+      bottom: 5,
+    },
+  };
+  shields["JP:prefectural"] = {
+    backgroundImage: shieldImages.shield40_jp_prefectural,
+    textLayoutConstraint: ShieldText.ellipseTextConstraint,
+    textColor: "white",
+    padding: {
+      left: 3,
+      right: 3,
+      top: 2,
+      bottom: 2,
+    },
+  };
+  [
+    "aichi",
+    "akita",
+    "aomori",
+    "chiba",
+    "ehime",
+    "fukui",
+    "fukuoka",
+    "fukushima",
+    "gifu",
+    "gunma",
+    "hiroshima",
+    "hokkaido",
+    "hyogo",
+    "ibaraki",
+    "ishikawa",
+    "iwate",
+    "kagawa",
+    "kagoshima",
+    "kanagawa",
+    "kochi",
+    "kumamoto",
+    "kyoto",
+    "mie",
+    "miyagi",
+    "miyazaki",
+    "nagano",
+    "nagasaki",
+    "nara",
+    "niigata",
+    "oita",
+    "okayama",
+    "okinawa",
+    "osaka",
+    "saga",
+    "saitama",
+    "shiga",
+    "shimane",
+    "shizuoka",
+    "tochigi",
+    "tokushima",
+    "tokyo",
+    "tottori",
+    "toyama",
+    "wakayama",
+    "yamagata",
+    "yamaguchi",
+    "yamanashi",
+  ].forEach((prefecture) => {
+    shields[`JP:prefectural:${prefecture}`] = shields["JP:prefectural"];
+  });
+
   shields["MY:E"] = shields["my:federal"] = {
     backgroundImage: shieldImages.shield40_my,
     textColor: "black",