diff --git a/icons/shield_mx_state_2.svg b/icons/shield_mx_state_2.svg
new file mode 100644
index 000000000..52a0d58f5
--- /dev/null
+++ b/icons/shield_mx_state_2.svg
@@ -0,0 +1,4 @@
+<svg width="18" height="20" version="1.0" viewBox="0 0 17.969 19.967" xmlns="http://www.w3.org/2000/svg">
+ <path d="m 0.498525,4.492575 h 16.97195 v 7.9868 c 0,3.6339 -4.992011,6.058388 -8.447901,6.915088 -3.53211,-0.8567 -8.524049,-3.261428 -8.524049,-6.915088 z" fill="#003f87" stroke="#fff" style="stroke-width:1;stroke-miterlimit:4;stroke:#000;fill:#fff"/>
+ <path d="m 0.498525,4.492575 v -3.9934 h 16.97195 v 3.9934 z" stroke="#fff" style="stroke-width:1;stroke-miterlimit:4;fill:#fff;stroke:#000"/>
+</svg>
diff --git a/icons/shield_mx_state_3.svg b/icons/shield_mx_state_3.svg
new file mode 100644
index 000000000..2923349a2
--- /dev/null
+++ b/icons/shield_mx_state_3.svg
@@ -0,0 +1,4 @@
+<svg width="25" height="20" version="1.0" viewBox="0 0 24.966 19.967" xmlns="http://www.w3.org/2000/svg">
+ <path d="m 0.49932,4.49098 h 23.96736 v 7.98912 c 0,4.59677 -7.489935,6.04001 -11.964475,6.8654 C 7.9892545,18.52011 0.49932,17.08802 0.49932,12.4801 Z" fill="#003f87" stroke="#fff" style="stroke-width:1;stroke-miterlimit:4;fill:#fff;stroke:#000"/>
+ <path d="M 24.46668,0.49642 V 4.49098 H 0.49932 l 0,-3.99456 z" stroke="#fff" style="stroke-width:1;stroke-miterlimit:4;fill:#fff;stroke:#000"/>
+</svg>
diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js
index 5bcfcb6d0..9ce4994ac 100644
--- a/src/js/shield_defs.js
+++ b/src/js/shield_defs.js
@@ -546,6 +546,51 @@ export function loadShields() {
       bottom: 2,
     },
   };
+  [
+    "AGS",
+    "BC",
+    "BCS",
+    "CAMP",
+    "COAH",
+    "COL",
+    "CHIS",
+    "CHIH",
+    "DGO",
+    "GTO",
+    "GRO",
+    "HGO",
+    "JAL",
+    // FIXME missing State of Mexico
+    "MICH",
+    "MOR",
+    "NAY",
+    "NL",
+    "OAX",
+    "PUE",
+    "QRO",
+    "Q.ROO",
+    "SLP",
+    "SIN",
+    "SON",
+    "TAB",
+    "TAM",
+    "TLAX",
+    "VER",
+    "YUC",
+    "ZAC",
+  ].forEach(
+    (state) =>
+      (shields[`MX:${state}`] = {
+        spriteBlank: ["shield_mx_state_2", "shield_mx_state_3"],
+        textColor: Color.shields.black,
+        padding: {
+          left: 2,
+          right: 2,
+          top: 5.5,
+          bottom: 4.5,
+        },
+      })
+  );
 
   // Ejes Viales (CDMX)
   shields["MX:CDMX:EJE:CENTRAL"] = {
diff --git a/src/shieldtest.js b/src/shieldtest.js
index 26b052058..f630a010f 100644
--- a/src/shieldtest.js
+++ b/src/shieldtest.js
@@ -121,6 +121,7 @@ let networks = [
   "US:VA",
   "US:PR:primary",
   "HK",
+  "MX:QRO",
   "CA:QC:A",
 
   "NZ:SH",