diff --git a/.changeset/fleet-statistics-with-app.md b/.changeset/fleet-statistics-with-app.md
new file mode 100644
index 00000000..ea7863e9
--- /dev/null
+++ b/.changeset/fleet-statistics-with-app.md
@@ -0,0 +1,5 @@
+---
+"ftw": patch
+---
+
+Fleet statistics now live with the FTW app settings. Fleet sharing stays on by default for existing boxes and remains a separate switch, so it can stay on when the app relay is off. The panel still shows the exact daily payload and its privacy limits.
diff --git a/config.example.yaml b/config.example.yaml
index 9cee9ebd..df7d7a70 100644
--- a/config.example.yaml
+++ b/config.example.yaml
@@ -185,7 +185,7 @@ app_link:
 # limits: those six fields still describe a household, so a rare mix may be
 # the only one of its kind, and the relay sees the address during the request.
 # It saves only daily totals, so the result counts reports, not unique boxes.
-# Settings → Fleet ping shows the exact message this box would send. On by
+# Settings → FTW app → Fleet statistics shows the exact message this box would send. On by
 # default; `enabled: false` turns it off without a restart.
 fleet_ping:
   enabled: true
diff --git a/docs/architecture.md b/docs/architecture.md
index fba7b33a..70dfdcf0 100644
--- a/docs/architecture.md
+++ b/docs/architecture.md
@@ -444,7 +444,7 @@ also sees the source IP while the request is open, though neither the relay nor
 Caddy writes it. And with no id there is no way to dedupe, so the totals count
 reports, not unique boxes.
 
-A failed send is forgotten, never retried. Settings → Fleet ping renders the
+A failed send is forgotten, never retried. Settings → FTW app → Fleet statistics renders the
 exact payload from the same call the sender uses, so the claim is checkable
 rather than promised. It is on by default; saving `enabled: false` opts out
 without a restart. See [`go/internal/fleetping`](../go/internal/fleetping).
diff --git a/web/app-link-tab.test.mjs b/web/app-link-tab.test.mjs
index f5550397..54316a61 100644
--- a/web/app-link-tab.test.mjs
+++ b/web/app-link-tab.test.mjs
@@ -12,8 +12,10 @@ import vm from "node:vm";
 // drive the real render() and read the markup it produces.
 
 const source = readFileSync(new URL("./settings/tabs/app.js", import.meta.url), "utf8");
+const fleetSource = readFileSync(new URL("./settings/tabs/fleet.js", import.meta.url), "utf8");
+const index = readFileSync(new URL("./index.html", import.meta.url), "utf8");
 
