diff --git a/src/app/finding-match/finding-match-client.tsx b/src/app/finding-match/finding-match-client.tsx
index 9db5fdf..d4f88dc 100644
--- a/src/app/finding-match/finding-match-client.tsx
+++ b/src/app/finding-match/finding-match-client.tsx
@@ -111,25 +111,27 @@ export default function FindingMatchClient() {
       />
 
       <main
-        style={{ paddingBottom: "calc(80px + var(--safe-bottom))" }}
+        style={{
+          minHeight: "calc(100dvh - 56px - max(12px, calc(var(--safe-top) + 6px)))",
+          paddingBottom: "calc(90px + var(--safe-bottom))",
+        }}
         className="flex min-h-0 flex-1 flex-col justify-between text-center page-slide-enter"
       >
-
-        <section className="mt-6 flex flex-1 flex-col items-center px-[23px]">
+        <section className="mt-8 sm:mt-12 flex flex-col items-center px-4">
           <div className="relative h-[124px] w-[130px]" aria-hidden="true">
             <Image
               src={matchImageSrc}
               alt=""
               fill
-              sizes="58px"
+              sizes="130px"
               className="object-cover"
               priority
             />
           </div>
-          <h1 className="mt-4 group-16 font-bold leading-none tracking-[0.02em] text-[#171717] uppercase">
+          <h1 className="mt-5 group-16 font-bold leading-none tracking-[0.02em] text-[#171717] uppercase">
             {copy.title}
           </h1>
-          <p className="mt-3 max-w-[320px] mx-auto text-center group-12 leading-[1.35] font-semibold text-[#747474]">
+          <p className="mt-3 max-w-[320px] mx-auto text-center group-12 leading-[1.4] font-semibold text-[#747474]">
             {copy.description}
           </p>
           {unseenRejection && (
@@ -177,22 +179,24 @@ export default function FindingMatchClient() {
           )}{" "}
         </section>
 
-        <AdvisorActionsCard
-          title={copy.advisorTitle}
-          description={copy.advisorDescription}
-          avatars={advisorAvatars}
-          extraCount={7}
-          getAdvisorLabel={copy.getAdvisor}
-          onGetAdvisor={openAdvisors}
-        />
+        <div className="mt-auto pt-6 pb-2">
+          <AdvisorActionsCard
+            title={copy.advisorTitle}
+            description={copy.advisorDescription}
+            avatars={advisorAvatars}
+            extraCount={7}
+            getAdvisorLabel={copy.getAdvisor}
+            onGetAdvisor={openAdvisors}
+          />
+        </div>
 
         <FixToTheEnd>
           {profile?.can_edit_profile === false ? (
             <div
-              className="inline-flex w-full items-center justify-center gap-2 rounded-[9px] border-none bg-[#D1D1D6] dark:bg-[#3D3E42] px-4 py-[17px] text-center text-[#747474] dark:text-[#A1A1A1] shadow-none"
+              className="inline-flex h-[52px] w-full items-center justify-center gap-2 rounded-[9px] border-none bg-[#D1D1D6] dark:bg-[#3D3E42] px-4 text-center text-[#747474] dark:text-[#A1A1A1] shadow-none"
               aria-live="polite"
             >
-              <Ic name="lock" aria-hidden="true" className="h-3.5 w-3.5 shrink-0" />
+              <Ic name="lock" aria-hidden="true" className="size-[18px] shrink-0" />
               <span className="group-16 leading-none font-semibold">
                 {t["Profile is locked"]}
               </span>
@@ -202,7 +206,7 @@ export default function FindingMatchClient() {
               variant="dark"
               href={localizePath("/questions-list", locale)}
             >
-              <Ic name="pencil" aria-hidden="true" className="h-3.5 w-3.5 shrink-0" />
+              <Ic name="pencil" aria-hidden="true" className="size-[18px] shrink-0" />
               <span>{copy.editProfile}</span>
             </Button>
           )}
diff --git a/src/app/new-match/new-match-client.tsx b/src/app/new-match/new-match-client.tsx
index 489a896..53fdf95 100644
--- a/src/app/new-match/new-match-client.tsx
+++ b/src/app/new-match/new-match-client.tsx
@@ -899,7 +899,7 @@ export default function NewMatchClient() {
             className="inline-flex w-full items-center justify-center gap-2 rounded-[9px] border-none bg-[#D1D1D6] px-4 h-[52px] text-center text-[#747474] shadow-none"
             role="status"
           >
-            <Ic name="lock" aria-hidden="true" className="h-3.5 w-3.5 shrink-0" />
+            <Ic name="lock" aria-hidden="true" className="size-[18px] shrink-0" />
             <span className="group-16 leading-none font-semibold">
               {t["Profile is locked"]}
             </span>
diff --git a/src/app/questions-list/questions-list-client.tsx b/src/app/questions-list/questions-list-client.tsx
index 0cd0396..0ef9c97 100644
--- a/src/app/questions-list/questions-list-client.tsx
+++ b/src/app/questions-list/questions-list-client.tsx
@@ -112,8 +112,18 @@ export default function QuestionsListClient() {
     () => (profile ? getSubmitPath(profile) : null),
     [profile],
   );
-  const isProfileRedirecting =
-    profileTargetPath !== null && profileTargetPath !== "/questions-list";
+  const isProfileRedirecting = useMemo(() => {
+    if (!profile || !profileTargetPath) return false;
+    if (profileTargetPath === "/questions-list") return false;
+    // Allow users to view and edit profile sections when profile is waiting or in match pool and can_edit_profile is not locked
+    if (
+      profileTargetPath === "/finding-match" &&
+      profile.can_edit_profile !== false
+    ) {
+      return false;
+    }
+    return true;
+  }, [profile, profileTargetPath]);
 
   useEffect(() => {
     if (isProfileRedirecting && profileTargetPath) {
diff --git a/src/components/Componentes/button.tsx b/src/components/Componentes/button.tsx
index 5dbac6e..a62aa28 100644
--- a/src/components/Componentes/button.tsx
+++ b/src/components/Componentes/button.tsx
@@ -162,7 +162,7 @@ export function Button({
     <span className="flex w-full min-w-0 max-w-full items-center justify-center gap-2">
       {renderArrow("left")}
       <span className="flex min-w-0 max-w-full flex-1 flex-col items-center justify-center">
-        <span className="block w-full min-w-0 max-w-full truncate text-center group-16 font-semibold leading-none">
+        <span className="flex w-full min-w-0 max-w-full items-center justify-center gap-2 truncate text-center group-16 font-semibold leading-none">
           {children}
         </span>
         {description && !isOutlined ? (