diff --git a/resources/views/components/episode-cover.blade.php b/resources/views/components/episode-cover.blade.php
new file mode 100644
index 0000000..6066211
--- /dev/null
+++ b/resources/views/components/episode-cover.blade.php
@@ -0,0 +1,100 @@
+@props([
+    'episode',
+    'view',
+    'displayjapanese' => false
+])
+
+@php
+    $title = $displayjapanese ? 
+        "$episode->title_jpn ($episode->title) - $episode->episode" :
+        "$episode->title - $episode->episode";
+
+    $isWatched = auth()->check() && $episode->userWatched(auth()->id());
+
+    $badgeColor = $isWatched
+        ? 'bg-green-600/80'
+        : 'bg-rose-700/70';
+
+    $problematic = cache()->rememberForever(
+        "episodeProblematic{$episode->id}",
+        fn () => $episode->getProblematicTags()
+    );
+@endphp
+
+<div
+    class="group relative w-full p-1 md:p-2 transition-all duration-300 ease-out md:hover:-translate-y-1 md:hover:scale-[1.03]">
+
+    <a
+        href="{{ route('hentai.index', ['title' => $episode->slug]) }}"
+        class="block overflow-hidden rounded-2xl dark:bg-neutral-950 bg-white shadow-lg">
+
+        
+        <div class="relative">
+            {{-- Switch between Cover and Thumbnail --}}
+            @if ($view === 'poster')
+            <img
+                src="{{ $episode->cover_url }}"
+                alt="{{ $episode->title }} - {{ $episode->episode }}"
+                loading="lazy"
+                width="400"
+                class="aspect-[11/16] w-full object-cover object-center"
+            >
+            @elseif ($view === 'thumbnail')
+            <img
+                src="{{ $episode->gallery->first()?->thumbnail_url }}"
+                alt="{{ $episode->title }} - {{ $episode->episode }}"
+                loading="lazy"
+                width="1000"
+                class="aspect-video w-full object-cover object-center "
+            >
+            @endif
+
+            {{-- Resolution Badge --}}
+            <div class="absolute top-0 right-0 z-20">
+                <span class="{{ $badgeColor }} rounded-bl-xl px-3 py-1.5 text-sm font-semibold text-white">
+                    {{ $episode->getResolution() }}
+                </span>
+            </div>
+
+            {{-- Stats --}}
+            <div class="absolute bottom-0 left-0 z-20">
+                <div class="{{ $badgeColor }} flex items-center gap-3 rounded-tr-xl px-3 py-1 text-sm font-semibold text-white">
+
+                    <span class="flex items-center gap-1">
+                        <i class="fa-regular fa-eye"></i>
+                        {{ $episode->viewCountFormatted() }}
+                    </span>
+
+                    <span class="flex items-center gap-1">
+                        <i class="fa-regular fa-heart"></i>
+                        {{ $episode->likeCount() }}
+                    </span>
+
+                    <span class="flex items-center gap-1">
+                        <i class="fa-regular fa-comment"></i>
+                        {{ $episode->commentCount() }}
+                    </span>
+                </div>
+            </div>
+
+            {{-- Problematic Tags --}}
+            @if (!empty($problematic))
+                <div class="absolute top-0 left-0 z-20">
+                    <span class="rounded-br-xl bg-red-700/80 px-3 py-1.5 text-sm font-semibold text-white backdrop-blur">
+                        <i class="fa-solid fa-triangle-exclamation"></i>
+                        {{ $problematic }}
+                    </span>
+                </div>
+            @endif
+
+
+        </div>
+
+        {{-- Title --}}
+        <div class="p-3 text-center">
+            <p class="text-sm font-bold text-black dark:text-white">
+                {{ $title }}
+            </p>
+        </div>
+    </a>
+</div>
\ No newline at end of file
diff --git a/resources/views/components/episode-thumbnail.blade.php b/resources/views/components/episode-thumbnail.blade.php
deleted file mode 100644
index 8149556..0000000
--- a/resources/views/components/episode-thumbnail.blade.php
+++ /dev/null
@@ -1,58 +0,0 @@
-@props(['episode'])
-
-<div class="relative p-1 mb-8 w-full transition duration-300 ease-in-out md:p-2 md:hover:-translate-y-1 md:hover:scale-110">
-    <a class="hover:text-blue-600" href="{{ route('hentai.index', ['title' => $episode->slug]) }}">
-        <img alt="{{ $episode->title }} - {{ $episode->episode }}" loading="lazy" width="1000"
-            class="block object-cover object-center relative z-20 rounded-lg aspect-video"
-            src="{{ $episode->gallery->first()->thumbnail_url }}"></img>
-
-        @guest
-            <p
-                class="absolute right-1 md:right-2 top-1 md:top-2 bg-rose-700/70 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                {{ $episode->getResolution() }}</p>
-            <p
-                class="absolute left-1 md:left-2 bottom-1 md:bottom-2 bg-rose-700/70 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                <i class="fa-regular fa-eye"></i> {{ $episode->viewCountFormatted() }} <i class="fa-regular fa-heart"></i>
-                {{ $episode->likeCount() }} <i class="fa-regular fa-comment"></i>
-                {{ $episode->commentCount() }}
-            </p>
-        @endguest
-
-        @php $problematic = cache()->rememberForever('episodeProblematic'.$episode->id, fn () => $episode->getProblematicTags()); @endphp
-        @if (!empty($problematic))
-            <p
-                class="absolute left-4 top-2 bg-red-700/70 !text-white rounded-br-lg rounded-tl-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                <i class="fa-solid fa-triangle-exclamation"></i> {{ $problematic }}
-            </p>
-        @endif
-
-        @auth
-            @if ($episode->userWatched(auth()->user()->id))
-                <p
-                    class="absolute right-1 md:right-2 top-1 md:top-2 bg-green-600/80 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                    {{ $episode->getResolution() }}</p>
-                <p
-                    class="absolute left-1 md:left-2 bottom-1 md:bottom-2 bg-green-600/80 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                    <i class="fa-regular fa-eye"></i> {{ $episode->viewCountFormatted() }} <i
-                        class="fa-regular fa-heart"></i> {{ $episode->likeCount() }} <i class="fa-regular fa-comment"></i>
-                    {{ $episode->commentCount() }}
-                </p>
-            @else
-                <p
-                    class="absolute right-1 md:right-2 top-1 md:top-2 bg-rose-700/70 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                    {{ $episode->getResolution() }}</p>
-                <p
-                    class="absolute left-1 md:left-2 bottom-1 md:bottom-2 bg-rose-700/70 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                    <i class="fa-regular fa-eye"></i> {{ $episode->viewCountFormatted() }} <i
-                        class="fa-regular fa-heart"></i> {{ $episode->likeCount() }} <i class="fa-regular fa-comment"></i>
-                    {{ $episode->commentCount() }}
-                </p>
-            @endif
-        @endauth
-
-        <div class="absolute w-[95%] grid grid-cols-1 text-center">
-            <p class="text-sm text-center text-black dark:text-white">{{ $episode->title }} -
-                {{ $episode->episode }}</p>
-        </div>
-    </a>
-</div>
diff --git a/resources/views/home/partials/tab/template.blade.php b/resources/views/home/partials/tab/template.blade.php
index 261d06a..2fd38df 100644
--- a/resources/views/home/partials/tab/template.blade.php
+++ b/resources/views/home/partials/tab/template.blade.php
@@ -1,9 +1,47 @@
 @if ($showThumbnails)
 <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5 gap-2">
