diff --git a/blocks/store-locator/store-locator.css b/blocks/store-locator/store-locator.css
index 31bf26b..9af3587 100644
--- a/blocks/store-locator/store-locator.css
+++ b/blocks/store-locator/store-locator.css
@@ -1,7 +1,8 @@
 .store-locator {
-  display: flex;
-  flex-direction: column;
-  gap: 24px;
+  display: grid;
+  grid-template-columns: 1fr;
+  gap: 24px 48px;
+  align-items: start;
 }
 
 .store-locator-search h1,
@@ -10,7 +11,7 @@
 .store-locator-search h4,
 .store-locator-search h5,
 .store-locator-search h6 {
-  margin: 0 0 16px;
+  margin: 0 0 24px;
   color: inherit;
 }
 
@@ -22,31 +23,70 @@
 .store-locator-field input {
   box-sizing: border-box;
   width: 100%;
-  border: 1px solid var(--conti-darkest-grey);
-  border-radius: 4px;
+  border: 0;
+  border-bottom: 1px solid var(--conti-white);
+  border-radius: 0;
   background-color: transparent;
-  padding: 12px 16px;
+  padding: 8px 24px 8px 0;
   color: var(--conti-white);
   font-family: var(--body-font-family);
   font-size: var(--body-font-size-s);
 }
 
 .store-locator-field input::placeholder {
-  color: var(--conti-dark-grey);
+  color: var(--conti-white);
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
 }
 
 .store-locator-field input:disabled {
-  cursor: not-allowed;
-  opacity: 0.7;
+  cursor: default;
+}
+
+.store-locator-search p {
+  margin: 12px 0 0;
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
+  font-size: var(--body-font-size-xs);
+}
+
+/* example store result */
+.store-locator-result {
+  display: grid;
+  grid-template-columns: auto 1fr;
+  gap: 4px 24px;
+  align-items: start;
+}
+
+.store-locator-result p {
+  margin: 0 0 6px;
+}
+
+.store-locator-result p:first-child {
+  grid-row: span 5;
+  align-self: center;
+  color: var(--conti-yellow);
+  font-size: var(--heading-font-size-l);
+  line-height: 1;
+  text-align: center;
+}
+
+.store-locator-result p:first-child strong {
+  display: block;
+  font-weight: 300;
+}
+
+.store-locator-result .icon {
+  width: 18px;
+  height: 18px;
+  vertical-align: middle;
+  margin-inline-end: 6px;
 }
 
 .store-locator-ctas {
   display: flex;
   flex-wrap: wrap;
   gap: 16px;
-}
-
-.store-locator-ctas p {
   margin: 0;
 }
 
@@ -62,10 +102,13 @@
   color: var(--conti-black);
 }
 
