diff --git a/public/images/unknown_ET41-A.png b/public/images/unknown_ET41-A.png
new file mode 100644
index 0000000..0e87ce1
Binary files /dev/null and b/public/images/unknown_ET41-A.png differ
diff --git a/public/images/unknown_ET41-B.png b/public/images/unknown_ET41-B.png
new file mode 100644
index 0000000..55e9a48
Binary files /dev/null and b/public/images/unknown_ET41-B.png differ
diff --git a/public/images/unknown_Gor77-A.png b/public/images/unknown_Gor77-A.png
new file mode 100644
index 0000000..da86261
Binary files /dev/null and b/public/images/unknown_Gor77-A.png differ
diff --git a/public/images/unknown_Gor77-B.png b/public/images/unknown_Gor77-B.png
new file mode 100644
index 0000000..a2805fa
Binary files /dev/null and b/public/images/unknown_Gor77-B.png differ
diff --git a/public/images/unknown_Gor77-C.png b/public/images/unknown_Gor77-C.png
new file mode 100644
index 0000000..2f06c81
Binary files /dev/null and b/public/images/unknown_Gor77-C.png differ
diff --git a/public/images/unknown_Gor77-D.png b/public/images/unknown_Gor77-D.png
new file mode 100644
index 0000000..5591e1d
Binary files /dev/null and b/public/images/unknown_Gor77-D.png differ
diff --git a/public/images/unknown_SM42.png b/public/images/unknown_SM42.png
new file mode 100644
index 0000000..ceea534
Binary files /dev/null and b/public/images/unknown_SM42.png differ
diff --git a/public/images/unknown_cargo.png b/public/images/unknown_cargo.png
new file mode 100644
index 0000000..3f4be67
Binary files /dev/null and b/public/images/unknown_cargo.png differ
diff --git a/public/images/unknown_ezt-ra.png b/public/images/unknown_ezt-ra.png
new file mode 100644
index 0000000..c4241e3
Binary files /dev/null and b/public/images/unknown_ezt-ra.png differ
diff --git a/public/images/unknown_ezt-rb.png b/public/images/unknown_ezt-rb.png
new file mode 100644
index 0000000..5074a5c
Binary files /dev/null and b/public/images/unknown_ezt-rb.png differ
diff --git a/public/images/unknown_ezt-s.png b/public/images/unknown_ezt-s.png
new file mode 100644
index 0000000..e1c493f
Binary files /dev/null and b/public/images/unknown_ezt-s.png differ
diff --git a/public/images/unknown_ezt-sa.png b/public/images/unknown_ezt-sa.png
new file mode 100644
index 0000000..e1c493f
Binary files /dev/null and b/public/images/unknown_ezt-sa.png differ
diff --git a/public/images/unknown_ezt-sb.png b/public/images/unknown_ezt-sb.png
new file mode 100644
index 0000000..e1c493f
Binary files /dev/null and b/public/images/unknown_ezt-sb.png differ
diff --git a/public/images/unknown_passenger.png b/public/images/unknown_passenger.png
new file mode 100644
index 0000000..a313461
Binary files /dev/null and b/public/images/unknown_passenger.png differ
diff --git a/public/images/unknown_train.png b/public/images/unknown_train.png
new file mode 100644
index 0000000..88a8a40
Binary files /dev/null and b/public/images/unknown_train.png differ
diff --git a/src/components/utils/StockThumbnails.vue b/src/components/utils/StockThumbnails.vue
index fe96495..ca9afa2 100644
--- a/src/components/utils/StockThumbnails.vue
+++ b/src/components/utils/StockThumbnails.vue
@@ -1,39 +1,52 @@
 <template>
   <div class="stock-thumbnails" ref="thumbnailsRef">
