diff --git a/app/bill/[id]/delete/page.tsx b/app/bill/[id]/delete/page.tsx
index 0063355..311a0ed 100644
--- a/app/bill/[id]/delete/page.tsx
+++ b/app/bill/[id]/delete/page.tsx
@@ -1,4 +1,5 @@
 import { deleteBillById } from '@/app/lib/billActions';
+import { revalidatePath } from 'next/cache';
 import { notFound, redirect } from 'next/navigation';
 
 export default async function Page({ params:{ id } }: { params: { id:string } }) {
@@ -8,5 +9,6 @@ export default async function Page({ params:{ id } }: { params: { id:string } })
         return(notFound());
     }
 
+    revalidatePath('/');
     redirect(`/`);
 }
\ No newline at end of file
diff --git a/app/location/[id]/delete/not-found.tsx b/app/location/[id]/delete/not-found.tsx
new file mode 100644
index 0000000..2e33623
--- /dev/null
+++ b/app/location/[id]/delete/not-found.tsx
@@ -0,0 +1,4 @@
+import { NotFoundPage } from '@/app/ui/NotFoundPage';
+ 
+export default () =>
+<NotFoundPage title="404 Billing Location Not Found" description="Could not find the requested Billing Location." />;
\ No newline at end of file
diff --git a/app/location/[id]/delete/page.tsx b/app/location/[id]/delete/page.tsx
new file mode 100644
index 0000000..9344ac2
--- /dev/null
+++ b/app/location/[id]/delete/page.tsx
@@ -0,0 +1,15 @@
+import { deleteBillById } from '@/app/lib/billActions';
+import { deleteLocationById } from '@/app/lib/locationActions';
+import { revalidatePath } from 'next/cache';
+import { notFound, redirect } from 'next/navigation';
+
+export default async function Page({ params:{ id } }: { params: { id:string } }) {
+    const locationID = id;
+
+    if(await deleteLocationById(locationID) === 0) {
+        return(notFound());
+    }
+
+    revalidatePath('/');
+    redirect(`/`);
+}
\ No newline at end of file
diff --git a/app/ui/LocationEditForm.tsx b/app/ui/LocationEditForm.tsx
index 3c94036..a2f55e1 100644
--- a/app/ui/LocationEditForm.tsx
+++ b/app/ui/LocationEditForm.tsx
@@ -32,13 +32,11 @@ export const LocationEditForm:FC<LocationEditFormProps> = ({ location, yearMonth
                 <div className="card-body">
                     <form action={dispatch}>
                         {
-                            // show delete button only if location is set (otherwise it's a add operation)
-                            location ?
-                                <a href={`/location/${location._id}/delete`} className="card-subtitle tooltip" data-tip="Delete Location">
-                                    <TrashIcon className="h-[1em] w-[1em] absolute cursor-pointer text-error bottom-5 right-4 text-2xl" />
-                                </a> : null
+                            location && 
+                                <a href={`/location/${location._id}/delete`} className="absolute bottom-5 right-4 tooltip" data-tip="Delete Location">
+                                    <TrashIcon className="h-[1em] w-[1em] text-error text-2xl" />
+                                </a>
                         }
-
                         <input id="locationName" name="locationName" type="text" placeholder="Naziv lokacije" className="input input-bordered w-full" defaultValue={location?.name ?? ""} />
                         <div id="status-error" aria-live="polite" aria-atomic="true">
                             {state.errors?.locationName &&