diff --git a/app/components/ui/button/index.ts b/app/components/ui/button/index.ts
index 337ec95..84e2e9f 100644
--- a/app/components/ui/button/index.ts
+++ b/app/components/ui/button/index.ts
@@ -18,6 +18,7 @@ export const buttonVariants = cva(
                 ghost:
                     'hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50',
                 link: 'text-primary underline-offset-4 hover:underline',
+                borderless: 'border-0 cursor-pointer size-20'
             },
             size: {
                 default: 'h-9 px-4 py-2 has-[>svg]:px-3',
diff --git a/app/components/ui/player/ChangeEpisodeButton.vue b/app/components/ui/player/ChangeEpisodeButton.vue
new file mode 100644
index 0000000..0540d7a
--- /dev/null
+++ b/app/components/ui/player/ChangeEpisodeButton.vue
@@ -0,0 +1,23 @@
+<script setup lang="ts">
+import { Icon } from '@iconify/vue'
+
+
+interface Props {
+    type: EpisodeChangeType;
+}
+
+const props = defineProps<Props>();
+</script>
+
+<script lang="ts">
+export enum EpisodeChangeType {
+    NEXT = "mage:next-fill",
+    PREVIOUS = "mage:previous-fill",
+}
+</script>
+
+<template>
+    <UiButton variant="borderless" size="icon">
+        <Icon :icon="props.type" class="size-5" />
+    </UiButton>
+</template>
diff --git a/app/components/ui/player/Player.vue b/app/components/ui/player/Player.vue
index 21c7e47..86db32b 100644
--- a/app/components/ui/player/Player.vue
+++ b/app/components/ui/player/Player.vue
@@ -1,11 +1,14 @@
 <script setup lang="ts">
 import Artplayer from "artplayer";
 import Hls from "hls.js";
+import { createVueControlSmart } from "~/components/util/player-control";
+import { EpisodeChangeType } from "./ChangeEpisodeButton.vue";
+import { UiPlayerChangeEpisodeButton } from "#components";
 
 interface Props {
     urls: any;
     id: string;
-    nextEpisodeButton: boolean;
+    episodeButton: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -15,20 +18,26 @@ const emit = defineEmits(['get-instance'])
 
 const options = computed(() => {
     const controls = []
-    if (props.nextEpisodeButton) {
+    if (props.episodeButton) {
         controls.push(
-            {
-                name: 'next-episode',
+            createVueControlSmart(UiPlayerChangeEpisodeButton, {
+                name: "next-episode",
                 index: 50,
-                position: 'left',
-                html: '<button>Test</button>',
-                tooltip: 'Next episode',
-                style: {
-                    color: 'red',
-                },
-                click: function () {
-                },
-            },
+                tooltip: "Next episode",
+                type: EpisodeChangeType.NEXT
+            }, {
+                click: () => console.log("NEXT")
+            })
+        )
+        controls.push(
+            createVueControlSmart(UiPlayerChangeEpisodeButton, {
+                name: "previous-episode",
+                index: 50,
+                tooltip: "Previous episode",
+                type: EpisodeChangeType.PREVIOUS
+            }, {
+                click: () => console.log("Previous")
+            })
         )
     }
     return {
diff --git a/app/components/util/player-control.js b/app/components/util/player-control.js
new file mode 100644
index 0000000..831ed9e
--- /dev/null
+++ b/app/components/util/player-control.js
@@ -0,0 +1,44 @@
+import { createApp, h } from 'vue'
+
+export function createVueControlSmart(component, props = {}, events = {}) {
+    let vueApp = null
+
+    return {
+        name: props.name || 'vue-control',
+        index: props.index || 0,
+        position: props.position || 'left',
+        html: `<div class="vue-control-wrapper" data-vue-control="${component.name}"></div>`,
+        tooltip: props.tooltip || '',
+
+        mounted: function ($control) {
+            const container = $control.querySelector('.vue-control-wrapper')
+
+            if (container && !vueApp) {
+
+                console.log("111")
+                vueApp = createApp({
+                    render() {
+                        return h(component, {
+                            ...props,
+                            ...Object.entries(events).reduce((acc, [eventName, handler]) => {
+                                acc[`on${eventName.charAt(0).toUpperCase() + eventName.slice(1)}`] = handler
+                                return acc
+                            }, {})
+                        })
+                    }
+                })
+
+                vueApp.mount(container)
+                $control._vueApp = vueApp
+            }
+        },
+
+        destroy: function ($control) {
+            if ($control._vueApp) {
+                $control._vueApp.unmount()
+                $control._vueApp = null
+                vueApp = null
+            }
+        }
+    }
+}
diff --git a/app/pages/watch.vue b/app/pages/watch.vue
index f55ee74..972ba64 100644
--- a/app/pages/watch.vue
+++ b/app/pages/watch.vue
@@ -9,7 +9,7 @@
 
             <div v-if="hlsUrls">
                 <Player :id="mediaId.toString().concat(episode?.toString() || '')" :urls="hlsUrls" :episode="episode"
-                    :nextEpisodeButton="true" />
+                    :episodeButton="true" />
             </div>
 
             <!-- Loading and Error States -->