-function loadTab() {
+function loadTab(withFleet = false) {
   const win = { FTWSettings: { tabs: {} } };
   const sandbox = {
     window: win,
@@ -27,6 +29,7 @@ function loadTab() {
   sandbox.globalThis = sandbox;
   vm.createContext(sandbox);
   vm.runInContext(source, sandbox);
+  if (withFleet) vm.runInContext(fleetSource, sandbox);
   const tab = win.FTWSettings.tabs.app;
   assert.ok(tab && typeof tab.render === "function", "app.js registered no tab");
   return tab;
@@ -80,4 +83,40 @@ describe("the app tab", () => {
     // Starting enabled means the first press of a fresh page fails.
     assert.match(render({}), /id="app-link-pair"[^>]*disabled/);
   });
+
+  it("keeps fleet statistics with the app, but independent of its switch", () => {
+    const appWithFleet = loadTab(true);
+    const config = { app_link: { enabled: false } };
+    const html = appWithFleet.render({ config });
+
+    assert.match(html, /<legend>Fleet statistics<\/legend>/);
+    assert.match(html, /data-checkbox-path="fleet_ping\.enabled"/);
+    assert.equal(config.fleet_ping.enabled, true, "fleet sharing should still default on");
+    assert.doesNotMatch(html, /id="app-link-enabled"[^>]*checked/);
+    assert.match(html, /id="fleet-ping-enabled"[^>]*checked/);
+  });
+
+  it("refreshes the fleet payload after saving from the app page", () => {
+    const win = { FTWSettings: { tabs: {} } };
+    const asked = [];
+    const sandbox = {
+      window: win,
+      setTimeout: () => 0,
+      document: { getElementById: () => ({ textContent: "", appendChild() {} }) },
+      fetch: (path) => { asked.push(path); return new Promise(() => {}); },
+      console,
+    };
+    sandbox.globalThis = sandbox;
+    vm.createContext(sandbox);
+    vm.runInContext(source, sandbox);
+    vm.runInContext(fleetSource, sandbox);
+
+    win.FTWSettings.tabs.app.afterSave();
+    assert.deepEqual(asked, ["/api/fleet-ping"]);
+  });
+
+  it("does not leave a standalone Fleet ping destination behind", () => {
+    assert.doesNotMatch(index, /data-tab="fleet"/);
+    assert.match(index, /settings\/tabs\/fleet\.js/);
+  });
 });
diff --git a/web/fleet-ping-tab.test.mjs b/web/fleet-ping-tab.test.mjs
index 7b01bca6..1d374978 100644
--- a/web/fleet-ping-tab.test.mjs
+++ b/web/fleet-ping-tab.test.mjs
@@ -3,7 +3,7 @@ import { readFileSync } from "node:fs";
 import { describe, it } from "node:test";
 import vm from "node:vm";
 
-// The fleet ping tab makes one claim: what you see is what the box sends.
+// The fleet statistics panel makes one claim: what you see is what the box sends.
 // These tests hold it to that. The rows must come from the payload rather
 // than from a list in the tab, and the checkbox must reflect the box's own
 // default rather than a friendlier one.
@@ -31,9 +31,10 @@ function loadTab() {
   sandbox.globalThis = sandbox;
   vm.createContext(sandbox);
   vm.runInContext(source, sandbox);
-  const tab = win.FTWSettings.tabs.fleet;
-  assert.ok(tab && typeof tab.render === "function", "fleet.js registered no tab");
-  return tab;
+  const panel = win.FTWSettings.fleetPing;
+  assert.ok(panel && typeof panel.render === "function", "fleet.js registered no panel");
+  assert.equal(win.FTWSettings.tabs.fleet, undefined, "fleet.js registered a standalone tab");
+  return panel;
 }
 
 const tab = loadTab();
@@ -53,7 +54,7 @@ const payload = {
   install_age: "6-12m",
 };
 
-describe("the fleet ping tab", () => {
+describe("the fleet statistics panel", () => {
   it("offers a checkbox bound to fleet_ping.enabled", () => {
     const html = render({});
     assert.match(html, /data-checkbox-path="fleet_ping\.enabled"/);
@@ -220,7 +221,7 @@ describe("keeping the line true after a save", () => {
     sandbox.globalThis = sandbox;
     vm.createContext(sandbox);
     vm.runInContext(source, sandbox);
-    sandbox.window.FTWSettings.tabs.fleet.afterSave();
+    sandbox.window.FTWSettings.fleetPing.afterSave();
     assert.deepEqual(asked, ["/api/fleet-ping"]);
   });
 });
diff --git a/web/index.html b/web/index.html
index 504274bf..f693a6bc 100644
--- a/web/index.html
+++ b/web/index.html
@@ -99,7 +99,6 @@ <h2>Settings</h2>
         <button data-tab="batteries">Batteries</button>
         <button data-tab="planner">Planner</button>
         <button data-tab="app">FTW app</button>
-        <button data-tab="fleet">Fleet ping</button>
         <button data-tab="ha">Home Assistant</button>
         <button data-tab="caldav">Calendar</button>
         <button data-tab="notifications">Notifications</button>
@@ -943,8 +942,8 @@ <h3>Price bars (top of the chart)</h3>
   <script src="/settings/tabs/planner.js?v=cvxpy1"></script>
   <script src="/settings/tabs/ha.js?v=tabsplit2"></script>
   <script src="/settings/tabs/caldav.js?v=caldav498g"></script>
-  <script src="/settings/tabs/app.js?v=applink1"></script>
-  <script src="/settings/tabs/fleet.js?v=fleetping1"></script>
+  <script src="/settings/tabs/app.js?v=applink2"></script>
+  <script src="/settings/tabs/fleet.js?v=fleetping2"></script>
   <script src="/settings/tabs/notifications.js?v=tabsplit2"></script>
   <script src="/settings/tabs/ev.js?v=tabsplit2"></script>
   <script src="/settings/tabs/system.js?v=tabsplit2"></script>
diff --git a/web/settings/tabs/app.js b/web/settings/tabs/app.js
index 4f316093..d63cc485 100644
--- a/web/settings/tabs/app.js
+++ b/web/settings/tabs/app.js
@@ -374,7 +374,19 @@
       });
   }
 
+  function fleetPanel(ctx) {
+    var panel = S.fleetPing;
+    return panel && panel.render ? panel.render(ctx) : "";
+  }
+
   S.tabs.app = {
+    afterSave: function () {
+      // These two switches share a page, not a state. The app link has its
+      // own restart boundary; fleet sharing takes effect as soon as it saves.
+      var panel = S.fleetPing;
+      if (panel && panel.afterSave) panel.afterSave();
+    },
+
     render: function (ctx) {
       if (!ctx.config.app_link) ctx.config.app_link = { enabled: true };
       var enabled = !!ctx.config.app_link.enabled;
@@ -434,7 +446,8 @@
         "one code is live at a time, so asking for any of them stops the last " +
         "one.</p>" +
         '<div id="app-link-slot"></div>' +
-        "</fieldset>"
+        "</fieldset>" +
+        fleetPanel(ctx)
       );
     },
   };
diff --git a/web/settings/tabs/fleet.js b/web/settings/tabs/fleet.js
index e8891b20..ac486180 100644
--- a/web/settings/tabs/fleet.js
+++ b/web/settings/tabs/fleet.js
@@ -159,7 +159,11 @@
       });
   }
 
-  S.tabs.fleet = {
+  // The FTW app and fleet statistics share a settings page, but not a
+  // setting: a box can share its anonymous daily report without using the
+  // app relay. Keep this as a reusable panel instead of a tab so the payload
+  // and privacy wording stay in one place.
+  S.fleetPing = {
     _pure: { payloadRows: payloadRows, describe: describe, whereLine: whereLine },
 
     // The line under the payload is the box's answer, not the checkbox's, so