diff --git a/src/front/Components/DesignSystem/UserFolder/UserFolderHeader/index.tsx b/src/front/Components/DesignSystem/UserFolder/UserFolderHeader/index.tsx
index fc434b9c..0293f7b3 100644
--- a/src/front/Components/DesignSystem/UserFolder/UserFolderHeader/index.tsx
+++ b/src/front/Components/DesignSystem/UserFolder/UserFolderHeader/index.tsx
@@ -5,20 +5,24 @@ import Typography, { ITypo } from "../../Typography";
 import Image from "next/image";
 import PenIcon from "@Assets/Icons/pen.svg";
 import WarningBadge from "../../WarningBadge";
+import Link from "next/link";
 
 type IProps = {
 	contact: {
+		uid: Contact["uid"];
 		first_name: Contact["first_name"];
 		last_name: Contact["last_name"];
 		phone_number: Contact["phone_number"];
 		cell_phone_number: Contact["cell_phone_number"];
 		email: Contact["email"];
 	};
+	selectedFolderUid: string;
 };
 type IState = {};
 
-export default class UserFolderHeader extends React.Component<IProps, IState> {
+export default class UserFolderHeaderClass extends React.Component<IProps, IState> {
 	public override render(): JSX.Element {
+		const redirectPath = "/folder/".concat(this.props.selectedFolderUid, "/update/client/", this.props.contact.uid);
 		return (
 			<div className={classes["root"]}>
 				<div className={classes["content"]}>
@@ -47,7 +51,9 @@ export default class UserFolderHeader extends React.Component<IProps, IState> {
 				</div>
 				<div className={classes["icons"]}>
 					<WarningBadge />
-					<Image src={PenIcon} alt="edit" className={classes["edit-icon"]} onClick={this.onEditClick} />
+					<Link href={redirectPath}>
+						<Image src={PenIcon} alt="edit" className={classes["edit-icon"]} onClick={this.onEditClick} />
+					</Link>
 				</div>
 			</div>
 		);
diff --git a/src/front/Components/DesignSystem/UserFolder/index.tsx b/src/front/Components/DesignSystem/UserFolder/index.tsx
index ced749a5..aee6e374 100644
--- a/src/front/Components/DesignSystem/UserFolder/index.tsx
+++ b/src/front/Components/DesignSystem/UserFolder/index.tsx
@@ -60,7 +60,7 @@ export default class UserFolder extends React.Component<IProps, IState> {
 				</Confirm>
 
 				<div className={classes["header"]} onClick={this.toggleOpen}>
-					<UserFolderHeader contact={this.props.customer.contact} />
+					<UserFolderHeader contact={this.props.customer.contact} selectedFolderUid={this.props.folder.uid} />
 					<Image
 						src={ChevronIcon}
 						alt="chevron open close"
diff --git a/src/front/Components/Layouts/Folder/AddClientToFolder/index.tsx b/src/front/Components/Layouts/Folder/AddClientToFolder/index.tsx
index beb17d58..3906f638 100644
--- a/src/front/Components/Layouts/Folder/AddClientToFolder/index.tsx
+++ b/src/front/Components/Layouts/Folder/AddClientToFolder/index.tsx
@@ -126,7 +126,7 @@ class AddClientToFolderClass extends BasePage<IProps, IState> {
 
 export default function AddClientToFolder() {
 	const router = useRouter();
-	let { uid } = router.query;
-	uid = uid as string;
-	return <AddClientToFolderClass selectedFolderUid={uid} />;
+	let { folderUid } = router.query;
+	folderUid = folderUid as string;
+	return <AddClientToFolderClass selectedFolderUid={folderUid} />;
 }
diff --git a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx
index 37a92015..58e693d6 100644
--- a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx
+++ b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx
@@ -121,7 +121,7 @@ class FolderInformationClass extends BasePage<IPropsClass, IState> {
 
 export default function FolderInformation() {
 	const router = useRouter();
-	let { uid } = router.query;
-	uid = uid as string;
-	return <FolderInformationClass selectedFolderUid={uid} />;
+	let { folderUid } = router.query;
+	folderUid = folderUid as string;
+	return <FolderInformationClass selectedFolderUid={folderUid} />;
 }
diff --git a/src/front/Components/Layouts/Folder/UpdateClient/index.tsx b/src/front/Components/Layouts/Folder/UpdateClient/index.tsx
index a216b6b6..a067aa16 100644
--- a/src/front/Components/Layouts/Folder/UpdateClient/index.tsx
+++ b/src/front/Components/Layouts/Folder/UpdateClient/index.tsx
@@ -62,7 +62,7 @@ class UpdateClientClass extends BasePage<IProps, IState> {
 
 export default function UpdateClient() {
 	const router = useRouter();
-	let { uid } = router.query;
-	uid = uid as string;
-	return <UpdateClientClass selectedFolderUid={uid} />;
+	let { folderUid } = router.query;
+	folderUid = folderUid as string;
+	return <UpdateClientClass selectedFolderUid={folderUid} />;
 }
diff --git a/src/front/Components/Layouts/Folder/UpdateFolderDescription/index.tsx b/src/front/Components/Layouts/Folder/UpdateFolderDescription/index.tsx
index 1f37a6a9..ea109fd8 100644
--- a/src/front/Components/Layouts/Folder/UpdateFolderDescription/index.tsx
+++ b/src/front/Components/Layouts/Folder/UpdateFolderDescription/index.tsx
@@ -58,7 +58,7 @@ class UpdateFolderDescriptionClass extends BasePage<IProps, IState> {
 
 export default function UpdateFolderDescription() {
 	const router = useRouter();
-	let { uid } = router.query;
-	uid = uid as string;
-	return <UpdateFolderDescriptionClass selectedFolderUid={uid} />;
+	let { folderUid } = router.query;
+	folderUid = folderUid as string;
+	return <UpdateFolderDescriptionClass selectedFolderUid={folderUid} />;
 }
diff --git a/src/front/Components/Layouts/Folder/UpdateFolderMetadata/index.tsx b/src/front/Components/Layouts/Folder/UpdateFolderMetadata/index.tsx
index aad61a82..03ed9b84 100644
--- a/src/front/Components/Layouts/Folder/UpdateFolderMetadata/index.tsx
+++ b/src/front/Components/Layouts/Folder/UpdateFolderMetadata/index.tsx
@@ -80,7 +80,7 @@ class UpdateFolderMetadataClass extends BasePage<IProps, IState> {
 
 export default function UpdateFolderMetadata() {
 	const router = useRouter();
-	let { uid } = router.query;
-	uid = uid as string;
-	return <UpdateFolderMetadataClass selectedFolderUid={uid} />;
+	let { folderUid } = router.query;
+	folderUid = folderUid as string;
+	return <UpdateFolderMetadataClass selectedFolderUid={folderUid} />;
 }
diff --git a/src/pages/folder/[uid]/add/client.tsx b/src/pages/folder/[folderUid]/add/client.tsx
similarity index 100%
rename from src/pages/folder/[uid]/add/client.tsx
rename to src/pages/folder/[folderUid]/add/client.tsx
diff --git a/src/pages/folder/[uid]/index.tsx b/src/pages/folder/[folderUid]/index.tsx
similarity index 100%
rename from src/pages/folder/[uid]/index.tsx
rename to src/pages/folder/[folderUid]/index.tsx
diff --git a/src/pages/folder/[uid]/update/client.tsx b/src/pages/folder/[folderUid]/update/client/[clientUid].tsx
similarity index 100%
rename from src/pages/folder/[uid]/update/client.tsx
rename to src/pages/folder/[folderUid]/update/client/[clientUid].tsx
diff --git a/src/pages/folder/[uid]/update/description.tsx b/src/pages/folder/[folderUid]/update/description.tsx
similarity index 100%
rename from src/pages/folder/[uid]/update/description.tsx
rename to src/pages/folder/[folderUid]/update/description.tsx
diff --git a/src/pages/folder/[uid]/update/metadata.tsx b/src/pages/folder/[folderUid]/update/metadata.tsx
similarity index 100%
rename from src/pages/folder/[uid]/update/metadata.tsx
rename to src/pages/folder/[folderUid]/update/metadata.tsx