-@media (width >= 700px) {
+@media (width >= 900px) {
   .store-locator {
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
+    grid-template-columns: 1fr 1fr;
+  }
+
+  .store-locator-ctas {
+    grid-column: 2;
+    justify-content: flex-end;
   }
 }
diff --git a/blocks/store-locator/store-locator.js b/blocks/store-locator/store-locator.js
index 6b775ee..28e9dc9 100644
--- a/blocks/store-locator/store-locator.js
+++ b/blocks/store-locator/store-locator.js
@@ -1,30 +1,30 @@
 /**
- * Static shell for the live store locator: a heading, a disabled location
- * input (no live geolocation/search in this demo) and CTA links. The input
- * is built in JS because it has no default-content representation.
+ * Static representation of the live "Stores near" module: a search column
+ * (heading + disabled location input + use-current-location link) and an
+ * example nearest-store result with distance, address, directions and phone,
+ * plus CTA links. No live geolocation/search in this demo; the store result
+ * is illustrative content authored on the page, matching what the live site
+ * renders by default.
  * @param {Element} block the store-locator block
  */
 export default function decorate(block) {
-  const heading = block.querySelector('h1, h2, h3, h4, h5, h6');
-  const ctaWrappers = [...block.querySelectorAll('p.button-wrapper')];
+  const [search, result, ctas] = [...block.children];
 
-  const search = document.createElement('div');
-  search.className = 'store-locator-search';
-  if (heading) search.append(heading);
+  if (search) {
+    search.className = 'store-locator-search';
+    const field = document.createElement('div');
+    field.className = 'store-locator-field';
+    const input = document.createElement('input');
+    input.type = 'text';
+    input.placeholder = 'Enter city, state or zip';
+    input.setAttribute('aria-label', 'Enter city, state or zip');
+    input.disabled = true;
+    field.append(input);
+    const heading = search.querySelector('h1, h2, h3, h4, h5, h6');
+    if (heading) heading.after(field);
+    else search.prepend(field);
+  }
 
-  const field = document.createElement('div');
-  field.className = 'store-locator-field';
-  const input = document.createElement('input');
-  input.type = 'text';
-  input.placeholder = 'Enter city, state or zip';
-  input.setAttribute('aria-label', 'Enter city, state or zip');
-  input.disabled = true;
-  field.append(input);
-  search.append(field);
-
-  const ctas = document.createElement('div');
-  ctas.className = 'store-locator-ctas';
-  ctaWrappers.forEach((p) => ctas.append(p));
-
-  block.replaceChildren(search, ctas);
+  if (result) result.className = 'store-locator-result';
+  if (ctas) ctas.className = 'store-locator-ctas';
 }
diff --git a/icons/chat.svg b/icons/chat.svg
index ffa6cdc..e7f6359 100644
--- a/icons/chat.svg
+++ b/icons/chat.svg
@@ -1,4 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <path d="M12,3.5c-5.2,0-9.5,3.5-9.5,7.8c0,2.4,1.3,4.6,3.5,6.1c-0.2,1.2-0.7,2.3-1.5,3.2c-0.2,0.2-0.1,0.5,0.2,0.5
-    c1.8-0.1,3.4-0.7,4.8-1.7c0.8,0.2,1.7,0.3,2.5,0.3c5.2,0,9.5-3.5,9.5-7.8S17.2,3.5,12,3.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 41 41"><g fill="none" fill-rule="evenodd"><path d="M16.118.294a6 6 0 00-6 6v12.118a6.002 6.002 0 004.705 5.86v5.434l6.619-5.295h13.264a6 6 0 006-6V6.295a6 6 0 00-6-6z" fill="orange"/><path d="M25.882 10.882a6 6 0 016 6V29a6.002 6.002 0 01-4.705 5.86v5.434L20.557 35 7.294 35a6 6 0 01-6-6V16.882a6 6 0 016-6z" stroke="#333"/></g></svg>
diff --git a/icons/facebook.svg b/icons/facebook.svg
index 6f75636..505d85f 100644
--- a/icons/facebook.svg
+++ b/icons/facebook.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <path d="M14,13.5h2.5l1-4H14v-2c0-1,0.5-2,2-2h1.6V2.1C17.6,2,16.4,2,15.2,2C12,2,10,4,10,7.4V9.5H6.5v4H10V22h4V13.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M20 10c0-5.523-4.477-10-10-10S0 4.477 0 10c0 4.991 3.657 9.128 8.438 9.879V12.89h-2.54V10h2.54V7.797c0-2.506 1.492-3.89 3.777-3.89 1.093 0 2.238.195 2.238.195v2.46h-1.26c-1.243 0-1.63.771-1.63 1.563V10h2.773l-.443 2.89h-2.33v6.989C16.343 19.129 20 14.99 20 10z" fill="currentColor" fill-rule="evenodd"/></svg>
diff --git a/icons/help-outline.svg b/icons/help-outline.svg
index e0d754c..631229f 100644
--- a/icons/help-outline.svg
+++ b/icons/help-outline.svg
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <path d="M12,2C6.5,2,2,6.5,2,12s4.5,10,10,10s10-4.5,10-10S17.5,2,12,2z M12,18.3c-0.7,0-1.3-0.6-1.3-1.3
-    s0.6-1.3,1.3-1.3s1.3,0.6,1.3,1.3S12.7,18.3,12,18.3z M13.8,12.6c-0.6,0.4-0.8,0.7-0.8,1.3v0.3h-2v-0.4
-    c0-1.1,0.4-1.7,1.3-2.3c0.8-0.5,1.2-0.9,1.2-1.6c0-0.8-0.6-1.3-1.5-1.3c-0.8,0-1.4,0.4-1.9,1.2L8.6,8.7
-    c0.7-1.2,1.9-2,3.5-2c2,0,3.4,1.2,3.4,2.9C15.5,11.1,14.8,11.9,13.8,12.6z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 8 16"><g fill="none" fill-rule="evenodd" stroke="var(--icon-stroke, #000)" stroke-linecap="round"><path d="M.5 2.5C2.187 1.307 3.696.998 5.03 1.572c1.998.86 2.107 3.546.8 4.624C4.525 7.275 2.5 8.601 2.5 9.86V11.5M2.5 14.5v1"/></g></svg>
diff --git a/icons/instagram.svg b/icons/instagram.svg
new file mode 100644
index 0000000..6229df7
--- /dev/null
+++ b/icons/instagram.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 21 21"><path d="M11.527.5c1.8.004 2.182.018 3.096.06 1.064.049 1.791.218 2.427.465a4.902 4.902 0 011.771 1.153 4.902 4.902 0 011.154 1.771c.247.637.416 1.363.465 2.428.01.228.019.424.026.616l.007.193c.017.517.024 1.086.026 2.286v2.055c-.002 1.2-.01 1.77-.026 2.287l-.007.193c-.007.192-.016.387-.026.616-.049 1.064-.218 1.791-.465 2.427a4.902 4.902 0 01-1.154 1.771 4.902 4.902 0 01-1.77 1.154c-.637.247-1.364.416-2.428.465-.229.01-.424.019-.616.026l-.193.007c-.517.017-1.086.024-2.287.026H9.472c-1.2-.002-1.77-.01-2.286-.026l-.193-.007a78.692 78.692 0 01-.616-.026c-1.065-.049-1.791-.218-2.428-.465a4.902 4.902 0 01-1.77-1.154 4.902 4.902 0 01-1.154-1.77c-.247-.637-.416-1.364-.465-2.428-.042-.914-.056-1.295-.06-3.096V9.472c.004-1.8.018-2.18.06-3.095.049-1.065.218-1.791.465-2.428a4.902 4.902 0 011.153-1.77A4.902 4.902 0 013.95 1.024C4.586.778 5.312.609 6.377.56 7.29.518 7.672.504 9.472.5zm-.471 1.802H9.239c-1.552.005-1.92.019-2.78.058-.975.044-1.505.207-1.857.344-.467.182-.8.398-1.15.748-.35.35-.566.683-.748 1.15-.137.352-.3.882-.344 1.857-.04.86-.053 1.228-.057 2.78v.454l-.001.251V11.761c.005 1.551.019 1.92.058 2.78.044.975.207 1.504.344 1.857.182.466.398.8.748 1.15.35.35.683.566 1.15.747.352.137.882.3 1.857.345.898.04 1.26.054 2.999.057l.755.001h1.329c1.738-.004 2.1-.017 2.999-.058.975-.045 1.504-.208 1.857-.345.466-.181.8-.398 1.15-.748.35-.35.566-.683.747-1.15.137-.352.3-.881.345-1.856.04-.899.054-1.261.057-3l.001-.754V10.5 9.458c-.004-1.738-.017-2.1-.058-2.999-.045-.975-.208-1.505-.345-1.857a3.098 3.098 0 00-.748-1.15 3.099 3.099 0 00-1.15-.748c-.352-.137-.881-.3-1.856-.344-.86-.04-1.229-.053-2.78-.057l-.454-.001h-.251zM10.5 5.5a5 5 0 110 10 5 5 0 010-10zm0 1.754a3.246 3.246 0 100 6.491 3.246 3.246 0 000-6.49zm5.555-3.42a1.111 1.111 0 110 2.221 1.111 1.111 0 010-2.222z" fill="currentColor" fill-rule="evenodd"/></svg>
diff --git a/icons/license-plate.svg b/icons/license-plate.svg
index 15173a6..e118eae 100644
--- a/icons/license-plate.svg
+++ b/icons/license-plate.svg
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <path fill-rule="evenodd" d="M3,6c0-1.1,0.9-2,2-2h14c1.1,0,2,0.9,2,2v12c0,1.1-0.9,2-2,2H5c-1.1,0-2-0.9-2-2V6z
-    M5,6v12h14V6H5z"/>
-  <rect x="6.5" y="10.5" width="4" height="3" rx="0.5"/>
-  <rect x="11.5" y="10.5" width="6" height="3" rx="0.5"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 30 18"><g fill="none" fill-rule="evenodd"><path d="M.6 1h28.8v16.32H.6zm22.649 1.76h1.422m-1.422 12.8h1.422M5.17 2.76H6.59M5.17 15.56H6.59" stroke="currentColor"/><g fill="currentColor"><path d="M9.56 4.52h10.88V5.8H9.56z"/><path d="M3.797 12.713v-5.55H2.2v.965h.532v4.585zm1.958-3.62a3.547 3.547 0 01-.008-.226V8.68c.005-.315.056-.836.449-.836.358 0 .432.425.432.7 0 .565-.407 1.306-.674 1.796l-1.29 2.372h2.913v-.957h-1.29l.963-1.844c.235-.451.427-.87.427-1.418 0-.948-.574-1.414-1.49-1.414-1.148 0-1.456.674-1.456 1.714 0 .1.009.2.017.3zm2.515-.366h.948l.001-.106c.007-.265.052-.634.365-.634.325 0 .383.374.383.624 0 .632-.275.732-.849.732v.932c.62 0 .819.14.832.735v.14c-.007.321-.066.789-.466.789-.3 0-.424-.258-.424-.524 0-.05.008-.108.008-.158H8.037c0 .948.499 1.547 1.472 1.547 1.007 0 1.631-.624 1.631-1.63 0-.633-.225-1.132-.857-1.332.558-.25.69-.757.69-1.323 0-.873-.507-1.439-1.397-1.439-.491 0-.949.183-1.157.649-.12.27-.145.546-.149.841zm4.753 2.397v-.899h-1.398v.899zm4.286 1.589l-1.33-5.55H14.83l-1.298 5.55h1.098l.2-.932h1.107l.208.932zm-2.312-1.79c.158-.773.316-1.547.366-2.329.025.242.058.491.091.732.083.541.2 1.065.316 1.598zm2.59-3.76v5.55h1.164l.099-.002c.33-.011.823-.089 1.207-.473.308-.307.416-.682.416-1.098 0-.208-.033-.516-.191-.782l-.033-.05a1.178 1.178 0 00-.566-.44c.208-.084.35-.217.44-.325.2-.242.259-.516.259-.79 0-.45-.158-.908-.458-1.199-.383-.374-.873-.39-1.165-.39zm1.097.907c.242 0 .391.075.483.166.145.145.171.332.174.465v.035c0 .124-.016.357-.174.516a.787.787 0 01-.483.19zm0 2.222c.159 0 .358.058.491.174.125.117.217.316.217.583a.737.737 0 01-.208.54.761.761 0 01-.5.175zm5.036 1.156a.966.966 0 01-.657.266.8.8 0 01-.624-.266c-.391-.433-.391-1.315-.391-1.456 0-.716.158-1.29.458-1.59a.827.827 0 01.607-.249c.175 0 .4.05.607.242V7.263a1.616 1.616 0 00-.69-.158c-.375 0-.874.1-1.332.557-.732.74-.798 1.806-.798 2.363 0 1.173.358 1.856.749 2.247.374.374.782.499 1.314.499.3 0 .516-.042.757-.175zm.527-4.285v5.55h1.073c1.68 0 2.246-1.248 2.246-2.746 0-.99-.283-2.163-1.273-2.612-.343-.16-.658-.188-1.022-.191zm1.098 4.535V8.137c.224.008.383.041.557.191.441.366.566 1.082.566 1.63l-.002.11c-.022.687-.26 1.637-1.088 1.63z" fill-rule="nonzero"/></g></g></svg>
diff --git a/icons/limited-warranty.svg b/icons/limited-warranty.svg
deleted file mode 100644
index 7acb0e8..0000000
--- a/icons/limited-warranty.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <path fill-rule="evenodd" d="M6,2h9l5,5v6h-2V8h-5V4H6v11h4v2H6c-1.1,0-2-0.9-2-2V4C4,2.9,4.9,2,6,2z"/>
-  <path fill-rule="evenodd" d="M17,13c-2.2,0-4,1.8-4,4c0,1,0.4,1.9,1,2.6L13,22.5l3-1.1c0.3,0.1,0.7,0.1,1,0.1
-    s0.7,0,1-0.1l3,1.1L20.5,22c0.6-0.7,1-1.6,1-2.6C22.8,15.1,20.2,13,17,13z M17,15.5c1.4,0,2.5,1.1,2.5,2.5
-    s-1.1,2.5-2.5,2.5s-2.5-1.1-2.5-2.5S15.6,15.5,17,15.5z"/>
-</svg>
diff --git a/icons/mileage-warranty.svg b/icons/mileage-warranty.svg
deleted file mode 100644
index 40fdbf6..0000000
--- a/icons/mileage-warranty.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <path fill-rule="evenodd" d="M12,3C6.5,3,2,7.5,2,13c0,2.2,0.7,4.2,1.9,5.9c0.2,0.3,0.5,0.5,0.9,0.5h14.4
-    c0.4,0,0.7-0.2,0.9-0.5C21.3,17.2,22,15.2,22,13C22,7.5,17.5,3,12,3z M12,5c3.9,0,7,3.1,7,7c0,0.8-0.1,1.5-0.4,2.2
-    l-1.9-0.7c0.2-0.5,0.3-1,0.3-1.5c0-2.8-2.2-5-5-5s-5,2.2-5,5c0,0.5,0.1,1,0.3,1.5l-1.9,0.7C5.1,13.5,5,12.8,5,12
-    C5,8.1,8.1,5,12,5z"/>
-  <path d="M12.7,7.3l1.8,4.9c0.3,0.1,0.5,0.3,0.7,0.5c0.6,0.6,0.6,1.5,0,2.1c-0.6,0.6-1.5,0.6-2.1,0
-    c-0.2-0.2-0.4-0.5-0.5-0.7l-4.9-1.8L12.7,7.3z"/>
-</svg>
diff --git a/icons/phone.svg b/icons/phone.svg
new file mode 100644
index 0000000..586edfe
--- /dev/null
+++ b/icons/phone.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15"><g fill="none" fill-rule="evenodd"><path d="M5.405 4.409c.425.408.437 1.082.027 1.505l-.742.765c-.734.753-.157 1.535 1.085 2.75 1.24 1.216 2.054 1.68 2.758.947.316-.33.563-.584.742-.766a1.072 1.072 0 011.511-.026l1.537 1.479c.425.408.437 1.082.027 1.504l-.743.766c-.41.423-2.975 1.668-7.28-2.472S1.205 4.145 1.615 3.722l.742-.765a1.072 1.072 0 011.511-.027z" fill="#fff" stroke="#333"/><path d="M8.105 5.096c.485.189.887.425 1.205.708.318.284.54.65.666 1.1m-1.84-3.822a5.058 5.058 0 012.574 1.331c.73.696 1.222 1.499 1.476 2.409M7.765.957c1.85.238 3.314.887 4.392 1.949 1.078 1.06 1.79 2.47 2.137 4.228" stroke="orange" stroke-linecap="round"/></g></svg>
diff --git a/icons/pin.svg b/icons/pin.svg
new file mode 100644
index 0000000..0c30a27
--- /dev/null
+++ b/icons/pin.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 49"><filter id="bua" height="1.558" width="1.774" x="-.387" y="-.279"><feOffset dx="1" dy="-2" in="SourceAlpha" result="shadowOffsetOuter1"/><feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation="2"/><feColorMatrix in="shadowBlurOuter1" result="shadowMatrixOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/><feMerge><feMergeNode in="shadowMatrixOuter1"/><feMergeNode in="SourceGraphic"/></feMerge></filter><g fill="none" fill-rule="evenodd" filter="url(#bua)" transform="translate(9 9.118)"><path d="M8.774 38.662c3.549-4.501 6.009-7.742 7.381-9.72 5.276-7.604 7.913-13.418 7.913-17.44 0-8.391-6.847-15.192-15.294-15.192C.328-3.69-6.52 3.11-6.52 11.5c0 5.593 5.098 14.647 15.294 27.161z" fill="orange"/><circle cx="8.774" cy="11.604" fill="#333" r="5.882"/></g></svg>
diff --git a/icons/road-hazard.svg b/icons/road-hazard.svg
deleted file mode 100644
index 6014dca..0000000
--- a/icons/road-hazard.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <path fill-rule="evenodd" d="M12,3L2,21h20L12,3z M12,7.5l6.5,11.5h-13L12,7.5z"/>
-  <rect x="11" y="11.5" width="2" height="5"/>
-  <rect x="11" y="17.5" width="2" height="2"/>
-</svg>
diff --git a/icons/roadside-assistance.svg b/icons/roadside-assistance.svg
deleted file mode 100644
index 95b67c8..0000000
--- a/icons/roadside-assistance.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <path fill-rule="evenodd" d="M20.7,7.3l-3.4,3.4l-2-2l3.4-3.4c-1.6-0.8-3.6-0.5-4.9,0.8c-1.4,1.4-1.7,3.5-0.8,5.2
-    l-8.6,8.6c-0.6,0.6-0.6,1.5,0,2.1c0.6,0.6,1.5,0.6,2.1,0l8.6-8.6c1.7,0.9,3.8,0.6,5.2-0.8
-    C21.2,10.9,21.5,8.9,20.7,7.3z"/>
-</svg>
diff --git a/icons/satisfaction-trial.svg b/icons/satisfaction-trial.svg
deleted file mode 100644
index 972aab9..0000000
--- a/icons/satisfaction-trial.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <path fill-rule="evenodd" d="M12,2C6.5,2,2,6.5,2,12s4.5,10,10,10s10-4.5,10-10S17.5,2,12,2z M12,4c4.4,0,8,3.6,8,8
-    s-3.6,8-8,8s-8-3.6-8-8S7.6,4,12,4z"/>
-  <path d="M9,11H7v7h2V11z M14.5,9h-2.8l0.5-2.4C12.3,6,11.9,5.5,11.3,5.5c-0.3,0-0.6,0.2-0.8,0.4L8,10v8h7.5
-    c0.7,0,1.3-0.5,1.4-1.2l0.9-4.5C18,11.5,17.3,10.7,16.5,10.7L14.5,9z"/>
-</svg>
diff --git a/icons/search.svg b/icons/search.svg
index 637c677..1c88718 100644
--- a/icons/search.svg
+++ b/icons/search.svg
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <path d="M16.9,15.5c2.4-3.2,2.2-7.7-0.7-10.6c-3.1-3.1-8.1-3.1-11.3,0c-3.1,3.2-3.1,8.3,0,11.4
-    c2.9,2.9,7.5,3.1,10.6,0.6c0,0.1,0,0.1,0,0.1l4.2,4.2c0.5,0.4,1.1,0.4,1.5,0c0.4-0.4,0.4-1,0-1.4L16.9,15.5
-    C16.9,15.5,16.9,15.5,16.9,15.5L16.9,15.5z M14.8,6.3c2.3,2.3,2.3,6.1,0,8.5c-2.3,2.3-6.1,2.3-8.5,0C4,12.5,4,8.7,6.3,6.3
-    C8.7,4,12.5,4,14.8,6.3z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 15 15"><path fill="var(--icon-stroke, #000)" d="M6.53 1.14a5.508 5.508 0 00-5.5 5.5c0 3.032 2.468 5.5 5.5 5.5s5.5-2.468 5.5-5.5-2.47-5.5-5.5-5.5zm0 1c2.49 0 4.5 2.01 4.5 4.5s-2.01 4.5-4.5 4.5-4.5-2.008-4.5-4.5 2.008-4.5 4.5-4.5z"/><path fill="var(--icon-stroke, #000)" d="M10.506 10.141a.5.5 0 00-.33.146.5.5 0 000 .708l3 3a.5.5 0 00.707 0 .5.5 0 000-.708l-3-3a.5.5 0 00-.377-.146z"/></svg>
diff --git a/icons/tcp-badge.svg b/icons/tcp-badge.svg
index 2f6f7d7..d4395fa 100644
--- a/icons/tcp-badge.svg
+++ b/icons/tcp-badge.svg
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 120" width="100" height="120">
-  <path fill="#ffa500" d="M50,2 L92,16 V56 C92,88 74,108 50,118 C26,108 8,88 8,56 V16 Z"/>
-  <path fill="#fff" d="M50,10 L84,22 V56 C84,83 68,100 50,109 C32,100 16,83 16,56 V22 Z"/>
-  <circle cx="50" cy="52" r="30" fill="#1d1d1d"/>
-  <path fill="#ffa500" d="M38,52 L47,61 L64,42 L60,38 L47,53 L42,48 Z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 166 195"><path d="M163.2 32.9c-8.3-4.9-16.5-8.5-24.4-10.7V10.5l-2.4-.9C120.5 3.3 102 0 83 0S45.5 3.3 29.5 9.6l-2.4.9v11.7C19.2 24.4 11 28 2.8 32.9l-1.8 1v79.6l.1 3.7c.9 18.4 8.1 36 20.2 49.8 12.9 14.7 30.5 24.3 49.7 27.1h.2c.6.1 1.1.2 1.7.2h.4c.5.1 1 .1 1.5.2h.7c.4 0 .9.1 1.3.1h1.1c.3 0 .6 0 .9.1H89c.4 0 .7-.1 1.1-.1h.9c.5 0 1-.1 1.5-.2l.5-.1c.6-.1 1.1-.1 1.7-.2h.2l1.8-.3c18.8-3.2 36-13 48.5-27.6 12.6-14.7 19.6-33.5 19.7-52.8V33.9z" fill="#fff"/><path d="M4.7 91.5h156.7v6.8H4.7z" fill="#ffa400"/><path d="M83 191.3c43.3 0 78.3-35.1 78.3-78.3V103.6H4.7V113c0 43.2 35 78.3 78.3 78.3z" fill="#231f20"/><path d="M135.1 25.1v-12C120 7.1 102.2 3.7 83 3.7s-37 3.4-52.1 9.4v12c-10.1 2.3-19.2 6.8-26.2 11v50.3h45.6C58.1 77 69.8 71 83 71s24.9 6 32.7 15.4h45.6V36.1c-7-4.2-16.1-8.7-26.2-11M154.4 121.4c.1 6.4-5.1 11.7-11.5 11.8s-11.7-5.1-11.8-11.5 5.1-11.7 11.5-11.8 11.7 5.1 11.8 11.5" fill="#ffa400"/><path d="M148.6 123.4v-.5-.2-.4-4.3c0-.3-.2-.6-.5-.7-.1-.1-.3-.1-.4-.1H143.9h-.1v-.1-2c.1-.1.1-.1.1-.2v-.6-.2c0-.1-.1-.2-.2-.2h-.3c-.1 0-.2 0-.2.1-.1.1-.2.2-.3.2h-1.7c-.1 0-.2-.1-.3-.2 0-.1-.1-.1-.2-.1h-.3-.1c-.1 0-.1.1-.1.1V114.8c0 .1 0 .2.1.2v2h-4.2c-.2 0-.4.1-.6.3s-.3.4-.3.6V125.6c0 .3.1.5.3.6.2.2.4.2.6.2H136.9v.4c0 .1.1.3.2.3.1.1.2.1.3.1h.7c.3 0 .4-.2.4-.5v-.4h6.6v.5c.1.2.2.3.4.3h.7c.3 0 .5-.2.5-.5v-.4H147.5c.4 0 .7-.2.8-.6 0-.1.1-.2.1-.4.2-.4.2-1.1.2-1.8zm-10.5 1.5c0 .1-.1.2-.2.2s-.2-.1-.2-.2v-.1-4.9-1.3c0-.1.1-.2.2-.2s.2.1.2.2v6.1zm5.2-7.9h-2.6v-.1V115c.1 0 .1-.1.1-.1.1-.1.1-.2.3-.2h1.8c.1 0 .2 0 .3.1l.1.1s0 .1.1.1v1.9c-.1 0-.1.1-.1.1zm3 4.8v3.1c0 .1-.1.2-.3.2-.1 0-.1-.1-.1-.2v-.1V118.6c0-.1.1-.2.2-.2s.2.1.2.2v.1z" fill="#231f20"/><path d="M144.9 124.5v1.1c0 .2 0 .5.1.7.3 1.4 1.2 2.3 2.6 2.7h.1c1.5-.3 2.7-1.7 2.7-3.3v-2.6s0-.1-.1-.1-.2 0-.3-.1c-.8-.2-1.6-.4-2.3-.7h-.1c-.8.4-1.7.6-2.6.8-.1 0-.1 0-.1.1z" fill="#ffa400"/><path d="M150.9 124.3v1.3c0 1.8-1.3 3.5-3 3.9-.2 0-.3.1-.5 0-1.6-.5-2.6-1.5-3-3.1-.1-.3-.1-.6-.1-.9v-2.8c0-.2 0-.2.2-.3.7-.1 1.4-.3 2.1-.6.3-.1.6-.2.8-.3h.3c.8.4 1.6.6 2.5.8.2 0 .3.1.5.1s.2.1.2.2zm-6 .2v1.1c0 .2 0 .5.1.7.3 1.4 1.2 2.3 2.6 2.7h.1c1.5-.3 2.7-1.7 2.7-3.3v-2.6s0-.1-.1-.1-.2 0-.3-.1c-.8-.2-1.6-.4-2.3-.7h-.1c-.8.4-1.7.6-2.6.8-.1 0-.1 0-.1.1z" fill="#231f20"/><path d="M147.3 125.9c.4-.6.7-1.2 1.1-1.7.3-.5.6-.6 1.2-.5 0 .1 0 .2-.1.2-.1.3-.3.6-.5.8-.4.7-.9 1.5-1.3 2.2-.2.3-.7.3-.9 0-.3-.5-.6-1.1-.9-1.6-.2-.3-.1-.4.3-.4h.1c.3 0 .5.1.7.4l.3.6z" fill="#231f20"/><path d="M34.9 121.5c0 6.4-5.2 11.6-11.6 11.6s-11.6-5.2-11.6-11.6 5.2-11.6 11.6-11.6 11.6 5.2 11.6 11.6" fill="#ffa400"/><path d="M15.9 125.9h14.8l-7.4-12.8zm15.7 1.1H14.9c-.2 0-.4-.1-.5-.3s-.1-.4 0-.5l8.3-14.4c.1-.2.3-.3.5-.3s.4.1.5.3l8.3 14.4c.1.1.1.2.1.3.1.3-.2.5-.5.5" fill="#231f20"/><path d="M23.3 124.9c-.7 0-1.2-.6-1.2-1.2s.5-1.2 1.2-1.2 1.2.6 1.2 1.2-.5 1.2-1.2 1.2m1.2-7.1c0 .5-.2 1-.3 1.4-.3.8-.5 1.5-.5 2.3 0 .2-.1.5-.4.5s-.4-.2-.4-.5c0-.8-.3-1.6-.5-2.3-.1-.4-.3-1-.3-1.4 0-.8.4-1.5 1.3-1.5.7 0 1.1.7 1.1 1.5" fill="#231f20"/><path d="M49.1 152.3c0 6.4-5.2 11.6-11.6 11.6s-11.6-5.2-11.6-11.6 5.2-11.6 11.6-11.6 11.6 5.2 11.6 11.6" fill="#ffa400"/><path d="M31.9 157.8h9v-12.2h-9zm9.5 1h-9.9c-.3 0-.5-.2-.5-.5v-13.2c0-.3.2-.5.5-.5h9.9c.3 0 .5.2.5.5v13.2c0 .3-.3.5-.5.5" fill="#231f20"/><path d="M39.7 147.5h-5.6c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h5.6c.3 0 .5.2.5.5-.1.3-.3.5-.5.5M39.7 149h-6.5c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h6.5c.3 0 .5.2.5.5-.1.3-.3.5-.5.5M39.7 150.6h-6.5c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h6.5c.3 0 .5.2.5.5-.1.2-.3.5-.5.5M39.7 152.1h-6.5c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h6.5c.3 0 .5.2.5.5-.1.3-.3.5-.5.5M39.7 153.6h-6.5c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h6.5c.3 0 .5.2.5.5-.1.3-.3.5-.5.5M39.7 155.2h-6.5c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h6.5c.3 0 .5.2.5.5s-.3.5-.5.5M39 156.7h-5.8c-.3 0-.5-.2-.5-.5s.2-.5.5-.5H39c.3 0 .5.2.5.5-.1.3-.3.5-.5.5" fill="#231f20"/><path d="M42.2 158.5c-.1 0-.2-.1-.3-.1h-.2l-.1.1-.2.2c-.1.2-.3.3-.5.3l.2 2.3.8-1.2 1.2.8-.8-2.4h-.1M43.9 157.1c-.1 0-.1 0-.2.1h-.1-.1v.5c0 .3-.2.5-.4.7l1.2 1.3-.1-1.4 1.4-.2-1.5-.9c0-.1-.1-.1-.2-.1" fill="#ffa400"/><path d="M44.2 158.2l.1 1.4-1.2-1.3c.2-.2.4-.4.4-.7v-.5h.2c.1 0 .1 0 .2-.1.1 0 .2-.1.2-.1l1.5.9zm-2.2 1.9l-.8 1.2-.2-2.3c.2 0 .4-.1.5-.3l.2-.2.1-.1h.2c.1 0 .2.1.3.1h.2l.8 2.4zm-1.6-1.7c-.1-.1-.2-.2-.2-.3l-.1-.1s-.1 0-.1-.1H39.7c-.1 0-.2.1-.4.1h-.4c-.1 0-.1 0-.1-.1s-.1-.1-.1-.1v-.2-.4c0-.2-.2-.4-.4-.4-.1 0-.2-.1-.4-.1-.3-.1-.5-.4-.3-.7.1-.1.1-.3.2-.4.1-.2.1-.4-.1-.6l-.3-.3c-.2-.2-.2-.5.1-.7.1-.1.2-.1.4-.2s.3-.3.3-.6c0-.1 0-.2-.1-.3V152.6v-.1-.1-.1H38.9c.1 0 .2-.2.3-.3s.1-.3.2-.4c0 0 0-.1.1-.1s0 0 .1-.1.1 0 .1-.1h.2s.1 0 .1.1c.1.1.2.2.4.2l.1.1H40.8c.1 0 .1 0 .2-.1s.2-.2.3-.2c0 0 .1 0 .1-.1H41.7l.1.1.1.1c.1.1.1.3.2.4 0 .1.1.1.1.1l.1.1H43.6v.4c-.1.5 0 .8.5 1.1.3.2.4.5.1.8l-.2.2c-.2.2-.2.4-.1.7 0 .1.1.2.1.2.2.3 0 .6-.3.7-.1 0-.2.1-.3.1-.3.1-.4.2-.4.5v.4c0 .2-.1.3-.3.4h-.2c-.1 0-.2-.1-.3-.1H41.9s-.1 0-.1.1-.1.1-.1.1l-.3.3c-.1.1-.1.1-.2.1H40.9c-.3.4-.4.4-.5.3zm5.5-.8l-1.4-.9.1-.1c.1-.3.1-.6-.1-.9 0 0 0-.1-.1-.1l-.1-.1v-.1l.1-.1.1-.1.1-.1c.2-.3.3-.6.3-.9-.1-.3-.3-.5-.6-.7-.3-.1-.3-.2-.2-.5s0-.6-.1-.9c-.2-.2-.5-.4-.8-.4h-.3c-.1 0 0-.1-.1-.1 0-.1-.1-.2-.1-.3-.2-.3-.5-.6-.9-.6-.2 0-.4.1-.5.2-.1 0-.1.1-.2.1l-.1.1-.1-.1c-.1-.1-.2-.1-.3-.2-.2-.1-.3-.1-.5-.1-.4 0-.7.2-.9.6 0 0 0 .1-.1.1 0 0 0 .1-.1.1 0 .1-.1.1-.1.1H38.6c-.3 0-.6.1-.8.4-.2.2-.3.6-.2.9V153.2s-.1 0-.1.1c-.1.1-.2.1-.3.2-.2.2-.4.4-.4.7s.1.5.2.7l.2.2.1.1c0 .1-.1.1-.1.2s-.1.1-.1.2c-.1.3-.1.6 0 .8.1.3.4.4.7.5h.1c.1 0 .1 0 .2.1v.4c0 .5.5.9 1 .9.1 0 .2 0 .3-.1h.1c.1 0 .2-.1.3-.1l.1.1c.1.1.1.2.2.2.1.1.3.2.4.3l.2 2.3c0 .2.2.4.4.4h.1c.2 0 .3-.1.4-.2l.6-.8.8.5c.1 0 .2.1.3.1s.2 0 .3-.1c.2-.1.2-.3.2-.5l-.5-1.6.8.8c.1.1.2.1.4.1h.2c.2-.1.3-.3.3-.5l-.1-1 1-.1c.2 0 .4-.2.4-.4-.2.2-.2 0-.4-.1" fill="#231f20"/><path d="M40.3 156.6h-.9l-.7-3v-.2h.9l.4 2.1.5-2.1h.7l.5 2.1.4-2.1h.8v.2l-.7 3h-.9l-.5-1.9zm.4 2H41c.1 0 .2-.1.2-.1l.3-.3.1-.1s.1 0 .1-.1H42c.1 0 .2.1.3.1h.2c.2-.1.3-.2.3-.4v-.4c0-.3.2-.4.4-.5.1 0 .2-.1.3-.1.3-.1.5-.4.3-.7 0-.1-.1-.2-.1-.2-.1-.3-.1-.5.1-.7l.2-.2c.3-.3.2-.6-.1-.8-.5-.2-.7-.5-.5-1.1v-.2-.1-.1c0-.1 0 0-.1 0h-.1-.1-.5-.1-.1-.2-.1s-.1 0-.1-.1-.1-.1-.1-.1c-.1-.1-.1-.3-.2-.4 0 0 0-.1-.1-.1s0 0-.1-.1H41.2s-.1 0-.1.1c-.1.1-.2.2-.3.2s-.1.1-.2.1H40.3s-.1 0-.1-.1c-.1-.1-.2-.2-.4-.2 0 0-.1 0-.1-.1h-.2s-.1 0-.1.1 0 0-.1.1l-.1.1c-.1.1-.1.3-.2.4l-.3.3h-.4-.1-.1-.1-.1V153.4c0 .1 0 .2.1.3 0 .3 0 .4-.3.6-.1.1-.2.1-.4.2-.2.2-.3.5-.1.7l.3.3c.1.2.2.4.1.6-.1.1-.1.3-.2.4-.1.3 0 .6.3.7.1 0 .2.1.4.1.2.1.4.2.4.4V158.3l.1.1.1.1h.4c.1 0 .2-.1.4-.1H39.8s.1 0 .1.1.1.1.1.1c.1.1.1.2.2.3.3-.4.4-.4.5-.3" fill="#ffa400"/><path d="M40.8 154.7l.4 1.9h1l.7-3.1v-.2h-.8l-.4 2.2-.5-2.2h-.7l-.5 2.2-.5-2.2h-.8v.3l.7 3h.9z" fill="#231f20"/><path d="M140.1 152.7c0 6.5-5.3 11.8-11.8 11.8s-11.8-5.3-11.8-11.8 5.3-11.8 11.8-11.8 11.8 5.3 11.8 11.8" fill="#ffa400"/><path d="M125.9 158.3c-.5 0-1 .4-1 1 0 .5.4 1 1 1 .5 0 1-.4 1-1-.1-.6-.5-1-1-1" fill="#231f20"/><path d="M125.9 160.9c-.9 0-1.6-.7-1.6-1.6s.7-1.6 1.6-1.6 1.6.7 1.6 1.6-.7 1.6-1.6 1.6m0-4.7c-1.7 0-3 1.3-3 3s1.4 3 3 3c1.7 0 3-1.3 3-3 0-1.6-1.4-3-3-3" fill="#231f20"/><path d="M133.1 145.2c.2 0 .4.2.4.4s-.2.4-.4.4-.4-.2-.4-.4.2-.4.4-.4m-10.9 14c0-2 1.7-3.7 3.7-3.7s3.7 1.7 3.7 3.7v.2H131.4v-1.8h-.4v-3.4h-6.1l7.8-7.5c.1 0 .2.1.3.1v4.6c-.2.1-.4.3-.4.5s.1.3.2.4c0 .1-.1.4-.2.5-.2.2-.3.5-.3.9 0 .3.2.6.4.7s.4.2.6.2h.2c.3-.1.6-.3.7-.6.1-.1 0-.3-.1-.4s-.3 0-.4.1c-.1.2-.2.3-.3.3s-.2 0-.3-.1-.1-.2-.2-.3c0-.1 0-.3.1-.4.3-.3.4-.8.4-.9.1-.1.2-.3.2-.5s-.2-.5-.4-.5v-4.6c.6-.1 1-.6 1-1.1 0-.6-.5-1.1-1.1-1.1s-1.1.5-1.1 1.1v.3l-13.6 8.3h-.8c.3 2 1.1 3.8 2.3 5.3h2.3v-.3" fill="#231f20"/><path d="M77.6 170.8c0 6.4-5.2 11.6-11.6 11.6s-11.6-5.2-11.6-11.6 5.2-11.6 11.6-11.6 11.6 5.2 11.6 11.6" fill="#ffa400"/><path d="M66 176.5c3.1 0 5.7-2.5 5.6-5.8-.1-2.8-2.6-5.3-5.4-5.4-3.3 0-5.9 2.6-5.8 5.9.1 2.9 2.5 5.4 5.6 5.3m-5.4-11.6c.3 0 .7.1 1 0s.6-.4.8-.6c.2-.3.3-.6.4-.9.3-.7 1-.9 1.6-.6l.9.6c.5.3.9.3 1.4 0 .3-.2.5-.4.7-.5.6-.4 1.4-.2 1.7.5.1.3.2.6.4.9.2.6.7.8 1.3.8h.7c1 0 1.5.5 1.3 1.5-.3 1.2 0 2 1.2 2.5.8.4.9 1.2.3 1.9-.2.2-.4.3-.5.5-.5.5-.5 1-.2 1.6l.3.6c.4.7.1 1.5-.7 1.7-.3.1-.5.1-.8.2-.6.2-1 .5-1 1.2 0 .3-.1.6-.1.8-.1.7-.8 1.2-1.5.9-.3-.1-.5-.2-.8-.3-.6-.2-1-.1-1.5.4-.2.3-.4.5-.6.8-.5.5-1.2.5-1.7 0-.2-.2-.4-.5-.5-.7-.4-.5-.8-.6-1.4-.5l-.9.3c-.7.2-1.4-.2-1.5-1 0-.3 0-.6-.1-.9-.1-.5-.4-.9-.9-1-.3-.1-.6-.1-.8-.2-.8-.2-1.1-.9-.8-1.6.1-.3.3-.6.4-.9.2-.5.1-.9-.2-1.3-.2-.3-.5-.5-.7-.7-.5-.5-.4-1.2.2-1.6.3-.2.6-.4.9-.5.5-.3.7-.8.6-1.4 0-.2-.1-.4-.1-.6-.4-1.4.3-2 1.2-1.9" fill="#231f20"/><path d="M61.1 170.9c0-2.7 2.2-4.9 4.9-4.9s4.9 2.2 4.9 4.9-2.2 4.9-4.9 4.9-4.9-2.2-4.9-4.9" fill="#231f20"/><path d="M63.5 171.9c1.1 1.2 1.8 1.9 2.4 2.7 0 0 2.1-3.9 6.1-6.8l-1-1.9s-3.5 4.4-5.2 7.1l-1.6-3zM111.6 170.8c0 6.4-5.2 11.6-11.6 11.6s-11.6-5.2-11.6-11.6 5.2-11.6 11.6-11.6 11.6 5.2 11.6 11.6" fill="#ffa400"/><path d="M94.9 170.8h1.3l.1-.1c.1-.2.2-.3.3-.5.1-.1.1-.3.1-.4s0-.3-.1-.3c-.1-.1-.1-.1-.3-.1-.1 0-.2.1-.2.2-.1.1-.1.2-.1.4h-.7c0-.3.1-.6.3-.9.2-.2.4-.4.7-.4s.6.1.8.3.3.5.3.8c0 .2 0 .4-.1.6 0 .1-.1.2-.2.3h1v-2.9h-3v3zM98 165.1h-1.1v1.8h-.7v-1.8h-1.3v2.5H98zM98.9 167.4c0-.4.1-.8.3-1s.4-.4.8-.4c.3 0 .6.1.7.4.2.3.3.6.3 1v1c0 .4-.1.8-.3 1-.2.3-.4.4-.7.4s-.6-.1-.8-.4-.3-.6-.3-1zm-.4 3.4h3v-5.7h-3z" fill="#231f20"/><path d="M99.9 169.1c.1 0 .2-.1.3-.2s.1-.3.1-.5v-1.1c0-.2 0-.4-.1-.5s-.1-.2-.3-.2c-.1 0-.2.1-.3.2s-.1.3-.1.5v1.1c0 .2 0 .4.1.5.1.2.2.2.3.2M102.5 167.4c0-.4.1-.8.3-1s.4-.4.8-.4c.3 0 .6.1.8.4s.3.6.3 1v1c0 .4-.1.8-.3 1-.2.3-.4.4-.7.4s-.6-.1-.8-.4-.3-.6-.3-1v-1zm-.4 3.4h3v-5.7h-3z" fill="#231f20"/><path d="M103.5 169.1c.1 0 .2-.1.3-.2s.1-.3.1-.5v-1.1c0-.2 0-.4-.1-.5s-.1-.2-.3-.2-.2.1-.3.2-.1.3-.1.5v1.1c0 .2 0 .4.1.5.1.2.2.2.3.2M108.1 168.4c0 .4-.1.8-.3 1-.2.3-.4.4-.7.4s-.6-.1-.8-.4-.3-.6-.3-1v-1c0-.4.1-.8.3-1s.4-.4.8-.4c.3 0 .6.1.7.4.2.3.3.6.3 1zm-2.5 2.4h3v-5.7h-3z" fill="#231f20"/><path d="M107.1 166.6c-.1 0-.2.1-.3.2s-.1.3-.1.5v1.1c0 .2 0 .4.1.5s.1.2.3.2c.1 0 .2-.1.3-.2s.1-.3.1-.5v-1.1c0-.2 0-.4-.1-.5-.2-.1-.2-.2-.3-.2M91.8 167.4c0-.4.1-.8.3-1s.4-.4.8-.4c.3 0 .6.1.8.4s.3.6.3 1v1c0 .4-.1.8-.3 1-.2.3-.4.4-.7.4s-.6-.1-.8-.4-.3-.6-.3-1v-1zm-.4 3.4h3v-5.7h-3z" fill="#231f20"/><path d="M92.8 169.1c.1 0 .2-.1.3-.2s.1-.3.1-.5v-1.1c0-.2 0-.4-.1-.5s-.1-.2-.3-.2c-.1 0-.2.1-.3.2s-.1.3-.1.5v1.1c0 .2 0 .4.1.5.1.2.2.2.3.2" fill="#231f20"/><path d="M104.7 177c-.1 0-.2-.1-.3-.1h-.2l-.1.1-.2.2c-.1.2-.3.3-.5.3l.2 2.3.8-1.2 1.2.8-.8-2.4h-.1M106.4 175.6c-.1 0-.1 0-.2.1h-.1-.1v.5c0 .3-.2.5-.4.7l1.2 1.3-.1-1.4 1.4-.2-1.5-.9c0-.1-.1-.1-.2-.1" fill="#ffa400"/><path d="M106.7 176.6l.1 1.4-1.2-1.3c.2-.2.4-.4.4-.7v-.5h.2c.1 0 .2 0 .2-.1.1 0 .2-.1.2-.1l1.5.9zm-2.2 2l-.8 1.2-.2-2.3c.2 0 .4-.1.5-.3l.2-.2.1-.1h.2c.1 0 .2.1.3.1h.2l.8 2.4zm-1.6-1.7c-.1-.1-.2-.2-.2-.3l-.1-.1s-.1 0-.1-.1H102.2c-.1 0-.2.1-.4.1h-.4c-.1 0-.1 0-.1-.1s-.1-.1-.1-.1v-.2-.4c0-.2-.2-.4-.4-.4-.1 0-.2-.1-.4-.1-.3-.1-.5-.4-.3-.7.1-.1.1-.3.2-.4.1-.2.1-.4-.1-.6l-.3-.3c-.2-.2-.2-.5.1-.7.1-.1.2-.1.4-.2s.3-.3.3-.6c0-.1 0-.2-.1-.3V171.1v-.1-.1-.1H101.4c.1 0 .2-.2.3-.3s.1-.3.2-.4c0 0 0-.1.1-.1s0 0 .1-.1.1 0 .1-.1h.2s.1 0 .1.1c.1.1.2.2.4.2l.1.1H103.3c.1 0 .1 0 .2-.1s.2-.2.3-.2c0 0 .1 0 .1-.1H104.2l.1.1.1.1c.1.1.1.3.2.4 0 .1.1.1.1.1l.1.1H106.1v.4c-.1.5 0 .8.5 1.1.3.2.4.5.1.8-.1.1-.2.1-.2.2-.2.2-.2.4-.1.7 0 .1.1.2.1.2.2.3 0 .6-.3.7-.1 0-.2.1-.3.1-.3.1-.4.2-.4.5v.4c0 .2-.1.3-.3.4s-.1 0-.2 0h-.1c-.1 0-.2-.1-.3-.1H104.3s-.1 0-.1.1-.1.1-.1.1l-.3.3c-.1.1-.1.1-.2.1H103.3c-.2.4-.3.4-.4.3zm5.5-.8l-1.4-.9.1-.1c.1-.3.1-.6-.1-.9l-.1-.1-.1-.1v-.1l.1-.1.1-.1.1-.1c.2-.3.3-.6.3-.9-.1-.3-.3-.5-.6-.7-.3-.1-.3-.2-.2-.5s0-.6-.1-.9c-.2-.2-.5-.4-.8-.4h-.3c-.1 0 0-.1-.1-.1 0-.1-.1-.2-.1-.3-.2-.3-.5-.6-.9-.6-.2 0-.4.1-.5.2-.1 0-.1.1-.2.1l-.1.1-.1-.1c-.1-.1-.2-.1-.3-.2-.2-.1-.3-.1-.5-.1-.4 0-.7.2-.9.6 0 0 0 .1-.1.1 0 0 0 .1-.1.1 0 .1-.1.1-.1.1H101.1c-.3 0-.6.1-.8.4-.2.2-.3.6-.2.9V171.7s-.1 0-.1.1c-.1.1-.2.1-.3.2-.2.2-.4.4-.4.7s.1.5.2.7l.2.2.1.1c0 .1-.1.1-.1.2s-.1.1-.1.2c-.1.3-.1.6 0 .8.1.3.4.4.7.5h.1c.1 0 .1 0 .2.1v.4c0 .5.5.9 1 .9.1 0 .2 0 .3-.1h.1c.1 0 .2-.1.3-.1h.1l.1.1c.1.1.1.2.2.2.1.1.3.2.4.3l.2 2.3c0 .2.2.4.4.4h.1c.2 0 .3-.1.4-.2l.6-.8.8.5c.1 0 .2.1.3.1s.2 0 .3-.1c.2-.1.2-.3.2-.5l-.5-1.6.8.8c.1.1.2.1.4.1h.2c.2-.1.3-.3.3-.5l-.1-1 1-.1c.2 0 .4-.2.4-.4-.3.2-.4 0-.5-.1" fill="#231f20"/><path d="M102.8 175h-.9l-.7-3v-.2h.9l.4 2.1.5-2.1h.7l.5 2.1.4-2.1h.8v.2l-.7 3h-.9l-.5-1.9zm.4 2H103.5c.1 0 .2-.1.2-.1l.3-.3.1-.1s.1 0 .1-.1H104.5c.1 0 .2.1.3.1h.2c.2-.1.3-.2.3-.4v-.4c0-.3.2-.4.4-.5.1 0 .2-.1.3-.1.3-.1.5-.4.3-.7 0-.1-.1-.2-.1-.2-.1-.3-.1-.5.1-.7l.2-.2c.3-.3.2-.6-.1-.8-.5-.2-.7-.5-.5-1.1v-.2-.1-.1c0-.1 0 0-.1 0h-.1-.1-.5-.1-.1-.2-.1s-.1 0-.1-.1-.1-.1-.1-.1c-.1-.1-.1-.3-.2-.4 0 0 0-.1-.1-.1s0 0-.1-.1H103.7s-.1 0-.1.1c-.1.1-.2.2-.3.2 0 0-.1.1-.2.1H102.8s-.1 0-.1-.1c-.1-.1-.2-.2-.4-.2 0 0-.1 0-.1-.1h-.2s-.1 0-.1.1 0 0-.1.1l-.1.1c-.1.1-.1.3-.2.4l-.3.3h-.4-.1-.1-.1-.2V171.8c0 .1 0 .2.1.3 0 .3 0 .4-.3.6-.1.1-.2.1-.4.2-.2.2-.3.5-.1.7l.3.3c.1.2.2.4.1.6-.1.1-.1.3-.2.4-.1.3 0 .6.3.7.1 0 .2.1.4.1.2.1.4.2.4.4V176.7l.1.1.1.1h.4c.1 0 .2-.1.4-.1H102.2s.1 0 .1.1.1.1.1.1c.1.1.1.2.2.3.4-.3.5-.3.6-.3" fill="#ffa400"/><path d="M103.2 173.1l.5 1.9h.9l.8-3v-.2h-.8l-.4 2.1-.5-2.1h-.8l-.4 2.1h-.1l-.4-2.1h-.9v.2l.8 3.1h.9zM51.5 34.8V21c-1.5.3-3.1.7-4.6 1v-2.6c4.3-1 8.6-1.9 13-2.5v2.6c-1.5.2-3.1.5-4.6.8v13.8c-1.3.2-2.6.5-3.8.7M73.3 23.7c0-4-1.8-5.8-4.3-5.6s-4.3 2.3-4.3 6.3 1.8 5.6 4.3 5.4 4.3-2 4.3-6.1m-12.4 1.2c0-5.4 3.8-9 8.2-9.4s8.2 2.5 8.2 7.9-3.8 8.5-8.2 8.9c-4.4.5-8.2-1.9-8.2-7.4M83 31.6V17.7c-1.6 0-3.1 0-4.7.1v-2.6c4.4-.1 8.8-.1 13.1.2V18c-1.6-.1-3.1-.1-4.7-.2v13.8H83M96.1 25.4c1.4.1 2.7.2 4.1.4-.7-2.1-1.4-4.2-2-6.3-.8 2-1.4 4-2.1 5.9m-5.2 5.4c1.9-5.1 3.8-10.1 5.6-15.1 1.3.1 2.6.2 3.9.4 1.9 5.4 3.8 10.8 5.6 16.2v1c-1.2-.2-2.4-.4-3.7-.5-.5-1.5-.9-2.9-1.4-4.3l-5.7-.6c-.5 1.4-.9 2.7-1.4 4.1-1-.1-2-.1-3-.2v-1zM108.3 33.7V17.2c1.3.2 2.5.4 3.8.7v13.8c2.3.4 4.6.9 6.9 1.5v2.6c-3.5-.8-7.1-1.6-10.7-2.1M12.5 61.2c0-5.3 3.2-10.1 7.8-12.2 2.2-1 3.4-1 4.7-.9v2.7c-.4.2-.9.3-1.3.5-.7-.3-1.7-.3-3.3.3-2.8 1.2-4.3 4-4.3 7.6 0 4 1.4 5.2 4.1 4 1.9-.8 2.9-2 3.8-3.3.4-.2.8-.3 1.1-.5v2.7c-1.1 1.6-2.8 2.9-5 3.9-4.6 2-7.6.5-7.6-4.8M38.3 50.9c0-4-1.7-5.4-4.1-4.6s-4.1 3.3-4.1 7.3 1.7 5.2 4.1 4.4c2.3-.8 4.1-3.1 4.1-7.1m-12 4.1c0-5.4 3.6-9.8 7.8-11.2s7.9.6 7.9 6-3.7 9.4-7.9 10.8c-4.2 1.3-7.8-.2-7.8-5.6M44.3 40.9c1.4-.4 2.8-.7 4.2-1 2.1 3 4.1 6.1 6.2 9.3h.1V38.6c1.1-.2 2.1-.4 3.2-.6v16.4c-1.1.2-2.3.4-3.4.6-2.4-3.6-4.7-7.1-7-10.5h-.1v12c-1 .2-2.1.5-3.1.8V40.9zM61.1 54V37.6c3.8-.5 7.5-.9 11.3-1.2V39c-2.5.2-5 .4-7.5.7v4.5c1.9-.2 3.9-.4 5.8-.6v2.5c-1.9.2-3.9.3-5.8.6v6.7c-1.3.2-2.5.4-3.8.6M74.3 52.7V36.3c1.3-.1 2.5-.1 3.8-.2v16.4c-1.2.1-2.5.1-3.8.2M86.6 49.9c3.5.1 5.2-1.4 5.2-5.5 0-4-1.6-5.7-5.2-5.8h-1.5v11.2c.5.1 1 .1 1.5.1M81.3 36h5.4c5.7.1 9 3 9 8.6s-3.3 8-9.1 7.8c-1.8 0-3.5-.1-5.3 0zM98 36.7c3.7.4 7.5.9 11.2 1.5v2.7c-2.5-.4-4.9-.8-7.4-1.1V44c1.8.2 3.6.5 5.3.7v2.5c-1.8-.3-3.5-.5-5.3-.7V51c2.6.3 5.1.7 7.7 1.1v2.6c-3.8-.7-7.6-1.2-11.4-1.5V36.7zM111.7 38.7l4.2.9c2.1 4 4.1 8 6.2 12h.1V41c1 .3 2.1.6 3.1.8v16.4c-1.1-.3-2.2-.6-3.4-.9-2.3-4.6-4.7-9.1-7-13.6h-.1v12c-1-.2-2.1-.4-3.1-.6zM127.5 50.8c0-5.3 3.4-7.5 8.1-5.8 2.2.8 3.5 1.7 4.7 2.9v2.7c-.4-.2-.9-.3-1.3-.5-.7-.9-1.7-1.8-3.3-2.4-2.8-1-4.4.5-4.4 4.1 0 4 1.4 6.3 4.2 7.3 1.9.7 3 .4 3.9-.2.4.1.8.3 1.1.4V62c-1.2.5-2.9.4-5.2-.4-4.6-1.6-7.8-5.5-7.8-10.8M142.8 48c3.5 1.5 7 3.1 10.4 4.8v2.7c-2.3-1.2-4.6-2.3-6.9-3.3v4.2c1.7.7 3.3 1.5 5 2.3v2.5c-1.6-.8-3.3-1.6-5-2.3v4.5c2.4 1.1 4.8 2.2 7.2 3.4v2.6c-3.5-1.8-7.1-3.4-10.7-4.9V48M51.4 64.4c.3-.1.6-.1.9-.2 1.2-.2 1.6-.8 1.6-1.7s-.3-1.3-1.6-1.1c-.3.1-.6.1-.9.2zm-1.9-3.8c1-.2 1.9-.4 2.9-.6 2.2-.4 3.5.2 3.5 2.1 0 1.8-1.3 2.9-3.5 3.4-.3.1-.6.1-.9.2v3.1c-.6.1-1.3.3-1.9.4v-8.6zM69.3 66.1v-8.5c.7-.1 1.3-.1 2-.2v7.2c1.2-.1 2.4-.2 3.6-.2v1.3c-1.9.1-3.8.2-5.6.4M90.9 62.2c.7 0 1.4.1 2.1.1-.4-1.1-.7-2.1-1.1-3.2-.3 1.1-.7 2.1-1 3.1m-2.7 2.9c1-2.6 2-5.3 2.9-7.9.7 0 1.4.1 2 .1 1 2.7 2 5.5 2.9 8.2v.5c-.6-.1-1.3-.1-1.9-.1-.2-.7-.5-1.5-.7-2.2-1-.1-2-.1-3-.2-.2.7-.5 1.4-.7 2.1-.5 0-1.1 0-1.6-.1v-.4zM109.5 59.2c.7.1 1.5.3 2.2.4 1.1 2 2.1 4.1 3.2 6.1v-5.5c.5.1 1.1.2 1.6.4v8.5c-.6-.1-1.2-.3-1.8-.4-1.2-2.3-2.4-4.6-3.7-6.9V68c-.5-.1-1.1-.2-1.6-.3v-8.5z" fill="#231f20"/><path d="M125.3 113.3c0 23.4-18.9 42.3-42.3 42.3s-42.3-18.9-42.3-42.3C40.7 90 59.6 71 83 71s42.3 19 42.3 42.3" fill="#fff"/><path d="M121.2 113.3c0 21.1-17.1 38.2-38.2 38.2s-38.2-17.1-38.2-38.2S61.9 75.1 83 75.1s38.2 17.1 38.2 38.2" fill="#231f20"/><g fill="#ffa400"><path d="M58.3 103.9c-1.7-.8-2.3-2.4-1.4-4.1.4-.8.8-1.1 1.2-1.5l.9.5-.2.4c-.3.1-.7.4-1 1-.5 1-.1 1.8 1.1 2.4 1.3.6 2.1.4 2.6-.5.3-.6.3-1.1.1-1.5.1-.1.1-.2.2-.4l.9.5c.1.6 0 1.2-.4 1.9-.7 1.6-2.2 2.1-4 1.3M61.2 98.3c-1.5-1.2-1.5-3-.4-4.2 1-1.2 2.8-1.5 4.2-.2 1.5 1.3 1.4 3.1.4 4.2-1 1.2-2.7 1.5-4.2.2m2.9-3.3c-1.1-1-2-.9-2.6-.3-.6.7-.5 1.6.6 2.6 1.1.9 2 .9 2.6.2.5-.6.5-1.5-.6-2.5M64.5 90.6c.4-.3.8-.6 1.3-.9 1.3.6 2.7 1.2 4 1.8 0-.2-1.8-2.9-2-3.2.3-.2.6-.4 1-.6l3.1 5c-.3.2-.7.4-1 .6l-4.5-2.1 2.5 3.5-.9.6zM75.2 91.3c-.4.1-.8.3-1.1.4l-1.9-4.6c-.5.2-1 .4-1.5.7l-.4-.8c1.5-.7 3-1.3 4.6-1.8l.3.9c-.5.2-1.1.3-1.6.5zM77.7 90.5l-1.2-5.7c.4-.1.9-.2 1.4-.3l1.1 5.8zM80.6 84.2h1.6c.7 1.2 1.5 2.5 2.2 3.8 0-.2.1-3.4.1-3.8.4 0 .8 0 1.2.1l-.3 5.8c-.4 0-.8-.1-1.2-.1-.8-1.4-1.6-2.9-2.5-4.3V90h-1.1zM88.4 84.6c1.4.3 2.7.6 4 1l-.3.9c-.9-.3-1.7-.5-2.6-.7l-.4 1.5c.6.1 1.2.3 1.8.5l-.2.9c-.6-.2-1.2-.3-1.8-.5l-.4 1.6c.9.2 1.7.4 2.6.7l-.3.9c-1.2-.4-2.5-.7-3.8-1zM94.7 86.5c.5.2 1 .5 1.4.7.1 1.4.1 2.9.2 4.4.1-.1 1.7-3 1.9-3.3.4.2.7.4 1 .6l-3 5c-.3-.2-.7-.4-1-.6 0-1.6-.1-3.3-.2-5l-2 3.8c-.3-.2-.6-.3-1-.5zM99 96.2c-.3-.3-.6-.5-.9-.8l3.2-3.8c-.4-.4-.9-.7-1.3-1.1l.6-.7c1.3 1 2.5 2.1 3.7 3.3l-.7.6-1.2-1.2zM100.3 96.9c1.8-.7 3.7-1.3 5.5-1.9.3.4.6.7.9 1.1-1.1 1.7-2.1 3.3-3.3 4.9l-.3.2-.7-1c.3-.4.6-.8.9-1.3-.4-.5-.8-1.1-1.2-1.6l-1.4.5-.6-.8zm2.6.1c.3.4.6.8.9 1.1.4-.6.9-1.3 1.3-1.9-.7.3-1.4.5-2.2.8M105.2 105.3c-.5-1.1-1-2.3-1.6-3.4l5.3-2.6.6 1.2-4.5 2.1c.4.7.7 1.5 1 2.2zM60.8 132l.7-.7.3.3c0 .4.1.9.6 1.4s1 .6 1.3.3c.4-.4.1-.9-.3-1.5-.5-1-.5-1.7.2-2.4.8-.8 1.8-.5 2.6.3.5.5.7 1 .8 1.4l-.7.7-.3-.3c-.1-.4-.2-.7-.5-1.1-.4-.5-.8-.6-1.2-.2-.3.3-.2.7.2 1.3.7 1.2.8 1.8.1 2.6-.8.8-1.8.7-2.9-.4-.5-.5-.8-1.1-.9-1.7M65 136.7l3.5-4.7 1 .8-3.4 4.7c-.3-.2-.7-.5-1.1-.8M70.8 133.6c.4.2.9.5 1.3.7.1 1.5.2 2.9.4 4.3l1.6-3.4c.3.2.7.3 1 .4l-2.4 5.4c-.4-.1-.8-.3-1.1-.5-.2-1.7-.3-3.3-.5-5l-1.9 3.8c-.3-.1-.7-.3-1-.5zM75.3 138.9c.4-1.7 1.6-2.6 3-2.5.7 0 1.5.3 1.9.7l-.1 1-.4-.1c-.2-.3-.5-.5-1.1-.6-1-.2-1.6.4-1.9 1.7-.3 1.4.1 2.2 1.1 2.4.7.1 1.2-.1 1.5-.3l.4.1-.1 1c-.5.3-1.2.4-2.1.3-1.8-.5-2.6-1.9-2.2-3.7M81.5 137c1.3 0 2.5 0 3.8-.1v.9c-.9 0-1.7.1-2.6.1v1.5h1.9v.9c-.6 0-1.3.1-1.9 0v1.6c.9 0 1.9 0 2.8-.1v.9c-1.4.1-2.8.1-4.2.1zM90.8 141.7l-1.2-4.2-.6.5-.3.1-.2-.8c.4-.4.8-.8 1.1-1.2l.8-.2 1.6 5.5-1.2.3M93.1 139.3c-.3-.7-.1-1.3.4-1.8-.6.1-1.1-.1-1.3-.7-.4-.9.1-1.7 1.2-2.3 1.1-.5 2.1-.4 2.5.4.3.5.2 1-.3 1.5.7-.1 1.4.1 1.7.8.5.9 0 1.9-1.3 2.6-1.4.7-2.4.5-2.9-.5m1.7-3.7c-.2-.4-.6-.5-1.1-.3-.4.2-.6.6-.4 1s.6.5 1.1.3c.4-.2.6-.6.4-1m1.3 2.2c-.2-.5-.7-.7-1.4-.4-.6.3-.8.8-.5 1.3.2.5.7.7 1.4.4.6-.4.8-.9.5-1.3M99.5 137.1c-.2-1.6-.6-3.3-.9-4.5-.7.6-1.4 1.1-2.1 1.6l-.6-.9c1-.6 2-1.4 2.9-2.2l.7.8c.5 1.6 1 3.2 1.4 4.9l-1.1.8zM104.3 133.6l-3.2-3-.2.7-.2.2-.6-.6c.1-.5.2-1.1.3-1.6l.6-.6 4.3 3.8c-.4.4-.7.7-1 1.1"/><path d="M83 82.4c17.1 0 30.9 13.9 30.9 30.9 0 17.1-13.9 30.9-30.9 30.9-17.1 0-30.9-13.9-30.9-30.9S65.9 82.4 83 82.4m0-.7c-17.5 0-31.7 14.2-31.7 31.7s14.2 31.7 31.7 31.7 31.7-14.2 31.7-31.7c0-17.6-14.2-31.7-31.7-31.7"/><path d="M83 92.1c11.7 0 21.2 9.5 21.2 21.2s-9.5 21.2-21.2 21.2-21.2-9.5-21.2-21.2S71.3 92.1 83 92.1m0-.7c-12.1 0-21.9 9.8-21.9 21.9s9.8 21.9 21.9 21.9 21.9-9.8 21.9-21.9S95.1 91.4 83 91.4"/><path d="M82.9 94.7c.5 0 1.5 1.1 1.8 1.4.2.2 1.4 1.9 1.6 2.3.3 1.5-.2 5.2-1 6.7 1.2 1.7 2.4 3.2 3.8 4.8 1 .9 4.3 1.6 4.3 4.6 0 1.6-1 3-1.5 3.5l1 3.2c.1.3.1.4-.1.6l-3.3 3.7-.3 1.6h-2.8c-.1-.9.8-1.9 1.6-2.5l2.4-3-4.1-4.2c-.2-.6-.5-1.9-.7-2.6-1.4-.8-4.3-2.8-4.9-3.5-.9-1-1.8-2.7-1.8-2.7l-3.3-2.4-1.3.9v2.1c.1.3.4 1.1.5 1.4l-1.3 1.9s-.8-.8-.8-2.6v-.8l.1-2.4c0-.2.1-.3.2-.4l2-2.1c.1-.1.3-.2.4-.1l2.7.9 2.2-1.5 1.9-2.8c-.5-.1-2.4.4-3 .5-.3-.1-.6-.3-.8-.5 0-.2-.1-.9-.1-1.4 1.6-1.2 3.3-2.3 4.6-3.2l-.1-1.3c-.1-.1 0-.1.1-.1m-11 11.3l.5-.2 1.8-1.9s-.1-.1-.2-.1-2.6.7-2.6.7-1.2.4-1.7.8c-.5.3-1.1.9-1.1 1.2l2.2.5c.3-.3.7-.8 1.1-1m15.7 13.9l-3.1 3c-.6.3-1.9 1.5-2.1 2.4h2.5c.2-.3.4-.9.6-1.2l3.4-2.9zm7.5 8.3H70.9c.5.4.9.8 1.5 1.1h21.2c.6-.4 1.1-.7 1.5-1.1m.9-14.1s-1.7-1.2-2-1.4-.4 0-.4 0c.2.4.5 1.3.8 2.1l.4 6.1c.7.7 1.9 1.4 2.7 1.7-.1-1.9-.7-7.2-1.5-8.5"/></g></svg>
diff --git a/icons/tire-size.svg b/icons/tire-size.svg
index 9adcfe0..c7c8d2b 100644
--- a/icons/tire-size.svg
+++ b/icons/tire-size.svg
@@ -1,9 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <path fill-rule="evenodd" d="M12,2C6.5,2,2,6.5,2,12s4.5,10,10,10s10-4.5,10-10S17.5,2,12,2z M12,4c4.4,0,8,3.6,8,8
-    s-3.6,8-8,8s-8-3.6-8-8S7.6,4,12,4z M12,8c-2.2,0-4,1.8-4,4s1.8,4,4,4s4-1.8,4-4S14.2,8,12,8z M12,10.5
-    c0.8,0,1.5,0.7,1.5,1.5s-0.7,1.5-1.5,1.5s-1.5-0.7-1.5-1.5S11.2,10.5,12,10.5z"/>
-  <rect x="11" y="0.5" width="2" height="2.3"/>
-  <rect x="11" y="21.2" width="2" height="2.3"/>
-  <rect x="0.5" y="11" width="2.3" height="2"/>
-  <rect x="21.2" y="11" width="2.3" height="2"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28"><g fill="none" fill-rule="evenodd"><path d="M14.16 22.94a8.777 8.777 0 100-17.554 8.777 8.777 0 000 17.554zm0 4.18c7.158 0 12.96-5.802 12.96-12.96 0-7.158-5.802-12.96-12.96-12.96C7.002 1.2 1.2 7.002 1.2 14.16c0 7.158 5.802 12.96 12.96 12.96zM14.16 16.24v6.72m0-17.6v6.72m-2.08 2.08H5.36m17.6 0h-6.72m-3.52-1.44l-4.8-4.8M20.4 20.4l-4.8-4.8m-2.88 0l-4.8 4.8M20.4 7.92l-4.8 4.8" stroke="currentColor"/><path d="M16.486 12.179l-.362-.327a1.012 1.012 0 01-1.729-.714l-.49-.018a1.013 1.013 0 01-1.732.714l-.311.353a1.014 1.014 0 01-.717 1.72l-.025.506a1.012 1.012 0 01.714 1.733l.336.34a1.012 1.012 0 011.734.714l.494-.025a1.013 1.013 0 011.726-.735l.337-.304a1.014 1.014 0 01.714-1.723l.025-.506a1.012 1.012 0 01-.714-1.728zM14.16 15.28a1.12 1.12 0 110-2.24 1.12 1.12 0 010 2.24z" fill="currentColor" fill-rule="nonzero"/></g></svg>
diff --git a/icons/trip-interruption.svg b/icons/trip-interruption.svg
deleted file mode 100644
index e99e332..0000000
--- a/icons/trip-interruption.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <path fill-rule="evenodd" d="M9,2h6c0.6,0,1,0.4,1,1v2h3c1.1,0,2,0.9,2,2v11c0,1.1-0.9,2-2,2H5c-1.1,0-2-0.9-2-2V7
-    c0-1.1,0.9-2,2-2h3V3C8,2.4,8.4,2,9,2z M10,4v1h4V4H10z M5,7v11h14V7H5z"/>
-  <rect x="10" y="10" width="4" height="2"/>
-</svg>
diff --git a/icons/vehicle.svg b/icons/vehicle.svg
index a3891bf..885d791 100644
--- a/icons/vehicle.svg
+++ b/icons/vehicle.svg
@@ -1,6 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <path d="M5.5,11l1.4-4.1C7.2,5.8,8.1,5.2,9,5.2h6c0.9,0,1.8,0.6,2.1,1.7L18.5,11H20c0.6,0,1,0.4,1,1v4
-    c0,0.6-0.4,1-1,1h-1c0,1.1-0.9,2-2,2s-2-0.9-2-2H8c0,1.1-0.9,2-2,2s-2-0.9-2-2H4c-0.6,0-1-0.4-1-1v-4
-    c0-0.6,0.4-1,1-1H5.5z M7.6,11h8.8l-1-3H8.6L7.6,11z M6,15.5c0.6,0,1-0.4,1-1s-0.4-1-1-1s-1,0.4-1,1
-    S5.4,15.5,6,15.5z M18,15.5c0.6,0,1-0.4,1-1s-0.4-1-1-1s-1,0.4-1,1S17.4,15.5,18,15.5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 17"><g fill="none" fill-rule="evenodd"><path d="M28.336 14.12h1.116c1.168 0 1.588-.613 1.588-1.79V9.55c0-1.441-2.802-2.168-4.577-2.544-1.774-.377-2.91-1.677-4.062-2.606-1.44-1.161-2.428-2.012-3.41-2.53-.98-.518-1.493-.532-2.8-.549-1.308-.017-5.278.125-6.118.455-.841.33-1.775.848-2.569 1.602-.793.753-2.895 2.685-2.895 2.685H2.788c-.56 0-1.121.707-1.121 1.46v1.365s-.654.662-.7 1.463c-.047.8.14 2.544 1.027 3.156.887.613 1.587.613 1.988.613m7.553-12.48S10.35 4.356 9.79 5.536c-.56 1.179.187 1.224 1.45 1.224H25.6M15.52 1.48v5.28M28.8 9.8h2.24m-14.4-.64h1.6M3.52 8.52h-1.6m9.28 5.44h10.24" stroke="currentColor" stroke-linecap="round"/><path d="M24.96 10.92a2.88 2.88 0 110 5.76 2.88 2.88 0 010-5.76zm-17.28 0a2.88 2.88 0 110 5.76 2.88 2.88 0 010-5.76zm17.28 1.92a.96.96 0 100 1.92.96.96 0 000-1.92zm-17.28 0a.96.96 0 100 1.92.96.96 0 000-1.92z" fill="currentColor"/></g></svg>
diff --git a/icons/x.svg b/icons/x.svg
index f9284f1..8f05391 100644
--- a/icons/x.svg
+++ b/icons/x.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24">
-  <path d="M18.9,2H22l-7.2,8.3L23.3,22h-6.6l-5.2-6.8L5.5,22H2.4l7.7-8.8L1.7,2h6.8l4.7,6.2L18.9,2z M17.7,20h1.8L7.4,4H5.5L17.7,20z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 25 25"><path d="M14.647 11.469L21.932 3h-1.726l-6.326 7.353L8.827 3H3l7.64 11.12L3 23h1.726l6.68-7.765L16.744 23h5.827l-7.924-11.531zm-2.365 2.748l-.774-1.107-6.16-8.81H8l4.971 7.11.774 1.107 6.462 9.242h-2.652l-5.273-7.541z" fill="currentColor" fill-rule="nonzero"/></svg>
diff --git a/icons/youtube.svg b/icons/youtube.svg
new file mode 100644
index 0000000..4900cf6
--- /dev/null
+++ b/icons/youtube.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 23 16"><path d="M9.73 12.385V3.538l6.193 4.424zM23 3.422A3.43 3.43 0 0019.563 0H3.438A3.43 3.43 0 000 3.422V12.5a3.43 3.43 0 003.438 3.423h16.125A3.43 3.43 0 0023 12.5z" fill="currentColor" fill-rule="evenodd"/></svg>
diff --git a/styles/styles.css b/styles/styles.css
index 65638a0..790cfbc 100644
--- a/styles/styles.css
+++ b/styles/styles.css
@@ -304,6 +304,12 @@ main img {
   width: 100%;
 }
 
+/* Total Confidence Plan badge renders at hero size, not as a small icon */
+.icon.icon-tcp-badge {
+  width: 110px;
+  height: 128px;
+}
+
 /* sections */
 main > .section {
   margin: 40px 0;