diff --git a/app/[locale]/(protected)/contributor/content/audio/components/columns.tsx b/app/[locale]/(protected)/contributor/content/audio/components/columns.tsx
index 66d5d9bc..7a6f8170 100644
--- a/app/[locale]/(protected)/contributor/content/audio/components/columns.tsx
+++ b/app/[locale]/(protected)/contributor/content/audio/components/columns.tsx
@@ -20,7 +20,7 @@ import Swal from "sweetalert2";
 import { useTranslations } from "next-intl";
 
 const useTableColumns = () => {
-  const t = useTranslations("Table"); // Panggil di dalam hook
+  const t = useTranslations("Table");
   const MySwal = withReactContent(Swal);
   const userLevelId = getCookiesDecrypt("ulie");
 
@@ -97,7 +97,8 @@ const useTableColumns = () => {
       cell: ({ row }) => {
         const isPublish = row.original.isPublish;
         const isPublishOnPolda = row.original.isPublishOnPolda;
-        const creatorGroupParentLevelId = row.original.creatorGroupParentLevelId;
+        const creatorGroupParentLevelId =
+          row.original.creatorGroupParentLevelId;
 
         let displayText = "-";
         if (isPublish && !isPublishOnPolda) {
@@ -225,6 +226,20 @@ const useTableColumns = () => {
             }
           });
         };
+
+        const [isMabesApprover, setIsMabesApprover] = React.useState(false);
+        const userId = getCookiesDecrypt("uie");
+        const userLevelId = getCookiesDecrypt("ulie");
+        const roleId = getCookiesDecrypt("urie");
+
+        React.useEffect(() => {
+          if (userLevelId !== undefined && roleId !== undefined) {
+            setIsMabesApprover(
+              Number(userLevelId) == 216 && Number(roleId) == 3
+            );
+          }
+        }, [userLevelId, roleId]);
+
         return (
           <DropdownMenu>
             <DropdownMenuTrigger asChild>
@@ -245,14 +260,25 @@ const useTableColumns = () => {
                   View
                 </DropdownMenuItem>
               </Link>
-              <Link
+              {/* <Link
                 href={`/contributor/content/audio/update/${row.original.id}`}
               >
                 <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none">
                   <SquarePen className="w-4 h-4 me-1.5" />
                   Edit
                 </DropdownMenuItem>
-              </Link>
+              </Link> */}
+              {(Number(row.original.uploadedById) === Number(userId) ||
+                isMabesApprover) && (
+                <Link
+                  href={`/contributor/content/audio/update/${row.original.id}`}
+                >
+                  <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none">
+                    <SquarePen className="w-4 h-4 me-1.5" />
+                    Edit
+                  </DropdownMenuItem>
+                </Link>
+              )}
               <DropdownMenuItem
                 onClick={() => handleDeleteMedia(row.original.id)}
                 className="p-2 border-b text-destructive bg-destructive/30  focus:bg-destructive focus:text-destructive-foreground rounded-none"
@@ -260,6 +286,15 @@ const useTableColumns = () => {
                 <Trash2 className="w-4 h-4 me-1.5" />
                 Delete
               </DropdownMenuItem>
+              {/* {(row.original.uploadedById === userId || isMabesApprover) && (
+                <DropdownMenuItem
+                  onClick={() => handleDeleteMedia(row.original.id)}
+                  className="p-2 border-b text-destructive bg-destructive/30 focus:bg-destructive focus:text-destructive-foreground rounded-none"
+                >
+                  <Trash2 className="w-4 h-4 me-1.5" />
+                  Hapus
+                </DropdownMenuItem>
+              )} */}
             </DropdownMenuContent>
           </DropdownMenu>
         );
diff --git a/app/[locale]/(protected)/contributor/content/image/components/columns.tsx b/app/[locale]/(protected)/contributor/content/image/components/columns.tsx
index 28edda42..18b9837b 100644
--- a/app/[locale]/(protected)/contributor/content/image/components/columns.tsx
+++ b/app/[locale]/(protected)/contributor/content/image/components/columns.tsx
@@ -100,7 +100,8 @@ const useTableColumns = () => {
       cell: ({ row }) => {
         const isPublish = row.original.isPublish;
         const isPublishOnPolda = row.original.isPublishOnPolda;
-        const creatorGroupParentLevelId = row.original.creatorGroupParentLevelId;
+        const creatorGroupParentLevelId =
+          row.original.creatorGroupParentLevelId;
 
         let displayText = "-";
         if (isPublish && !isPublishOnPolda) {
@@ -231,6 +232,20 @@ const useTableColumns = () => {
             }
           });
         };
+
+        const [isMabesApprover, setIsMabesApprover] = React.useState(false);
+        const userId = getCookiesDecrypt("uie");
+        const userLevelId = getCookiesDecrypt("ulie");
+        const roleId = getCookiesDecrypt("urie");
+
+        React.useEffect(() => {
+          if (userLevelId !== undefined && roleId !== undefined) {
+            setIsMabesApprover(
+              Number(userLevelId) == 216 && Number(roleId) == 3
+            );
+          }
+        }, [userLevelId, roleId]);
+
         return (
           <DropdownMenu>
             <DropdownMenuTrigger asChild>
@@ -251,14 +266,25 @@ const useTableColumns = () => {
                   View
                 </DropdownMenuItem>
               </Link>
-              <Link
+              {/* <Link
                 href={`/contributor/content/image/update/${row.original.id}`}
               >
                 <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none">
                   <SquarePen className="w-4 h-4 me-1.5" />
                   Edit
                 </DropdownMenuItem>
-              </Link>
+              </Link> */}
+              {(Number(row.original.uploadedById) === Number(userId) ||
+                isMabesApprover) && (
+                <Link
+                  href={`/contributor/content/image/update/${row.original.id}`}
+                >
+                  <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none">
+                    <SquarePen className="w-4 h-4 me-1.5" />
+                    Edit
+                  </DropdownMenuItem>
+                </Link>
+              )}
               <DropdownMenuItem
                 onClick={() => handleDeleteMedia(row.original.id)}
                 className="p-2 border-b text-destructive bg-destructive/30  focus:bg-destructive focus:text-destructive-foreground rounded-none"
@@ -266,6 +292,15 @@ const useTableColumns = () => {
                 <Trash2 className="w-4 h-4 me-1.5" />
                 Delete
               </DropdownMenuItem>
+              {/* {(row.original.uploadedById === userId || isMabesApprover) && (
+                <DropdownMenuItem
+                  onClick={() => handleDeleteMedia(row.original.id)}
+                  className="p-2 border-b text-destructive bg-destructive/30 focus:bg-destructive focus:text-destructive-foreground rounded-none"
+                >
+                  <Trash2 className="w-4 h-4 me-1.5" />
+                  Hapus
+                </DropdownMenuItem>
+              )} */}
             </DropdownMenuContent>
           </DropdownMenu>
         );
diff --git a/app/[locale]/(protected)/contributor/content/teks/components/columns.tsx b/app/[locale]/(protected)/contributor/content/teks/components/columns.tsx
index 7dc5990f..398c1f29 100644
--- a/app/[locale]/(protected)/contributor/content/teks/components/columns.tsx
+++ b/app/[locale]/(protected)/contributor/content/teks/components/columns.tsx
@@ -20,7 +20,7 @@ import Swal from "sweetalert2";
 import { useTranslations } from "next-intl";
 
 const useTableColumns = () => {
-  const t = useTranslations("Table"); // Panggil di dalam hook
+  const t = useTranslations("Table");
   const MySwal = withReactContent(Swal);
   const userLevelId = getCookiesDecrypt("ulie");
 
@@ -97,7 +97,8 @@ const useTableColumns = () => {
       cell: ({ row }) => {
         const isPublish = row.original.isPublish;
         const isPublishOnPolda = row.original.isPublishOnPolda;
-        const creatorGroupParentLevelId = row.original.creatorGroupParentLevelId;
+        const creatorGroupParentLevelId =
+          row.original.creatorGroupParentLevelId;
 
         let displayText = "-";
         if (isPublish && !isPublishOnPolda) {
@@ -226,6 +227,20 @@ const useTableColumns = () => {
             }
           });
         };
+
+        const [isMabesApprover, setIsMabesApprover] = React.useState(false);
+        const userId = getCookiesDecrypt("uie");
+        const userLevelId = getCookiesDecrypt("ulie");
+        const roleId = getCookiesDecrypt("urie");
+
+        React.useEffect(() => {
+          if (userLevelId !== undefined && roleId !== undefined) {
+            setIsMabesApprover(
+              Number(userLevelId) == 216 && Number(roleId) == 3
+            );
+          }
+        }, [userLevelId, roleId]);
+
         return (
           <DropdownMenu>
             <DropdownMenuTrigger asChild>
@@ -246,14 +261,25 @@ const useTableColumns = () => {
                   View
                 </DropdownMenuItem>
               </Link>
-              <Link
+              {(Number(row.original.uploadedById) === Number(userId) ||
+                isMabesApprover) && (
+                <Link
+                  href={`/contributor/content/teks/update/${row.original.id}`}
+                >
+                  <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none">
+                    <SquarePen className="w-4 h-4 me-1.5" />
+                    Edit
+                  </DropdownMenuItem>
+                </Link>
+              )}
+              {/* <Link
                 href={`/contributor/content/teks/update/${row.original.id}`}
               >
                 <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none">
                   <SquarePen className="w-4 h-4 me-1.5" />
                   Edit
                 </DropdownMenuItem>
-              </Link>
+              </Link> */}
               <DropdownMenuItem
                 onClick={() => handleDeleteMedia(row.original.id)}
                 className="p-2 border-b text-destructive bg-destructive/30  focus:bg-destructive focus:text-destructive-foreground rounded-none"
@@ -261,6 +287,15 @@ const useTableColumns = () => {
                 <Trash2 className="w-4 h-4 me-1.5" />
                 Delete
               </DropdownMenuItem>
+              {/* {(row.original.uploadedById === userId || isMabesApprover) && (
+                <DropdownMenuItem
+                  onClick={() => handleDeleteMedia(row.original.id)}
+                  className="p-2 border-b text-destructive bg-destructive/30 focus:bg-destructive focus:text-destructive-foreground rounded-none"
+                >
+                  <Trash2 className="w-4 h-4 me-1.5" />
+                  Hapus
+                </DropdownMenuItem>
+              )} */}
             </DropdownMenuContent>
           </DropdownMenu>
         );
diff --git a/app/[locale]/(protected)/contributor/content/video/components/columns.tsx b/app/[locale]/(protected)/contributor/content/video/components/columns.tsx
index ccd03859..3cc325c2 100644
--- a/app/[locale]/(protected)/contributor/content/video/components/columns.tsx
+++ b/app/[locale]/(protected)/contributor/content/video/components/columns.tsx
@@ -20,7 +20,7 @@ import { error } from "@/lib/swal";
 import { useTranslations } from "next-intl";
 
 const useTableColumns = () => {
-  const t = useTranslations("Table"); // Panggil di dalam hook
+  const t = useTranslations("Table");
   const MySwal = withReactContent(Swal);
   const userLevelId = getCookiesDecrypt("ulie");
 
@@ -97,7 +97,8 @@ const useTableColumns = () => {
       cell: ({ row }) => {
         const isPublish = row.original.isPublish;
         const isPublishOnPolda = row.original.isPublishOnPolda;
-        const creatorGroupParentLevelId = row.original.creatorGroupParentLevelId;
+        const creatorGroupParentLevelId =
+          row.original.creatorGroupParentLevelId;
 
         let displayText = "-";
         if (isPublish && !isPublishOnPolda) {
@@ -226,6 +227,20 @@ const useTableColumns = () => {
             }
           });
         };
+
+        const [isMabesApprover, setIsMabesApprover] = React.useState(false);
+        const userId = getCookiesDecrypt("uie");
+        const userLevelId = getCookiesDecrypt("ulie");
+        const roleId = getCookiesDecrypt("urie");
+
+        React.useEffect(() => {
+          if (userLevelId !== undefined && roleId !== undefined) {
+            setIsMabesApprover(
+              Number(userLevelId) == 216 && Number(roleId) == 3
+            );
+          }
+        }, [userLevelId, roleId]);
+
         return (
           <DropdownMenu>
             <DropdownMenuTrigger asChild>
@@ -246,14 +261,25 @@ const useTableColumns = () => {
                   View
                 </DropdownMenuItem>
               </Link>
-              <Link
+              {/* <Link
                 href={`/contributor/content/video/update/${row.original.id}`}
               >
                 <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none">
                   <SquarePen className="w-4 h-4 me-1.5" />
                   Edit
                 </DropdownMenuItem>
-              </Link>
+              </Link> */}
+              {(Number(row.original.uploadedById) === Number(userId) ||
+                isMabesApprover) && (
+                <Link
+                  href={`/contributor/content/video/update/${row.original.id}`}
+                >
+                  <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none">
+                    <SquarePen className="w-4 h-4 me-1.5" />
+                    Edit
+                  </DropdownMenuItem>
+                </Link>
+              )}
               <DropdownMenuItem
                 onClick={() => handleDeleteMedia(row.original.id)}
                 className="p-2 border-b text-destructive bg-destructive/30  focus:bg-destructive focus:text-destructive-foreground rounded-none"
@@ -261,6 +287,15 @@ const useTableColumns = () => {
                 <Trash2 className="w-4 h-4 me-1.5" />
                 Delete
               </DropdownMenuItem>
+              {/* {(row.original.uploadedById === userId || isMabesApprover) && (
+                <DropdownMenuItem
+                  onClick={() => handleDeleteMedia(row.original.id)}
+                  className="p-2 border-b text-destructive bg-destructive/30 focus:bg-destructive focus:text-destructive-foreground rounded-none"
+                >
+                  <Trash2 className="w-4 h-4 me-1.5" />
+                  Hapus
+                </DropdownMenuItem>
+              )} */}
             </DropdownMenuContent>
           </DropdownMenu>
         );
diff --git a/app/[locale]/(protected)/dashboard/routine-task/components/columns.tsx b/app/[locale]/(protected)/dashboard/routine-task/components/columns.tsx
index 0a6c4caf..cf176d13 100644
--- a/app/[locale]/(protected)/dashboard/routine-task/components/columns.tsx
+++ b/app/[locale]/(protected)/dashboard/routine-task/components/columns.tsx
@@ -228,6 +228,17 @@ const columns: ColumnDef<any>[] = [
         });
       };
 
+      const [isMabesApprover, setIsMabesApprover] = React.useState(false);
+      const userId = getCookiesDecrypt("uie");
+      const userLevelId = getCookiesDecrypt("ulie");
+      const roleId = getCookiesDecrypt("urie");
+
+      React.useEffect(() => {
+        if (userLevelId !== undefined && roleId !== undefined) {
+          setIsMabesApprover(Number(userLevelId) == 216 && Number(roleId) == 3);
+        }
+      }, [userLevelId, roleId]);
+
       return (
         <DropdownMenu>
           <DropdownMenuTrigger asChild>
@@ -240,7 +251,6 @@ const columns: ColumnDef<any>[] = [
             </Button>
           </DropdownMenuTrigger>
           <DropdownMenuContent className="p-0" align="end">
-            {/* Link "View" yang diperbarui dengan logika kondisional untuk fileTypeSegment */}
             <Link
               href={`/contributor/content/${fileTypeSegment}/detail/${row.original.id}`}
             >
@@ -249,13 +259,28 @@ const columns: ColumnDef<any>[] = [
                 Lihat
               </DropdownMenuItem>
             </Link>
-            <DropdownMenuItem
-              onClick={() => handleDeleteMedia(row.original.id)}
-              className="p-2 border-b text-destructive bg-destructive/30  focus:bg-destructive focus:text-destructive-foreground rounded-none"
-            >
-              <Trash2 className="w-4 h-4 me-1.5" />
-              Hapus
-            </DropdownMenuItem>
+
+            {(Number(row.original.uploadedById) === Number(userId) ||
+              isMabesApprover) && (
+              <Link
+                href={`/contributor/content/${fileTypeSegment}/update/${row.original.id}`}
+              >
+                <DropdownMenuItem className="p-2 border-b text-default-700 group focus:bg-default focus:text-primary-foreground rounded-none">
+                  <SquarePen className="w-4 h-4 me-1.5" />
+                  Edit
+                </DropdownMenuItem>
+              </Link>
+            )}
+
+            {(row.original.uploadedById === userId || isMabesApprover) && (
+              <DropdownMenuItem
+                onClick={() => handleDeleteMedia(row.original.id)}
+                className="p-2 border-b text-destructive bg-destructive/30 focus:bg-destructive focus:text-destructive-foreground rounded-none"
+              >
+                <Trash2 className="w-4 h-4 me-1.5" />
+                Hapus
+              </DropdownMenuItem>
+            )}
           </DropdownMenuContent>
         </DropdownMenu>
       );
diff --git a/app/[locale]/(public)/image/filter/page.tsx b/app/[locale]/(public)/image/filter/page.tsx
index a41f03f5..eacd0392 100644
--- a/app/[locale]/(public)/image/filter/page.tsx
+++ b/app/[locale]/(public)/image/filter/page.tsx
@@ -507,7 +507,6 @@ const FilterPage = () => {
   return (
     <div className="flex flex-col">
       {/* Header */}
-
       <div className="flex flex-row md:flex-row items-start gap-3 py-10 px-4 lg:px-20 bg-[#f7f7f7] dark:bg-black">
         <p> {t("image", { defaultValue: "Image" })}</p>
         {">"}