diff --git a/src/components/SceneryView/SceneryTimetable.vue b/src/components/SceneryView/SceneryTimetable.vue
index 3dc53d0..36824a7 100644
--- a/src/components/SceneryView/SceneryTimetable.vue
+++ b/src/components/SceneryView/SceneryTimetable.vue
@@ -130,7 +130,7 @@
 
             <span class="schedule-stop">
               <span class="stop-connection">
-                {{ row.arrivingLine }}
+                {{ row.currentElement.arrivalRouteExt }}
               </span>
 
               <span class="stop-time">
@@ -139,7 +139,7 @@
               </span>
 
               <span class="stop-connection">
-                {{ row.departureLine }}
+                {{ row.currentElement.departureRouteExt }}
               </span>
             </span>
 
@@ -279,12 +279,9 @@ export default defineComponent({
           return {
             checkpointStop: ct.checkpointStop,
             train: ct.train,
-            prevDepartureLine: ct.previousSceneryElement?.departureRouteExt ?? null,
-            nextArrivalLine: ct.nextSceneryElement?.arrivalRouteExt ?? null,
-            departureLine: ct.timetablePathElement.departureRouteExt ?? null,
-            arrivingLine: ct.timetablePathElement.arrivalRouteExt ?? null,
-            prevStationName: ct.previousSceneryElement?.stationName ?? null,
-            nextStationName: ct.nextSceneryElement?.stationName ?? null,
+            prevElement: ct.previousSceneryElement,
+            nextElement: ct.nextSceneryElement,
+            currentElement: ct.timetablePathElement,
             status: trainStopStatus
           };
         })
diff --git a/src/components/SceneryView/ScheduledTrainStatus.vue b/src/components/SceneryView/ScheduledTrainStatus.vue
index f315400..90755f6 100644
--- a/src/components/SceneryView/ScheduledTrainStatus.vue
+++ b/src/components/SceneryView/ScheduledTrainStatus.vue
@@ -2,7 +2,9 @@
   <div class="general-status">
     <span
       :class="computedScheduledTrain.status"
-      :title="computedScheduledTrain.stopStatusDescription"
+      data-tooltip-type="HtmlTooltip"
+      :data-tooltip-content="computedScheduledTrain.stopStatusDescription"
+      @click.prevent="() => {}"
     >
       {{ computedScheduledTrain.stopStatusIndicator }}
     </span>
