diff --git a/icons/poi_restaurant.svg b/icons/poi_restaurant.svg
new file mode 100644
index 000000000..87fb83907
--- /dev/null
+++ b/icons/poi_restaurant.svg
@@ -0,0 +1,4 @@
+<svg height="20" width="20" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+ <path style="stroke:#fff;stroke-width:2;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:markers stroke fill" d="m 2.1526351,1.00012 c -0.036479,0 -0.073055,0.00428 -0.1088663,0.010003 C 1.8351718,1.0438624 1.6562821,1.1721404 1.564334,1.354311 0.5089408,3.4393355 0.94816994,5.9341014 2.6613819,7.5716813 l 3.0650316,2.9275897 c 0.3023966,0.289372 0.712777,0.450244 1.1368252,0.450244 0.04535,0 0.090746,-0.0024 0.1360848,-0.006 l 1.7795615,-0.144081 7.758886,8.00034 c 0.120468,0.124377 0.289083,0.196756 0.466874,0.200107 h 0.01257 c 0.17381,0 0.339182,-0.06493 0.462684,-0.182099 l 1.329438,-1.270691 c 0.122777,-0.117083 0.190518,-0.276598 0.190518,-0.442237 0,-0.165612 -0.06822,-0.325136 -0.190518,-0.442242 L 2.6132277,1.1842199 C 2.4897629,1.0661738 2.3240825,1.00012 2.1526351,1.00012 Z"/>
+ <path style="stroke:#fff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill" d="m 14.777996,1.0000001 c -0.142518,0 -0.28521,0.053959 -0.39419,0.1627659 L 11.00671,4.5396678 c -0.811771,0.812242 -0.882051,2.1085863 -0.619237,3.1460097 L 1.1656743,16.805941 c -0.22733603,0.226991 -0.22733603,0.596606 0,0.823633 l 1.1982611,1.200154 c 0.227336,0.22703 0.5969733,0.22703 0.8236817,0 L 12.279138,9.5477168 c 1.037408,0.2618388 2.362642,0.2511605 3.173493,-0.5604223 l 3.379056,-3.3769018 c 0.217998,-0.2175774 0.217961,-0.5707587 0,-0.7883359 -0.217368,-0.2172456 -0.569087,-0.2172456 -0.786418,0 l -3.002518,3.000383 c -0.284004,0.2836923 -0.743637,0.2836923 -1.027641,0 -0.28275,-0.2834706 -0.28275,-0.7422243 0,-1.0256212 l 2.984865,-2.9846947 c 0.225638,-0.2258468 0.225638,-0.5933494 0,-0.8197126 -0.226708,-0.2255511 -0.592159,-0.2255511 -0.817797,0 L 13.19731,5.9790672 c -0.284004,0.2839873 -0.743636,0.2839873 -1.027638,0 -0.283415,-0.2833602 -0.283415,-0.7444436 0,-1.0275822 l 3.000553,-3.0003829 c 0.217959,-0.2175775 0.217959,-0.5704634 0,-0.7883361 C 15.061547,1.0539602 14.920516,1.0000001 14.777996,1.0000001 Z"/>
+</svg>
diff --git a/shieldlib/README.md b/shieldlib/README.md
index 32899597d..02b1d62fb 100644
--- a/shieldlib/README.md
+++ b/shieldlib/README.md
@@ -136,6 +136,10 @@ You should create one definition entry for each network. The entry key must matc
     }
   },
   "banners": ["ALT"],