-    <div
-      class="thumbnail-item"
-      v-for="(stock, stockIndex) in store.stockList"
-      :key="stockIndex"
-      :data-selected="store.chosenStockListIndex == stockIndex"
-      :data-sponsor-only="
-        stock.vehicleRef.sponsorOnlyTimestamp && stock.vehicleRef.sponsorOnlyTimestamp > Date.now()
-      "
-      :data-team-only="stock.vehicleRef.teamOnly"
-      draggable="true"
-      @dragstart="onDragStart(stockIndex)"
-      @drop="onDrop($event, stockIndex)"
-      @dragover="allowDrop"
-      @click="onListItemClick(stockIndex)"
-    >
-      <b>
-        {{ stock.vehicleRef.type }}
-      </b>
+    <ul>
+      <li
+        class="thumbnail-item"
+        v-for="(stock, stockIndex) in store.stockList"
+        :key="stockIndex"
+        :data-selected="store.chosenStockListIndex == stockIndex"
+        :data-sponsor-only="
+          stock.vehicleRef.sponsorOnlyTimestamp &&
+          stock.vehicleRef.sponsorOnlyTimestamp > Date.now()
+        "
+        :data-team-only="stock.vehicleRef.teamOnly"
+        draggable="true"
+        @dragstart="onDragStart(stockIndex)"
+        @drop="onDrop($event, stockIndex)"
+        @dragover="allowDrop"
+        @click="onListItemClick(stockIndex)"
+      >
+        <div class="stock-text">
+          <p>
+            {{ stock.vehicleRef.type.replace(/_/g, ' ') }}
+          </p>
+        </div>
 
-      <img
-        draggable="false"
-        :src="`https://static.spythere.eu/thumbnails/${stock.vehicleRef.type}.png`"
-        :alt="stock.vehicleRef.type"
-        :title="stock.vehicleRef.type"
-        @error="stockImageError($event, stock)"
-      />
-    </div>
+        <span>
+          <img
+            v-for="thumbnail in getVehicleThumbnails(stock.vehicleRef.type)"
+            draggable="false"
+            style="min-width: 200px"
+            :src="`https://static.spythere.eu/thumbnails/v2/${thumbnail.src}.png`"
+            :alt="stock.vehicleRef.type"
+            :title="stock.vehicleRef.type"
+            @load="($event) => (($event.target as HTMLImageElement).style.minWidth = 'auto')"
+            @error="
+              ($event) =>
+                (($event.target as HTMLImageElement).src = `/images/${thumbnail.fallbackSrc}.png`)
+            "
+            height="70"
+          />
+        </span>
+      </li>
+    </ul>
   </div>
 </template>
 
 <script setup lang="ts">
 import { Ref, computed, nextTick, ref, watch } from 'vue';
 import { useStore } from '../../store';
-import { IStock } from '../../types';
 
 const store = useStore();
 const emit = defineEmits(['listItemClick']);
@@ -45,10 +58,6 @@ const onListItemClick = (index: number) => {
   emit('listItemClick', index);
 };
 
