diff --git a/public/locales/de/welcome.json b/public/locales/de/welcome.json
index 1e79c522..060fd70e 100644
--- a/public/locales/de/welcome.json
+++ b/public/locales/de/welcome.json
@@ -43,7 +43,7 @@
     "tunnel_domain_assigned": "A temporary public domain has been assigned to you",
     "tunnel_opt_in_title": "Get an automatically assigned public domain?",
     "tunnel_opt_in_yes": "Yes",
-    "tunnel_opt_in_skip": "Skip",
+    "tunnel_opt_in_skip": "Next",
     "tunnel_progress": "Starting tunnel...",
     "tunnel_error": "Tunnel error",
     "tunnel_get_domain": "Get Public Domain"
diff --git a/public/locales/en/welcome.json b/public/locales/en/welcome.json
index 1709e415..6e5edabd 100644
--- a/public/locales/en/welcome.json
+++ b/public/locales/en/welcome.json
@@ -43,7 +43,7 @@
     "tunnel_domain_assigned": "A temporary public domain has been assigned to you",
     "tunnel_opt_in_title": "Get an automatically assigned public domain?",
     "tunnel_opt_in_yes": "Yes",
-    "tunnel_opt_in_skip": "Skip",
+    "tunnel_opt_in_skip": "Next",
     "tunnel_progress": "Starting tunnel...",
     "tunnel_error": "Tunnel error",
     "tunnel_get_domain": "Get Public Domain"
diff --git a/public/locales/es/welcome.json b/public/locales/es/welcome.json
index 29c0359a..310f4c67 100644
--- a/public/locales/es/welcome.json
+++ b/public/locales/es/welcome.json
@@ -43,7 +43,7 @@
     "tunnel_domain_assigned": "A temporary public domain has been assigned to you",
     "tunnel_opt_in_title": "Get an automatically assigned public domain?",
     "tunnel_opt_in_yes": "Yes",
-    "tunnel_opt_in_skip": "Skip",
+    "tunnel_opt_in_skip": "Next",
     "tunnel_progress": "Starting tunnel...",
     "tunnel_error": "Tunnel error",
     "tunnel_get_domain": "Get Public Domain"
diff --git a/public/locales/fr/welcome.json b/public/locales/fr/welcome.json
index 8e5c1d23..0db5ba82 100644
--- a/public/locales/fr/welcome.json
+++ b/public/locales/fr/welcome.json
@@ -43,7 +43,7 @@
     "tunnel_domain_assigned": "A temporary public domain has been assigned to you",
     "tunnel_opt_in_title": "Get an automatically assigned public domain?",
     "tunnel_opt_in_yes": "Yes",
-    "tunnel_opt_in_skip": "Skip",
+    "tunnel_opt_in_skip": "Next",
     "tunnel_progress": "Starting tunnel...",
     "tunnel_error": "Tunnel error",
     "tunnel_get_domain": "Get Public Domain"
diff --git a/public/locales/pt/welcome.json b/public/locales/pt/welcome.json
index 2e128006..638b577c 100644
--- a/public/locales/pt/welcome.json
+++ b/public/locales/pt/welcome.json
@@ -43,7 +43,7 @@
     "tunnel_domain_assigned": "A temporary public domain has been assigned to you",
     "tunnel_opt_in_title": "Get an automatically assigned public domain?",
     "tunnel_opt_in_yes": "Yes",
-    "tunnel_opt_in_skip": "Skip",
+    "tunnel_opt_in_skip": "Next",
     "tunnel_progress": "Starting tunnel...",
     "tunnel_error": "Tunnel error",
     "tunnel_get_domain": "Get Public Domain"
diff --git a/public/locales/ru/welcome.json b/public/locales/ru/welcome.json
index 9df763ba..3d92bbb3 100644
--- a/public/locales/ru/welcome.json
+++ b/public/locales/ru/welcome.json
@@ -43,7 +43,7 @@
     "tunnel_domain_assigned": "A temporary public domain has been assigned to you",
     "tunnel_opt_in_title": "Get an automatically assigned public domain?",
     "tunnel_opt_in_yes": "Yes",
-    "tunnel_opt_in_skip": "Skip",
+    "tunnel_opt_in_skip": "Next",
     "tunnel_progress": "Starting tunnel...",
     "tunnel_error": "Tunnel error",
     "tunnel_get_domain": "Get Public Domain"
diff --git a/public/locales/tr/welcome.json b/public/locales/tr/welcome.json
index a5992b75..4068ad3c 100644
--- a/public/locales/tr/welcome.json
+++ b/public/locales/tr/welcome.json
@@ -43,7 +43,7 @@
     "tunnel_domain_assigned": "A temporary public domain has been assigned to you",
     "tunnel_opt_in_title": "Get an automatically assigned public domain?",
     "tunnel_opt_in_yes": "Yes",
-    "tunnel_opt_in_skip": "Skip",
+    "tunnel_opt_in_skip": "Next",
     "tunnel_progress": "Starting tunnel...",
     "tunnel_error": "Tunnel error",
     "tunnel_get_domain": "Get Public Domain"
