diff --git a/app/(application)/announcement/create.tsx b/app/(application)/announcement/create.tsx
index 37b84e7..c4ef147 100644
--- a/app/(application)/announcement/create.tsx
+++ b/app/(application)/announcement/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 ButtonSelect from "@/components/buttonSelect";
 import { InputForm } from "@/components/inputForm";
 import Styles from "@/constants/Styles";
@@ -15,6 +14,10 @@ export default function CreateAnnouncement() {
                headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Tambah Pengumuman',
                headerTitleAlign: 'center',
+               headerRight: () => <ButtonSaveHeader category="create" onPress={() => {
+                  ToastAndroid.show('Berhasil menambah data', ToastAndroid.SHORT)
+                  router.push('/announcement')
+               }} />
             }}
          />
          <ScrollView>
@@ -22,7 +25,7 @@ export default function CreateAnnouncement() {
                <InputForm label="Judul" type="default" placeholder="Judul Pengumuman" required />
                <InputForm label="Pengumuman" type="default" placeholder="Deskripsi Pengumuman" required />
                <ButtonSelect value="Pilih divisi penerima pengumuman" />
-               <ButtonForm
+               {/* <ButtonForm
                   text="SIMPAN"
                   onPress={() => {
                      AlertKonfirmasi({
@@ -33,7 +36,7 @@ export default function CreateAnnouncement() {
                            router.push('/announcement')
                         }
                      })
-                  }} />
+                  }} /> */}
             </View>
          </ScrollView>
       </SafeAreaView>
diff --git a/app/(application)/announcement/edit/[id].tsx b/app/(application)/announcement/edit/[id].tsx
index adba867..3d79a3a 100644
--- a/app/(application)/announcement/edit/[id].tsx
+++ b/app/(application)/announcement/edit/[id].tsx
@@ -1,6 +1,7 @@
 import AlertKonfirmasi from "@/components/alertKonfirmasi"
 import ButtonBackHeader from "@/components/buttonBackHeader"
 import { ButtonForm } from "@/components/buttonForm"
+import ButtonSaveHeader from "@/components/buttonSaveHeader"
 import ButtonSelect from "@/components/buttonSelect"
 import { InputForm } from "@/components/inputForm"
 import Styles from "@/constants/Styles"
@@ -15,6 +16,10 @@ export default function EditAnnouncement() {
                headerLeft: () => <ButtonBackHeader onPress={() => { router.back() }} />,
                headerTitle: 'Edit Pengumuman',
                headerTitleAlign: 'center',
+               headerRight: () => <ButtonSaveHeader category="update" onPress={() => {
+                  ToastAndroid.show('Berhasil mengubah data', ToastAndroid.SHORT)
+                  router.push('/announcement')
+               }} />
             }}
          />
          <ScrollView>
@@ -22,7 +27,7 @@ export default function EditAnnouncement() {
                <InputForm label="Judul" type="default" placeholder="Judul Pengumuman" required />
                <InputForm label="Pengumuman" type="default" placeholder="Deskripsi Pengumuman" required />
                <ButtonSelect value="Pilih divisi penerima pengumuman" />
-               <ButtonForm
+               {/* <ButtonForm
                   text="SIMPAN"
                   onPress={() => {
                      AlertKonfirmasi({
@@ -33,7 +38,7 @@ export default function EditAnnouncement() {
                            router.push('/announcement')
                         }
                      })
-                  }} />
+                  }} /> */}
             </View>
          </ScrollView>
       </SafeAreaView>