-const stockImageError = (e: Event, stock: IStock) => {
-  (e.target as HTMLImageElement).src = `images/${stock.vehicleRef.group}-unknown.png`;
-};
-
 watch(
   computed(() => store.chosenStockListIndex),
   (index) => {
@@ -56,7 +65,7 @@ watch(
 
     nextTick(() => {
       (thumbnailsRef.value as HTMLElement)
-        .querySelector(`div:nth-child(${index + 1})`)
+        .querySelector(`li:nth-child(${index + 1})`)
         ?.scrollIntoView({
           block: 'nearest',
           inline: 'start',
@@ -74,7 +83,7 @@ const onDragStart = (vehicleIndex: number) => {
 const onDrop = (e: DragEvent, vehicleIndex: number) => {
   e.preventDefault();
 
-  let targetEl = thumbnailsRef.value.querySelector(`div:nth-child(${vehicleIndex + 1})`);
+  let targetEl = thumbnailsRef.value.querySelector(`li:nth-child(${vehicleIndex + 1})`);
 
   if (!targetEl && draggedIndex.value != -1) return;
 
@@ -88,31 +97,100 @@ const onDrop = (e: DragEvent, vehicleIndex: number) => {
 const allowDrop = (e: DragEvent) => {
   e.preventDefault();
 };
+
+const getVehicleThumbnails = (vehicleString: string) => {
+  const [vehicleName, vehicleCargo] = vehicleString.split(':');
+
+  const thumbnails: { src: string; fallbackSrc: string }[] = [];
+
+  // Generowanie członów EN57
+  if (vehicleName.startsWith('EN57')) {
+    thumbnails.push(
+      { src: vehicleName + 'ra', fallbackSrc: 'unknown_ezt-ra' },
+      { src: vehicleName + 's', fallbackSrc: 'unknown_ezt-s' },
+      { src: vehicleName + 'rb', fallbackSrc: 'unknown_ezt-rb' }
+    );
+  }
+
+  // Generowanie członów EN71
+  else if (vehicleName.startsWith('EN71')) {
+    thumbnails.push(
+      { src: vehicleName + 'ra', fallbackSrc: 'unknown_ezt-ra' },
+      { src: vehicleName + 'sa', fallbackSrc: 'unknown_ezt-sa' },
+      { src: vehicleName + 'sb', fallbackSrc: 'unknown_ezt-sb' },
+      { src: vehicleName + 'rb', fallbackSrc: 'unknown_ezt-rb' }
+    );
+  }
+
+  // Generowanie pojazdów i członów 2EN57
+  else if (vehicleString.startsWith('2EN57')) {
+    const [firstVehicleNumber, secondVehicleNumber] = vehicleString
+      .replace('2EN57-', '')
+      .split('+');
+
+    thumbnails.push(
+      { src: `EN57-${firstVehicleNumber}ra`, fallbackSrc: 'unknown_ezt-ra' },
+      { src: `EN57-${firstVehicleNumber}s`, fallbackSrc: 'unknown_ezt-s' },
+      { src: `EN57-${firstVehicleNumber}rb`, fallbackSrc: 'unknown_ezt-rb' },
+      { src: `EN57-${secondVehicleNumber}ra`, fallbackSrc: 'unknown_ezt-ra' },
+      { src: `EN57-${secondVehicleNumber}s`, fallbackSrc: 'unknown_ezt-s' },
+      { src: `EN57-${secondVehicleNumber}rb`, fallbackSrc: 'unknown_ezt-rb' }
+    );
+  }
+
+  // Generowanie członów Gor77
+  else if (vehicleString.startsWith('Gor77')) {
+    thumbnails.push(
+      { src: vehicleName + '-A', fallbackSrc: 'unknown_Gor77-A' },
+      { src: vehicleName + '-B', fallbackSrc: 'unknown_Gor77-B' },
+      { src: vehicleName + '-C', fallbackSrc: 'unknown_Gor77-C' },
+      { src: vehicleName + '-D', fallbackSrc: 'unknown_Gor77-D' }
+    );
+  }
+
+  // Generowanie członów ET41
+  else if (vehicleString.startsWith('ET41')) {
+    thumbnails.push(
+      { src: vehicleName + '-A', fallbackSrc: 'unknown_ET41-A' },
+      { src: vehicleName + '-B', fallbackSrc: 'unknown_ET41-B' }
+    );
+  }
+
+  // Generowanie pozostałych pojazdów
+  else {
+    let fallbackVehicleImage = 'unknown_cargo';
+
+    if (/^(EP|EU)/.test(vehicleName)) fallbackVehicleImage = 'unknown_train';
+    else if (/^(SM42)/.test(vehicleName)) fallbackVehicleImage = 'unknown_SM42';
+    else if (/(\d{3}a|(Bau|Gor)\d{2}|304C)_/.test(vehicleName))
+      fallbackVehicleImage = 'unknown_passenger';
+
+    thumbnails.push({ src: vehicleName, fallbackSrc: fallbackVehicleImage });
+  }
+
+  return thumbnails;
+};
 </script>
 
 <style lang="scss" scoped>
 @import '../../styles/global.scss';
 
 .stock-thumbnails {
-  display: flex;
   overflow: auto;
   background-color: #353a57;
-  min-height: 100px;
+  height: auto;
+}
+
+ul {
+  display: flex;
+  align-items: flex-end;
+  min-height: 110px;
 }
 
 .thumbnail-item {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-
-  flex-direction: column;
-  gap: 0.5em;
-
-  padding-top: 0.5em;
-
   cursor: pointer;
-  min-height: 100px;
   font-size: 0.85em;
+  text-align: center;
 
   user-select: none;
   -moz-user-select: none;
@@ -122,11 +200,6 @@ const allowDrop = (e: DragEvent) => {
     background-color: rebeccapurple;
   }
 
-  b {
-    color: #ccc;
-    margin: 0 1em;
-  }
-
   &[data-sponsor-only='true'] > b {
     color: $sponsorColor;
   }
@@ -136,7 +209,22 @@ const allowDrop = (e: DragEvent) => {
   }
 
   img {
-    max-height: 60px;
+    max-height: 70px;
+    width: auto;
+    height: auto;
   }
 }
+
+.stock-text {
+  font-weight: bold;
+  color: #ccc;
+  font-size: 0.9em;
+}
+
+.thumbnail-item > span {
+  display: flex;
+  justify-content: center;
+  align-items: flex-end;
+  cursor: crosshair;
+}
 </style>