@@ -24,16 +26,16 @@ export default defineComponent({
 
   computed: {
     computedScheduledTrain() {
-      const { prevDepartureLine, prevStationName, nextArrivalLine, nextStationName, status } =
-        this.sceneryTimetableRow;
+      const { status, prevElement, currentElement, nextElement } = this.sceneryTimetableRow;
 
-      const prevDepartureIndicator = prevDepartureLine
-        ? `(${prevDepartureLine}) ${prevStationName}`
-        : '---';
-      const nextArrivalIndicator = nextArrivalLine
-        ? `(${nextArrivalLine}) ${nextStationName}`
+      const prevDepartureIndicator = prevElement?.departureRouteExt
+        ? `(${prevElement.departureRouteExt}) ${prevElement.stationName}`
         : '---';
 
+      const nextArrivalIndicator = nextElement?.arrivalRouteExt
+        ? `(${nextElement.arrivalRouteExt}) ${nextElement.stationName}`
+        : `${currentElement.stationName}`;
+
       let stopStatusDescription = '',
         stopStatusIndicator = '';
 
@@ -41,34 +43,45 @@ export default defineComponent({
         case StopStatus.ARRIVING:
           stopStatusIndicator = `${this.$t('timetables.from')}: ${prevDepartureIndicator}`;
           stopStatusDescription = this.$t('timetables.desc-arriving', {
-            prevStationName,
-            prevDepartureLine
+            prevStationName: prevElement?.stationName ?? '',
+            prevDepartureLine: prevElement?.departureRouteExt ?? ''
           });
           break;
 
         case StopStatus.ONLINE:
         case StopStatus.STOPPED:
-          stopStatusIndicator = nextArrivalLine
+          stopStatusIndicator = nextElement?.arrivalRouteExt
             ? `${this.$t('timetables.to')}: ${nextArrivalIndicator}`
             : `${this.$t('timetables.desc-end')}`;
-          stopStatusDescription = nextArrivalLine
-            ? this.$t(`timetables.desc-${status}`, { nextStationName, nextArrivalLine })
+          stopStatusDescription = nextElement?.arrivalRouteExt
+            ? this.$t(`timetables.desc-${status}`, {
+                nextStationName: nextElement?.stationName,
+                nextArrivalLine: nextElement?.arrivalRouteExt
+              })
             : '';
           break;
 
         case StopStatus.DEPARTED:
           stopStatusIndicator = `${this.$t('timetables.to')}: ${nextArrivalIndicator}`;
-          stopStatusDescription = this.$t('timetables.desc-departed', {
-            nextStationName,
-            nextArrivalLine
-          });
+
+          if (!nextElement?.stationName) {
+            stopStatusDescription = this.$t('timetables.desc-departed-ends', {
+              nextStationName: currentElement.stationName
+            });
+          } else {
+            stopStatusDescription = this.$t('timetables.desc-departed', {
+              nextStationName: nextElement?.stationName ?? currentElement.stationName,
+              nextArrivalLine: nextElement?.arrivalRouteExt
+            });
+          }
+
           break;
 
         case StopStatus.DEPARTED_AWAY:
           stopStatusIndicator = `${this.$t('timetables.to')}: ${nextArrivalIndicator}`;
           stopStatusDescription = this.$t('timetables.desc-departed-away', {
-            nextStationName,
-            nextArrivalLine
+            nextStationName: nextElement?.stationName,
+            nextArrivalLine: nextElement?.arrivalRouteExt
           });
           break;
 
@@ -93,6 +106,7 @@ export default defineComponent({
 <style lang="scss" scoped>
 .general-status {
   margin-top: 0.5em;
+  cursor: help;
 
   span.arriving {
     color: #ccc;
diff --git a/src/components/SceneryView/typings.ts b/src/components/SceneryView/typings.ts
index 7a24107..45237f7 100644
--- a/src/components/SceneryView/typings.ts
+++ b/src/components/SceneryView/typings.ts
@@ -1,13 +1,10 @@
-import { StopStatus, Train, TrainStop } from '../../typings/common';
+import { StopStatus, TimetablePathElement, Train, TrainStop } from '../../typings/common';
 
 export interface SceneryTimetableRow {
   checkpointStop: TrainStop;
   train: Train;
-  prevDepartureLine: string | null;
-  nextArrivalLine: string | null;
-  departureLine: string | null;
-  arrivingLine: string | null;
-  prevStationName: string | null;
-  nextStationName: string | null;
+  prevElement: TimetablePathElement | null;
+  nextElement: TimetablePathElement | null;
+  currentElement: TimetablePathElement;
   status: StopStatus;
 }
diff --git a/src/components/Tooltip/HtmlTooltip.vue b/src/components/Tooltip/HtmlTooltip.vue
new file mode 100644
index 0000000..0a8e41b
--- /dev/null
+++ b/src/components/Tooltip/HtmlTooltip.vue
@@ -0,0 +1,39 @@
+<template>
+  <div class="tooltip-content">
+    <span v-html="tooltipStore.content"></span>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { useTooltipStore } from '../../store/tooltipStore';
+
+export default defineComponent({
+  data() {
+    return {
+      tooltipStore: useTooltipStore()
+    };
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.tooltip-content {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  gap: 0.5em;
+  white-space: pre-line;
+
+  padding: 0.25em 0.5em;
+  border-radius: 0.25em;
+
+  width: 100%;
+  background-color: #1f1f1f;
+  box-shadow: 0 0 5px 2px #aaa;
+}
+
+img {
+  height: 1em;
+}
+</style>
diff --git a/src/components/Tooltip/Tooltip.vue b/src/components/Tooltip/Tooltip.vue
index 029fe26..300e4fe 100644
--- a/src/components/Tooltip/Tooltip.vue
+++ b/src/components/Tooltip/Tooltip.vue
@@ -12,11 +12,19 @@ import VehiclePreviewTooltip from './VehiclePreviewTooltip.vue';
 import BaseTooltip from './BaseTooltip.vue';
 import SpawnsTooltip from './SpawnsTooltip.vue';
 import UsersTooltip from './UsersTooltip.vue';
+import HtmlTooltip from './HtmlTooltip.vue';
 
 const BOX_PADDING_PX = 20;
 
 export default defineComponent({
-  components: { DonatorTooltip, VehiclePreviewTooltip, BaseTooltip, SpawnsTooltip, UsersTooltip },
+  components: {
+    DonatorTooltip,
+    VehiclePreviewTooltip,
+    BaseTooltip,
+    SpawnsTooltip,
+    UsersTooltip,
+    HtmlTooltip
+  },
 
   data() {
     return {
diff --git a/src/locales/en.json b/src/locales/en.json
index f669954..f018ac2 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -543,12 +543,13 @@
     "terminates": "TERMINATES\nHERE",
     "from": "FROM",
     "to": "TO",
-    "desc-arriving": "The train is not here yet. It's going to come from: {prevStationName} (szlak {prevDepartureLine})",
-    "desc-online": "The train is at the station. It's going to leave to: {nextStationName} (szlak {nextArrivalLine})",
-    "desc-stopped": "The train is at the station and is stopped. It's going to leave towards: {nextStationName} (szlak {nextArrivalLine})",
-    "desc-next-arrival": "Leaves towards: {nextStationName} (szlak {nextArrivalLine})",
-    "desc-departed": "The train is at the station and it's been departed. Leaves towards: {nextStationName} (szlak {nextArrivalLine})",
-    "desc-departed-away": "The train has been departed to: {nextStationName} (szlak {nextArrivalLine})",
+    "desc-arriving": "The train is not here yet.\nIt's going to come from: <b>{prevStationName} (route {prevDepartureLine})</b>",
+    "desc-online": "The train is at the station.\nIt's going to leave to: <b>{nextStationName} (route {nextArrivalLine})</b>",
+    "desc-stopped": "The train is at the station and is stopped.\nIt's going to leave towards: <b>{nextStationName} (route {nextArrivalLine})</b>",
+    "desc-next-arrival": "Leaves towards: <b>{nextStationName} (route {nextArrivalLine})</b>",
+    "desc-departed": "The train is at the station and it's been departed.\nLeaves towards: <b>{nextStationName} (route {nextArrivalLine})</b>",
+    "desc-departed-ends": "The train is at the station and it's been departed.\nLeaves towards station: <b>{nextStationName}</b>",
+    "desc-departed-away": "The train has been departed to:\n<b>{nextStationName} (route {nextArrivalLine})</b>",
     "desc-end": "The train terminates here",
     "desc-terminated": "The train has been terminated"
   },
diff --git a/src/locales/pl.json b/src/locales/pl.json
index e7a1b15..db33f06 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -529,12 +529,13 @@
     "terminates": "KOŃCZY BIEG",
     "from": "Z",
     "to": "DO",
-    "desc-arriving": "Pociągu nie ma jeszcze na tej scenerii. Przyjedzie z: {prevStationName} (szlak {prevDepartureLine})",
-    "desc-online": "Pociąg jest na tej scenerii. Odjedzie do: {nextStationName} (szlak {nextArrivalLine})",
-    "desc-stopped": "Pociąg jest na tej scenerii i odbywa postój. Odjedzie do: {nextStationName} (szlak {nextArrivalLine})",
-    "desc-next-arrival": "Odjeżdża do: {nextStationName} (szlak {nextArrivalLine})",
-    "desc-departed": "Pociąg jest na tej scenerii i został odprawiony. Odjeżdża do: {nextStationName} (szlak {nextArrivalLine})",
-    "desc-departed-away": "Pociąg został odprawiony i odjechał do: {nextStationName} (szlak {nextArrivalLine})",
+    "desc-arriving": "Pociągu nie ma jeszcze na tej scenerii.\nPrzyjedzie z: <b>{prevStationName} (szlak {prevDepartureLine})</b>",
+    "desc-online": "Pociąg jest na tej scenerii.\nOdjedzie w kierunku: <b>{nextStationName} (szlak {nextArrivalLine})</b>",
+    "desc-stopped": "Pociąg jest na tej scenerii i odbywa postój.\nOdjedzie w kierunku: <b>{nextStationName} (szlak {nextArrivalLine})</b>",
+    "desc-next-arrival": "Odjeżdża do:\n<b>{nextStationName} (szlak {nextArrivalLine})</b>",
+    "desc-departed": "Pociąg jest na tej scenerii i został odprawiony.\nOdjeżdża w kierunku: <b>{nextStationName} (szlak {nextArrivalLine})</b>",
+    "desc-departed-ends": "Pociąg jest na tej scenerii i został odprawiony.\nOdjechał w kierunku stacji: <b>{nextStationName}</b>",
+    "desc-departed-away": "Pociąg został odprawiony i odjechał do:\n<b>{nextStationName} (szlak {nextArrivalLine})</b>",
     "desc-end": "Pociąg kończy bieg",
     "desc-terminated": "Pociąg skończył bieg"
   },
diff --git a/src/store/tooltipStore.ts b/src/store/tooltipStore.ts
index 7ac18f4..48c6364 100644
--- a/src/store/tooltipStore.ts
+++ b/src/store/tooltipStore.ts
@@ -7,7 +7,8 @@ export const tooltipKeys = [
   'BaseTooltip',
   'VehiclePreviewTooltip',
   'SpawnsTooltip',
-  'UsersTooltip'
+  'UsersTooltip',
+  'HtmlTooltip'
 ] as const;
 
 export type TooltipType = (typeof tooltipKeys)[number];