diff --git a/icons/shield40_us_nm_2.svg b/icons/shield40_us_nm_2.svg
new file mode 100644
index 000000000..13a23c708
--- /dev/null
+++ b/icons/shield40_us_nm_2.svg
@@ -0,0 +1,5 @@
+<svg width="25" height="25" version="1.0" xmlns="http://www.w3.org/2000/svg">
+ <path style="color:#000;fill:#fff;-inkscape-stroke:none" d="M 10,0 V 1 H 8 V 3.0195312 C 5.8238148,4.0586126 4.0586126,5.8238148 3.0195312,8 H 1 v 2 H 0 v 2 1 2 h 1 v 2 H 3.0195312 C 4.0586126,19.176185 5.8238148,20.941387 8,21.980469 V 24 h 2 v 1 h 2 1 2 v -1 h 2 V 21.980469 C 19.176185,20.941387 20.941387,19.176185 21.980469,17 H 24 v -2 h 1 V 13 12 10 H 24 V 8 H 21.980469 C 20.941387,5.8238148 19.176185,4.0586126 17,3.0195312 V 1 H 15 V 0 h -2 -1 z"/>
+ <path style="color:#000;fill:#df4661;-inkscape-stroke:none" d="M 11,1 V 9 H 10 V 2 H 9 V 9 H 2 v 1 h 7 v 1 H 1 v 1 h 8 v 1 H 1 v 1 h 8 v 1 H 2 v 1 h 7 v 7 h 1 v -7 h 1 v 8 h 1 v -8 h 1 v 8 h 1 v -8 h 1 v 7 h 1 v -7 h 7 v -1 h -7 v -1 h 8 v -1 h -8 v -1 h 8 v -1 h -8 v -1 h 7 V 9 H 16 V 2 H 15 V 9 H 14 V 1 H 13 V 9 H 12 V 1 Z"/>
+ <circle style="fill:#fff;fill-rule:evenodd;stroke:#df4661;stroke-linejoin:round" cx="12.5" cy="12.5" r="9"/>
+</svg>
diff --git a/icons/shield40_us_nm_3.svg b/icons/shield40_us_nm_3.svg
new file mode 100644
index 000000000..a15b60d6a
--- /dev/null
+++ b/icons/shield40_us_nm_3.svg
@@ -0,0 +1,5 @@
+<svg width="33" height="25" version="1.0" xmlns="http://www.w3.org/2000/svg">
+ <path style="color:#000;fill:#fff;-inkscape-stroke:none" d="M 14,0 V 1 H 12 V 2.0117188 C 8.0397728,2.1990891 4.6426288,4.6006889 3.0195312,8 H 1 v 2 H 0 v 2 1 2 h 1 v 2 H 3.0195312 C 4.6426288,20.399311 8.0397728,22.800911 12,22.988281 V 24 h 2 v 1 h 2 1 2 v -1 h 2 V 22.988281 C 24.960227,22.800911 28.357371,20.399311 29.980469,17 H 32 v -2 h 1 V 13 12 10 H 32 V 8 H 29.980469 C 28.357371,4.6006889 24.960227,2.1990891 21,2.0117188 V 1 H 19 V 0 h -2 -1 z"/>
+ <path style="color:#000;fill:#df4661;-inkscape-stroke:none" d="M 15,1 V 9 H 14 V 2 H 13 V 9 H 2 v 1 h 11 v 1 H 1 v 1 h 12 v 1 H 1 v 1 h 12 v 1 H 2 v 1 h 11 v 7 h 1 v -7 h 1 v 8 h 1 v -8 h 1 v 8 h 1 v -8 h 1 v 7 h 1 V 16 H 31 V 15 H 20 V 14 H 32 V 13 H 20 V 12 H 32 V 11 H 20 V 10 H 31 V 9 H 20 V 2 H 19 V 9 H 18 V 1 H 17 V 9 H 16 V 1 Z"/>
+ <path style="fill:#fff;fill-rule:evenodd;stroke:#df4661;stroke-linejoin:round" d="m 12.5,21.5 c -4.9705627,0 -9,-4.029437 -9,-9 0,-4.9705627 4.0294373,-9 9,-9 h 8 c 4.970563,0 9,4.0294373 9,9 0,4.970563 -4.029437,9 -9,9 z"/>
+</svg>
diff --git a/scripts/stats_compare.js b/scripts/stats_compare.js
index 279171a60..bf999529a 100644
--- a/scripts/stats_compare.js
+++ b/scripts/stats_compare.js
@@ -49,7 +49,13 @@ const ss2xRow = mdCompareRow(
   difference.spriteSheet2xSize
 );
 
-printTable("Style size statistics", [layersRow, sizeRow, ss1xRow, ss2xRow, shieldRow]);
+printTable("Style size statistics", [
+  layersRow,
+  sizeRow,
+  ss1xRow,
+  ss2xRow,
+  shieldRow,
+]);
 
 /**
  * Show comparison of the number of layers in each group before and after
diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js
index 03f6c1bd9..1529c0c5f 100644
--- a/src/js/shield_defs.js
+++ b/src/js/shield_defs.js
@@ -1673,11 +1673,17 @@ export function loadShields() {
   );
 
   // New Mexico
-  shields["US:NM"] = pillShield(
-    Color.shields.white,
-    Color.shields.pink,
-    Color.shields.black
-  );
+  shields["US:NM"] = {
+    spriteBlank: ["shield40_us_nm_2", "shield40_us_nm_3"],
+    textColor: Color.shields.black,
+    textLayout: textConstraint("ellipse"),
+    padding: {
+      left: 5,
+      right: 5,
+      top: 5,
+      bottom: 5,
+    },
+  };
   shields["US:NM:Frontage"] = {
     spriteBlank: "shield_us_nm_frontage",
     textColor: Color.shields.black,
diff --git a/src/layer/poi.js b/src/layer/poi.js
index 1352e90d3..d9a5ddbcc 100644
--- a/src/layer/poi.js
+++ b/src/layer/poi.js
@@ -368,13 +368,9 @@ export const poi = {
     [
       "match",
       ["get", "subclass"],
-      [
-      ...getSubclasses(iconDefs.college),
-      ],
+      [...getSubclasses(iconDefs.college)],
       10,
-      [
-        "station",
-        "halt"],
+      ["station", "halt"],
       12,
       ["bus_station", "subway"],
       14,