diff --git a/src/lib/train/train-detail.svelte b/src/lib/train/train-detail.svelte
index b765ce2..0194d08 100644
--- a/src/lib/train/train-detail.svelte
+++ b/src/lib/train/train-detail.svelte
@@ -61,7 +61,7 @@
         {:else}
           <div class="detailOperator"><StylesToc toc={service?.operator || ''} full={true} /></div>
           
-          <TrainIcons firstClass={serviceDetail.firstClass} hasCatering={serviceDetail.catering} sleeper={serviceDetail.sleeper} vstp={serviceDetail.vstp} />
+          <TrainIcons serviceDetails={serviceDetail.serviceDetails} />
           {#if serviceDetail.pis}
             <PisHandler pisObject={serviceDetail.pis} />
           {/if}
diff --git a/src/lib/train/trainIcons.svelte b/src/lib/train/trainIcons.svelte
index 53846ad..adbc585 100644
--- a/src/lib/train/trainIcons.svelte
+++ b/src/lib/train/trainIcons.svelte
@@ -1,35 +1,33 @@
 <script lang="ts">
   import Tooltip from "$lib/Tooltip.svelte";
+  import type { ServiceDetail } from "@owlboard/ts-types";
 import { IconBed, IconSquare1, IconSquareLetterV, IconToolsKitchen2 } from "@tabler/icons-svelte";
 
   
 
-    export let firstClass: boolean
-    export let hasCatering: boolean
-    export let sleeper: boolean
-    export let vstp: boolean
+    export let serviceDetails: ServiceDetail
 </script>
 
 
-{#if firstClass}
+{#if serviceDetails.firstClass}
   <Tooltip text="First Class is available">
     <IconSquare1 />
   </Tooltip>
 {/if}
 
-{#if hasCatering}
+{#if serviceDetails.catering}
   <Tooltip text="Catering is available">
     <IconToolsKitchen2 />
   </Tooltip>
 {/if}
 
-{#if sleeper}
+{#if serviceDetails.sleeper}
   <Tooltip text="Sleeping Berths are available">
     <IconBed />
   </Tooltip>
 {/if}
 
-{#if vstp}
+{#if serviceDetails.vstp}
   <Tooltip text="This is a VSTP planned service">
     <IconSquareLetterV />
   </Tooltip>