-    @include('partials.episode-thumbnail', ['limit' => 15])
+    @php 
+        $limit = 15;
+        $limitcounter = 0; 
+    @endphp
+
+    @foreach ($episodes as $ep)
+        @if (isset($popularView))
+            @php $episode = $ep->episode @endphp
+        @else
+            @php $episode = $ep @endphp
+        @endif
+
+        @if ($limitcounter >= $limit)
+            @break
+        @endif
+
+        <x-episode-cover :episode="$episode" view="thumbnail" />
+
+        @php $limitcounter++; @endphp
+    @endforeach
 </div>
 @else
 <div class="grid grid-cols-2 sm:grid-cols-4 md:grid-cols-5 lg:grid-cols-6 xl:grid-cols-7 2xl:grid-cols-8 gap-2">
-    @include('partials.episode-cover', ['limit' => 16])
+    @php
+        $limit = 16;
+        $limitcounter = 0;
+    @endphp
+
+    @foreach ($episodes as $ep)
+        @if (isset($popularView))
+            @php $episode = $ep->episode @endphp
+        @else
+            @php $episode = $ep @endphp
+        @endif
+
+        @if ($limitcounter >= $limit)
+            @break
+        @endif
+
+        <x-episode-cover :episode="$episode" view="poster" />
+
+        @php $limitcounter++; @endphp
+    @endforeach
 </div>
 @endif