diff --git a/public/locales/zh/welcome.json b/public/locales/zh/welcome.json
index caa3426f..a2bf2616 100644
--- a/public/locales/zh/welcome.json
+++ b/public/locales/zh/welcome.json
@@ -43,7 +43,7 @@
     "tunnel_domain_assigned": "已为您分配了一个临时的公网域名",
     "tunnel_opt_in_title": "获取自动分配的公网域名？",
     "tunnel_opt_in_yes": "是",
-    "tunnel_opt_in_skip": "跳过",
+    "tunnel_opt_in_skip": "下一步",
     "tunnel_progress": "正在启动 Tunnel...",
     "tunnel_error": "Tunnel 出错",
     "tunnel_get_domain": "获取公网域名"
diff --git a/src/routes/onboarding/steps/get-public-domain.tsx b/src/routes/onboarding/steps/get-public-domain.tsx
index 9997a1f4..e06a626d 100644
--- a/src/routes/onboarding/steps/get-public-domain.tsx
+++ b/src/routes/onboarding/steps/get-public-domain.tsx
@@ -195,28 +195,25 @@ export default function GetPublicDomain() {
   if (phase === "done" && tunnelUrl) {
     return (
       <div className="flex-center flex-col h-full text-center gap-6 dark:text-gray-100 px-4 md:max-w-md m-auto">
-        <div className="w-10 h-10 border-4 border-green-400 border-t-transparent rounded-full animate-spin" />
-        <span className="font-mono text-sm break-all text-green-600 dark:text-green-400">
+        {isLocalhost && (
+          <div className="w-10 h-10 border-4 border-green-400 border-t-transparent rounded-full animate-spin" />
+        )}
+        <a
+          href={tunnelUrl}
+          target="_blank"
+          rel="noopener noreferrer"
+          className="font-mono text-sm break-all text-green-600 dark:text-green-400 underline"
+        >
           {tunnelUrl}
-        </span>
+        </a>
         {isLocalhost ? (
           <span className="text-lg font-semibold">
             {t("tunnel_redirect_countdown", { seconds: countdown })}
           </span>
         ) : (
-          <div className="flex flex-col items-center gap-3">
-            <a
-              href={tunnelUrl}
-              target="_blank"
-              rel="noopener noreferrer"
-              className="text-blue-500 underline text-sm"
-            >
-              {tunnelUrl}
-            </a>
-            <StyledButton className="w-32 h-11" onClick={nextStep}>
-              {t("tunnel_opt_in_skip")}
-            </StyledButton>
-          </div>
+          <StyledButton className="w-32 h-11" onClick={nextStep}>
+            {t("tunnel_opt_in_skip")}
+          </StyledButton>
         )}
       </div>
     );
diff --git a/src/routes/onboarding/steps/welcome-page.tsx b/src/routes/onboarding/steps/welcome-page.tsx
index 23a85157..8a90b994 100644
--- a/src/routes/onboarding/steps/welcome-page.tsx
+++ b/src/routes/onboarding/steps/welcome-page.tsx
@@ -165,11 +165,18 @@ export default function WelcomePage() {
   if (phase === "dns_wait" || phase === "redirecting") {
     return (
       <div className="flex-center flex-col h-full text-center gap-6 dark:text-gray-100 px-4 md:max-w-md m-auto">
-        <div className="w-10 h-10 border-4 border-green-400 border-t-transparent rounded-full animate-spin" />
+        {isLocalhost && (
+          <div className="w-10 h-10 border-4 border-green-400 border-t-transparent rounded-full animate-spin" />
+        )}
         {tunnelUrl && (
-          <span className="font-mono text-sm break-all text-green-600 dark:text-green-400">
+          <a
+            href={tunnelUrl}
+            target="_blank"
+            rel="noopener noreferrer"
+            className="font-mono text-sm break-all text-green-600 dark:text-green-400 underline"
+          >
             {tunnelUrl}
-          </span>
+          </a>
         )}
         <p className="text-sm text-gray-500 dark:text-gray-400">
           {t("tunnel_dns_warning")}
@@ -179,21 +186,9 @@ export default function WelcomePage() {
             {t("tunnel_redirect_countdown", { seconds: countdown })}
           </span>
         ) : (
-          <div className="flex flex-col items-center gap-3">
-            {tunnelUrl && (
-              <a
-                href={tunnelUrl}
-                target="_blank"
-                rel="noopener noreferrer"
-                className="text-blue-500 underline text-sm"
-              >
-                {tunnelUrl}
-              </a>
-            )}
-            <StyledButton className="w-32 h-11" onClick={nextStep}>
-              {t("tunnel_opt_in_skip")}
-            </StyledButton>
-          </div>
+          <StyledButton className="w-32 h-11" onClick={nextStep}>
+            {t("tunnel_opt_in_skip")}
+          </StyledButton>
         )}
       </div>
     );