diff --git a/src/pages/parts/auth/PassphraseGeneratePart.tsx b/src/pages/parts/auth/PassphraseGeneratePart.tsx
index bf2cbe8c..dd521229 100644
--- a/src/pages/parts/auth/PassphraseGeneratePart.tsx
+++ b/src/pages/parts/auth/PassphraseGeneratePart.tsx
@@ -70,6 +70,12 @@ export function PassphraseGeneratePart(props: PassphraseGeneratePartProps) {
         onCustomPassphrase={handleCustomPassphrase}
       />
 
+      <LargeCardButtons>
+        <Button theme="purple" onClick={() => props.onNext?.(mnemonic)}>
+          {t("auth.generate.next")}
+        </Button>
+      </LargeCardButtons>
+
       {isPasskeySupported() && (
         <div className="mt-4">
           <Button
@@ -89,12 +95,6 @@ export function PassphraseGeneratePart(props: PassphraseGeneratePartProps) {
           )}
         </div>
       )}
-
-      <LargeCardButtons>
-        <Button theme="purple" onClick={() => props.onNext?.(mnemonic)}>
-          {t("auth.generate.next")}
-        </Button>
-      </LargeCardButtons>
     </LargeCard>
   );
 }
diff --git a/src/pages/parts/auth/VerifyPassphrasePart.tsx b/src/pages/parts/auth/VerifyPassphrasePart.tsx
index 7b939e85..98d440a1 100644
--- a/src/pages/parts/auth/VerifyPassphrasePart.tsx
+++ b/src/pages/parts/auth/VerifyPassphrasePart.tsx
@@ -201,7 +201,9 @@ export function VerifyPassphrase(props: VerifyPassphraseProps) {
               loading={passkeyResult.loading}
               onClick={() => authenticatePasskeyFn()}
             >
-              <Icon icon={Icons.LOCK} className="mr-2" />
+              {passkeyResult.loading ? (
+                <Icon icon={Icons.LOCK} className="mr-2" />
+              ) : null}
               {t("auth.verify.authenticatePasskey")}
             </Button>
           </LargeCardButtons>