\ No newline at end of file
diff --git a/resources/views/livewire/partials/search-result.blade.php b/resources/views/livewire/partials/search-result.blade.php
index 8454dc2..ce0db75 100644
--- a/resources/views/livewire/partials/search-result.blade.php
+++ b/resources/views/livewire/partials/search-result.blade.php
@@ -1,86 +1,3 @@
 <div wire:key="episode-{{ $episode->id }}">
-    @if ($searchIsJpn)
-        <div class="relative p-1 mb-14 w-full transition duration-300 ease-in-out md:p-2 md:hover:-translate-y-1 md:hover:scale-110"
-            data-thumbs="{{ optional($episode->gallery)->pluck('thumbnail_url') }}">
-        @else
-        <div class="relative p-1 mb-8 w-full transition duration-300 ease-in-out md:p-2 md:hover:-translate-y-1 md:hover:scale-110"
-            data-thumbs="{{ optional($episode->gallery)->pluck('thumbnail_url') }}">
-    @endif
-    <a class="hover:text-blue-600" href="{{ route('hentai.index', ['title' => $episode->slug]) }}">
-        <div class="absolute w-[95%] top-[38%] text-center z-10">
-            <svg aria-hidden="true"
-                class="inline mr-2 w-8 h-8 text-gray-200 animate-spin dark:text-gray-600 fill-pink-600"
-                viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
-                <path
-                    d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
-                    fill="currentColor" />
-                <path
-                    d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
-                    fill="currentFill" />
-            </svg>
-        </div>
-
-        @switch(true)
-            @case($view === 'thumbnail')
-                <img alt="{{ $episode->title }} - {{ $episode->episode }}" loading="lazy" width="500"
-                    class="block object-cover object-center relative z-20 rounded-lg aspect-video"
-                    src="{{ optional($episode->gallery->first())->thumbnail_url }}">
-                @if ($episode->hasAutoTrans())
-                    <p
-                        class="absolute right-1 md:right-2 bottom-1 md:bottom-2 bg-blue-600/80 !text-white rounded-tl-lg rounded-br-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                        <i class="fa-regular fa-closed-captioning"></i> Multi-Subs
-                    </p>
-                @endif
-            @break
-
-            @case($view === 'poster')
-                <img alt="{{ $episode->title }} - {{ $episode->episode }}" loading="lazy" width="400"
-                    class="block relative rounded-lg object-cover object-center aspect-[11/16] z-20"
-                    src="{{ $episode->cover_url }}">
-            @break
-
-        @endswitch
-
-        @php $problematic = cache()->rememberForever('episodeProblematic'.$episode->id, fn () => $episode->getProblematicTags()); @endphp
-        @if (!empty($problematic))
-            <p
-                class="absolute left-1 md:left-2 top-1 md:top-2 bg-red-700/70 !text-white rounded-br-lg rounded-tl-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                <i class="fa-solid fa-triangle-exclamation"></i> {{ $problematic }}
-            </p>
-        @endif
-
-        @if (auth()->check() && $episode->userWatched(auth()->user()->id))
-            <p
-                class="absolute right-1 md:right-2 top-1 md:top-2 bg-green-600/80 !text-white rounded-bl-lg rounded-tr-lg  p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                {{ $episode->getResolution() }}</p>
-            <p
-                class="absolute left-1 md:left-2 bottom-1 md:bottom-2 bg-green-600/80 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                <i class="fa-regular fa-eye"></i> {{ $episode->viewCountFormatted() }} <i
-                    class="fa-regular fa-heart"></i>
-                {{ $episode->likeCount() }} <i class="fa-regular fa-comment"></i> {{ $episode->commentCount() }}
-            </p>
-        @else
-            <p
-                class="absolute right-1 md:right-2 top-1 md:top-2 bg-rose-700/70 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                {{ $episode->getResolution() }}</p>
-            <p
-                class="absolute left-1 md:left-2 bottom-1 md:bottom-2 bg-rose-700/70 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                <i class="fa-regular fa-eye"></i>
-                {{ $episode->viewCountFormatted() }}
-                <i class="fa-regular fa-heart"></i> {{ $episode->likeCount() }} <i class="fa-regular fa-comment"></i>
-                {{ $episode->commentCount() }}
-            </p>
-        @endif
-
-        <div class="absolute  w-[95%] grid grid-cols-1 text-center">
-            @if ($searchIsJpn)
-                <p class="text-sm text-center text-black dark:text-white">{{ $episode->title }}
-                    ({{ $episode->title_jpn }}) - {{ $episode->episode }}</p>
-            @else
-                <p class="text-sm text-center text-black dark:text-white">{{ $episode->title }} -
-                    {{ $episode->episode }}</p>
-            @endif
-        </div>
-    </a>
-</div>
+    <x-episode-cover :episode="$episode" :view="$view" :displayjapanese="$searchIsJpn" />
 </div>
