diff --git a/app/component/TramLeg.js b/app/component/TramLeg.js
index 26f088f60f..fff13fe971 100644
--- a/app/component/TramLeg.js
+++ b/app/component/TramLeg.js
@@ -1,21 +1,25 @@
 import PropTypes from 'prop-types';
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
+import { getRouteMode } from '../util/modeUtils';
 
 import TransitLeg from './TransitLeg';
 
-const TramLeg = ({ leg, ...props }) => (
-  <TransitLeg mode="TRAM" leg={leg} {...props}>
-    <FormattedMessage
-      id="tram-with-route-number"
-      values={{
-        routeNumber: leg.route && leg.route.shortName,
-        headSign: leg.trip && leg.trip.tripHeadsign,
-      }}
-      defaultMessage="Tram {routeNumber} {headSign}"
-    />
-  </TransitLeg>
-);
+const TramLeg = ({ leg, ...props }) => {
+  const mode = getRouteMode({ mode: leg.mode, type: leg.route.type });
+  return (
+    <TransitLeg mode={mode} leg={leg} {...props}>
+      <FormattedMessage
+        id="tram-with-route-number"
+        values={{
+          routeNumber: leg.route && leg.route.shortName,
+          headSign: leg.trip && leg.trip.tripHeadsign,
+        }}
+        defaultMessage="Tram {routeNumber} {headSign}"
+      />
+    </TransitLeg>
+  );
+};
 
 TramLeg.propTypes = {
   leg: PropTypes.object.isRequired,
diff --git a/app/component/itinerary.scss b/app/component/itinerary.scss
index 76cc36c4a2..2f9701b47f 100644
--- a/app/component/itinerary.scss
+++ b/app/component/itinerary.scss
@@ -18,6 +18,9 @@ $itinerary-tab-switch-height: 48px;
   &.bus-express {
     @include getCircleSvg($bus-express-color, $fill);
   }
+  &.tram-local {
+    @include getCircleSvg($tram-local-color, $fill);
+  }
   &.airplane {
     @include getCircleSvg($airplane-color, $fill);
   }
diff --git a/app/component/map/VehicleMarkerContainer.js b/app/component/map/VehicleMarkerContainer.js
index bb58ffb9c8..1cc251f01a 100644
--- a/app/component/map/VehicleMarkerContainer.js
+++ b/app/component/map/VehicleMarkerContainer.js
@@ -14,6 +14,7 @@ const MODES_WITH_ICONS = [
   'rail',
   'subway',
   'ferry',
+  'tram-local',
 ];
 
 function getVehicleIcon(
@@ -80,8 +81,14 @@ function VehicleMarkerContainer(props) {
   return visibleVehicles.map(([id, message]) => {
     const type = props.topics?.find(t => t.shortName === message.shortName)
       ?.type;
-    const mode =
-      type === ExtendedRouteTypes.BusExpress ? 'bus-express' : message.mode;
+    let mode;
+    if (type === ExtendedRouteTypes.BusExpress) {
+      mode = 'bus-express';
+    } else if (type === ExtendedRouteTypes.TramLocal) {
+      mode = 'tram-local';
+    } else {
+      mode = message.mode;
+    }
     return (
       <IconMarker
         key={id}
diff --git a/app/component/map/popups/marker-popup.scss b/app/component/map/popups/marker-popup.scss
index b90fd9d60f..1610d58edb 100644
--- a/app/component/map/popups/marker-popup.scss
+++ b/app/component/map/popups/marker-popup.scss
@@ -74,6 +74,9 @@
     .funicular-stop {
       color: $funicular-color;
     }
+    .tram-local-stop {
+      color: $tram-local-color;
+    }
   }
 
   .choose-row-center-column {
diff --git a/app/component/map/tile-layer/MarkerSelectPopup.js b/app/component/map/tile-layer/MarkerSelectPopup.js
index 394d1ff345..c82b2afba9 100644
--- a/app/component/map/tile-layer/MarkerSelectPopup.js
+++ b/app/component/map/tile-layer/MarkerSelectPopup.js
@@ -41,6 +41,7 @@ function MarkerSelectPopup(props) {
           {...option.feature.properties}
           key={option.feature.properties.gtfsId}
           colors={props.colors}
+          routes={option.feature.properties.routes}
         />
       );
     }
diff --git a/app/component/map/tile-layer/SelectStopRow.js b/app/component/map/tile-layer/SelectStopRow.js
index 18cff16450..7e24899b81 100644
--- a/app/component/map/tile-layer/SelectStopRow.js
+++ b/app/component/map/tile-layer/SelectStopRow.js
@@ -10,15 +10,20 @@ function isNull(val) {
 }
 
 function SelectStopRow(
-  { code, type, desc, gtfsId, name, patterns, terminal, colors },
+  { code, type, desc, gtfsId, name, terminal, colors, routes },
   { config },
 ) {
   let mode = type;
-  if (patterns && type === 'BUS' && config.useExtendedRouteTypes) {
-    const patternArray = JSON.parse(patterns);
-    if (patternArray.some(p => p.gtfsType === ExtendedRouteTypes.BusExpress)) {
+  if (routes && type === 'BUS' && config.useExtendedRouteTypes) {
+    const routesArray = JSON.parse(routes);
+    if (routesArray.some(p => p.gtfsType === ExtendedRouteTypes.BusExpress)) {
       mode = 'bus-express';
     }
+  } else if (routes && type === 'TRAM' && config.useExtendedRouteTypes) {
+    const routesArray = JSON.parse(routes);
+    if (routesArray.some(p => p.gtfsType === ExtendedRouteTypes.TramLocal)) {
+      mode = 'tram-local';
+    }
   }
   const iconOptions = {};
   switch (mode) {
@@ -58,6 +63,10 @@ function SelectStopRow(
       iconOptions.iconId = 'icon-icon_funicular-stop-lollipop';
       iconOptions.className = 'funicular-stop';
       break;
+    case 'tram-local':
+      iconOptions.iconId = 'icon-icon_tram-local-stop-lollipop';
+      iconOptions.className = 'tram-local-stop';
+      break;
     case 'FERRY':
       iconOptions.iconId = !isNull(code)
         ? 'icon-icon_ferry'
@@ -113,7 +122,7 @@ SelectStopRow.propTypes = {
   gtfsId: PropTypes.string.isRequired,
   type: PropTypes.string.isRequired,
   name: PropTypes.string.isRequired,
-  patterns: PropTypes.string,
+  routes: PropTypes.string,
   code: PropTypes.string,
   desc: PropTypes.string,
   terminal: PropTypes.bool,
diff --git a/app/component/map/tile-layer/Stops.js b/app/component/map/tile-layer/Stops.js
index f5c2bdf6ac..f78bdefd82 100644
--- a/app/component/map/tile-layer/Stops.js
+++ b/app/component/map/tile-layer/Stops.js
@@ -35,6 +35,7 @@ class Stops {
       this.tile.hilightedStops &&
       this.tile.hilightedStops.includes(feature.properties.gtfsId);
     let hasTrunkRoute = false;
+    let hasLocalTramRoute = false;
     if (
       feature.properties.type === 'BUS' &&
       this.config.useExtendedRouteTypes
@@ -44,6 +45,15 @@ class Stops {
         hasTrunkRoute = true;
       }
     }
+    if (
+      feature.properties.type === 'TRAM' &&
+      this.config.useExtendedRouteTypes
+    ) {
+      const routes = JSON.parse(feature.properties.routes);
+      if (routes.some(p => p.gtfsType === ExtendedRouteTypes.TramLocal)) {
+        hasLocalTramRoute = true;
+      }
+    }
     const ignoreMinZoomLevel =
       feature.properties.type === 'FERRY' ||
       feature.properties.type === 'RAIL' ||
@@ -60,10 +70,18 @@ class Stops {
         return;
       }
 
+      let mode = feature.properties.type;
+      if (hasTrunkRoute) {
+        mode = 'bus-express';
+      }
+      if (hasLocalTramRoute) {
+        mode = 'tram-local';
+      }
+
       drawStopIcon(
         this.tile,
         feature.geom,
-        hasTrunkRoute ? 'bus-express' : feature.properties.type,
+        mode,
         !isNull(feature.properties.platform)
           ? feature.properties.platform
           : false,
diff --git a/app/configurations/config.hsl.js b/app/configurations/config.hsl.js
index 56890ef7be..5fb7105ece 100644
--- a/app/configurations/config.hsl.js
+++ b/app/configurations/config.hsl.js
@@ -122,6 +122,7 @@ export default {
       'mode-metro': '#CA4000',
       'mode-citybike': '#f2b62d',
       'mode-citybike-secondary': '#333333',
+      'mode-tram-local': '#007E79',
     },
   },
   getAutoSuggestIcons: {
@@ -642,6 +643,35 @@ export default {
         sv: 'hsl.fi/matkustaminen/lahibussit',
       },
     },
+    {
+      showForRoute: route => route.type === 902,
+      header: {
+        fi: 'Raide-Jokeri',
+        en: 'Jokeri Light Rail',
+        sv: 'Spårjokern',
+      },
+      content: {
+        fi: [
+          'Sed nibh ante, sodales non tortor vel, ullamcorper auctor massa. Nulla facilisi. Sed pharetra malesuada mauris, et auctor diam luctus at.',
+        ],
+        en: [
+          'Sed nibh ante, sodales non tortor vel, ullamcorper auctor massa. Nulla facilisi. Sed pharetra malesuada mauris, et auctor diam luctus at.',
+        ],
+        sv: [
+          'Sed nibh ante, sodales non tortor vel, ullamcorper auctor massa. Nulla facilisi. Sed pharetra malesuada mauris, et auctor diam luctus at.',
+        ],
+      },
+      closeButtonLabel: {
+        fi: 'Mitä lähibussi tarkoittaa?',
+        en: 'What does a neigbourhood route mean?',
+        sv: 'Vad betyder en närbuss?',
+      },
+      link: {
+        fi: 'hsl.fi/matkustaminen/lahibussit',
+        en: 'hsl.fi/matkustaminen/lahibussit',
+        sv: 'hsl.fi/matkustaminen/lahibussit',
+      },
+    },
   ],
 
   embeddedSearch: {
diff --git a/app/constants.js b/app/constants.js
index 9528150721..bb6314269c 100644
--- a/app/constants.js
+++ b/app/constants.js
@@ -95,6 +95,7 @@ export const AlertEntityType = Object.freeze({
 export const ExtendedRouteTypes = Object.freeze({
   BusExpress: 702,
   BusLocal: 704,
+  TramLocal: 902,
 });
 
 export const ParkTypes = {
diff --git a/app/translations.js b/app/translations.js
index 634f57077c..3fe04edf42 100644
--- a/app/translations.js
+++ b/app/translations.js
@@ -1575,6 +1575,7 @@ const translations = {
     'track-short-no-num': 'Track',
     traficom: 'Traficom',
     tram: 'Tram',
+    'tram-local': 'Jokeri Light Rail',
     'tram-with-route-number': 'Tram {routeNumber} {headSign}',
     transfer: 'Transfer',
     transfers: 'Number of transfers',
@@ -2710,6 +2711,7 @@ const translations = {
     'track-short-no-num': 'Raide',
     traficom: 'Traficom',
     tram: 'Raitiovaunu',
+    'tram-local': 'Raide-Jokeri',
     'tram-with-route-number': 'Raitiovaunu {routeNumber} {headSign}',
     transfer: 'Vaihto',
     transfers: 'Vaihtojen määrä',
@@ -4627,6 +4629,7 @@ const translations = {
     'track-short-no-num': 'Spår',
     traficom: 'Traficom',
     tram: 'Spårvagn',
+    'tram-local': 'Spårjokern',
     'tram-with-route-number': 'Spårvagn {routeNumber} {headSign}',
     transfer: 'Byte',
     transfers: 'Antal byten',
diff --git a/app/util/modeUtils.js b/app/util/modeUtils.js
index cbfd39206e..1f8ca4ed75 100644
--- a/app/util/modeUtils.js
+++ b/app/util/modeUtils.js
@@ -110,6 +110,8 @@ export const getRouteMode = route => {
       return 'bus-express';
     case ExtendedRouteTypes.BusLocal:
       return 'bus-local';
+    case ExtendedRouteTypes.TramLocal:
+      return 'tram-local';
     default:
       return route.mode?.toLowerCase();
   }
diff --git a/digitransit-component/packages/digitransit-component-autosuggest-panel/package.json b/digitransit-component/packages/digitransit-component-autosuggest-panel/package.json
index 9ebd5dabc5..a35c835e42 100644
--- a/digitransit-component/packages/digitransit-component-autosuggest-panel/package.json
+++ b/digitransit-component/packages/digitransit-component-autosuggest-panel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-component/digitransit-component-autosuggest-panel",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "digitransit-component autosuggest-panel module",
   "main": "index.js",
   "files": [
@@ -28,8 +28,8 @@
   "author": "Digitransit Authors",
   "license": "(AGPL-3.0 OR EUPL-1.2)",
   "peerDependencies": {
-    "@digitransit-component/digitransit-component-autosuggest": "^1.9.8",
-    "@digitransit-component/digitransit-component-icon": "^0.2.1",
+    "@digitransit-component/digitransit-component-autosuggest": "^1.9.9",
+    "@digitransit-component/digitransit-component-icon": "^0.2.2",
     "@hsl-fi/sass": "^0.2.0",
     "classnames": "2.2.6",
     "i18next": "^19.3.3",
diff --git a/digitransit-component/packages/digitransit-component-autosuggest/package.json b/digitransit-component/packages/digitransit-component-autosuggest/package.json
index d38027be71..ef00071c76 100644
--- a/digitransit-component/packages/digitransit-component-autosuggest/package.json
+++ b/digitransit-component/packages/digitransit-component-autosuggest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-component/digitransit-component-autosuggest",
-  "version": "1.9.8",
+  "version": "1.9.9",
   "description": "digitransit-component autosuggest module",
   "main": "index.js",
   "files": [
@@ -36,8 +36,8 @@
   },
   "peerDependencies": {
     "@digitransit-component/digitransit-component-dialog-modal": "^0.3.4",
-    "@digitransit-component/digitransit-component-icon": "^0.2.1",
-    "@digitransit-component/digitransit-component-suggestion-item": "^1.1.2",
+    "@digitransit-component/digitransit-component-icon": "^0.2.2",
+    "@digitransit-component/digitransit-component-suggestion-item": "^1.1.3",
     "@hsl-fi/sass": "^0.2.0",
     "classnames": "2.2.6",
     "i18next": "^19.3.3",
diff --git a/digitransit-component/packages/digitransit-component-control-panel/package.json b/digitransit-component/packages/digitransit-component-control-panel/package.json
index 335af701e2..da3041cba8 100644
--- a/digitransit-component/packages/digitransit-component-control-panel/package.json
+++ b/digitransit-component/packages/digitransit-component-control-panel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-component/digitransit-component-control-panel",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "digitransit-component control-panel module",
   "main": "index.js",
   "files": [
@@ -29,7 +29,7 @@
   "author": "Digitransit Authors",
   "license": "(AGPL-3.0 OR EUPL-1.2)",
   "peerDependencies": {
-    "@digitransit-component/digitransit-component-icon": "^0.2.1",
+    "@digitransit-component/digitransit-component-icon": "^0.2.2",
     "@hsl-fi/sass": "~0.2.0",
     "classnames": "2.2.6",
     "i18next": "^19.3.3",
diff --git a/digitransit-component/packages/digitransit-component-datetimepicker/package.json b/digitransit-component/packages/digitransit-component-datetimepicker/package.json
index 10859e9a1b..dd9cdae5de 100644
--- a/digitransit-component/packages/digitransit-component-datetimepicker/package.json
+++ b/digitransit-component/packages/digitransit-component-datetimepicker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-component/digitransit-component-datetimepicker",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "description": "digitransit-component datetimepicker module",
   "main": "index.js",
   "files": [
@@ -29,7 +29,7 @@
   "author": "Digitransit Authors",
   "license": "(AGPL-3.0 OR EUPL-1.2)",
   "peerDependencies": {
-    "@digitransit-component/digitransit-component-icon": "^0.2.1",
+    "@digitransit-component/digitransit-component-icon": "^0.2.2",
     "i18next": "^19.3.3",
     "lodash": "4.17.21",
     "lodash-es": "4.17.21",
diff --git a/digitransit-component/packages/digitransit-component-favourite-bar/package.json b/digitransit-component/packages/digitransit-component-favourite-bar/package.json
index 40079f90c5..9ef7dcb1b2 100644
--- a/digitransit-component/packages/digitransit-component-favourite-bar/package.json
+++ b/digitransit-component/packages/digitransit-component-favourite-bar/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-component/digitransit-component-favourite-bar",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "digitransit-component favourite-bar module",
   "main": "index.js",
   "files": [
@@ -32,8 +32,8 @@
     "@digitransit-search-util/digitransit-search-util-uniq-by-label": "^1.1.0"
   },
   "peerDependencies": {
-    "@digitransit-component/digitransit-component-icon": "^0.2.1",
-    "@digitransit-component/digitransit-component-suggestion-item": "^1.1.2",
+    "@digitransit-component/digitransit-component-icon": "^0.2.2",
+    "@digitransit-component/digitransit-component-suggestion-item": "^1.1.3",
     "@hsl-fi/sass": "^0.2.0",
     "@hsl-fi/shimmer": "0.1.2",
     "classnames": "2.2.6",
diff --git a/digitransit-component/packages/digitransit-component-favourite-editing-modal/package.json b/digitransit-component/packages/digitransit-component-favourite-editing-modal/package.json
index ddb8868f52..718ab9a7fb 100644
--- a/digitransit-component/packages/digitransit-component-favourite-editing-modal/package.json
+++ b/digitransit-component/packages/digitransit-component-favourite-editing-modal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-component/digitransit-component-favourite-editing-modal",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "digitransit-component favourite-editing-modal module",
   "main": "index.js",
   "files": [
@@ -33,7 +33,7 @@
   },
   "peerDependencies": {
     "@digitransit-component/digitransit-component-dialog-modal": "^0.3.4",
-    "@digitransit-component/digitransit-component-icon": "^0.2.1",
+    "@digitransit-component/digitransit-component-icon": "^0.2.2",
     "@hsl-fi/container-spinner": "0.3.1",
     "@hsl-fi/modal": "^0.3.1",
     "@hsl-fi/sass": "^0.2.0",
diff --git a/digitransit-component/packages/digitransit-component-favourite-modal/package.json b/digitransit-component/packages/digitransit-component-favourite-modal/package.json
index 7e37d50279..06cee5f1f6 100644
--- a/digitransit-component/packages/digitransit-component-favourite-modal/package.json
+++ b/digitransit-component/packages/digitransit-component-favourite-modal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-component/digitransit-component-favourite-modal",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "digitransit-component favourite-modal module",
   "main": "index.js",
   "files": [
@@ -29,7 +29,7 @@
   "author": "Digitransit Authors",
   "license": "(AGPL-3.0 OR EUPL-1.2)",
   "peerDependencies": {
-    "@digitransit-component/digitransit-component-icon": "^0.2.1",
+    "@digitransit-component/digitransit-component-icon": "^0.2.2",
     "@hsl-fi/modal": "^0.3.1",
     "@hsl-fi/sass": "^0.2.0",
     "classnames": "2.2.6",
diff --git a/digitransit-component/packages/digitransit-component-icon/package.json b/digitransit-component/packages/digitransit-component-icon/package.json
index 9736ccb67e..f2bd24c408 100644
--- a/digitransit-component/packages/digitransit-component-icon/package.json
+++ b/digitransit-component/packages/digitransit-component-icon/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-component/digitransit-component-icon",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "digitransit-component icon module",
   "main": "index.js",
   "files": [
diff --git a/digitransit-component/packages/digitransit-component-icon/src/assets/bus-local.svg b/digitransit-component/packages/digitransit-component-icon/src/assets/bus-local.svg
index 8ea23c23ff..b204cee924 100644
--- a/digitransit-component/packages/digitransit-component-icon/src/assets/bus-local.svg
+++ b/digitransit-component/packages/digitransit-component-icon/src/assets/bus-local.svg
@@ -1,11 +1,4 @@
 <svg viewBox="0 0 30 30" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_304_789)">
 <path d="M0 24.5002C0 26.4255 1.57553 28.001 3.50074 28.001H24.5002C26.4255 28.001 28 26.4255 28 24.5002V3.49975C28 1.57454 26.4255 0 24.5002 0H3.50074C1.57553 0 0 1.57454 0 3.49975V24.5002Z" fill="#007AC9"/>
 <path d="M25.1294 7.40056L20.707 2.98216C20.3435 2.61964 19.7489 2.61964 19.3864 2.98216L14.963 7.40056C14.5995 7.76308 14.8672 8.37156 15.3927 8.37156H16.3598V13.2799H23.7287V8.37156H24.7017C25.1985 8.37156 25.4929 7.76308 25.1294 7.40056ZM18.7028 11.8091H17.5115V10.524H18.7028V11.8091ZM18.7028 9.75546H17.5115V8.47034H18.7028V9.75546ZM20.6764 11.8091H19.4851V10.524H20.6764V11.8091ZM20.6764 9.75546H19.4851V8.47034H20.6764V9.75546ZM11.9601 20.2053L13.0754 20.0848C13.3924 20.0542 13.6631 20.2804 13.6631 20.5975C13.6631 20.8691 13.4675 21.0943 13.1959 21.125L12.0955 21.2603C11.7646 21.3057 11.4771 21.0499 11.4771 20.718C11.4781 20.4612 11.6885 20.235 11.9601 20.2053ZM6.71495 20.2053C6.98561 20.235 7.197 20.4612 7.197 20.718C7.197 21.0499 6.91054 21.3057 6.57963 21.2603L5.47922 21.125C5.20758 21.0943 5.012 20.8691 5.012 20.5975C5.012 20.2814 5.28364 20.0552 5.59973 20.0848L6.71495 20.2053ZM5.29846 14.2213H13.3924C13.5436 15.2466 13.6631 16.512 13.6631 18.3364H5.012C5.012 16.4972 5.13251 15.2308 5.29846 14.2213ZM9.33754 11.9C7.76992 11.9 7.09229 11.9908 5.64517 12.2012C5.16313 12.2615 4.93693 12.5173 4.83123 12.9401C4.68109 13.5427 4.50032 14.5077 4.33437 16.4823C3.88196 16.3766 3.71601 16.347 3.56587 16.347C3.21915 16.347 2.94751 16.6028 2.94751 16.9644C2.94751 17.2805 3.17371 17.5521 3.50463 17.6272L4.22769 17.7783C4.21287 18.2307 4.19707 18.698 4.19707 19.18C4.19707 20.6271 4.30276 22.0436 4.36302 22.3597C4.40846 22.6313 4.60404 22.8724 4.84506 22.9178L5.20659 22.9781V24.2582C5.20659 24.3946 5.34291 24.5003 5.49305 24.5003H6.60827C6.72878 24.5003 6.87991 24.3946 6.87991 24.2582V23.1588C7.61878 23.2339 8.32604 23.2793 9.33656 23.2793C10.3461 23.2793 11.0553 23.2339 11.7932 23.1588V24.2582C11.7932 24.3946 11.9443 24.5003 12.0648 24.5003H13.1801C13.3312 24.5003 13.4665 24.3946 13.4665 24.2582V22.9781L13.8281 22.9178C14.0691 22.8724 14.2647 22.6313 14.3101 22.3597C14.3704 22.0436 14.476 20.6271 14.476 19.18C14.476 18.698 14.4612 18.2307 14.4464 17.7783L15.1705 17.6272C15.5024 17.5521 15.7276 17.2805 15.7276 16.9644C15.7276 16.6028 15.4559 16.347 15.1092 16.347C14.9591 16.347 14.7931 16.3766 14.3407 16.4823C14.1748 14.5077 13.994 13.5436 13.8587 12.9401C13.7688 12.5183 13.512 12.2615 13.0299 12.2012C11.5838 11.9908 10.9052 11.9 9.33754 11.9Z" fill="white"/>
-</g>
-<defs>
-<clipPath id="clip0_304_789">
-<rect width="28" height="28" fill="white"/>
-</clipPath>
-</defs>
 </svg>
diff --git a/digitransit-component/packages/digitransit-component-icon/src/assets/search-tram-local-stop-default.svg b/digitransit-component/packages/digitransit-component-icon/src/assets/search-tram-local-stop-default.svg
new file mode 100644
index 0000000000..9b05561f12
--- /dev/null
+++ b/digitransit-component/packages/digitransit-component-icon/src/assets/search-tram-local-stop-default.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 240 240" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="108.75" y="165" width="22.5" height="60" rx="11.25" fill="#333333"/>
+<circle cx="120" cy="97.5" r="82.5" fill="#007E79"/>
+<path d="M74.9984 37.5H164.997C173.278 37.5 179.996 44.2226 179.996 52.4989V142.501C179.996 150.782 173.273 157.5 164.997 157.5H74.9984C66.7182 157.5 60 150.777 60 142.501V52.4989C60 44.2226 66.7224 37.5 74.9984 37.5Z" fill="#007E79"/>
+<path d="M149.427 112.194L143.192 68.6579C142.777 65.5632 140.906 62.8793 138.214 61.6092C132.486 58.8999 126.564 57.8796 123.135 57.4647V52.1857H134.167C135.801 52.1857 137.126 50.8606 137.126 49.2265C137.126 47.5925 135.801 46.2674 134.167 46.2674H106.007C104.373 46.2674 103.048 47.5925 103.048 49.2265C103.048 50.8606 104.373 52.1857 106.007 52.1857H117.056V57.4647C113.61 57.8796 107.688 58.8999 101.96 61.6092C99.2676 62.8835 97.4092 65.5675 96.9944 68.6579L90.7588 112.19C90.2931 115.462 90.6106 118.807 91.652 121.927C92.2701 123.777 93.4258 127.511 94.1285 129.335C95.1191 131.909 97.3627 133.721 99.9111 134.381C104.547 135.584 111.464 136.625 120.087 136.625C128.71 136.625 135.627 135.584 140.262 134.381C142.815 133.721 145.054 131.909 146.045 129.335C146.748 127.515 147.903 123.781 148.522 121.927C149.563 118.807 149.893 115.462 149.427 112.19V112.194ZM143.823 118.295L142.248 123.138C141.846 124.365 141.206 124.67 140.241 124.962C138.053 125.623 128.799 127.197 120.087 127.261C111.371 127.197 102.138 125.623 99.9492 124.962C98.9882 124.67 98.349 124.365 97.9469 123.138L96.3721 118.295C96.0123 117.202 96.9182 116.428 98.1374 116.758C101.913 117.782 106.109 118.637 109.601 119.323C110.659 119.531 111.641 120.187 112.103 121.131C112.645 122.24 113.728 123.002 114.888 123.074C116.476 123.176 118.33 123.235 120.087 123.235C121.844 123.235 123.694 123.176 125.281 123.074C126.441 123.002 127.525 122.236 128.066 121.131C128.532 120.187 129.514 119.531 130.568 119.323C134.057 118.637 138.273 117.782 142.045 116.758C143.268 116.428 144.174 117.202 143.814 118.295H143.823ZM141.418 109.836C136.393 111.445 128.405 113.193 120.091 113.193C111.777 113.193 103.793 111.449 98.7723 109.836C97.659 109.481 96.969 108.371 97.1341 107.211L101.541 76.4261C101.685 75.4271 102.438 74.6227 103.429 74.4195C107.76 73.522 113.661 72.6881 120.091 72.6881C126.521 72.6881 132.435 73.522 136.766 74.4195C137.756 74.6227 138.51 75.4271 138.654 76.4261L143.061 107.211C143.226 108.371 142.536 109.476 141.422 109.836H141.418ZM137.134 139.55C135.043 139.978 132.698 140.317 130.31 140.575C130.31 140.575 134.848 145.977 136.038 147.399C137.574 149.232 138.823 149.821 140.584 149.821C142.578 149.821 144.352 148.347 142.252 145.727C141.223 144.44 137.134 139.55 137.134 139.55ZM103.056 139.55C105.148 139.978 107.493 140.317 109.88 140.575C109.88 140.575 105.342 145.977 104.153 147.399C102.616 149.232 101.367 149.821 99.6063 149.821C97.6124 149.821 95.8387 148.347 97.9384 145.727C98.9671 144.44 103.056 139.55 103.056 139.55Z" fill="white"/>
+</svg>
\ No newline at end of file
diff --git a/digitransit-component/packages/digitransit-component-icon/src/assets/tram-local.svg b/digitransit-component/packages/digitransit-component-icon/src/assets/tram-local.svg
new file mode 100644
index 0000000000..26016acd11
--- /dev/null
+++ b/digitransit-component/packages/digitransit-component-icon/src/assets/tram-local.svg
@@ -0,0 +1,4 @@
+<svg viewBox="0 0 240 240" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M29.9968 0H209.995C226.555 0 239.992 13.4453 239.992 29.9979V210.002C239.992 226.563 226.547 240 209.995 240H29.9968C13.4363 240 0 226.555 0 210.002V29.9979C0 13.4453 13.4448 0 29.9968 0Z" fill="#007E79"/>
+<path d="M178.855 149.388L166.384 62.3157C165.554 56.1264 161.812 50.7585 156.427 48.2184C144.972 42.7997 133.127 40.7592 126.269 39.9294V29.3713H148.333C151.601 29.3713 154.251 26.7212 154.251 23.453C154.251 20.1848 151.601 17.5347 148.333 17.5347H92.014C88.7459 17.5347 86.0959 20.1848 86.0959 23.453C86.0959 26.7212 88.7459 29.3713 92.014 29.3713H114.112V39.9294C107.22 40.7592 95.3752 42.7997 83.92 48.2184C78.5353 50.7669 74.8185 56.1349 73.9888 62.3157L61.5176 149.38C60.5863 155.925 61.2213 162.613 63.304 168.853C64.5401 172.553 66.8515 180.021 68.2569 183.67C70.2381 188.818 74.7254 192.442 79.8222 193.763C89.093 196.167 102.927 198.25 120.174 198.25C137.42 198.25 151.254 196.167 160.525 193.763C165.63 192.442 170.109 188.818 172.09 183.67C173.496 180.03 175.807 172.562 177.043 168.853C179.126 162.613 179.786 155.925 178.855 149.38V149.388ZM167.645 161.589L164.496 171.275C163.691 173.73 162.413 174.34 160.483 174.924C156.105 176.245 137.598 179.395 120.174 179.522C102.741 179.395 84.2756 176.245 79.8984 174.924C77.9765 174.34 76.698 173.73 75.8937 171.275L72.7442 161.589C72.0245 159.405 73.8364 157.855 76.2747 158.515C83.8268 160.564 92.2171 162.275 99.202 163.646C101.319 164.061 103.283 165.374 104.206 167.262C105.289 169.48 107.457 171.004 109.777 171.148C112.952 171.351 116.66 171.47 120.174 171.47C123.687 171.47 127.387 171.351 130.562 171.148C132.882 171.004 135.049 169.472 136.133 167.262C137.064 165.374 139.028 164.061 141.137 163.646C148.113 162.275 156.546 160.564 164.089 158.515C166.536 157.855 168.348 159.405 167.628 161.589H167.645ZM162.836 144.672C152.787 147.89 136.81 151.386 120.182 151.386C103.554 151.386 87.586 147.898 77.5447 144.672C75.318 143.961 73.938 141.743 74.2682 139.423L83.0818 77.8522C83.3696 75.8541 84.8767 74.2454 86.8578 73.839C95.5191 72.044 107.321 70.3761 120.182 70.3761C133.043 70.3761 144.87 72.044 153.532 73.839C155.513 74.2454 157.02 75.8541 157.308 77.8522L166.121 139.423C166.451 141.743 165.071 143.953 162.845 144.672H162.836ZM154.268 204.101C150.086 204.956 145.395 205.633 140.62 206.15C140.62 206.15 149.696 216.953 152.075 219.798C155.149 223.464 157.646 224.641 161.168 224.641C165.156 224.641 168.704 221.695 164.504 216.454C162.447 213.88 154.268 204.101 154.268 204.101ZM86.1128 204.101C90.2953 204.956 94.9857 205.633 99.7608 206.15C99.7608 206.15 90.6847 216.953 88.3056 219.798C85.2323 223.464 82.7347 224.641 79.2126 224.641C75.2249 224.641 71.6774 221.695 75.8768 216.454C77.9342 213.88 86.1128 204.101 86.1128 204.101Z" fill="white"/>
+</svg>
\ No newline at end of file
diff --git a/digitransit-component/packages/digitransit-component-icon/src/index.js b/digitransit-component/packages/digitransit-component-icon/src/index.js
index 88c9f53050..9221daed88 100644
--- a/digitransit-component/packages/digitransit-component-icon/src/index.js
+++ b/digitransit-component/packages/digitransit-component-icon/src/index.js
@@ -39,6 +39,7 @@ import CautionWhite from './assets/caution_white_exclamation.svg';
 import Trash from './assets/trash.svg';
 import ModeBus from './assets/mode_bus.svg';
 import ModeBusExpress from './assets/bus-express.svg';
+import ModeTramLocal from './assets/tram-local.svg';
 import ModeBusLocal from './assets/bus-local.svg';
 import ModeRail from './assets/mode_rail.svg';
 import ModeTram from './assets/mode_tram.svg';
@@ -59,6 +60,7 @@ import TramWaltti from './assets/tram-waltti.svg';
 import Check from './assets/check.svg';
 import SearchBusStopDefault from './assets/search-bus-stop-default.svg';
 import SearchBusStopExpressDefault from './assets/search-bus-stop-express-default.svg';
+import SearchTramLocalStopDefault from './assets/search-tram-local-stop-default.svg';
 import SearchRailStopDefault from './assets/search-rail-stop-default.svg';
 import SearchFerryDefault from './assets/search-ferry-default.svg';
 import SearchFerryStopDefault from './assets/search-ferry-stop-default.svg';
@@ -122,6 +124,7 @@ const IconMap = style => {
     'mode-bus': <ModeBus style={style} />,
     'mode-bus-express': <ModeBusExpress style={style} />,
     'mode-bus-local': <ModeBusLocal style={style} />,
+    'mode-tram-local': <ModeTramLocal style={style} />,
     'mode-rail': <ModeRail style={style} />,
     'mode-tram': <ModeTram style={style} />,
     'mode-subway': <Subway style={style} />,
@@ -148,6 +151,9 @@ const IconMap = style => {
     'search-bus-stop-express-default': (
       <SearchBusStopExpressDefault style={style} />
     ),
+    'search-tram-local-stop-default': (
+      <SearchTramLocalStopDefault style={style} />
+    ),
     'search-rail-stop-default': <SearchRailStopDefault style={style} />,
     'search-ferry-default': <SearchFerryDefault style={style} />,
     'search-ferry-stop-default': <SearchFerryStopDefault style={style} />,
diff --git a/digitransit-component/packages/digitransit-component-suggestion-item/package.json b/digitransit-component/packages/digitransit-component-suggestion-item/package.json
index d846fbbb30..1530cec033 100644
--- a/digitransit-component/packages/digitransit-component-suggestion-item/package.json
+++ b/digitransit-component/packages/digitransit-component-suggestion-item/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-component/digitransit-component-suggestion-item",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "digitransit-component suggestion-item module",
   "main": "index.js",
   "files": [
@@ -32,7 +32,7 @@
     "recompose": "0.30.0"
   },
   "peerDependencies": {
-    "@digitransit-component/digitransit-component-icon": "^0.2.1",
+    "@digitransit-component/digitransit-component-icon": "^0.2.2",
     "@hsl-fi/sass": " ^0.2.0",
     "classnames": "2.2.6",
     "i18next": "^19.3.3",
diff --git a/digitransit-component/packages/digitransit-component-suggestion-item/src/index.js b/digitransit-component/packages/digitransit-component-suggestion-item/src/index.js
index b53180fa8b..e62fac3acb 100644
--- a/digitransit-component/packages/digitransit-component-suggestion-item/src/index.js
+++ b/digitransit-component/packages/digitransit-component-suggestion-item/src/index.js
@@ -8,6 +8,7 @@ import styles from './helpers/styles.scss';
 
 const BUS_EXPRESS = 702;
 const BUS_LOCAL = 704;
+const TRAM_LOCAL = 902;
 
 const getRouteMode = props => {
   switch (props.type) {
@@ -15,6 +16,8 @@ const getRouteMode = props => {
       return 'bus-local';
     case BUS_EXPRESS:
       return 'bus-express';
+    case TRAM_LOCAL:
+      return 'tram-local';
     default:
       return props?.mode?.toLowerCase() || 'bus';
   }
@@ -124,6 +127,10 @@ function getIconProperties(
       'BUS-EXPRESS-default',
       { icon: 'search-bus-stop-express-default', color: 'mode-bus-express' },
     ],
+    [
+      'TRAM-LOCAL-default',
+      { icon: 'search-tram-local-stop-default', color: 'mode-tram-local' },
+    ],
     [
       'BUS-digitransit',
       { icon: 'search-bus-stop-digitransit', color: 'mode-bus' },
@@ -201,6 +208,8 @@ function getIconProperties(
       }
     } else if (modes.includes('BUS-EXPRESS') && modeSet === 'default') {
       iconStr = [layerIcon.get('BUS-EXPRESS'.concat('-').concat(modeSet))];
+    } else if (modes.includes('TRAM-LOCAL') && modeSet === 'default') {
+      iconStr = [layerIcon.get('TRAM-LOCAL'.concat('-').concat(modeSet))];
     } else {
       iconStr = [layerIcon.get(mode.concat('-').concat(modeSet))];
     }
diff --git a/digitransit-component/packages/digitransit-component-traffic-now-link/package.json b/digitransit-component/packages/digitransit-component-traffic-now-link/package.json
index a287079c18..a376753957 100644
--- a/digitransit-component/packages/digitransit-component-traffic-now-link/package.json
+++ b/digitransit-component/packages/digitransit-component-traffic-now-link/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-component/digitransit-component-traffic-now-link",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "digitransit-component traffic-now-link module",
   "main": "index.js",
   "files": [
@@ -29,7 +29,7 @@
   "author": "Digitransit Authors",
   "license": "(AGPL-3.0 OR EUPL-1.2)",
   "peerDependencies": {
-    "@digitransit-component/digitransit-component-icon": "^0.2.1",
+    "@digitransit-component/digitransit-component-icon": "^0.2.2",
     "@hsl-fi/sass": "^0.2.0",
     "i18next": "^19.3.3",
     "prop-types": "^15.7.2",
diff --git a/digitransit-component/packages/digitransit-component/package.json b/digitransit-component/packages/digitransit-component/package.json
index 82146ecdb3..b6f508cb4f 100644
--- a/digitransit-component/packages/digitransit-component/package.json
+++ b/digitransit-component/packages/digitransit-component/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@digitransit-component/digitransit-component",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "description": "a JavaScript library for Digitransit",
   "main": "digitransit-component",
   "module": "digitransit-component.mjs",
@@ -14,14 +14,14 @@
     "docs": "node -r esm ../../scripts/generate-readmes"
   },
   "dependencies": {
-    "@digitransit-component/digitransit-component-autosuggest": "^1.9.8",
-    "@digitransit-component/digitransit-component-autosuggest-panel": "^2.0.4",
-    "@digitransit-component/digitransit-component-control-panel": "^1.1.2",
-    "@digitransit-component/digitransit-component-favourite-bar": "1.1.2",
-    "@digitransit-component/digitransit-component-favourite-editing-modal": "^1.1.3",
-    "@digitransit-component/digitransit-component-favourite-modal": "^1.0.1",
-    "@digitransit-component/digitransit-component-icon": "^0.2.1",
-    "@digitransit-component/digitransit-component-suggestion-item": "^1.1.2",
+    "@digitransit-component/digitransit-component-autosuggest": "^1.9.9",
+    "@digitransit-component/digitransit-component-autosuggest-panel": "^2.0.5",
+    "@digitransit-component/digitransit-component-control-panel": "^1.1.3",
+    "@digitransit-component/digitransit-component-favourite-bar": "1.1.3",
+    "@digitransit-component/digitransit-component-favourite-editing-modal": "^1.1.4",
+    "@digitransit-component/digitransit-component-favourite-modal": "^1.0.2",
+    "@digitransit-component/digitransit-component-icon": "^0.2.2",
+    "@digitransit-component/digitransit-component-suggestion-item": "^1.1.3",
     "@digitransit-component/digitransit-component-with-breakpoint": "^0.0.5"
   },
   "peerDependencies": {
diff --git a/sass/base/_helper-classes.scss b/sass/base/_helper-classes.scss
index 9e555d0822..bc77890d61 100644
--- a/sass/base/_helper-classes.scss
+++ b/sass/base/_helper-classes.scss
@@ -16,6 +16,9 @@
 .bus-express {
   color: $bus-express-color;
 }
+.tram-local {
+  color: $tram-local-color;
+}
 .map .call {
   color: $white;
 }
diff --git a/sass/themes/default/_theme.scss b/sass/themes/default/_theme.scss
index f2f06be16a..e8ae685138 100644
--- a/sass/themes/default/_theme.scss
+++ b/sass/themes/default/_theme.scss
@@ -64,6 +64,7 @@ $nav-content-color: false;
 $airplane-color: $livi-airplane-blue;
 $bus-color: $livi-bus-blue;
 $bus-express-color: $livi-bus-blue;
+$tram-local-color: $livi-tram-green;
 $tram-color: $livi-tram-green;
 $metro-color: $livi-subway-orange;
 $rail-color: $livi-rail-purple;
diff --git a/sass/themes/hsl/_theme.scss b/sass/themes/hsl/_theme.scss
index 9465796986..cbca2ecc37 100644
--- a/sass/themes/hsl/_theme.scss
+++ b/sass/themes/hsl/_theme.scss
@@ -36,6 +36,7 @@ $top-bar-color: $primary-color;
 $airplane-color: #0046ad;
 $bus-color: $hsl-blue;
 $bus-express-color: $hsl-bus-express;
+$tram-local-color: #007E79;
 $tram-color: $hsl-tram-green;
 $metro-color: $hsl-metro-orange;
 $rail-color: $hsl-rail-red;
diff --git a/sass/themes/matka/_theme.scss b/sass/themes/matka/_theme.scss
index b4a43fb3db..9c7aafe38d 100644
--- a/sass/themes/matka/_theme.scss
+++ b/sass/themes/matka/_theme.scss
@@ -24,6 +24,7 @@ $button-font-family: 'Montserrat', Arial, Georgia, sans-serif;
 $bus-color: #007ac9;
 $airplane-color: #0046ad;
 $tram-color: #5E7921;
+$tram-local-color: #5E7921;
 $metro-color: #CA4000;
 $rail-color: #8c4799;
 $ferry-color: #247C7B;
diff --git a/static/assets/svg-sprite.default.svg b/static/assets/svg-sprite.default.svg
index f7445300df..0223dc3d0c 100644
--- a/static/assets/svg-sprite.default.svg
+++ b/static/assets/svg-sprite.default.svg
@@ -201,6 +201,19 @@
 	<path d="M22.3998 21H9.60017C8.71627 21 8 20.2837 8 19.4003V6.60023C8 5.71629 8.71627 5 9.60017 5H22.3998C23.2837 5 24 5.71629 24 6.60023V19.4003C23.9994 20.2837 23.2832 21 22.3998 21Z" />
 	<path d="M19.7718 17.2498V10.3973C19.7718 9.81423 19.2988 8.27666 18.7157 8.27666H16.8887L17.4209 7.16864H18.3161V6.6008H13.6844V7.16864H14.5892L15.1214 8.27666H13.2842C12.7011 8.27666 12.2281 9.81423 12.2281 10.3973V17.2498C12.2281 17.8329 12.7006 18.3053 13.2836 18.3059L12.4946 19.4009H13.6494L14.4385 18.3059H17.5615L18.3506 19.4009H19.5054L18.7163 18.3059C19.2994 18.3053 19.7718 17.8329 19.7718 17.2498ZM15.2123 7.16864H16.7984L16.2661 8.27666H15.7446L15.2123 7.16864ZM14.3233 8.95062H17.6766V9.51846H14.3233V8.95062ZM12.9822 16.4833C12.9822 16.1643 13.2407 15.9058 13.5596 15.9058C13.8786 15.9058 14.1371 16.1643 14.1371 16.4833C14.1371 16.8022 13.8786 17.0607 13.5596 17.0607C13.2407 17.0607 12.9822 16.8022 12.9822 16.4833ZM18.4397 17.0607C18.1208 17.0607 17.8623 16.8022 17.8623 16.4833C17.8623 16.1643 18.1208 15.9058 18.4397 15.9058C18.7586 15.9058 19.0172 16.1643 19.0172 16.4833C19.0172 16.8022 18.7586 17.0607 18.4397 17.0607ZM19.0172 14.7916C19.0172 14.9282 18.9443 15.0473 18.8388 15.0828C18.4183 15.224 17.3024 15.3385 15.9997 15.3385C14.697 15.3385 13.5811 15.224 13.1606 15.0828C13.055 15.0473 12.9822 14.9282 12.9822 14.7916V10.3838C12.9822 10.2173 13.09 10.0818 13.2238 10.0818H18.7761C18.9093 10.0818 19.0177 10.2167 19.0177 10.3838V14.7916H19.0172Z" fill="white"/>
 </symbol>
+<symbol id="icon-icon_tram-local-stop-lollipop" viewBox="0 0 240 240" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="108.75" y="165" width="22.5" height="60" rx="11.25" fill="#333333"/>
+<circle cx="120" cy="97.5" r="82.5" fill="#007E79"/>
+<g clip-path="url(#clip0_210_706)">
+<path d="M74.9984 37.5H164.997C173.278 37.5 179.996 44.2226 179.996 52.4989V142.501C179.996 150.782 173.273 157.5 164.997 157.5H74.9984C66.7182 157.5 60 150.777 60 142.501V52.4989C60 44.2226 66.7224 37.5 74.9984 37.5Z" fill="#007E79"/>
+<path d="M149.427 112.194L143.192 68.6579C142.777 65.5632 140.906 62.8793 138.214 61.6092C132.486 58.8999 126.564 57.8796 123.135 57.4647V52.1857H134.167C135.801 52.1857 137.126 50.8606 137.126 49.2265C137.126 47.5925 135.801 46.2674 134.167 46.2674H106.007C104.373 46.2674 103.048 47.5925 103.048 49.2265C103.048 50.8606 104.373 52.1857 106.007 52.1857H117.056V57.4647C113.61 57.8796 107.688 58.8999 101.96 61.6092C99.2676 62.8835 97.4092 65.5675 96.9944 68.6579L90.7588 112.19C90.2931 115.462 90.6106 118.807 91.652 121.927C92.2701 123.777 93.4258 127.511 94.1285 129.335C95.1191 131.909 97.3627 133.721 99.9111 134.381C104.547 135.584 111.464 136.625 120.087 136.625C128.71 136.625 135.627 135.584 140.262 134.381C142.815 133.721 145.054 131.909 146.045 129.335C146.748 127.515 147.903 123.781 148.522 121.927C149.563 118.807 149.893 115.462 149.427 112.19V112.194ZM143.823 118.295L142.248 123.138C141.846 124.365 141.206 124.67 140.241 124.962C138.053 125.623 128.799 127.197 120.087 127.261C111.371 127.197 102.138 125.623 99.9492 124.962C98.9882 124.67 98.349 124.365 97.9469 123.138L96.3721 118.295C96.0123 117.202 96.9182 116.428 98.1374 116.758C101.913 117.782 106.109 118.637 109.601 119.323C110.659 119.531 111.641 120.187 112.103 121.131C112.645 122.24 113.728 123.002 114.888 123.074C116.476 123.176 118.33 123.235 120.087 123.235C121.844 123.235 123.694 123.176 125.281 123.074C126.441 123.002 127.525 122.236 128.066 121.131C128.532 120.187 129.514 119.531 130.568 119.323C134.057 118.637 138.273 117.782 142.045 116.758C143.268 116.428 144.174 117.202 143.814 118.295H143.823ZM141.418 109.836C136.393 111.445 128.405 113.193 120.091 113.193C111.777 113.193 103.793 111.449 98.7723 109.836C97.659 109.481 96.969 108.371 97.1341 107.211L101.541 76.4261C101.685 75.4271 102.438 74.6227 103.429 74.4195C107.76 73.522 113.661 72.6881 120.091 72.6881C126.521 72.6881 132.435 73.522 136.766 74.4195C137.756 74.6227 138.51 75.4271 138.654 76.4261L143.061 107.211C143.226 108.371 142.536 109.476 141.422 109.836H141.418ZM137.134 139.55C135.043 139.978 132.698 140.317 130.31 140.575C130.31 140.575 134.848 145.977 136.038 147.399C137.574 149.232 138.823 149.821 140.584 149.821C142.578 149.821 144.352 148.347 142.252 145.727C141.223 144.44 137.134 139.55 137.134 139.55ZM103.056 139.55C105.148 139.978 107.493 140.317 109.88 140.575C109.88 140.575 105.342 145.977 104.153 147.399C102.616 149.232 101.367 149.821 99.6063 149.821C97.6124 149.821 95.8387 148.347 97.9384 145.727C98.9671 144.44 103.056 139.55 103.056 139.55Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_210_706">
+<rect width="120" height="120" fill="white" transform="translate(60 37.5)"/>
+</clipPath>
+</defs>
+</symbol>
 
 <symbol id="icon-icon_citybike" viewBox="364.958 236 28 28">
   <path class="citybike" fill="#F2B62D" d="M25.1997 28H2.8003C1.25347 28 0 26.7465 0 25.2007V2.8003C0 1.25347 1.25347 0 2.8003 0H25.1997C26.7465 0 28 1.25347 28 2.8003V25.2007C27.999 26.7465 26.7455 28 25.1997 28Z" transform="matrix(1, 0, 0, 1, 364.958099, 235.999985)"></path>
@@ -417,6 +430,10 @@
 	<path class="path1 tram" d="M921.607 1024.025h-819.214c-56.554 0-102.4-45.846-102.4-102.4v-819.251c0-56.554 45.846-102.4 102.4-102.4h819.214c56.554 0 102.4 45.846 102.4 102.4v819.247c0 56.557-45.846 102.404-102.4 102.404z"></path>
 	<path fill="rgb(255, 255, 255)" class="path2" d="M753.416 783.974v-438.572c0-37.332-30.266-135.729-67.597-135.729h-116.929l34.066-70.899h57.305v-36.335h-296.438v36.338h57.901l34.066 70.899h-117.609c-37.332 0-67.597 98.397-67.597 135.729v438.572c0 37.317 30.237 67.568 67.547 67.594l-50.514 70.083h73.923l50.51-70.083h199.894l50.51 70.083h73.923l-50.514-70.083c37.317-0.033 67.554-30.284 67.554-67.597zM461.58 138.774h101.519l-34.066 70.899h-33.387l-34.066-70.899zM404.691 252.814h214.619v36.338h-214.619v-36.338zM318.868 734.909c0-20.414 16.549-36.963 36.963-36.963s36.963 16.549 36.963 36.963c0 20.414-16.549 36.963-36.963 36.963s-36.963-16.549-36.963-36.963zM668.172 771.873c-20.414 0-36.963-16.549-36.963-36.963s16.549-36.963 36.963-36.963c20.414 0 36.963 16.549 36.963 36.963-0.004 20.414-16.552 36.963-36.963 36.963zM705.132 626.661c0 8.742-4.678 16.383-11.43 18.651-26.913 9.038-98.325 16.372-181.702 16.372s-154.789-7.337-181.702-16.372c-6.755-2.269-11.43-9.909-11.43-18.651v-282.1c0-10.668 6.918-19.312 15.451-19.312h355.362c8.533 0 15.451 8.648 15.451 19.312v282.1z"></path>
 </symbol>
+<symbol id="icon-icon_tram-local" viewBox="0 0 1024 1024">
+	<path class="path1 tram" d="M921.607 1024.025h-819.214c-56.554 0-102.4-45.846-102.4-102.4v-819.251c0-56.554 45.846-102.4 102.4-102.4h819.214c56.554 0 102.4 45.846 102.4 102.4v819.247c0 56.557-45.846 102.404-102.4 102.404z"></path>
+	<path fill="rgb(255, 255, 255)" class="path2" d="M753.416 783.974v-438.572c0-37.332-30.266-135.729-67.597-135.729h-116.929l34.066-70.899h57.305v-36.335h-296.438v36.338h57.901l34.066 70.899h-117.609c-37.332 0-67.597 98.397-67.597 135.729v438.572c0 37.317 30.237 67.568 67.547 67.594l-50.514 70.083h73.923l50.51-70.083h199.894l50.51 70.083h73.923l-50.514-70.083c37.317-0.033 67.554-30.284 67.554-67.597zM461.58 138.774h101.519l-34.066 70.899h-33.387l-34.066-70.899zM404.691 252.814h214.619v36.338h-214.619v-36.338zM318.868 734.909c0-20.414 16.549-36.963 36.963-36.963s36.963 16.549 36.963 36.963c0 20.414-16.549 36.963-36.963 36.963s-36.963-16.549-36.963-36.963zM668.172 771.873c-20.414 0-36.963-16.549-36.963-36.963s16.549-36.963 36.963-36.963c20.414 0 36.963 16.549 36.963 36.963-0.004 20.414-16.552 36.963-36.963 36.963zM705.132 626.661c0 8.742-4.678 16.383-11.43 18.651-26.913 9.038-98.325 16.372-181.702 16.372s-154.789-7.337-181.702-16.372c-6.755-2.269-11.43-9.909-11.43-18.651v-282.1c0-10.668 6.918-19.312 15.451-19.312h355.362c8.533 0 15.451 8.648 15.451 19.312v282.1z"></path>
+</symbol>
 <symbol id="icon-icon_under-construction" viewBox="0 0 1024 1024">
 	<path class="path1" d="M259.114 310.509l112.381 300.083-126.062 47.212c-16.224 6.076-24.449 24.153-18.373 40.373l55.763 148.897c3.818-3.941 7.427-8.19 11.231-13.077 23.864-30.656 55.452-60.6 128.739-28.015 43.809 19.5 126.214-12.824 168.126-40.753 38.585-25.717 91.418-19.717 119.487-13.821 3.287 0.69 6.755 1.636 10.162 2.493l-79.005-210.956c-6.076-16.224-24.153-24.449-40.377-18.373l-126.062 47.212-111.030-296.471c47.15-66.181 30.020-191.77 24.691-223.672 1.145-14.602-4.443-29.019-15.559-39.138-13.359-12.152-32.177-15.769-49.094-9.432l-208.86 78.222c-16.917 6.336-28.723 21.411-30.811 39.358-1.756 15.053 3.613 29.724 14.248 39.994 20.060 31.472 86.559 127.565 160.406 149.865zM326.531 71.101c10.158 68.381 7.886 164.438-29.211 178.331-33.329 12.481-98.986-55.799-138.879-115.38l168.090-62.951z"></path>
 	<path class="path2" d="M1.727 1024h1020.546c0 0-14.79-88.745-81.346-103.534s-118.949-36.566-140.508-70.256c-29.583-46.222-140.508-77.651-184.881-48.068s-144.207 73.952-210.764 44.372-62.865 11.094-99.842 40.673c-36.978 29.583-129.418 62.861-155.301 59.162s-147.903-14.79-147.903 77.651z"></path>
@@ -1147,6 +1164,19 @@
         </g>
     </g>
 </symbol>
+<symbol id="icon-icon_stop_tram-local" viewBox="0 0 240 240" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="108.75" y="165" width="22.5" height="60" rx="11.25" fill="#333333"/>
+<circle cx="120" cy="97.5" r="82.5" fill="#007E79"/>
+<g clip-path="url(#clip0_210_706)">
+<path d="M74.9984 37.5H164.997C173.278 37.5 179.996 44.2226 179.996 52.4989V142.501C179.996 150.782 173.273 157.5 164.997 157.5H74.9984C66.7182 157.5 60 150.777 60 142.501V52.4989C60 44.2226 66.7224 37.5 74.9984 37.5Z" fill="#007E79"/>
+<path d="M149.427 112.194L143.192 68.6579C142.777 65.5632 140.906 62.8793 138.214 61.6092C132.486 58.8999 126.564 57.8796 123.135 57.4647V52.1857H134.167C135.801 52.1857 137.126 50.8606 137.126 49.2265C137.126 47.5925 135.801 46.2674 134.167 46.2674H106.007C104.373 46.2674 103.048 47.5925 103.048 49.2265C103.048 50.8606 104.373 52.1857 106.007 52.1857H117.056V57.4647C113.61 57.8796 107.688 58.8999 101.96 61.6092C99.2676 62.8835 97.4092 65.5675 96.9944 68.6579L90.7588 112.19C90.2931 115.462 90.6106 118.807 91.652 121.927C92.2701 123.777 93.4258 127.511 94.1285 129.335C95.1191 131.909 97.3627 133.721 99.9111 134.381C104.547 135.584 111.464 136.625 120.087 136.625C128.71 136.625 135.627 135.584 140.262 134.381C142.815 133.721 145.054 131.909 146.045 129.335C146.748 127.515 147.903 123.781 148.522 121.927C149.563 118.807 149.893 115.462 149.427 112.19V112.194ZM143.823 118.295L142.248 123.138C141.846 124.365 141.206 124.67 140.241 124.962C138.053 125.623 128.799 127.197 120.087 127.261C111.371 127.197 102.138 125.623 99.9492 124.962C98.9882 124.67 98.349 124.365 97.9469 123.138L96.3721 118.295C96.0123 117.202 96.9182 116.428 98.1374 116.758C101.913 117.782 106.109 118.637 109.601 119.323C110.659 119.531 111.641 120.187 112.103 121.131C112.645 122.24 113.728 123.002 114.888 123.074C116.476 123.176 118.33 123.235 120.087 123.235C121.844 123.235 123.694 123.176 125.281 123.074C126.441 123.002 127.525 122.236 128.066 121.131C128.532 120.187 129.514 119.531 130.568 119.323C134.057 118.637 138.273 117.782 142.045 116.758C143.268 116.428 144.174 117.202 143.814 118.295H143.823ZM141.418 109.836C136.393 111.445 128.405 113.193 120.091 113.193C111.777 113.193 103.793 111.449 98.7723 109.836C97.659 109.481 96.969 108.371 97.1341 107.211L101.541 76.4261C101.685 75.4271 102.438 74.6227 103.429 74.4195C107.76 73.522 113.661 72.6881 120.091 72.6881C126.521 72.6881 132.435 73.522 136.766 74.4195C137.756 74.6227 138.51 75.4271 138.654 76.4261L143.061 107.211C143.226 108.371 142.536 109.476 141.422 109.836H141.418ZM137.134 139.55C135.043 139.978 132.698 140.317 130.31 140.575C130.31 140.575 134.848 145.977 136.038 147.399C137.574 149.232 138.823 149.821 140.584 149.821C142.578 149.821 144.352 148.347 142.252 145.727C141.223 144.44 137.134 139.55 137.134 139.55ZM103.056 139.55C105.148 139.978 107.493 140.317 109.88 140.575C109.88 140.575 105.342 145.977 104.153 147.399C102.616 149.232 101.367 149.821 99.6063 149.821C97.6124 149.821 95.8387 148.347 97.9384 145.727C98.9671 144.44 103.056 139.55 103.056 139.55Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_210_706">
+<rect width="120" height="120" fill="white" transform="translate(60 37.5)"/>
+</clipPath>
+</defs>
+</symbol>
 <symbol id="icon-icon_stop_ferry" viewBox="0 0 16 22" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>icon-stop-hsl_ferry-small</title>
     <defs>
diff --git a/static/assets/svg-sprite.hsl.svg b/static/assets/svg-sprite.hsl.svg
index f76807fe45..3a2d6c993d 100644
--- a/static/assets/svg-sprite.hsl.svg
+++ b/static/assets/svg-sprite.hsl.svg
@@ -89,15 +89,12 @@
 	<path fill="#CA4000" d="M0.033 126.799c0-69.114 57.594-126.709 126.709-126.709h767.931c71.676 0 129.27 57.594 129.27 126.709v767.931c0 71.672-57.594 129.27-129.27 129.27h-767.928c-69.114 0-126.709-57.594-126.709-129.27v-767.931zM513.268 110.16c-106.229 0-198.384 5.119-299.491 19.197-30.717 3.84-48.635 21.758-48.635 48.635v598.985c0 19.197 14.078 31.996 26.877 35.836l38.397 6.398v80.631c0 8.959 7.68 15.36 17.918 15.36h61.434c7.68 0 15.357-6.398 15.357-15.36v-71.672c49.914 6.398 117.75 8.959 185.585 8.959 69.114 0 139.508-2.558 188.146-8.959v71.672c0 8.959 8.959 15.36 16.636 15.36h61.434c10.238 0 17.918-6.398 17.918-15.36v-80.631l38.397-6.398c14.078-3.84 26.877-15.357 26.877-35.836v-598.982c0-26.877-17.918-44.795-48.635-48.635-102.393-12.799-195.823-19.2-298.216-19.2zM778.205 620.834c-72.951 12.799-168.946 25.598-262.376 25.598-98.553 0-191.983-11.517-266.216-28.156-20.476-3.84-28.156-11.52-28.156-28.156v-373.731c0-16.636 7.68-28.156 28.156-28.156l528.592 2.558c20.479 0 26.877 11.52 26.877 28.159v373.728c0 16.639-6.398 25.598-26.877 28.156zM241.933 723.227c1.279-16.636 16.636-31.996 34.557-31.996 17.918 0 33.275 15.357 33.275 31.996 0 19.197-15.357 34.557-33.275 34.557-19.197-1.279-34.557-16.639-34.557-34.557zM710.373 723.227c1.279-16.636 16.639-31.996 33.275-31.996 17.918 0 33.278 15.357 33.278 31.996 0 19.197-15.357 34.557-33.278 34.557-17.918-1.279-33.275-16.639-33.275-34.557z"></path>
 </symbol>
 <symbol id="icon-icon_bus-local" viewBox="0 0 30 30">
-<g clip-path="url(#clip0_10_1986)">
 <path d="M0 26.2503C0 28.313 1.68807 30.0011 3.75079 30.0011H26.2503C28.313 30.0011 30 28.313 30 26.2503V3.74974C30 1.68701 28.313 0 26.2503 0H3.75079C1.68807 0 0 1.68701 0 3.74974V26.2503Z" fill="#007AC9"/>
 <path d="M26.9245 7.92916L22.1863 3.19516C21.7968 2.80674 21.1597 2.80674 20.7713 3.19516L16.032 7.92916C15.6425 8.31757 15.9293 8.96952 16.4924 8.96952H17.5285V14.2285H25.4238V8.96952H26.4662C26.9986 8.96952 27.314 8.31757 26.9245 7.92916ZM20.0389 12.6526H18.7625V11.2757H20.0389V12.6526ZM20.0389 10.4523H18.7625V9.07535H20.0389V10.4523ZM22.1535 12.6526H20.8771V11.2757H22.1535V12.6526ZM22.1535 10.4523H20.8771V9.07535H22.1535V10.4523ZM12.8146 21.6486L14.0095 21.5194C14.3492 21.4866 14.6392 21.729 14.6392 22.0687C14.6392 22.3598 14.4296 22.6011 14.1386 22.6339L12.9596 22.7789C12.605 22.8276 12.2971 22.5534 12.2971 22.1978C12.2981 21.9227 12.5235 21.6803 12.8146 21.6486ZM7.19475 21.6486C7.48474 21.6803 7.71123 21.9227 7.71123 22.1978C7.71123 22.5534 7.4043 22.8276 7.04976 22.7789L5.87075 22.6339C5.57971 22.6011 5.37015 22.3598 5.37015 22.0687C5.37015 21.73 5.6612 21.4877 5.99987 21.5194L7.19475 21.6486ZM5.67708 15.2371H14.3492C14.5111 16.3356 14.6392 17.6914 14.6392 19.6462H5.37015C5.37015 17.6755 5.49927 16.3187 5.67708 15.2371ZM10.0047 12.7499C8.32507 12.7499 7.59904 12.8473 6.04856 13.0727C5.53208 13.1373 5.28972 13.4114 5.17648 13.8644C5.01561 14.51 4.82193 15.544 4.64413 17.6596C4.1594 17.5464 3.9816 17.5146 3.82073 17.5146C3.44925 17.5146 3.1582 17.7888 3.1582 18.1761C3.1582 18.5148 3.40057 18.8058 3.75511 18.8863L4.52982 19.0482C4.51395 19.5329 4.49702 20.0335 4.49702 20.55C4.49702 22.1005 4.61026 23.6181 4.67482 23.9568C4.7235 24.2479 4.93306 24.5061 5.19129 24.5548L5.57865 24.6193V25.991C5.57865 26.137 5.7247 26.2503 5.88557 26.2503H7.08045C7.20957 26.2503 7.37149 26.137 7.37149 25.991V24.813C8.16314 24.8935 8.92092 24.9421 10.0036 24.9421C11.0852 24.9421 11.8451 24.8935 12.6357 24.813V25.991C12.6357 26.137 12.7977 26.2503 12.9268 26.2503H14.1216C14.2836 26.2503 14.4286 26.137 14.4286 25.991V24.6193L14.8159 24.5548C15.0742 24.5061 15.2837 24.2479 15.3324 23.9568C15.397 23.6181 15.5102 22.1005 15.5102 20.55C15.5102 20.0335 15.4943 19.5329 15.4785 19.0482L16.2542 18.8863C16.6098 18.8058 16.8511 18.5148 16.8511 18.1761C16.8511 17.7888 16.5601 17.5146 16.1886 17.5146C16.0277 17.5146 15.8499 17.5464 15.3652 17.6596C15.1874 15.544 14.9937 14.511 14.8487 13.8644C14.7524 13.4125 14.4773 13.1373 13.9608 13.0727C12.4114 12.8473 11.6843 12.7499 10.0047 12.7499Z" fill="white"/>
-</g>
-<defs>
-<clipPath id="clip0_10_1986">
-<rect width="30" height="30" fill="white"/>
-</clipPath>
-</defs>
+</symbol>
+<symbol id="icon-icon_tram-local" viewBox="0 0 240 240" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M29.9968 0H209.995C226.555 0 239.992 13.4453 239.992 29.9979V210.002C239.992 226.563 226.547 240 209.995 240H29.9968C13.4363 240 0 226.555 0 210.002V29.9979C0 13.4453 13.4448 0 29.9968 0Z" fill="#007E79"/>
+<path d="M178.855 149.388L166.384 62.3157C165.554 56.1264 161.812 50.7585 156.427 48.2184C144.972 42.7997 133.127 40.7592 126.269 39.9294V29.3713H148.333C151.601 29.3713 154.251 26.7212 154.251 23.453C154.251 20.1848 151.601 17.5347 148.333 17.5347H92.014C88.7459 17.5347 86.0959 20.1848 86.0959 23.453C86.0959 26.7212 88.7459 29.3713 92.014 29.3713H114.112V39.9294C107.22 40.7592 95.3752 42.7997 83.92 48.2184C78.5353 50.7669 74.8185 56.1349 73.9888 62.3157L61.5176 149.38C60.5863 155.925 61.2213 162.613 63.304 168.853C64.5401 172.553 66.8515 180.021 68.2569 183.67C70.2381 188.818 74.7254 192.442 79.8222 193.763C89.093 196.167 102.927 198.25 120.174 198.25C137.42 198.25 151.254 196.167 160.525 193.763C165.63 192.442 170.109 188.818 172.09 183.67C173.496 180.03 175.807 172.562 177.043 168.853C179.126 162.613 179.786 155.925 178.855 149.38V149.388ZM167.645 161.589L164.496 171.275C163.691 173.73 162.413 174.34 160.483 174.924C156.105 176.245 137.598 179.395 120.174 179.522C102.741 179.395 84.2756 176.245 79.8984 174.924C77.9765 174.34 76.698 173.73 75.8937 171.275L72.7442 161.589C72.0245 159.405 73.8364 157.855 76.2747 158.515C83.8268 160.564 92.2171 162.275 99.202 163.646C101.319 164.061 103.283 165.374 104.206 167.262C105.289 169.48 107.457 171.004 109.777 171.148C112.952 171.351 116.66 171.47 120.174 171.47C123.687 171.47 127.387 171.351 130.562 171.148C132.882 171.004 135.049 169.472 136.133 167.262C137.064 165.374 139.028 164.061 141.137 163.646C148.113 162.275 156.546 160.564 164.089 158.515C166.536 157.855 168.348 159.405 167.628 161.589H167.645ZM162.836 144.672C152.787 147.89 136.81 151.386 120.182 151.386C103.554 151.386 87.586 147.898 77.5447 144.672C75.318 143.961 73.938 141.743 74.2682 139.423L83.0818 77.8522C83.3696 75.8541 84.8767 74.2454 86.8578 73.839C95.5191 72.044 107.321 70.3761 120.182 70.3761C133.043 70.3761 144.87 72.044 153.532 73.839C155.513 74.2454 157.02 75.8541 157.308 77.8522L166.121 139.423C166.451 141.743 165.071 143.953 162.845 144.672H162.836ZM154.268 204.101C150.086 204.956 145.395 205.633 140.62 206.15C140.62 206.15 149.696 216.953 152.075 219.798C155.149 223.464 157.646 224.641 161.168 224.641C165.156 224.641 168.704 221.695 164.504 216.454C162.447 213.88 154.268 204.101 154.268 204.101ZM86.1128 204.101C90.2953 204.956 94.9857 205.633 99.7608 206.15C99.7608 206.15 90.6847 216.953 88.3056 219.798C85.2323 223.464 82.7347 224.641 79.2126 224.641C75.2249 224.641 71.6774 221.695 75.8768 216.454C77.9342 213.88 86.1128 204.101 86.1128 204.101Z" fill="white"/>
 </symbol>
 <symbol id="icon-icon_ferry" viewBox="0 0 1024 1024">
 	<path fill="rgb(255, 255, 255)" class="path1 fill-color14" d="M870.396 993.287h-716.814c-67.864 0-122.883-55.015-122.883-122.883v-716.811c0-67.864 55.015-122.883 122.883-122.883h716.814c67.864 0 122.883 55.015 122.883 122.883v716.811c-0.004 67.868-55.018 122.883-122.883 122.883z"></path>
@@ -159,6 +156,12 @@
 	<path d="M8 7C8 5.89543 8.89543 5 10 5H22C23.1046 5 24 5.89543 24 7V19C24 20.1046 23.1046 21 22 21H10C8.89543 21 8 20.1046 8 19V7Z" fill="#008151"/>
 	<path d="M18.18 19.2V18.6L17.44 18.7V19.2H14.58V18.7L13.84 18.6V19.2H13.24C13.02 19.2 12.88 19.38 12.88 19.56C12.88 19.82 13.02 19.98 13.24 19.98H18.78C18.96 19.98 19.16 19.82 19.16 19.56C19.16 19.38 18.96 19.2 18.78 19.2H18.18ZM19.18 8.41999C19.08 8.17999 18.94 8.05999 18.7 7.99999C17.84 7.77999 17.22 7.69999 16.42 7.67999V6.97999H17.9C18.1 6.97999 18.26 6.79999 18.26 6.59999C18.26 6.35999 18.1 6.17999 17.9 6.17999H14.14C13.9 6.17999 13.72 6.35999 13.72 6.59999C13.72 6.79999 13.9 6.97999 14.14 6.97999H15.6V7.67999C14.78 7.69999 14.12 7.77999 13.32 7.99999C13.04 8.07999 12.9 8.17999 12.78 8.41999L12.44 9.23999C12.34 9.47999 12.34 9.81999 12.34 10.08V17.28C12.34 17.64 12.58 17.86 12.94 17.92C14.02 18.14 14.96 18.22 16 18.22C17 18.22 17.96 18.14 19.08 17.92C19.42 17.86 19.68 17.64 19.68 17.28V10.08C19.68 9.81999 19.62 9.47999 19.52 9.23999L19.18 8.41999ZM13.52 16.56C13.26 16.56 13.06 16.38 13.06 16.12C13.06 15.84 13.26 15.62 13.52 15.62C13.8 15.62 14 15.84 14 16.12C14 16.38 13.8 16.56 13.52 16.56ZM13.08 9.91999H18.9V14.78C18.14 15 17.06 15.14 16 15.14C14.96 15.14 13.88 14.98 13.08 14.78V9.91999ZM18.54 16.56C18.28 16.56 18.1 16.38 18.1 16.12C18.1 15.84 18.28 15.62 18.54 15.62C18.82 15.62 19.04 15.84 19.04 16.12C19.04 16.38 18.82 16.56 18.54 16.56Z" fill="white"/>
 </symbol>
+<symbol id="icon-icon_tram-local-stop-lollipop" viewBox="0 0 240 240" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="108.75" y="165" width="22.5" height="60" rx="11.25" fill="#333333"/>
+<circle cx="120" cy="97.5" r="82.5" fill="#007E79"/>
+<path d="M74.9984 37.5H164.997C173.278 37.5 179.996 44.2226 179.996 52.4989V142.501C179.996 150.782 173.273 157.5 164.997 157.5H74.9984C66.7182 157.5 60 150.777 60 142.501V52.4989C60 44.2226 66.7224 37.5 74.9984 37.5Z" fill="#007E79"/>
+<path d="M149.427 112.194L143.192 68.6579C142.777 65.5632 140.906 62.8793 138.214 61.6092C132.486 58.8999 126.564 57.8796 123.135 57.4647V52.1857H134.167C135.801 52.1857 137.126 50.8606 137.126 49.2265C137.126 47.5925 135.801 46.2674 134.167 46.2674H106.007C104.373 46.2674 103.048 47.5925 103.048 49.2265C103.048 50.8606 104.373 52.1857 106.007 52.1857H117.056V57.4647C113.61 57.8796 107.688 58.8999 101.96 61.6092C99.2676 62.8835 97.4092 65.5675 96.9944 68.6579L90.7588 112.19C90.2931 115.462 90.6106 118.807 91.652 121.927C92.2701 123.777 93.4258 127.511 94.1285 129.335C95.1191 131.909 97.3627 133.721 99.9111 134.381C104.547 135.584 111.464 136.625 120.087 136.625C128.71 136.625 135.627 135.584 140.262 134.381C142.815 133.721 145.054 131.909 146.045 129.335C146.748 127.515 147.903 123.781 148.522 121.927C149.563 118.807 149.893 115.462 149.427 112.19V112.194ZM143.823 118.295L142.248 123.138C141.846 124.365 141.206 124.67 140.241 124.962C138.053 125.623 128.799 127.197 120.087 127.261C111.371 127.197 102.138 125.623 99.9492 124.962C98.9882 124.67 98.349 124.365 97.9469 123.138L96.3721 118.295C96.0123 117.202 96.9182 116.428 98.1374 116.758C101.913 117.782 106.109 118.637 109.601 119.323C110.659 119.531 111.641 120.187 112.103 121.131C112.645 122.24 113.728 123.002 114.888 123.074C116.476 123.176 118.33 123.235 120.087 123.235C121.844 123.235 123.694 123.176 125.281 123.074C126.441 123.002 127.525 122.236 128.066 121.131C128.532 120.187 129.514 119.531 130.568 119.323C134.057 118.637 138.273 117.782 142.045 116.758C143.268 116.428 144.174 117.202 143.814 118.295H143.823ZM141.418 109.836C136.393 111.445 128.405 113.193 120.091 113.193C111.777 113.193 103.793 111.449 98.7723 109.836C97.659 109.481 96.969 108.371 97.1341 107.211L101.541 76.4261C101.685 75.4271 102.438 74.6227 103.429 74.4195C107.76 73.522 113.661 72.6881 120.091 72.6881C126.521 72.6881 132.435 73.522 136.766 74.4195C137.756 74.6227 138.51 75.4271 138.654 76.4261L143.061 107.211C143.226 108.371 142.536 109.476 141.422 109.836H141.418ZM137.134 139.55C135.043 139.978 132.698 140.317 130.31 140.575C130.31 140.575 134.848 145.977 136.038 147.399C137.574 149.232 138.823 149.821 140.584 149.821C142.578 149.821 144.352 148.347 142.252 145.727C141.223 144.44 137.134 139.55 137.134 139.55ZM103.056 139.55C105.148 139.978 107.493 140.317 109.88 140.575C109.88 140.575 105.342 145.977 104.153 147.399C102.616 149.232 101.367 149.821 99.6063 149.821C97.6124 149.821 95.8387 148.347 97.9384 145.727C98.9671 144.44 103.056 139.55 103.056 139.55Z" fill="white"/>
+</symbol>
 <symbol id="icon-icon_airplane" viewBox="0 0 1024 1024">
 	<path class="path1" d="M0.043 126.755c0-69.114 57.594-126.709 126.709-126.709h767.931c71.676 0 129.27 57.594 129.27 126.709v767.931c0 71.672-57.594 129.27-129.27 129.27h-767.928c-69.114 0-126.709-57.594-126.709-129.27v-767.931z"></path>
 	<path fill="rgb(255, 255, 255)" class="path2 fill-color14" d="M861.495 712.552v-88.723l-292.602-208.279v-247.276c0-31.393-25.465-56.857-56.933-56.857-31.389 0-56.854 25.465-56.854 56.857v243.432l-292.598 212.123v88.723l297.804-116.59 14.331 201.393-81.596 61.658v53.57l119.393-37.075 119.393 37.075v-53.57l-82.477-61.738 14.331-201.314 297.807 116.59z"></path>
@@ -1146,6 +1149,12 @@
 	</g>
 	</g>
 </symbol>
+<symbol id="icon-icon_stop_tram-local" viewBox="25 35 190 190" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="108.75" y="165" width="16" height="120" rx="11.25" fill="#333333"/>
+<circle cx="120" cy="97.5" r="82.5" fill="#007E79"/>
+<path d="M74.9984 37.5H164.997C173.278 37.5 179.996 44.2226 179.996 52.4989V142.501C179.996 150.782 173.273 157.5 164.997 157.5H74.9984C66.7182 157.5 60 150.777 60 142.501V52.4989C60 44.2226 66.7224 37.5 74.9984 37.5Z" fill="#007E79"/>
+<path d="M149.427 112.194L143.192 68.6579C142.777 65.5632 140.906 62.8793 138.214 61.6092C132.486 58.8999 126.564 57.8796 123.135 57.4647V52.1857H134.167C135.801 52.1857 137.126 50.8606 137.126 49.2265C137.126 47.5925 135.801 46.2674 134.167 46.2674H106.007C104.373 46.2674 103.048 47.5925 103.048 49.2265C103.048 50.8606 104.373 52.1857 106.007 52.1857H117.056V57.4647C113.61 57.8796 107.688 58.8999 101.96 61.6092C99.2676 62.8835 97.4092 65.5675 96.9944 68.6579L90.7588 112.19C90.2931 115.462 90.6106 118.807 91.652 121.927C92.2701 123.777 93.4258 127.511 94.1285 129.335C95.1191 131.909 97.3627 133.721 99.9111 134.381C104.547 135.584 111.464 136.625 120.087 136.625C128.71 136.625 135.627 135.584 140.262 134.381C142.815 133.721 145.054 131.909 146.045 129.335C146.748 127.515 147.903 123.781 148.522 121.927C149.563 118.807 149.893 115.462 149.427 112.19V112.194ZM143.823 118.295L142.248 123.138C141.846 124.365 141.206 124.67 140.241 124.962C138.053 125.623 128.799 127.197 120.087 127.261C111.371 127.197 102.138 125.623 99.9492 124.962C98.9882 124.67 98.349 124.365 97.9469 123.138L96.3721 118.295C96.0123 117.202 96.9182 116.428 98.1374 116.758C101.913 117.782 106.109 118.637 109.601 119.323C110.659 119.531 111.641 120.187 112.103 121.131C112.645 122.24 113.728 123.002 114.888 123.074C116.476 123.176 118.33 123.235 120.087 123.235C121.844 123.235 123.694 123.176 125.281 123.074C126.441 123.002 127.525 122.236 128.066 121.131C128.532 120.187 129.514 119.531 130.568 119.323C134.057 118.637 138.273 117.782 142.045 116.758C143.268 116.428 144.174 117.202 143.814 118.295H143.823ZM141.418 109.836C136.393 111.445 128.405 113.193 120.091 113.193C111.777 113.193 103.793 111.449 98.7723 109.836C97.659 109.481 96.969 108.371 97.1341 107.211L101.541 76.4261C101.685 75.4271 102.438 74.6227 103.429 74.4195C107.76 73.522 113.661 72.6881 120.091 72.6881C126.521 72.6881 132.435 73.522 136.766 74.4195C137.756 74.6227 138.51 75.4271 138.654 76.4261L143.061 107.211C143.226 108.371 142.536 109.476 141.422 109.836H141.418ZM137.134 139.55C135.043 139.978 132.698 140.317 130.31 140.575C130.31 140.575 134.848 145.977 136.038 147.399C137.574 149.232 138.823 149.821 140.584 149.821C142.578 149.821 144.352 148.347 142.252 145.727C141.223 144.44 137.134 139.55 137.134 139.55ZM103.056 139.55C105.148 139.978 107.493 140.317 109.88 140.575C109.88 140.575 105.342 145.977 104.153 147.399C102.616 149.232 101.367 149.821 99.6063 149.821C97.6124 149.821 95.8387 148.347 97.9384 145.727C98.9671 144.44 103.056 139.55 103.056 139.55Z" fill="white"/>
+</symbol>
 <symbol id="icon-icon_stop_ferry" viewBox="0 0 16 22">
 	<g fill="none" fill-rule="evenodd" xmlns="http://www.w3.org/2000/svg">
 	<g transform="translate(-52 -298)">
diff --git a/yarn.lock b/yarn.lock
index d8d7c7743f..9c951bb2ec 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1826,12 +1826,12 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@digitransit-component/digitransit-component-autosuggest-panel@^2.0.4, @digitransit-component/digitransit-component-autosuggest-panel@workspace:digitransit-component/packages/digitransit-component-autosuggest-panel":
+"@digitransit-component/digitransit-component-autosuggest-panel@^2.0.5, @digitransit-component/digitransit-component-autosuggest-panel@workspace:digitransit-component/packages/digitransit-component-autosuggest-panel":
   version: 0.0.0-use.local
   resolution: "@digitransit-component/digitransit-component-autosuggest-panel@workspace:digitransit-component/packages/digitransit-component-autosuggest-panel"
   peerDependencies:
-    "@digitransit-component/digitransit-component-autosuggest": ^1.9.8
-    "@digitransit-component/digitransit-component-icon": ^0.2.1
+    "@digitransit-component/digitransit-component-autosuggest": ^1.9.9
+    "@digitransit-component/digitransit-component-icon": ^0.2.2
     "@hsl-fi/sass": ^0.2.0
     classnames: 2.2.6
     i18next: ^19.3.3
@@ -1846,7 +1846,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@digitransit-component/digitransit-component-autosuggest@^1.9.8, @digitransit-component/digitransit-component-autosuggest@workspace:digitransit-component/packages/digitransit-component-autosuggest":
+"@digitransit-component/digitransit-component-autosuggest@^1.9.9, @digitransit-component/digitransit-component-autosuggest@workspace:digitransit-component/packages/digitransit-component-autosuggest":
   version: 0.0.0-use.local
   resolution: "@digitransit-component/digitransit-component-autosuggest@workspace:digitransit-component/packages/digitransit-component-autosuggest"
   dependencies:
@@ -1856,8 +1856,8 @@ __metadata:
     "@hsl-fi/hooks": ^1.2.0
   peerDependencies:
     "@digitransit-component/digitransit-component-dialog-modal": ^0.3.4
-    "@digitransit-component/digitransit-component-icon": ^0.2.1
-    "@digitransit-component/digitransit-component-suggestion-item": ^1.1.2
+    "@digitransit-component/digitransit-component-icon": ^0.2.2
+    "@digitransit-component/digitransit-component-suggestion-item": ^1.1.3
     "@hsl-fi/sass": ^0.2.0
     classnames: 2.2.6
     i18next: ^19.3.3
@@ -1871,11 +1871,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@digitransit-component/digitransit-component-control-panel@^1.1.2, @digitransit-component/digitransit-component-control-panel@workspace:digitransit-component/packages/digitransit-component-control-panel":
+"@digitransit-component/digitransit-component-control-panel@^1.1.3, @digitransit-component/digitransit-component-control-panel@workspace:digitransit-component/packages/digitransit-component-control-panel":
   version: 0.0.0-use.local
   resolution: "@digitransit-component/digitransit-component-control-panel@workspace:digitransit-component/packages/digitransit-component-control-panel"
   peerDependencies:
-    "@digitransit-component/digitransit-component-icon": ^0.2.1
+    "@digitransit-component/digitransit-component-icon": ^0.2.2
     "@hsl-fi/sass": ~0.2.0
     classnames: 2.2.6
     i18next: ^19.3.3
@@ -1889,7 +1889,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@digitransit-component/digitransit-component-datetimepicker@workspace:digitransit-component/packages/digitransit-component-datetimepicker"
   peerDependencies:
-    "@digitransit-component/digitransit-component-icon": ^0.2.1
+    "@digitransit-component/digitransit-component-icon": ^0.2.2
     i18next: ^19.3.3
     lodash: 4.17.21
     lodash-es: 4.17.21
@@ -1917,14 +1917,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@digitransit-component/digitransit-component-favourite-bar@1.1.2, @digitransit-component/digitransit-component-favourite-bar@workspace:digitransit-component/packages/digitransit-component-favourite-bar":
+"@digitransit-component/digitransit-component-favourite-bar@1.1.3, @digitransit-component/digitransit-component-favourite-bar@workspace:digitransit-component/packages/digitransit-component-favourite-bar":
   version: 0.0.0-use.local
   resolution: "@digitransit-component/digitransit-component-favourite-bar@workspace:digitransit-component/packages/digitransit-component-favourite-bar"
   dependencies:
     "@digitransit-search-util/digitransit-search-util-uniq-by-label": ^1.1.0
   peerDependencies:
-    "@digitransit-component/digitransit-component-icon": ^0.2.1
-    "@digitransit-component/digitransit-component-suggestion-item": ^1.1.2
+    "@digitransit-component/digitransit-component-icon": ^0.2.2
+    "@digitransit-component/digitransit-component-suggestion-item": ^1.1.3
     "@hsl-fi/sass": ^0.2.0
     "@hsl-fi/shimmer": 0.1.2
     classnames: 2.2.6
@@ -1936,14 +1936,14 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@digitransit-component/digitransit-component-favourite-editing-modal@^1.1.3, @digitransit-component/digitransit-component-favourite-editing-modal@workspace:digitransit-component/packages/digitransit-component-favourite-editing-modal":
+"@digitransit-component/digitransit-component-favourite-editing-modal@^1.1.4, @digitransit-component/digitransit-component-favourite-editing-modal@workspace:digitransit-component/packages/digitransit-component-favourite-editing-modal":
   version: 0.0.0-use.local
   resolution: "@digitransit-component/digitransit-component-favourite-editing-modal@workspace:digitransit-component/packages/digitransit-component-favourite-editing-modal"
   dependencies:
     "@digitransit-search-util/digitransit-search-util-uniq-by-label": ^1.1.0
   peerDependencies:
     "@digitransit-component/digitransit-component-dialog-modal": ^0.3.4
-    "@digitransit-component/digitransit-component-icon": ^0.2.1
+    "@digitransit-component/digitransit-component-icon": ^0.2.2
     "@hsl-fi/container-spinner": 0.3.1
     "@hsl-fi/modal": ^0.3.1
     "@hsl-fi/sass": ^0.2.0
@@ -1954,11 +1954,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@digitransit-component/digitransit-component-favourite-modal@^1.0.1, @digitransit-component/digitransit-component-favourite-modal@workspace:digitransit-component/packages/digitransit-component-favourite-modal":
+"@digitransit-component/digitransit-component-favourite-modal@^1.0.2, @digitransit-component/digitransit-component-favourite-modal@workspace:digitransit-component/packages/digitransit-component-favourite-modal":
   version: 0.0.0-use.local
   resolution: "@digitransit-component/digitransit-component-favourite-modal@workspace:digitransit-component/packages/digitransit-component-favourite-modal"
   peerDependencies:
-    "@digitransit-component/digitransit-component-icon": ^0.2.1
+    "@digitransit-component/digitransit-component-icon": ^0.2.2
     "@hsl-fi/modal": ^0.3.1
     "@hsl-fi/sass": ^0.2.0
     classnames: 2.2.6
@@ -1970,7 +1970,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@digitransit-component/digitransit-component-icon@^0.2.1, @digitransit-component/digitransit-component-icon@workspace:digitransit-component/packages/digitransit-component-icon":
+"@digitransit-component/digitransit-component-icon@^0.2.2, @digitransit-component/digitransit-component-icon@workspace:digitransit-component/packages/digitransit-component-icon":
   version: 0.0.0-use.local
   resolution: "@digitransit-component/digitransit-component-icon@workspace:digitransit-component/packages/digitransit-component-icon"
   peerDependencies:
@@ -1980,13 +1980,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@digitransit-component/digitransit-component-suggestion-item@^1.1.2, @digitransit-component/digitransit-component-suggestion-item@workspace:digitransit-component/packages/digitransit-component-suggestion-item":
+"@digitransit-component/digitransit-component-suggestion-item@^1.1.3, @digitransit-component/digitransit-component-suggestion-item@workspace:digitransit-component/packages/digitransit-component-suggestion-item":
   version: 0.0.0-use.local
   resolution: "@digitransit-component/digitransit-component-suggestion-item@workspace:digitransit-component/packages/digitransit-component-suggestion-item"
   dependencies:
     recompose: 0.30.0
   peerDependencies:
-    "@digitransit-component/digitransit-component-icon": ^0.2.1
+    "@digitransit-component/digitransit-component-icon": ^0.2.2
     "@hsl-fi/sass": " ^0.2.0"
     classnames: 2.2.6
     i18next: ^19.3.3
@@ -1999,7 +1999,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@digitransit-component/digitransit-component-traffic-now-link@workspace:digitransit-component/packages/digitransit-component-traffic-now-link"
   peerDependencies:
-    "@digitransit-component/digitransit-component-icon": ^0.2.1
+    "@digitransit-component/digitransit-component-icon": ^0.2.2
     "@hsl-fi/sass": ^0.2.0
     i18next: ^19.3.3
     prop-types: ^15.7.2
@@ -2023,14 +2023,14 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@digitransit-component/digitransit-component@workspace:digitransit-component/packages/digitransit-component"
   dependencies:
-    "@digitransit-component/digitransit-component-autosuggest": ^1.9.8
-    "@digitransit-component/digitransit-component-autosuggest-panel": ^2.0.4
-    "@digitransit-component/digitransit-component-control-panel": ^1.1.2
-    "@digitransit-component/digitransit-component-favourite-bar": 1.1.2
-    "@digitransit-component/digitransit-component-favourite-editing-modal": ^1.1.3
-    "@digitransit-component/digitransit-component-favourite-modal": ^1.0.1
-    "@digitransit-component/digitransit-component-icon": ^0.2.1
-    "@digitransit-component/digitransit-component-suggestion-item": ^1.1.2
+    "@digitransit-component/digitransit-component-autosuggest": ^1.9.9
+    "@digitransit-component/digitransit-component-autosuggest-panel": ^2.0.5
+    "@digitransit-component/digitransit-component-control-panel": ^1.1.3
+    "@digitransit-component/digitransit-component-favourite-bar": 1.1.3
+    "@digitransit-component/digitransit-component-favourite-editing-modal": ^1.1.4
+    "@digitransit-component/digitransit-component-favourite-modal": ^1.0.2
+    "@digitransit-component/digitransit-component-icon": ^0.2.2
+    "@digitransit-component/digitransit-component-suggestion-item": ^1.1.3
     "@digitransit-component/digitransit-component-with-breakpoint": ^0.0.5
   peerDependencies:
     "@digitransit-component/digitransit-component-dialog-modal": ^0.3.4