diff --git a/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/edit.tsx b/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/edit.tsx
index 0fb34d9..bed91a1 100644
--- a/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/edit.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/calendar/[detail]/edit.tsx
@@ -1,12 +1,11 @@
-import AlertKonfirmasi from "@/components/alertKonfirmasi"
 import ButtonBackHeader from "@/components/buttonBackHeader"
-import { ButtonForm } from "@/components/buttonForm"
+import ButtonSaveHeader from "@/components/buttonSaveHeader"
 import { InputForm } from "@/components/inputForm"
 import SelectForm from "@/components/selectForm"
 import Styles from "@/constants/Styles"
 import { Stack, router } from "expo-router"
 import { useState } from "react"
-import { SafeAreaView, ScrollView, View, ToastAndroid, Text } from "react-native"
+import { SafeAreaView, ScrollView, Text, ToastAndroid, View } from "react-native"
 
 export default function EditEventCalendar() {
    const [chooseGroup, setChooseGroup] = useState({ val: '', label: '' })
@@ -18,6 +17,10 @@ export default function EditEventCalendar() {
                headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Edit Acara',
                headerTitleAlign: 'center',
+               headerRight: () => <ButtonSaveHeader category="update" onPress={() => {
+                  ToastAndroid.show('Berhasil mengubah data', ToastAndroid.SHORT)
+                  router.back()
+               }} />
             }}
          />
          <ScrollView>
@@ -42,7 +45,7 @@ export default function EditEventCalendar() {
                <SelectForm bg="white" label="Ulangi Acara" placeholder="Ulangi Acara" value={chooseGroup.label} required onPress={() => { }} />
                <InputForm label="Jumlah Pengulangan" type="numeric" placeholder="Jumlah Pengulangan" required bg="white" />
                <InputForm label="Deskripsi" type="default" placeholder="Deskripsi" bg="white" />
-               <ButtonForm
+               {/* <ButtonForm
                   text="SIMPAN"
                   onPress={() => {
                      AlertKonfirmasi({
@@ -53,7 +56,7 @@ export default function EditEventCalendar() {
                            router.back()
                         }
                      })
-                  }} />
+                  }} /> */}
             </View>
          </ScrollView>
       </SafeAreaView>
diff --git a/app/(application)/division/[id]/(fitur-division)/calendar/create.tsx b/app/(application)/division/[id]/(fitur-division)/calendar/create.tsx
index 11cd0e5..43d1570 100644
--- a/app/(application)/division/[id]/(fitur-division)/calendar/create.tsx
+++ b/app/(application)/division/[id]/(fitur-division)/calendar/create.tsx
@@ -1,6 +1,5 @@
-import AlertKonfirmasi from "@/components/alertKonfirmasi";
 import ButtonBackHeader from "@/components/buttonBackHeader";
-import { ButtonForm } from "@/components/buttonForm";
+import ButtonSaveHeader from "@/components/buttonSaveHeader";
 import { InputForm } from "@/components/inputForm";
 import SelectForm from "@/components/selectForm";
 import Styles from "@/constants/Styles";
@@ -18,6 +17,10 @@ export default function CalendarDivisionCreate() {
                headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Tambah Acara',
                headerTitleAlign: 'center',
+               headerRight: () => <ButtonSaveHeader category="create" onPress={() => {
+                  ToastAndroid.show('Berhasil menambahkan data', ToastAndroid.SHORT)
+                  router.push('./')
+               }} />
             }}
          />
          <ScrollView>
@@ -42,7 +45,7 @@ export default function CalendarDivisionCreate() {
                <SelectForm bg="white" label="Ulangi Acara" placeholder="Ulangi Acara" value={chooseGroup.label} required onPress={() => { }} />
                <InputForm label="Jumlah Pengulangan" type="numeric" placeholder="Jumlah Pengulangan" required bg="white" />
                <InputForm label="Deskripsi" type="default" placeholder="Deskripsi" bg="white" />
-               <ButtonForm
+               {/* <ButtonForm
                   text="SIMPAN"
                   onPress={() => {
                      AlertKonfirmasi({
@@ -53,7 +56,7 @@ export default function CalendarDivisionCreate() {
                            router.push('./')
                         }
                      })
-                  }} />
+                  }} /> */}
             </View>
          </ScrollView>
       </SafeAreaView>