diff --git a/resources/views/livewire/watched.blade.php b/resources/views/livewire/watched.blade.php
index ab562a1..f82173a 100644
--- a/resources/views/livewire/watched.blade.php
+++ b/resources/views/livewire/watched.blade.php
@@ -15,7 +15,7 @@
                         <div class="grid grid-cols-1 gap-2 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 2xl:grid-cols-5">
                             @foreach ($episodes as $episode)
                                 <div class="mt-2 mb-6 ml-4">
-                                    <x-episode-thumbnail :episode="$episode->episode" />
+                                    <x-episode-cover :episode="$episode->episode" view="thumbnail" />
                                 </div>
                             @endforeach
                         </div>
diff --git a/resources/views/partials/episode-cover.blade.php b/resources/views/partials/episode-cover.blade.php
deleted file mode 100644
index 8b9c34b..0000000
--- a/resources/views/partials/episode-cover.blade.php
+++ /dev/null
@@ -1,73 +0,0 @@
-@php $limitcounter = 0; @endphp
-
-@foreach ($episodes as $ep)
-    @if (isset($popularView))
-        @php $episode = $ep->episode @endphp
-    @else
-        @php $episode = $ep @endphp
-    @endif
-
-    @if ($limitcounter >= $limit)
-        @break
-    @endif
-
-    <div
-        class="relative p-1 mb-8 w-full transition duration-300 ease-in-out md:p-2 md:hover:-translate-y-1 md:hover:scale-110">
-        <a class="hover:text-blue-600" href="{{ route('hentai.index', ['title' => $episode->slug]) }}">
-            <img alt="{{ $episode->title }} - {{ $episode->episode }}" loading="lazy" width="400"
-                class="block relative rounded-lg object-cover object-center aspect-[11/16] z-20 "
-                src="{{ $episode->cover_url }}"></img>
-
-            @guest
-                <p
-                    class="absolute right-1 md:right-2 top-1 md:top-2 bg-rose-700/70 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                    {{ $episode->getResolution() }}</p>
-                <p
-                    class="absolute left-1 md:left-2 bottom-1 md:bottom-2 bg-rose-700/70 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                    <i class="fa-regular fa-eye"></i> {{ $episode->viewCountFormatted() }} <i
-                        class="fa-regular fa-heart"></i> {{ $episode->likeCount() }} <i class="fa-regular fa-comment"></i>
-                    {{ $episode->commentCount() }}
-                </p>
-            @endguest
-
-            @php $problematic = cache()->rememberForever('episodeProblematic'.$episode->id, fn () => $episode->getProblematicTags()); @endphp
-            @if (!empty($problematic))
-                <p
-                    class="absolute left-1 md:left-2 top-1 md:top-2 bg-red-700/70 !text-white rounded-br-lg rounded-tl-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                    <i class="fa-solid fa-triangle-exclamation"></i> {{ $problematic }}
-                </p>
-            @endif
-
-            @auth
-                @if ($episode->userWatched(auth()->user()->id))
-                    <p
-                        class="absolute right-1 md:right-2 top-1 md:top-2 bg-green-600/80 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                        {{ $episode->getResolution() }}</p>
-                    <p
-                        class="absolute left-1 md:left-2 bottom-1 md:bottom-2 bg-green-600/80 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                        <i class="fa-regular fa-eye"></i> {{ $episode->viewCountFormatted() }} <i
-                            class="fa-regular fa-heart"></i> {{ $episode->likeCount() }} <i
-                            class="fa-regular fa-comment"></i> {{ $episode->commentCount() }}
-                    </p>
-                @else
-                    <p
-                        class="absolute right-1 md:right-2 top-1 md:top-2 bg-rose-700/70 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                        {{ $episode->getResolution() }}</p>
-                    <p
-                        class="absolute left-1 md:left-2 bottom-1 md:bottom-2 bg-rose-700/70 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                        <i class="fa-regular fa-eye"></i> {{ $episode->viewCountFormatted() }} <i
-                            class="fa-regular fa-heart"></i> {{ $episode->likeCount() }} <i
-                            class="fa-regular fa-comment"></i> {{ $episode->commentCount() }}
-                    </p>
-                @endif
-            @endauth
-
-            <div class="absolute  w-[95%] grid grid-cols-1 text-center">
-                <p class="text-sm text-center text-black dark:text-white">{{ $episode->title }} -
-                    {{ $episode->episode }}</p>
-            </div>
-        </a>
-    </div>
-
-    @php $limitcounter++; @endphp
-@endforeach
diff --git a/resources/views/partials/episode-thumbnail.blade.php b/resources/views/partials/episode-thumbnail.blade.php
deleted file mode 100644
index f1b67a6..0000000
--- a/resources/views/partials/episode-thumbnail.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-@php $limitcounter = 0; @endphp
-
-@foreach ($episodes as $ep)
-    @if (isset($popularView))
-        @php $episode = $ep->episode @endphp
-    @else
-        @php $episode = $ep @endphp
-    @endif
-
-    @if ($limitcounter >= $limit)
-        @break
-    @endif
-
-    <x-episode-thumbnail :episode="$episode" />
-
-    @php $limitcounter++; @endphp
-@endforeach
diff --git a/resources/views/series/partials/episodes.blade.php b/resources/views/series/partials/episodes.blade.php
index 2cc9d9b..37d0797 100644
--- a/resources/views/series/partials/episodes.blade.php
+++ b/resources/views/series/partials/episodes.blade.php
@@ -6,7 +6,7 @@
     <!-- Episode List -->
     <div class="grid grid-cols-1 sm:grid-cols-1 md:grid-cols-1 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 gap-2">
         @foreach ($hentai->episodes as $episode)