+  "bannerMap": {
+    "ThisNetwork:Truck": ["TRK"],
+    "ThisNetwork:Truck:Bypass": ["TRK", "BYP"]
+  },
   "bannerTextColor": "#000",
   "bannerTextHaloColor": "#FFF",
   "textLayout": {
@@ -176,6 +180,7 @@ You should create one definition entry for each network. The entry key must matc
 
 ![Bannered routes near Downington, PA](https://wiki.openstreetmap.org/w/images/f/f8/Downington_bannered_routes_Americana.png)
 
+- **`bannerMap`**: a map of network-to-banner arrays listing networks that should have the same style but with specified banners.
 - **`bannerTextColor`**: specify the color of the banner text.
 - **`bannerTextHaloColor`**: specify the color of the banner knockout halo.
 - **`textLayout`**: specify how text should be inscribed within the padded bounds of the shield. The text will be drawn at the maximum size allowed by this constraint. See the [text layout functions](#text-layout-functions) section for text layout options.
diff --git a/shieldlib/src/shield_renderer.ts b/shieldlib/src/shield_renderer.ts
index 87f72cb55..626b7cabc 100644
--- a/shieldlib/src/shield_renderer.ts
+++ b/shieldlib/src/shield_renderer.ts
@@ -11,6 +11,7 @@ import {
   RouteDefinition,
   RouteParser,
   ShapeBlankParams,
+  ShieldDefinition,
   ShieldDefinitions,
   ShieldOptions,
   ShieldSpecification,
@@ -104,6 +105,30 @@ export class AbstractShieldRenderer {
   /** Specify which shields to draw and with what graphics */
   protected setShields(shieldSpec: ShieldSpecification) {
     this._renderContext.options = shieldSpec.options;
+
+    // Unpack any banner maps and compose them as separate network entries in-memory
+    for (const [key, shieldDef] of Object.entries(shieldSpec.networks)) {
+      if (!shieldDef) {
+        continue; // Skip if shieldDef is null or undefined
+      }
+
+      // Check to see if it has a bannerMap
+      if (shieldDef.bannerMap) {
+        // If it does, loop through each entry in the bannerMap
+        for (const [bannerKey, banners] of Object.entries(
+          shieldDef.bannerMap
+        )) {
+          // Make a copy of the ShieldDefinition and attach the banners
+          const banneredShieldDef: ShieldDefinition = {
+            ...shieldDef,
+            banners: banners,
+          };
+          // Insert this modified ShieldDefinition into the global network list
+          shieldSpec.networks[bannerKey] = banneredShieldDef;
+        }
+      }
+    }
+
     this._renderContext.shieldDef = shieldSpec.networks;
     this._fontSpec = "1em " + shieldSpec.options.shieldFont;
     console.log("ShieldJSON loaded");
diff --git a/shieldlib/src/types.ts b/shieldlib/src/types.ts
index b008a5cea..ba29fc651 100644
--- a/shieldlib/src/types.ts
+++ b/shieldlib/src/types.ts
@@ -35,6 +35,10 @@ export interface ShieldDefinitionBase {
   textLayout?: TextLayout;
   /** Banners to be drawn above a shield */
   banners?: string[];
+  /** Map of additional networks that are bannered variants of this one */
+  bannerMap?: {
+    [key: string]: string[];
+  };
   /** If true, no next should be drawn on this shield */
   notext?: boolean;
   /** Maximum size of shield text */
diff --git a/src/js/shield_defs.js b/src/js/shield_defs.js
index 1f810c38e..06df44179 100644
--- a/src/js/shield_defs.js
+++ b/src/js/shield_defs.js
@@ -649,15 +649,16 @@ export function loadShields() {
       top: 6,
       bottom: 5,
     },
+    bannerMap: {
+      "US:I:Alternate": ["ALT"],
+      "US:I:Express": ["EXPR"],
+      "US:I:Express:Toll": ["EXPR"],
+      "US:I:Future": ["FUT"],
+      "US:I:Spur": ["SPUR"],
+      "US:I:Truck": ["TRK"],
+    },
   };
 
-  shields["US:I:Alternate"] = banneredShield(shields["US:I"], ["ALT"]);
-  shields["US:I:Future"] = banneredShield(shields["US:I"], ["FUT"]);
-  shields["US:I:Spur"] = banneredShield(shields["US:I"], ["SPUR"]);
-  shields["US:I:Truck"] = banneredShield(shields["US:I"], ["TRK"]);
-  shields["US:I:Express"] = banneredShield(shields["US:I"], ["EXPR"]);
-  shields["US:I:Express:Toll"] = shields["US:I:Express"];
-
   shields["US:I:Business:Loop"] = {
     ...shields["US:I"],
     spriteBlank: [
@@ -671,38 +672,22 @@ export function loadShields() {
   shields["US:I:Downtown:Spur"] = shields["US:I:Business:Spur"];
 
   // US Highways
-  shields["US:US"] = badgeShield;
-
-  shields["US:US:Truck"] = banneredShield(shields["US:US"], ["TRK"]);
-  shields["US:US:Truck:Bypass"] = banneredShield(shields["US:US"], [
-    "TRK",
-    "BYP",
-  ]);
-
-  shields["US:US:Spur"] = banneredShield(shields["US:US"], ["SPUR"]);
-
-  shields["US:US:Connector"] = banneredShield(shields["US:US"], ["CONN"]);
-
-  shields["US:US:Bypass"] = banneredShield(shields["US:US"], ["BYP"]);
-
-  shields["US:US:Future"] = banneredShield(shields["US:US"], ["FUT"]);
-
-  shields["US:US:Business"] = banneredShield(shields["US:US"], ["BUS"]);
-  shields["US:US:Business:Alternate"] = banneredShield(shields["US:US"], [
-    "BUS",
-    "ALT",
-  ]);
-  shields["US:US:Business:Truck"] = banneredShield(shields["US:US"], [
-    "BUS",
-    "TRK",
-  ]);
-
-  shields["US:US:Alternate"] = banneredShield(shields["US:US"], ["ALT"]);
-  shields["US:US:Alternate:Truck:Business"] = banneredShield(shields["US:US"], [
-    "ALT",
-    "TRK",
-    "BUS",
-  ]);
+  shields["US:US"] = {
+    ...badgeShield,
+    bannerMap: {
+      "US:US:Truck": ["TRK"],
+      "US:US:Truck:Bypass": ["TRK", "BYP"],
+      "US:US:Spur": ["SPUR"],
+      "US:US:Connector": ["CONN"],
+      "US:US:Bypass": ["BYP"],
+      "US:US:Future": ["FUT"],
+      "US:US:Business": ["BUS"],
+      "US:US:Business:Alternate": ["BUS", "ALT"],
+      "US:US:Business:Truck": ["BUS", "TRK"],
+      "US:US:Alternate": ["ALT"],
+      "US:US:Alternate:Truck:Business": ["ALT", "TRK", "BUS"],
+    },
+  };
 
   shields["US:US:Historic"] = banneredShield(
     {
@@ -809,8 +794,11 @@ export function loadShields() {
       top: 3,
       bottom: 6,
     },
+    bannerMap: {
+      "US:AL:Truck": ["TRK"],
+    },
   };
-  shields["US:AL:Truck"] = banneredShield(shields["US:AL"], ["TRK"]);
+
   [
     "Autauga",
     "Baldwin",
@@ -989,10 +977,13 @@ export function loadShields() {
       top: 3,
       bottom: 4,
     },
+    bannerMap: {
+      "US:AZ:Spur": ["SPUR"],
+      "US:AZ:Loop": ["LOOP"],
+      "US:AZ:Business": ["BUS"],
+    },
   };
-  shields["US:AZ:Spur"] = banneredShield(shields["US:AZ"], ["SPUR"]);
-  shields["US:AZ:Loop"] = banneredShield(shields["US:AZ"], ["LOOP"]);
-  shields["US:AZ:Business"] = banneredShield(shields["US:AZ"], ["BUS"]);
+
   ["Coconino", "Mohave", "Yavapai"].forEach(
     (county) =>
       (shields[`US:AZ:${county}`] = pentagonUpShield(
@@ -1017,13 +1008,11 @@ export function loadShields() {
       top: 6,
       bottom: 4,
     },
+    bannerMap: {
+      "US:CA:Business": ["BUS"],
+    },
   };
-  shields["US:CA:Business"] = banneredShield(
-    shields["US:CA"],
-    ["BUS"],
-    Color.shields.green
-  );
-  ["CR", "Sierra"].forEach(
+  ["CR", "Nevada", "Sierra"].forEach(
     (county) =>
       (shields[`US:CA:${county}`] = pentagonUpShield(
         3,
@@ -1137,10 +1126,14 @@ export function loadShields() {
   };
 
   // Delaware
-  shields["US:DE"] = ovalShield(Color.shields.white, Color.shields.black);
-  shields["US:DE:Alternate"] = banneredShield(shields["US:DE"], ["ALT"]);
-  shields["US:DE:Business"] = banneredShield(shields["US:DE"], ["BUS"]);
-  shields["US:DE:Truck"] = banneredShield(shields["US:DE"], ["TRK"]);
+  shields["US:DE"] = {
+    ...ovalShield(Color.shields.white, Color.shields.black),
+    bannerMap: {
+      "US:DE:Alternate": ["ALT"],
+      "US:DE:Business": ["BUS"],
+      "US:DE:Truck": ["TRK"],
+    },
+  };
 
   // Florida
   shields["US:FL"] = {
@@ -1168,13 +1161,22 @@ export function loadShields() {
       spriteBlank: "shield_us_fl_turnpike",
     },
   };
-  shields["US:FL:CR"] = pentagonUpShield(
-    3,
-    15,
-    Color.shields.blue,
-    Color.shields.yellow
-  );
-  shields["US:FL:CR:Truck"] = banneredShield(shields["US:FL:CR"], ["TRK"]);
+
+  shields["US:DE"] = {
+    ...ovalShield(Color.shields.white, Color.shields.black),
+    bannerMap: {
+      "US:DE:Alternate": ["ALT"],
+      "US:DE:Business": ["BUS"],
+      "US:DE:Truck": ["TRK"],
+    },
+  };
+
+  shields["US:FL:CR"] = {
+    ...pentagonUpShield(3, 15, Color.shields.blue, Color.shields.yellow),
+    bannerMap: {
+      "US:FL:CR:Truck": ["TRK"],
+    },
+  };
 
   // Georgia
   shields["US:GA"] = {
@@ -1186,6 +1188,15 @@ export function loadShields() {
       top: 5,
       bottom: 4,
     },
+    bannerMap: {
+      "US:GA:Truck:Bypass": ["TRK", "BYP"],
+      "US:GA:Spur": ["SPUR"],
+      "US:GA:Loop": ["LOOP"],
+      "US:GA:Connector": ["CONN"],
+      "US:GA:Bypass": ["BYP"],
+      "US:GA:Business": ["BUS"],
+      "US:GA:Alternate": ["ALT"],
+    },
     overrideByRef: {
       515: {
         textColor: Color.shields.blue,
@@ -1197,16 +1208,6 @@ export function loadShields() {
       },
     },
   };
-  shields["US:GA:Truck:Bypass"] = banneredShield(shields["US:GA"], [
-    "TRK",
-    "BYP",
-  ]);
-  shields["US:GA:Spur"] = banneredShield(shields["US:GA"], ["SPUR"]);
-  shields["US:GA:Loop"] = banneredShield(shields["US:GA"], ["LOOP"]);
-  shields["US:GA:Connector"] = banneredShield(shields["US:GA"], ["CONN"]);
-  shields["US:GA:Bypass"] = banneredShield(shields["US:GA"], ["BYP"]);
-  shields["US:GA:Business"] = banneredShield(shields["US:GA"], ["BUS"]);
-  shields["US:GA:Alternate"] = banneredShield(shields["US:GA"], ["ALT"]);
 
   // Guam
   shields["US:GU"] = {
@@ -1243,8 +1244,10 @@ export function loadShields() {
       top: 1.5,
       bottom: 9,
     },
+    bannerMap: {
+      "US:ID:Business": ["BUS"],
+    },
   };
-  shields["US:ID:Business"] = banneredShield(shields["US:ID"], ["BUS"]);
 
   // Illinois
   shields["US:IL"] = roundedRectShield(
@@ -1365,8 +1368,13 @@ export function loadShields() {
   );
 
   // Kentucky
-  shields["US:KY"] = pillShield(Color.shields.white, Color.shields.black);
-  shields["US:KY:Business"] = banneredShield(shields["US:KY"], ["BUS"]);
+  shields["US:KY"] = {
+    ...pillShield(Color.shields.white, Color.shields.black),
+    bannerMap: {
+      "US:KY:Business": ["BUS"],
+    },
+  };
+
   shields["US:KY:AA"] = shields["US:KY:Parkway"] = {
     spriteBlank: "shield_us_ky_parkway",
     textColor: Color.shields.blue,
@@ -1397,10 +1405,13 @@ export function loadShields() {
       top: 7,
       bottom: 3,
     },
+    bannerMap: {
+      "US:LA:Business": ["BUS"],
+      "US:LA:Spur": ["SPUR"],
+      "US:LA:Truck": ["TRK"],
+    },
   };
-  shields["US:LA:Business"] = banneredShield(shields["US:LA"], ["BUS"]);
-  shields["US:LA:Spur"] = banneredShield(shields["US:LA"], ["SPUR"]);
-  shields["US:LA:Truck"] = banneredShield(shields["US:LA"], ["TRK"]);
+
   [
     "Bienville",
     "Caddo",
@@ -1455,9 +1466,11 @@ export function loadShields() {
       top: 6,
       bottom: 2,
     },
+    bannerMap: {
+      "US:MD:Alternate": ["ALT"],
+      "US:MD:Bypass": ["BYP"],
+    },
   };
-  shields["US:MD:Alternate"] = banneredShield(shields["US:MD"], ["ALT"]);
-  shields["US:MD:Bypass"] = banneredShield(shields["US:MD"], ["BYP"]);
   shields["US:MD:Business"] = banneredShield(
     {
       ...shields["US:MD"],
@@ -1469,29 +1482,35 @@ export function loadShields() {
   );
 
   // Maine
-  shields["US:ME"] = roundedRectShield(
-    Color.shields.white,
-    Color.shields.black
-  );
-  shields["US:ME:Business"] = banneredShield(shields["US:ME"], ["BUS"]);
+  shields["US:ME"] = {
+    ...roundedRectShield(Color.shields.white, Color.shields.black),
+    bannerMap: {
+      "US:ME:Business": ["BUS"],
+    },
+  };
   shields["US:ME:Turnpike"] = {
     spriteBlank: "shield_us_me_turnpike",
     notext: true,
   };
 
   // Michigan
-  shields["US:MI"] = diamondShield(Color.shields.white, Color.shields.black);
-  shields["US:MI"].overrideByRef = {
-    185: diamondShield(
-      Color.shields.brown,
-      Color.shields.white,
-      Color.shields.white,
-      0,
-      24
-    ),
+  shields["US:MI"] = {
+    ...diamondShield(Color.shields.white, Color.shields.black),
+    bannerMap: {
+      "US:MI:Business": ["BUS"],
+      "US:MI:Connector": ["CONN"],
+    },
+    overrideByRef: {
+      185: diamondShield(
+        Color.shields.brown,
+        Color.shields.white,
+        Color.shields.white,
+        0,
+        24
+      ),
+    },
   };
-  shields["US:MI:Business"] = banneredShield(shields["US:MI"], ["BUS"]);
-  shields["US:MI:Connector"] = banneredShield(shields["US:MI"], ["CONN"]);
+
   ["CR", "Benzie", "Gogebic", "Kalkaska", "Montcalm", "Roscommon"].forEach(
     (county) =>
       (shields[`US:MI:${county}`] = pentagonUpShield(
@@ -1674,18 +1693,18 @@ export function loadShields() {
       top: 2,
       bottom: 5,
     },
+    bannerMap: {
+      "US:MO:Alternate": ["ALT"],
+      "US:MO:Business": ["BUS"],
+      "US:MO:Spur": ["SPUR"],
+    },
+  };
+  shields["US:MO:Supplemental"] = {
+    ...roundedRectShield(Color.shields.white, Color.shields.black),
+    bannerMap: {
+      "US:MO:Supplemental:Spur": ["SPUR"],
+    },
   };
-  shields["US:MO:Alternate"] = banneredShield(shields["US:MO"], ["ALT"]);
-  shields["US:MO:Business"] = banneredShield(shields["US:MO"], ["BUS"]);
-  shields["US:MO:Spur"] = banneredShield(shields["US:MO"], ["SPUR"]);
-  shields["US:MO:Supplemental"] = roundedRectShield(
-    Color.shields.white,
-    Color.shields.black
-  );
-  shields["US:MO:Supplemental:Spur"] = banneredShield(
-    shields["US:MO:Supplemental"],
-    ["SPUR"]
-  );
   [
     "Bollinger",
     "Butler",
@@ -1788,16 +1807,20 @@ export function loadShields() {
   );
 
   // North Carolina
-  shields["US:NC"] = diamondShield(
-    Color.shields.white,
-    Color.shields.black,
-    Color.shields.black,
-    2,
-    24
-  );
-  shields["US:NC:Bypass"] = banneredShield(shields["US:NC"], ["BYP"]);
-  shields["US:NC:Business"] = banneredShield(shields["US:NC"], ["BUS"]);
-  shields["US:NC:Truck"] = banneredShield(shields["US:NC"], ["TRK"]);
+  shields["US:NC"] = {
+    ...diamondShield(
+      Color.shields.white,
+      Color.shields.black,
+      Color.shields.black,
+      2,
+      24
+    ),
+    bannerMap: {
+      "US:NC:Bypass": ["BYP"],
+      "US:NC:Business": ["BUS"],
+      "US:NC:Truck": ["TRK"],
+    },
+  };
   shields["US:NC:Mecklenburg:Charlotte"] = pentagonUpShield(
     3,
     15,
@@ -1815,11 +1838,13 @@ export function loadShields() {
       top: 4,
       bottom: 4,
     },
+    bannerMap: {
+      "US:ND:Alternate": ["ALT"],
+      "US:ND:Business": ["BUS"],
+      "US:ND:Bypass": ["BYP"],
+      "US:ND:Truck": ["TRK"],
+    },
   };
-  shields["US:ND:Alternate"] = banneredShield(shields["US:ND"], ["ALT"]);
-  shields["US:ND:Business"] = banneredShield(shields["US:ND"], ["BUS"]);
-  shields["US:ND:Bypass"] = banneredShield(shields["US:ND"], ["BYP"]);
-  shields["US:ND:Truck"] = banneredShield(shields["US:ND"], ["TRK"]);
   [
     "Barnes",
     "Benson",
@@ -1877,16 +1902,16 @@ export function loadShields() {
   );
 
   // Nebraska
-  shields["US:NE"] = trapezoidDownShield(
-    10,
-    Color.shields.white,
-    Color.shields.black
-  );
-  shields["US:NE:Business"] = banneredShield(shields["US:NE"], ["BUS"]);
-  shields["US:NE:Link"] = banneredShield(shields["US:NE"], ["LINK"]);
-  shields["US:NE:Rec"] = banneredShield(shields["US:NE"], ["REC"]);
-  shields["US:NE:Spur"] = banneredShield(shields["US:NE"], ["SPUR"]);
-  shields["US:NE:Truck"] = banneredShield(shields["US:NE"], ["TRK"]);
+  shields["US:NE"] = {
+    ...trapezoidDownShield(10, Color.shields.white, Color.shields.black),
+    bannerMap: {
+      "US:NE:Business": ["BUS"],
+      "US:NE:Link": ["LINK"],
+      "US:NE:Rec": ["REC"],
+      "US:NE:Spur": ["SPUR"],
+      "US:NE:Truck": ["TRK"],
+    },
+  };
   shields["US:NE:Scenic"] = {
     spriteBlank: "shield_us_ne_byway_noref",
     notext: true,
@@ -1902,8 +1927,10 @@ export function loadShields() {
       top: 4,
       bottom: 5,
     },
+    bannerMap: {
+      "US:NH:Bypass": ["BYP"],
+    },
   };
-  shields["US:NH:Bypass"] = banneredShield(shields["US:NH"], ["BYP"]);
   shields["US:NH:Turnpike"] = {
     notext: true,
     overrideByName: {
@@ -1923,12 +1950,11 @@ export function loadShields() {
   shields["US:NJ:ACE"] = {
     spriteBlank: "shield_us_nj_ace_noref",
     notext: true,
+    bannerTextColor: Color.shields.blue,
+    bannerMap: {
+      "US:NJ:ACE:Connector": ["CONN"],
+    },
   };
-  shields["US:NJ:ACE:Connector"] = banneredShield(
-    shields["US:NJ:ACE"],
-    ["CONN"],
-    Color.shields.blue
-  );
   shields["US:NJ:GSP"] = {
     spriteBlank: "shield_us_nj_gsp_noref",
     notext: true,
@@ -2080,8 +2106,10 @@ export function loadShields() {
       top: 5,
       bottom: 5,
     },
+    bannerMap: {
+      "US:NY:Truck": ["TRK"],
+    },
   };
-  shields["US:NY:Truck"] = banneredShield(shields["US:NY"], ["TRK"]);
   shields["US:NY:Inner_Loop"] = {
     ...trapezoidDownShield(
       10,
@@ -2216,9 +2244,11 @@ export function loadShields() {
       top: 4,
       bottom: 6,
     },
+    bannerMap: {
+      "US:OH:Bypass": ["BYP"],
+      "US:OH:Business": ["BUS"],
+    },
   };
-  shields["US:OH:Bypass"] = banneredShield(shields["US:OH"], ["BYP"]);
-  shields["US:OH:Business"] = banneredShield(shields["US:OH"], ["BUS"]);
   shields["US:OH:Turnpike"] = {
     spriteBlank: "shield_us_oh_turnpike",
     notext: true,
@@ -2428,12 +2458,14 @@ export function loadShields() {
       top: 7,
       bottom: 3,
     },
+    bannerMap: {
+      "US:OK:Toll": [],
+      "US:OK:Business": ["BUS"],
+      "US:OK:Loop": ["LOOP"],
+      "US:OK:Spur": ["SPUR"],
+      "US:OK:Truck": ["TRK"],
+    },
   };
-  shields["US:OK:Toll"] = shields["US:OK"];
-  shields["US:OK:Business"] = banneredShield(shields["US:OK"], ["BUS"]);
-  shields["US:OK:Loop"] = banneredShield(shields["US:OK"], ["LOOP"]);
-  shields["US:OK:Spur"] = banneredShield(shields["US:OK"], ["SPUR"]);
-  shields["US:OK:Truck"] = banneredShield(shields["US:OK"], ["TRK"]);
   shields["US:OK:Turnpike"] = {
     spriteBlank: "shield_us_ok_turnpike",
     notext: true,
@@ -2450,8 +2482,10 @@ export function loadShields() {
       top: 1,
       bottom: 4,
     },
+    bannerMap: {
+      "US:OR:Business": ["BUS"],
+    },
   };
-  shields["US:OR:Business"] = banneredShield(shields["US:OR"], ["BUS"]);
   ["Douglas", "Grant", "Lake", "Lane", "Morrow"].forEach(
     (county) =>
       (shields[`US:OR:${county}`] = pentagonUpShield(
@@ -2472,10 +2506,12 @@ export function loadShields() {
       top: 5,
       bottom: 5,
     },
+    bannerMap: {
+      "US:PA:Truck": ["TRK"],
+      "US:PA:Business": ["BUS"],
+      "US:PA:Alternate": ["ALT"],
+    },
   };
-  shields["US:PA:Truck"] = banneredShield(shields["US:PA"], ["TRK"]);
-  shields["US:PA:Business"] = banneredShield(shields["US:PA"], ["BUS"]);
-  shields["US:PA:Alternate"] = banneredShield(shields["US:PA"], ["ALT"]);
   shields["US:PA:Turnpike"] = {
     spriteBlank: ["shield_us_pa_2", "shield_us_pa_3"],
     textColor: Color.shields.white,
@@ -2536,33 +2572,20 @@ export function loadShields() {
   shields["US:SC"] = {
     spriteBlank: "shield_us_sc",
     textColor: Color.shields.blue,
+    bannerTextColor: Color.shields.blue,
     padding: {
       left: 2,
       right: 2,
       top: 6,
       bottom: 3,
     },
+    bannerMap: {
+      "US:SC:Truck": ["TRK"],
+      "US:SC:Business": ["BUS"],
+      "US:SC:Alternate": ["ALT"],
+      "US:SC:Connector": ["CONN"],
+    },
   };
-  shields["US:SC:Truck"] = banneredShield(
-    shields["US:SC"],
-    ["TRK"],
-    Color.shields.blue
-  );
-  shields["US:SC:Business"] = banneredShield(
-    shields["US:SC"],
-    ["BUS"],
-    Color.shields.blue
-  );
-  shields["US:SC:Alternate"] = banneredShield(
-    shields["US:SC"],
-    ["ALT"],
-    Color.shields.blue
-  );
-  shields["US:SC:Connector"] = banneredShield(
-    shields["US:SC"],
-    ["CONN"],
-    Color.shields.blue
-  );
 
   // South Dakota
   shields["US:SD"] = {
@@ -2574,9 +2597,11 @@ export function loadShields() {
       top: 3,
       bottom: 5,
     },
+    bannerMap: {
+      "US:SD:Business": ["BUS"],
+      "US:SD:Truck": ["TRK"],
+    },
   };
-  shields["US:SD:Business"] = banneredShield(shields["US:SD"], ["BUS"]);
-  shields["US:SD:Truck"] = banneredShield(shields["US:SD"], ["TRK"]);
   shields["US:SD:Secondary"] = roundedRectShield(
     Color.shields.white,
     Color.shields.black
@@ -2657,32 +2682,20 @@ export function loadShields() {
       top: 2,
       bottom: 7,
     },
+    bannerMap: {
+      "US:TN:primary:Business": ["BUS"],
+      "US:TN:primary:Bypass": ["BYP"],
+      "US:TN:primary:Truck": ["TRK"],
+    },
+  };
+  shields["US:TN:secondary"] = {
+    ...triangleDownShield(Color.shields.white, Color.shields.black),
+    bannerMap: {
+      "US:TN:secondary:Alternate": ["ALT"],
+      "US:TN:secondary:Scenic": ["SCEN"],
+      "US:TN:secondary:Truck": ["TRK"],
+    },
   };
-  shields["US:TN:primary:Business"] = banneredShield(shields["US:TN:primary"], [
-    "BUS",
-  ]);
-  shields["US:TN:primary:Bypass"] = banneredShield(shields["US:TN:primary"], [
-    "BYP",
-  ]);
-  shields["US:TN:primary:Truck"] = banneredShield(shields["US:TN:primary"], [
-    "TRK",
-  ]);
-  shields["US:TN:secondary"] = triangleDownShield(
-    Color.shields.white,
-    Color.shields.black
-  );
-  shields["US:TN:secondary:Alternate"] = banneredShield(
-    shields["US:TN:secondary"],
-    ["ALT"]
-  );
-  shields["US:TN:secondary:Scenic"] = banneredShield(
-    shields["US:TN:secondary"],
-    ["SCEN"]
-  );
-  shields["US:TN:secondary:Truck"] = banneredShield(
-    shields["US:TN:secondary"],
-    ["TRK"]
-  );
   shields["US:TN:McMinn"] = pentagonUpShield(
     3,
     15,
@@ -2691,17 +2704,18 @@ export function loadShields() {
   );
 
   // Texas
-  shields["US:TX"] = roundedRectShield(
-    Color.shields.white,
-    Color.shields.black
-  );
-  shields["US:TX:Beltway"] = banneredShield(shields["US:TX"], ["BELT"]);
-  shields["US:TX:Business"] = banneredShield(shields["US:TX"], ["BUS"]);
-  shields["US:TX:Loop"] = banneredShield(shields["US:TX"], ["LOOP"]);
-  shields["US:TX:NASA"] = banneredShield(shields["US:TX"], ["NASA"]);
-  shields["US:TX:Park"] = banneredShield(shields["US:TX"], ["PARK"]);
-  shields["US:TX:PA"] = banneredShield(shields["US:TX"], ["P.A."]);
-  shields["US:TX:Spur"] = banneredShield(shields["US:TX"], ["SPUR"]);
+  shields["US:TX"] = {
+    ...roundedRectShield(Color.shields.white, Color.shields.black),
+    bannerMap: {
+      "US:TX:Beltway": ["BELT"],
+      "US:TX:Business": ["BUS"],
+      "US:TX:Loop": ["LOOP"],
+      "US:TX:NASA": ["NASA"],
+      "US:TX:Park": ["PARK"],
+      "US:TX:PA": ["P.A."],
+      "US:TX:Spur": ["SPUR"],
+    },
+  };
   shields["US:TX:FM"] = shields["US:TX:RM"] = {
     spriteBlank: "shield_us_tx_outline",
     textColor: Color.shields.black,
@@ -2712,8 +2726,10 @@ export function loadShields() {
       top: 7,
       bottom: 10,
     },
+    bannerMap: {
+      "US:TX:FM:Business": ["BUS"],
+    },
   };
-  shields["US:TX:FM:Business"] = banneredShield(shields["US:TX:FM"], ["BUS"]);
   shields["US:TX:Recreational"] = banneredShield(
     {
       ...shields["US:TX:FM"],
@@ -2723,38 +2739,32 @@ export function loadShields() {
     ["R"],
     Color.shields.brown
   );
-  shields["US:TX:NASA"] = banneredShield(shields["US:TX"], ["NASA"]);
 
   // Texas toll roads
+  shields["US:TX:Toll"] = {
+    ...roundedRectShield(Color.shields.blue, Color.shields.white),
+    bannerTextColor: Color.shields.blue,
+    bannerMap: {
+      "US:TX:NTTA": [],
+      "US:TX:Express:Toll": ["EXPR"],
+      "US:TX:Loop:Toll": ["LOOP"],
+      "US:TX:Loop:Express:Toll": ["EXPR", "LOOP"],
+    },
+  };
   shields["US:TX:Toll"] = shields["US:TX:NTTA"] = roundedRectShield(
     Color.shields.blue,
     Color.shields.white
   );
-  shields["US:TX:Express:Toll"] = banneredShield(
-    shields["US:TX:Toll"],
-    ["EXPR"],
-    Color.shields.blue
-  );
-  shields["US:TX:Loop:Toll"] = banneredShield(
-    shields["US:TX:Toll"],
-    ["LOOP"],
-    Color.shields.blue
-  );
-  shields["US:TX:Loop:Express:Toll"] = banneredShield(
-    shields["US:TX:Toll"],
-    ["EXPR", "LOOP"],
-    Color.shields.blue
-  );
-  shields["US:TX:CTRMA"] = roundedRectShield(
-    Color.shields.blue,
-    Color.shields.yellow,
-    Color.shields.white
-  );
-  shields["US:TX:CTRMA:Express"] = banneredShield(
-    shields["US:TX:CTRMA"],
-    ["EXPR"],
-    Color.shields.blue
-  );
+  shields["US:TX:CTRMA"] = {
+    ...roundedRectShield(
+      Color.shields.blue,
+      Color.shields.yellow,
+      Color.shields.white
+    ),
+    bannerMap: {
+      "US:TX:CTRMA:Express": ["EXPR"],
+    },
+  };
   shields["US:TX:Montgomery:MCTRA"] = homePlateDownShield(
     5,
     Color.shields.blue,
@@ -2863,7 +2873,7 @@ export function loadShields() {
       bottom: 5,
     },
   };
-  ["Wayne", "Washington"].forEach(
+  ["FA", "Washington"].forEach(
     (county) =>
       (shields[`US:UT:${county}`] = pentagonUpShield(
         3,
@@ -2874,15 +2884,19 @@ export function loadShields() {
   );
 
   // Virginia
-  shields["US:VA"] = escutcheonDownShield(
-    12,
-    Color.shields.white,
-    Color.shields.black,
-    Color.shields.black,
-    2
-  );
-  shields["US:VA:Business"] = banneredShield(shields["US:VA"], ["BUS"]);
-  shields["US:VA:Alternate"] = banneredShield(shields["US:VA"], ["ALT"]);
+  shields["US:VA"] = {
+    ...escutcheonDownShield(
+      12,
+      Color.shields.white,
+      Color.shields.black,
+      Color.shields.black,
+      2
+    ),
+    bannerMap: {
+      "US:VA:Business": ["BUS"],
+      "US:VA:Alternate": ["ALT"],
+    },
+  };
   shields["US:VA:Secondary"] = pillShield(
     Color.shields.white,
     Color.shields.black
@@ -2901,17 +2915,12 @@ export function loadShields() {
       top: 5,
       bottom: 2,
     },
+    bannerTextColor: Color.shields.green,
+    bannerMap: {
+      "US:VT:Alternate": ["ALT"],
+      "US:VT:Truck": ["TRK"],
+    },
   };
-  shields["US:VT:Alternate"] = banneredShield(
-    shields["US:VT"],
-    ["ALT"],
-    Color.shields.green
-  );
-  shields["US:VT:Truck"] = banneredShield(
-    shields["US:VT"],
-    ["TRK"],
-    Color.shields.green
-  );
 
   // Vermont routes town maintained sections - black and white ovals
   shields["US:VT:Town"] = ovalShield(Color.shields.white, Color.shields.black);
@@ -2927,10 +2936,12 @@ export function loadShields() {
       top: 2,
       bottom: 6,
     },
+    bannerMap: {
+      "US:WA:Spur": ["SPUR"],
+      "US:WA:Business": ["BUS"],
+      "US:WA:Alternate": ["ALT"],
+    },
   };
-  shields["US:WA:Spur"] = banneredShield(shields["US:WA"], ["SPUR"]);
-  shields["US:WA:Business"] = banneredShield(shields["US:WA"], ["BUS"]);
-  shields["US:WA:Alternate"] = banneredShield(shields["US:WA"], ["ALT"]);
 
   shields["US:WA:Asotin"] = roundedRectShield(
     Color.shields.green,
@@ -2947,9 +2958,11 @@ export function loadShields() {
       top: 3,
       bottom: 6,
     },
+    bannerMap: {
+      "US:WI:Business": ["BUS"],
+      "US:WI:Spur": ["SPUR"],
+    },
   };
-  shields["US:WI:Business"] = banneredShield(shields["US:WI"], ["BUS"]);
-  shields["US:WI:Spur"] = banneredShield(shields["US:WI"], ["SPUR"]);
   [
     "Adams",
     "Ashland",
@@ -3030,10 +3043,9 @@ export function loadShields() {
         Color.shields.black
       ))
   );
-  shields["US:WI:Marquette:Truck"] = banneredShield(
-    shields["US:WI:Marquette"],
-    ["TRK"]
-  );
+  shields["US:WI:Marquette"].bannerMap = {
+    "US:WI:Marquette:Truck": ["TRK"],
+  };
   shields["US:WI:Rustic"] = {
     spriteBlank: "shield_us_wi_rustic",
     textColor: Color.shields.yellow,
@@ -3188,7 +3200,7 @@ export function loadShields() {
   // AFRICA
 
   // Algeria
-  shields["DZ:highway"] = shields["DZ:national"] = roundedRectShield(
+  shields["DZ:motorway"] = shields["DZ:national"] = roundedRectShield(
     Color.shields.red,
     Color.shields.white
   );
@@ -3366,11 +3378,13 @@ export function loadShields() {
       top: 4,
       bottom: 2,
     },
+    bannerMap: {
+      "ID:toll": ["TOL"],
+    },
   };
-  shields["ID:toll"] = banneredShield(shields["ID:national"], ["TOL"]);
 
   // Iran
-  shields["ir:freeways"] = roundedRectShield(
+  shields["ir:freeway"] = roundedRectShield(
     Color.shields.blue,
     Color.shields.white
   );
@@ -3556,11 +3570,11 @@ export function loadShields() {
   );
 
   // Vietnam
-  shields["vn:expressway"] = roundedRectShield(
+  shields["VN:expressway"] = roundedRectShield(
     Color.shields.yellow,
     Color.shields.black
   );
-  shields["vn:national"] = roundedRectShield(
+  shields["VN:national"] = roundedRectShield(
     Color.shields.white,
     Color.shields.black
   );
@@ -3934,13 +3948,12 @@ export function loadShields() {
   );
 
   // Poland
-  shields["pl:motorways"] = roundedRectShield(
+  shields["pl:expressway"] = shields["pl:motorway"] = roundedRectShield(
     Color.shields.red,
     Color.shields.white,
     Color.shields.white,
     34
   );
-  shields["pl:expressways"] = shields["pl:motorways"];
   shields["pl:national"] = roundedRectShield(
     Color.shields.red,
     Color.shields.white
diff --git a/src/layer/poi.js b/src/layer/poi.js
index 8fc48fc6b..b3c61b632 100644
--- a/src/layer/poi.js
+++ b/src/layer/poi.js
@@ -244,6 +244,15 @@ var iconDefs = {
     color: Color.poi.transport,
     description: "Tram stop",
   },
+  restaurant: {
+    classes: {
+      restaurant: ["restaurant"],
+      fast_food: ["fast_food", "food_court"],
+    },
+    sprite: "poi_restaurant",
+    color: Color.poi.consumer,
+    description: "Restaurant or fast food",
+  },
   school: {
     classes: {
       school: ["kindergarten", "school"],
@@ -336,6 +345,7 @@ export const poi = {
         ...getSubclasses(iconDefs.car_repair),
         ...getSubclasses(iconDefs.hotel),
         ...getSubclasses(iconDefs.hostel),
+        ...getSubclasses(iconDefs.restaurant),
       ],
       Color.poi.consumer,
       [
@@ -415,6 +425,7 @@ export const poi = {
         ...getSubclasses(iconDefs.taxi),
         ...getSubclasses(iconDefs.hotel),
         ...getSubclasses(iconDefs.hostel),
+        ...getSubclasses(iconDefs.restaurant),
       ],
       16,
       ["clinic", "doctors", "parking"],