-            <x-episode-thumbnail :episode="$episode" />
+            <x-episode-cover :episode="$episode" view="thumbnail" />
         @endforeach
     </div>
 </div>
diff --git a/resources/views/series/partials/popular.blade.php b/resources/views/series/partials/popular.blade.php
index 479b11a..1e82204 100644
--- a/resources/views/series/partials/popular.blade.php
+++ b/resources/views/series/partials/popular.blade.php
@@ -12,7 +12,9 @@
                     @if($counter >= 8)
                         @continue
                     @endif
-                    @include('stream.partials.episode-partial')
+                    <li>
+                        <x-episode-cover :episode="$episode" view="thumbnail"/>
+                    </li>
                     @php $counter += 1; @endphp
                 @endforeach
             </ul>
diff --git a/resources/views/stream/partials/episode-partial.blade.php b/resources/views/stream/partials/episode-partial.blade.php
deleted file mode 100644
index 68f9892..0000000
--- a/resources/views/stream/partials/episode-partial.blade.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<li>
-    <a class="flex flex-col w-auto text-black dark:text-white hover:text-white hover:bg-rose-900/80 rounded-lg cursor-pointer pt-1"
-        href="{{ route('hentai.index', ['title' => $episode->slug]) }}">
-        <div class="flex items-center">
-            <div class="relative w-full aspect-[16/9]">
-                @auth
-                    @if ($episode->userWatched(auth()->user()->id))
-                        <p
-                            class="absolute right-1 top-1 bg-green-600/80 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                            {{ $episode->getResolution() }}</p>
-                        <p
-                            class="absolute left-1 bottom-1 bg-green-600/80 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                            <i class="fa-regular fa-eye"></i> {{ $episode->viewCountFormatted() }} <i
-                                class="fa-regular fa-heart"></i> {{ $episode->likeCount() }} <i
-                                class="fa-regular fa-comment"></i> {{ $episode->commentCount() }}
-                        </p>
-                    @else
-                        <p
-                            class="absolute right-1 top-1 bg-rose-700/70 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                            {{ $episode->getResolution() }}</p>
-                        <p
-                            class="absolute left-1 bottom-1 bg-rose-700/70 !text-white rounded-bl-lg rounded-tr-lg p-1 pr-2 pl-2 font-semibold text-sm z-30">
-                            <i class="fa-regular fa-eye"></i> {{ $episode->viewCountFormatted() }} <i
-                                class="fa-regular fa-heart"></i> {{ $episode->likeCount() }} <i
-                                class="fa-regular fa-comment"></i> {{ $episode->commentCount() }}
-                        </p>
-                    @endif
-                @endauth
-                <img loading="lazy" class="block relative rounded-xl object-cover object-center z-20 p-1"
-                    src="{{ optional($episode->gallery->first())->thumbnail_url }}"
-                    alt="{{ $episode->title }} - {{ $episode->episode }}">
-            </div>
-        </div>
-        <div class="basis-3/4 pl-2 text-center">
-            <p class="text-sm font-bold">{{ $episode->title }} - {{ $episode->episode }}</p>
-        </div>
-    </a>
-</li>
diff --git a/resources/views/stream/partials/more-episodes.blade.php b/resources/views/stream/partials/more-episodes.blade.php
index f564045..7f9fca2 100644
--- a/resources/views/stream/partials/more-episodes.blade.php
+++ b/resources/views/stream/partials/more-episodes.blade.php
@@ -7,7 +7,9 @@
         <div class="text-center xl:text-left">
             <ul class="inline-block xl:block">
                 @foreach ($moreEpisodes as $episode)
-                    @include('stream.partials.episode-partial')
+                    <li>
+                        <x-episode-cover :episode="$episode" view="thumbnail"/>
+                    </li>
                 @endforeach
             </ul>
         </div>
diff --git a/resources/views/stream/partials/more-studio.blade.php b/resources/views/stream/partials/more-studio.blade.php
index 3cd619a..85df4b4 100644
--- a/resources/views/stream/partials/more-studio.blade.php
+++ b/resources/views/stream/partials/more-studio.blade.php
@@ -7,7 +7,9 @@
         <div class="text-center xl:text-left">
             <ul class="inline-block xl:block">
                 @foreach ($studioEpisodes as $episode)
-                    @include('stream.partials.episode-partial')
+                    <li>
+                        <x-episode-cover :episode="$episode" view="thumbnail"/>
+                    </li>
                 @endforeach
             </ul>
         </div>