diff --git a/CHANGELOG.md b/CHANGELOG.md
index 396b6f8..15791b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,8 @@ the configuration; each release says how to upgrade.
 - Portal: form controls follow the same pill language — text inputs, selects and checkboxes on the
   filter screens (Dashboard, Downloaded, Analytics, Alerts), the chart range and alert severity as
   pill switches, and the Feed and Audit filters as chips.
+- Portal: forms (users, login, profile, settings, Node configuration, the Node dialogs) use the
+  same fields, and every action button is rounded to match.
 
 ### Fixed
 - Portal: the language selector no longer spills out of the sidebar; it sits on its own row
diff --git a/portal/src/components/AddNodeModal.tsx b/portal/src/components/AddNodeModal.tsx
index cb036c9..282aad9 100644
--- a/portal/src/components/AddNodeModal.tsx
+++ b/portal/src/components/AddNodeModal.tsx
@@ -69,13 +69,13 @@ export function AddNodeModal({ onClose, onLogout }: { onClose: () => void; onLog
               placeholder={t("health.addNodeModal.namePlaceholder")}
               autoFocus
               autoComplete="off"
-              className="mt-1 w-full rounded-lg border border-slate-700 bg-slate-950 px-3 py-2 text-sm text-white outline-none focus:border-emerald-500"
+              className="sg-field mt-1 w-full"
             />
             {err && <p className="mt-3 rounded-lg bg-red-500/10 px-3 py-2 text-xs text-red-400">{err}</p>}
             <button
               type="submit"
               disabled={busy}
-              className="mt-4 w-full rounded-lg bg-emerald-600 px-3 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-50"
+              className="mt-4 w-full rounded-full bg-emerald-600 px-3 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-50"
             >
               {busy ? t("health.addNodeModal.generating") : t("health.addNodeModal.generateBtn")}
             </button>
@@ -104,7 +104,7 @@ export function AddNodeModal({ onClose, onLogout }: { onClose: () => void; onLog
                 </code>
                 <button
                   onClick={() => copy(cmd, "cmd")}
-                  className="shrink-0 rounded-lg border border-slate-700 px-2.5 py-2 text-xs text-white transition hover:bg-slate-800"
+                  className="shrink-0 rounded-full border border-slate-700 px-2.5 py-2 text-xs text-white transition hover:bg-slate-800"
                 >
                   {copied === "cmd" ? t("health.addNodeModal.copiedCheck") : t("health.addNodeModal.copy")}
                 </button>
@@ -120,7 +120,7 @@ export function AddNodeModal({ onClose, onLogout }: { onClose: () => void; onLog
                   </code>
                   <button
                     onClick={() => copy(tok.token, "token")}
-                    className="shrink-0 rounded-lg border border-slate-700 px-2.5 py-2 text-xs text-white transition hover:bg-slate-800"
+                    className="shrink-0 rounded-full border border-slate-700 px-2.5 py-2 text-xs text-white transition hover:bg-slate-800"
                   >
                     {copied === "token" ? "✓" : t("health.addNodeModal.copy")}
                   </button>
@@ -142,7 +142,7 @@ export function AddNodeModal({ onClose, onLogout }: { onClose: () => void; onLog
 
         <button
           onClick={onClose}
-          className="mt-4 w-full rounded-lg px-3 py-2 text-xs text-slate-400 transition hover:bg-slate-800"
+          className="mt-4 w-full rounded-full px-3 py-2 text-xs text-slate-400 transition hover:bg-slate-800"
         >
           {t("common.close")}
         </button>
diff --git a/portal/src/components/Layout.tsx b/portal/src/components/Layout.tsx
index 16b9870..75bb73c 100644
--- a/portal/src/components/Layout.tsx
+++ b/portal/src/components/Layout.tsx
@@ -190,7 +190,7 @@ export function Layout({
           <button
             onClick={() => setOpen(true)}
             aria-label={t("nav.openMenu")}
-            className="rounded-lg border border-slate-700 px-3 py-1.5 text-slate-300"
+            className="rounded-full border border-slate-700 px-3 py-1.5 text-slate-300"
           >
             ☰
           </button>
diff --git a/portal/src/components/MigratePicker.tsx b/portal/src/components/MigratePicker.tsx
index 4db2f1d..10b24bb 100644
--- a/portal/src/components/MigratePicker.tsx
+++ b/portal/src/components/MigratePicker.tsx
@@ -112,7 +112,7 @@ export function MigratePicker({
         </div>
         <button
           onClick={onClose}
-          className="mt-4 w-full rounded-lg px-3 py-2 text-xs text-slate-400 transition hover:bg-slate-800"
+          className="mt-4 w-full rounded-full px-3 py-2 text-xs text-slate-400 transition hover:bg-slate-800"
         >
           {t("common.cancel")}
         </button>
diff --git a/portal/src/components/NodeCard.tsx b/portal/src/components/NodeCard.tsx
index 01fd795..0863473 100644
--- a/portal/src/components/NodeCard.tsx
+++ b/portal/src/components/NodeCard.tsx
@@ -143,7 +143,7 @@ export function NodeCard({
                 onClick={onRename}
                 disabled={busy}
                 title={t("health.nodeCard.actions.renameTitle")}
-                className="rounded-lg border border-slate-700 px-2.5 py-1 text-xs text-slate-300 transition hover:bg-slate-800 disabled:opacity-40"
+                className="rounded-full border border-slate-700 px-2.5 py-1 text-xs text-slate-300 transition hover:bg-slate-800 disabled:opacity-40"
               >
                 {t("health.nodeCard.actions.rename")}
               </button>
@@ -151,7 +151,7 @@ export function NodeCard({
                 onClick={onDrain}
                 disabled={busy || torrents.length === 0}
                 title={t("health.nodeCard.actions.drainTitle")}
-                className="rounded-lg border border-slate-700 px-2.5 py-1 text-xs text-blue-400 transition hover:bg-slate-800 disabled:opacity-40"
+                className="rounded-full border border-slate-700 px-2.5 py-1 text-xs text-blue-400 transition hover:bg-slate-800 disabled:opacity-40"
               >
                 {t("health.nodeCard.actions.drain")}
               </button>
@@ -159,7 +159,7 @@ export function NodeCard({
                 onClick={onRestartEngine}
                 disabled={busy || running.size > 0}
                 title={t("health.nodeCard.actions.restartEngineTitle")}
-                className="inline-flex items-center gap-1.5 rounded-lg border border-slate-700 px-2.5 py-1 text-xs text-amber-400 transition hover:bg-slate-800 disabled:opacity-40"
+                className="inline-flex items-center gap-1.5 rounded-full border border-slate-700 px-2.5 py-1 text-xs text-amber-400 transition hover:bg-slate-800 disabled:opacity-40"
               >
                 {running.has(n.id) ? <Spinner /> : "⟳"} {t("health.nodeCard.actions.restartEngine")}
               </button>
@@ -167,7 +167,7 @@ export function NodeCard({
                 onClick={onDelete}
                 disabled={busy}
                 title={t("health.nodeCard.actions.removeTitle")}
-                className="rounded-lg border border-slate-700 px-2.5 py-1 text-xs text-red-400 transition hover:bg-slate-800 disabled:opacity-40"
+                className="rounded-full border border-slate-700 px-2.5 py-1 text-xs text-red-400 transition hover:bg-slate-800 disabled:opacity-40"
               >
                 {t("health.nodeCard.actions.remove")}
               </button>
diff --git a/portal/src/components/NodeConfigPanel.tsx b/portal/src/components/NodeConfigPanel.tsx
index 7846549..0d029bf 100644
--- a/portal/src/components/NodeConfigPanel.tsx
+++ b/portal/src/components/NodeConfigPanel.tsx
@@ -19,8 +19,8 @@ const REFRESH_MS = 10_000;
 // /nodes/{id}/settings/{key}. Dedicated function so the test can check which permission is requested.
 export const canWriteNodeConfig = (can: (perm: string) => boolean): boolean => can("nodes:write");
 
-const inputCls =
-  "rounded-lg border border-slate-700 bg-slate-950/60 px-2.5 py-1 text-sm text-slate-100 outline-none transition focus:border-emerald-500 disabled:opacity-50";
+// Form-control base classes (#22): sg-field, plus sg-select on the lists.
+const inputCls = "sg-field";
 
 const TONE: Record<"ok" | "warn" | "muted", string> = {
   ok: "bg-emerald-500/15 text-emerald-300 ring-emerald-500/30",
@@ -78,7 +78,7 @@ function ValueInput({
   const t = useT();
   if (item.type === "bool") {
     return (
-      <select value={value} onChange={(e) => onChange(e.target.value)} disabled={disabled} className={`w-32 ${inputCls}`}>
+      <select value={value} onChange={(e) => onChange(e.target.value)} disabled={disabled} className={`w-32 ${inputCls} sg-select`}>
         <option value="true">{t("nodes.nodeConfigPanel.boolOn")}</option>
         <option value="false">{t("nodes.nodeConfigPanel.boolOff")}</option>
       </select>
@@ -86,7 +86,7 @@ function ValueInput({
   }
   if (item.options && item.options.length > 0) {
     return (
-      <select value={value} onChange={(e) => onChange(e.target.value)} disabled={disabled} className={`w-32 ${inputCls}`}>
+      <select value={value} onChange={(e) => onChange(e.target.value)} disabled={disabled} className={`w-32 ${inputCls} sg-select`}>
         {item.options.map((o) => (
           <option key={o} value={o}>
             {o}
@@ -186,14 +186,14 @@ function ConfigRow({
               <button
                 onClick={save}
                 disabled={busy}
-                className="rounded-lg bg-emerald-600 px-2.5 py-1 text-xs font-medium text-white transition hover:bg-emerald-500 disabled:opacity-40"
+                className="rounded-full bg-emerald-600 px-2.5 py-1 text-xs font-medium text-white transition hover:bg-emerald-500 disabled:opacity-40"
               >
                 {t("common.save")}
               </button>
               <button
                 onClick={() => setEditing(false)}
                 disabled={busy}
-                className="rounded-lg border border-slate-700 px-2.5 py-1 text-xs text-slate-300 transition hover:bg-slate-800 disabled:opacity-40"
+                className="rounded-full border border-slate-700 px-2.5 py-1 text-xs text-slate-300 transition hover:bg-slate-800 disabled:opacity-40"
               >
                 {t("common.cancel")}
               </button>
@@ -208,7 +208,7 @@ function ConfigRow({
                     ? t("nodes.nodeConfigPanel.editTitleNode")
                     : t("nodes.nodeConfigPanel.editTitleCluster")
                 }
-                className="rounded-lg border border-slate-700 px-2.5 py-1 text-xs text-slate-300 transition hover:bg-slate-800 disabled:opacity-40"
+                className="rounded-full border border-slate-700 px-2.5 py-1 text-xs text-slate-300 transition hover:bg-slate-800 disabled:opacity-40"
               >
                 {item.source === "node" ? t("nodes.nodeConfigPanel.actionEdit") : t("nodes.nodeConfigPanel.actionOverride")}
               </button>
@@ -217,7 +217,7 @@ function ConfigRow({
                   onClick={reset}
                   disabled={busy}
                   title={t("nodes.nodeConfigPanel.resetTitle")}
-                  className="rounded-lg border border-slate-700 px-2.5 py-1 text-xs text-amber-400 transition hover:bg-slate-800 disabled:opacity-40"
+                  className="rounded-full border border-slate-700 px-2.5 py-1 text-xs text-amber-400 transition hover:bg-slate-800 disabled:opacity-40"
                 >
                   {t("nodes.nodeConfigPanel.actionReset")}
                 </button>
diff --git a/portal/src/components/RenameNodeModal.tsx b/portal/src/components/RenameNodeModal.tsx
index 0260c49..17b0aeb 100644
--- a/portal/src/components/RenameNodeModal.tsx
+++ b/portal/src/components/RenameNodeModal.tsx
@@ -71,21 +71,21 @@ export function RenameNodeModal({
           placeholder={node.hostname}
           autoFocus
           autoComplete="off"
-          className="mt-1 w-full rounded-lg border border-slate-700 bg-slate-950 px-3 py-2 text-sm text-white outline-none focus:border-emerald-500"
+          className="sg-field mt-1 w-full"
         />
         {err && <p className="mt-3 rounded-lg bg-red-500/10 px-3 py-2 text-xs text-red-400">{err}</p>}
         <div className="mt-4 flex gap-2">
           <button
             type="button"
             onClick={onClose}
-            className="flex-1 rounded-lg px-3 py-2 text-xs text-slate-400 transition hover:bg-slate-800"
+            className="flex-1 rounded-full px-3 py-2 text-xs text-slate-400 transition hover:bg-slate-800"
           >
             {t("common.cancel")}
           </button>
           <button
             type="submit"
             disabled={busy}
-            className="flex-1 rounded-lg bg-emerald-600 px-3 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-50"
+            className="flex-1 rounded-full bg-emerald-600 px-3 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-50"
           >
             {busy ? t("common.saving") : t("common.save")}
           </button>
diff --git a/portal/src/components/TrackerProfileEditor.tsx b/portal/src/components/TrackerProfileEditor.tsx
index 42e0e11..fe4d418 100644
--- a/portal/src/components/TrackerProfileEditor.tsx
+++ b/portal/src/components/TrackerProfileEditor.tsx
@@ -326,7 +326,7 @@ export function TrackerProfileEditor({
                 <button
                   onClick={() => removeRow(axis, r.key)}
                   title={t("trackers.trackerProfileEditor.rows.removeTitle")}
-                  className="shrink-0 rounded px-1.5 py-1 text-xs text-slate-500 hover:bg-slate-800 hover:text-red-400"
+                  className="shrink-0 rounded-full px-1.5 py-1 text-xs text-slate-500 hover:bg-slate-800 hover:text-red-400"
                 >
                   ✕
                 </button>
@@ -343,7 +343,7 @@ export function TrackerProfileEditor({
         <button
           onClick={save}
           disabled={saving || !dirty}
-          className="rounded-lg bg-emerald-600 px-4 py-1.5 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-40"
+          className="rounded-full bg-emerald-600 px-4 py-1.5 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-40"
         >
           {saving ? t("common.saving") : t("trackers.trackerProfileEditor.actions.save")}
         </button>
@@ -400,7 +400,7 @@ export function TrackerProfileEditor({
               onClick={discover}
               disabled={discovering || dirty}
               title={dirty ? t("trackers.trackerProfileEditor.discovery.dirtyTitle") : undefined}
-              className="rounded-lg bg-sky-700 px-4 py-1.5 text-sm font-medium text-white transition hover:bg-sky-600 disabled:opacity-40"
+              className="rounded-full bg-sky-700 px-4 py-1.5 text-sm font-medium text-white transition hover:bg-sky-600 disabled:opacity-40"
             >
               {discovering ? t("trackers.trackerProfileEditor.discovery.scanning") : t("trackers.trackerProfileEditor.discovery.button")}
             </button>
@@ -548,7 +548,7 @@ function Proposal({
         <button
           onClick={onApply}
           disabled={applying || count === 0}
-          className="rounded-lg bg-emerald-600 px-4 py-1.5 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-40"
+          className="rounded-full bg-emerald-600 px-4 py-1.5 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-40"
         >
           {applying ? t("trackers.trackerProfileEditor.proposal.applying") : t("trackers.trackerProfileEditor.proposal.applyButton", { count })}
         </button>
diff --git a/portal/src/components/TrackerProfileExchange.tsx b/portal/src/components/TrackerProfileExchange.tsx
index 64c73e7..667fe36 100644
--- a/portal/src/components/TrackerProfileExchange.tsx
+++ b/portal/src/components/TrackerProfileExchange.tsx
@@ -342,7 +342,7 @@ export function ImportPreviewView({
         <button
           onClick={onApply}
           disabled={applying || !changes}
-          className="rounded-lg bg-emerald-600 px-4 py-1.5 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-40"
+          className="rounded-full bg-emerald-600 px-4 py-1.5 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-40"
         >
           {applying ? t("trackers.trackerProfileExchange.applying") : t("trackers.trackerProfileExchange.apply")}
         </button>
diff --git a/portal/src/components/TrackersPanel.tsx b/portal/src/components/TrackersPanel.tsx
index e5ace55..a4d5d5f 100644
--- a/portal/src/components/TrackersPanel.tsx
+++ b/portal/src/components/TrackersPanel.tsx
@@ -168,21 +168,21 @@ export function TrackersPanel({ can, onLogout }: { can: (perm: string) => boolea
                     <button
                       onClick={() => setProfileOpen(profileOpen === tracker.id ? null : tracker.id)}
                       title={t("trackers.trackersPanel.tooltips.profileButton")}
-                      className="rounded px-2 py-1 text-xs text-slate-400 transition hover:bg-slate-800 hover:text-sky-300"
+                      className="rounded-full px-2 py-1 text-xs text-slate-400 transition hover:bg-slate-800 hover:text-sky-300"
                     >
                       {profileOpen === tracker.id ? t("trackers.trackersPanel.actions.profileOpen") : t("trackers.trackersPanel.actions.profileClosed")}
                     </button>
                   )}
                   <button
                     onClick={() => startEdit(tracker)}
-                    className="rounded px-2 py-1 text-xs text-slate-400 transition hover:bg-slate-800 hover:text-sky-300"
+                    className="rounded-full px-2 py-1 text-xs text-slate-400 transition hover:bg-slate-800 hover:text-sky-300"
                   >
                     {t("trackers.trackersPanel.actions.edit")}
                   </button>
                   {!tracker.is_default && (
                     <button
                       onClick={() => makeDefault(tracker.id)}
-                      className="rounded px-2 py-1 text-xs text-slate-400 transition hover:bg-slate-800 hover:text-emerald-400"
+                      className="rounded-full px-2 py-1 text-xs text-slate-400 transition hover:bg-slate-800 hover:text-emerald-400"
                     >
                       {t("trackers.trackersPanel.actions.makeDefault")}
                     </button>
@@ -190,7 +190,7 @@ export function TrackersPanel({ can, onLogout }: { can: (perm: string) => boolea
                   <button
                     onClick={() => remove(tracker.id, tracker.name)}
                     title={t("trackers.trackersPanel.actions.removeTitle")}
-                    className="rounded px-2 py-1 text-xs text-slate-400 transition hover:bg-slate-800 hover:text-red-400"
+                    className="rounded-full px-2 py-1 text-xs text-slate-400 transition hover:bg-slate-800 hover:text-red-400"
                   >
                     🗑
                   </button>
@@ -290,7 +290,7 @@ export function TrackersPanel({ can, onLogout }: { can: (perm: string) => boolea
         <button
           onClick={submit}
           disabled={busy}
-          className="rounded-lg bg-emerald-600 px-4 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-50"
+          className="rounded-full bg-emerald-600 px-4 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-50"
         >
           {busy ? t("common.saving") : editing ? t("trackers.trackersPanel.actions.saveChanges") : t("trackers.trackersPanel.actions.addTracker")}
         </button>
diff --git a/portal/src/components/torrents.tsx b/portal/src/components/torrents.tsx
index 8ca8f69..b2828fd 100644
--- a/portal/src/components/torrents.tsx
+++ b/portal/src/components/torrents.tsx
@@ -137,7 +137,7 @@ export function ActionBtn({
       onClick={onClick}
       disabled={disabled}
       title={title}
-      className={`rounded px-2 py-1 text-xs hover:bg-slate-800 disabled:opacity-40 ${TONES[tone] ?? TONES.slate}`}
+      className={`rounded-full px-2 py-1 text-xs hover:bg-slate-800 disabled:opacity-40 ${TONES[tone] ?? TONES.slate}`}
     >
       {children}
     </button>
diff --git a/portal/src/pages/AddTorrent.tsx b/portal/src/pages/AddTorrent.tsx
index a1fe097..bdaa7b1 100644
--- a/portal/src/pages/AddTorrent.tsx
+++ b/portal/src/pages/AddTorrent.tsx
@@ -255,7 +255,7 @@ function AddExisting({ onLogout }: { onLogout: () => void }) {
                   onClick={() => removeFile(i)}
                   disabled={running}
                   title={t("torrents.addTorrent.removeFile")}
-                  className="shrink-0 rounded px-2 py-0.5 text-xs text-slate-400 hover:bg-slate-800 hover:text-red-400 disabled:opacity-40"
+                  className="shrink-0 rounded-full px-2 py-0.5 text-xs text-slate-400 hover:bg-slate-800 hover:text-red-400 disabled:opacity-40"
                 >
                   ✕
                 </button>
@@ -315,7 +315,7 @@ function AddExisting({ onLogout }: { onLogout: () => void }) {
         <button
           onClick={submit}
           disabled={running || totalPending === 0}
-          className="rounded-lg bg-emerald-600 px-4 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-50"
+          className="rounded-full bg-emerald-600 px-4 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-50"
         >
           {running
             ? t("torrents.addTorrent.btnAdding")
@@ -527,7 +527,7 @@ function PublishContent({ onLogout }: { onLogout: () => void }) {
                       onClick={() => resumePending(p)}
                       disabled={!p.has_file || running || pendingBusy === p.id}
                       title={p.has_file ? t("torrents.addTorrent.resumeTitleReady") : t("torrents.addTorrent.resumeTitleWaiting")}
-                      className="rounded-lg bg-amber-600 px-3 py-1 text-xs font-medium text-white transition hover:bg-amber-500 disabled:opacity-40"
+                      className="rounded-full bg-amber-600 px-3 py-1 text-xs font-medium text-white transition hover:bg-amber-500 disabled:opacity-40"
                     >
                       {t("torrents.addTorrent.btnReviewPublish")}
                     </button>
@@ -535,7 +535,7 @@ function PublishContent({ onLogout }: { onLogout: () => void }) {
                       onClick={() => abandonPending(p)}
                       disabled={running || pendingBusy === p.id}
                       title={t("torrents.addTorrent.abandonTitle")}
-                      className="rounded-lg border border-red-700/50 px-3 py-1 text-xs font-medium text-red-400 transition hover:bg-red-500/10 disabled:opacity-40"
+                      className="rounded-full border border-red-700/50 px-3 py-1 text-xs font-medium text-red-400 transition hover:bg-red-500/10 disabled:opacity-40"
                     >
                       {pendingBusy === p.id ? t("torrents.addTorrent.btnRemoving") : t("torrents.addTorrent.btnAbandon")}
                     </button>
@@ -588,7 +588,7 @@ function PublishContent({ onLogout }: { onLogout: () => void }) {
                   onClick={() => removeFile(i)}
                   disabled={running}
                   title={t("torrents.addTorrent.removeFile")}
-                  className="shrink-0 rounded px-2 py-0.5 text-xs text-slate-400 hover:bg-slate-800 hover:text-red-400 disabled:opacity-40"
+                  className="shrink-0 rounded-full px-2 py-0.5 text-xs text-slate-400 hover:bg-slate-800 hover:text-red-400 disabled:opacity-40"
                 >
                   ✕
                 </button>
@@ -679,7 +679,7 @@ function PublishContent({ onLogout }: { onLogout: () => void }) {
         <button
           onClick={submit}
           disabled={running || files.length === 0}
-          className="rounded-lg bg-emerald-600 px-4 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-50"
+          className="rounded-full bg-emerald-600 px-4 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-50"
         >
           {phase === "uploading"
             ? t("torrents.addTorrent.progressUploading", { pct })
diff --git a/portal/src/pages/AlertsEvents.tsx b/portal/src/pages/AlertsEvents.tsx
index bc1879e..55cdff0 100644
--- a/portal/src/pages/AlertsEvents.tsx
+++ b/portal/src/pages/AlertsEvents.tsx
@@ -104,7 +104,7 @@ export function CancelMigrationButton({
       onClick={onCancel}
       disabled={busy}
       title={t("alerts.alertsEvents.cancelMigration.title")}
-      className="rounded-md border border-red-500/40 px-2 py-0.5 text-[11px] text-red-300 transition hover:bg-red-500/10 disabled:cursor-not-allowed disabled:opacity-50"
+      className="rounded-full border border-red-500/40 px-2 py-0.5 text-[11px] text-red-300 transition hover:bg-red-500/10 disabled:cursor-not-allowed disabled:opacity-50"
     >
       {busy ? t("alerts.alertsEvents.cancelMigration.cancelling") : t("alerts.alertsEvents.cancelMigration.label")}
     </button>
diff --git a/portal/src/pages/Analytics.tsx b/portal/src/pages/Analytics.tsx
index 2b9fac3..7f03a70 100644
--- a/portal/src/pages/Analytics.tsx
+++ b/portal/src/pages/Analytics.tsx
@@ -205,7 +205,7 @@ export function Analytics({ onLogout }: { onLogout: () => void }) {
               type="button"
               onClick={() => setFilter(isActive ? "todos" : c.id)}
               title={t("analytics.analytics.filterTitle", { label: t(c.labelKey) })}
-              className={`rounded-xl border px-3 py-2 text-left transition ${
+              className={`rounded-lg border px-3 py-2 text-left transition ${
                 isActive
                   ? "border-emerald-500 bg-emerald-500/10"
                   : "border-slate-800 bg-slate-950/40 hover:border-slate-700"
diff --git a/portal/src/pages/Explore.tsx b/portal/src/pages/Explore.tsx
index c1f2add..0347b5c 100644
--- a/portal/src/pages/Explore.tsx
+++ b/portal/src/pages/Explore.tsx
@@ -285,7 +285,7 @@ export function Explore({ can, onLogout }: { can: (perm: string) => boolean; onL
                   onClick={doSearch}
                   disabled={loading}
                   title={t("explore.explore.search.buttonTitle")}
-                  className="shrink-0 rounded-lg bg-emerald-600 px-4 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-40"
+                  className="shrink-0 rounded-full bg-emerald-600 px-4 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-40"
                 >
                   {t("explore.explore.search.button")}
                 </button>
@@ -380,7 +380,7 @@ export function Explore({ can, onLogout }: { can: (perm: string) => boolean; onL
               <button
                 onClick={() => load(trackerId, cursor, true, activeQ)}
                 disabled={loading}
-                className="rounded-lg border border-slate-700 px-4 py-2 text-sm text-slate-300 transition hover:bg-slate-800 disabled:opacity-40"
+                className="rounded-full border border-slate-700 px-4 py-2 text-sm text-slate-300 transition hover:bg-slate-800 disabled:opacity-40"
               >
                 {loading ? t("common.loading") : t("explore.explore.loadMore")}
               </button>
@@ -520,7 +520,7 @@ function CatalogCard({
                 <button
                   onClick={onSeed}
                   disabled={busy}
-                  className="inline-flex items-center gap-1.5 rounded-lg bg-emerald-600 px-4 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-40"
+                  className="inline-flex items-center gap-1.5 rounded-full bg-emerald-600 px-4 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-40"
                 >
                   {busy ? <Spinner /> : "⬇"} {t("explore.explore.card.seedButton")}
                 </button>
diff --git a/portal/src/pages/HealthStatus.tsx b/portal/src/pages/HealthStatus.tsx
index aabc2bf..83af880 100644
--- a/portal/src/pages/HealthStatus.tsx
+++ b/portal/src/pages/HealthStatus.tsx
@@ -205,7 +205,7 @@ export function HealthStatus({ can, onLogout }: { can: (perm: string) => boolean
         {can("enroll:write") && (
           <button
             onClick={() => setAddOpen(true)}
-            className="rounded-lg border border-emerald-600/40 bg-emerald-600/15 px-3 py-1.5 text-sm font-medium text-emerald-300 transition hover:bg-emerald-600/25"
+            className="rounded-full border border-emerald-600/40 bg-emerald-600/15 px-3 py-1.5 text-sm font-medium text-emerald-300 transition hover:bg-emerald-600/25"
           >
             {t("health.healthStatus.actions.addNode")}
           </button>
diff --git a/portal/src/pages/Login.tsx b/portal/src/pages/Login.tsx
index c9b7ec8..f5ed10c 100644
--- a/portal/src/pages/Login.tsx
+++ b/portal/src/pages/Login.tsx
@@ -40,7 +40,7 @@ export function Login({ onLogin }: { onLogin: () => void }) {
 
         <label className="mb-1 block text-sm text-slate-300">{t("login.username")}</label>
         <input
-          className="mb-4 w-full rounded-lg border border-slate-700 bg-slate-950 px-3 py-2 text-sm text-white outline-none focus:border-emerald-500"
+          className="sg-field mb-4 w-full"
           value={username}
           onChange={(e) => setUsername(e.target.value)}
           autoFocus
@@ -49,7 +49,7 @@ export function Login({ onLogin }: { onLogin: () => void }) {
         <label className="mb-1 block text-sm text-slate-300">{t("login.password")}</label>
         <input
           type="password"
-          className="mb-4 w-full rounded-lg border border-slate-700 bg-slate-950 px-3 py-2 text-sm text-white outline-none focus:border-emerald-500"
+          className="sg-field mb-4 w-full"
           value={password}
           onChange={(e) => setPassword(e.target.value)}
         />
@@ -59,7 +59,7 @@ export function Login({ onLogin }: { onLogin: () => void }) {
         <button
           type="submit"
           disabled={loading || !username || !password}
-          className="w-full rounded-lg bg-emerald-600 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-50"
+          className="w-full rounded-full bg-emerald-600 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-50"
         >
           {loading ? t("login.submitting") : t("login.submit")}
         </button>
diff --git a/portal/src/pages/NodeDetail.tsx b/portal/src/pages/NodeDetail.tsx
index 264e4a3..f5931ec 100644
--- a/portal/src/pages/NodeDetail.tsx
+++ b/portal/src/pages/NodeDetail.tsx
@@ -152,7 +152,7 @@ export function NodeDetail({
             <button
               onClick={() => setRenaming(true)}
               title={t("nodes.nodeDetail.renameTitle")}
-              className="inline-flex items-center gap-1.5 rounded-lg border border-slate-700 px-2.5 py-1 text-xs text-slate-300 transition hover:bg-slate-800"
+              className="inline-flex items-center gap-1.5 rounded-full border border-slate-700 px-2.5 py-1 text-xs text-slate-300 transition hover:bg-slate-800"
             >
               ✎ {t("nodes.nodeDetail.rename")}
             </button>
@@ -162,7 +162,7 @@ export function NodeDetail({
               onClick={onRestartEngine}
               disabled={running.size > 0}
               title={t("nodes.nodeDetail.restartEngineTitle")}
-              className="inline-flex items-center gap-1.5 rounded-lg border border-slate-700 px-2.5 py-1 text-xs text-amber-400 transition hover:bg-slate-800 disabled:opacity-40"
+              className="inline-flex items-center gap-1.5 rounded-full border border-slate-700 px-2.5 py-1 text-xs text-amber-400 transition hover:bg-slate-800 disabled:opacity-40"
             >
               {running.has(node.id) ? <Spinner /> : "⟳"} {t("nodes.nodeDetail.restartEngine")}
             </button>
diff --git a/portal/src/pages/Profile.tsx b/portal/src/pages/Profile.tsx
index 6f335aa..4e80f7f 100644
--- a/portal/src/pages/Profile.tsx
+++ b/portal/src/pages/Profile.tsx
@@ -52,7 +52,7 @@ export function Profile({ onLogout }: { onLogout: () => void }) {
         type="password"
         value={val}
         onChange={(e) => set(e.target.value)}
-        className="w-full rounded-lg border border-slate-700 bg-slate-950 px-3 py-2 text-sm text-white outline-none focus:border-emerald-500"
+        className="sg-field w-full"
       />
     </div>
   );
@@ -75,7 +75,7 @@ export function Profile({ onLogout }: { onLogout: () => void }) {
         <button
           onClick={submit}
           disabled={loading || !current || !next}
-          className="rounded-lg bg-emerald-600 px-4 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-50"
+          className="rounded-full bg-emerald-600 px-4 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-50"
         >
           {loading ? t("profile.changePassword.submitting") : t("profile.changePassword.submit")}
         </button>
diff --git a/portal/src/pages/Settings.tsx b/portal/src/pages/Settings.tsx
index 497334d..372090d 100644
--- a/portal/src/pages/Settings.tsx
+++ b/portal/src/pages/Settings.tsx
@@ -181,8 +181,8 @@ function SettingField({
     [onSaved, onLogout, t],
   );
 
-  const inputCls =
-    "rounded-lg border border-slate-700 bg-slate-950/60 px-3 py-1.5 text-sm text-slate-100 outline-none transition focus:border-emerald-500 disabled:opacity-50";
+  // Form-control base classes (#22): sg-field, plus sg-select on the lists.
+  const inputCls = "sg-field";
 
   // CLUSTER value of an Agent/Engine tunable (ADR-039) reaches ALL Nodes without their
   // own value on the next heartbeat — it's the broadest change on this screen, and the one #144
@@ -228,7 +228,7 @@ function SettingField({
                   checked={sel.has(c.value)}
                   onChange={() => toggle(c.value)}
                   disabled={busy}
-                  className="h-4 w-4 shrink-0 rounded border-slate-600 bg-slate-950 accent-emerald-500"
+                  className="sg-check shrink-0"
                 />
                 {choiceLabel(item.key, c.value, c.label)}
               </label>
@@ -238,7 +238,7 @@ function SettingField({
             <button
               onClick={() => run(() => updateSetting(item.key, value))}
               disabled={busy || !dirty}
-              className="rounded-lg bg-emerald-600 px-3 py-1.5 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:cursor-not-allowed disabled:opacity-40"
+              className="rounded-full bg-emerald-600 px-3 py-1.5 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:cursor-not-allowed disabled:opacity-40"
             >
               {t("common.save")}
             </button>
@@ -246,7 +246,7 @@ function SettingField({
               <button
                 onClick={() => setValue("")}
                 disabled={busy}
-                className="rounded-lg border border-slate-700 px-3 py-1.5 text-sm text-slate-300 transition hover:bg-slate-800/60 disabled:opacity-40"
+                className="rounded-full border border-slate-700 px-3 py-1.5 text-sm text-slate-300 transition hover:bg-slate-800/60 disabled:opacity-40"
               >
                 {t("settings.settings.actions.clear")}
               </button>
@@ -264,12 +264,12 @@ function SettingField({
       ) : (
       <div className="mt-1 flex flex-wrap items-center gap-2">
         {item.type === "bool" ? (
-          <select value={value} onChange={(e) => setValue(e.target.value)} disabled={busy} className={`w-40 ${inputCls}`}>
+          <select value={value} onChange={(e) => setValue(e.target.value)} disabled={busy} className={`w-40 ${inputCls} sg-select`}>
             <option value="true">{t("settings.settings.field.optionOn")}</option>
             <option value="false">{t("settings.settings.field.optionOff")}</option>
           </select>
         ) : item.options && item.options.length > 0 ? (
-          <select value={value} onChange={(e) => setValue(e.target.value)} disabled={busy} className={`w-40 ${inputCls}`}>
+          <select value={value} onChange={(e) => setValue(e.target.value)} disabled={busy} className={`w-40 ${inputCls} sg-select`}>
             {item.options.map((o) => (
               <option key={o} value={o}>
                 {o}
@@ -305,7 +305,7 @@ function SettingField({
             }
           }}
           disabled={busy || !dirty}
-          className="rounded-lg bg-emerald-600 px-3 py-1.5 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:cursor-not-allowed disabled:opacity-40"
+          className="rounded-full bg-emerald-600 px-3 py-1.5 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:cursor-not-allowed disabled:opacity-40"
         >
           {t("common.save")}
         </button>
@@ -317,7 +317,7 @@ function SettingField({
               }
             }}
             disabled={busy}
-            className="rounded-lg border border-slate-700 px-3 py-1.5 text-sm text-slate-300 transition hover:bg-slate-800/60 disabled:opacity-40"
+            className="rounded-full border border-slate-700 px-3 py-1.5 text-sm text-slate-300 transition hover:bg-slate-800/60 disabled:opacity-40"
             title={t("settings.settings.actions.resetDefaultTitle")}
           >
             {t("settings.settings.actions.resetDefault")}
@@ -420,7 +420,7 @@ function ChannelTestButton({
       <button
         onClick={send}
         disabled={busy || !enabled}
-        className="rounded-lg border border-emerald-600/40 bg-emerald-600/10 px-3 py-1.5 text-sm font-medium text-emerald-300 transition hover:bg-emerald-600/20 disabled:cursor-not-allowed disabled:opacity-40"
+        className="rounded-full border border-emerald-600/40 bg-emerald-600/10 px-3 py-1.5 text-sm font-medium text-emerald-300 transition hover:bg-emerald-600/20 disabled:cursor-not-allowed disabled:opacity-40"
         title={enabled ? t("settings.settings.actions.testEnabledTitle") : t("settings.settings.actions.testDisabledTitle")}
       >
         {busy ? t("settings.settings.actions.sending") : t("settings.settings.actions.test")}
diff --git a/portal/src/pages/TorrentDetail.tsx b/portal/src/pages/TorrentDetail.tsx
index ee89670..222be73 100644
--- a/portal/src/pages/TorrentDetail.tsx
+++ b/portal/src/pages/TorrentDetail.tsx
@@ -203,7 +203,7 @@ export function TorrentDetail({
                   onClick={onDownload}
                   disabled={downloading || running.size > 0 || busy}
                   title={t("torrents.torrentDetail.downloadTitle")}
-                  className={`inline-flex items-center gap-1.5 rounded-lg border border-slate-700 px-3 py-1.5 text-xs transition hover:bg-slate-800 disabled:opacity-40 ${TRANSFER.down.text}`}
+                  className={`inline-flex items-center gap-1.5 rounded-full border border-slate-700 px-3 py-1.5 text-xs transition hover:bg-slate-800 disabled:opacity-40 ${TRANSFER.down.text}`}
                 >
                   {downloading ? <Spinner /> : "⬇"} {t("torrents.torrentDetail.download")}
                 </button>
@@ -213,7 +213,7 @@ export function TorrentDetail({
                   <button
                     onClick={() => act(t("torrents.torrentDetail.resumeVerb"), resumeTorrent)}
                     disabled={running.size > 0 || busy}
-                    className="rounded-lg border border-slate-700 px-3 py-1.5 text-xs text-emerald-400 transition hover:bg-slate-800 disabled:opacity-40"
+                    className="rounded-full border border-slate-700 px-3 py-1.5 text-xs text-emerald-400 transition hover:bg-slate-800 disabled:opacity-40"
                   >
                     ▶ {t("torrents.torrentDetail.resume")}
                   </button>
@@ -221,7 +221,7 @@ export function TorrentDetail({
                   <button
                     onClick={() => act(t("torrents.torrentDetail.pauseVerb"), pauseTorrent)}
                     disabled={running.size > 0 || busy}
-                    className="rounded-lg border border-slate-700 px-3 py-1.5 text-xs text-amber-400 transition hover:bg-slate-800 disabled:opacity-40"
+                    className="rounded-full border border-slate-700 px-3 py-1.5 text-xs text-amber-400 transition hover:bg-slate-800 disabled:opacity-40"
                   >
                     ⏸ {t("torrents.torrentDetail.pause")}
                   </button>
@@ -231,7 +231,7 @@ export function TorrentDetail({
                   onClick={() => act(t("torrents.torrentDetail.recheckVerb"), recheckTorrent)}
                   disabled={running.size > 0 || busy}
                   title={t("torrents.torrentDetail.recheckTitle")}
-                  className={`rounded-lg border border-slate-700 px-3 py-1.5 text-xs transition hover:bg-slate-800 disabled:opacity-40 ${
+                  className={`rounded-full border border-slate-700 px-3 py-1.5 text-xs transition hover:bg-slate-800 disabled:opacity-40 ${
                     tor.status === "ERROR" ? "text-red-400" : "text-slate-300"
                   }`}
                 >
@@ -242,7 +242,7 @@ export function TorrentDetail({
                 <button
                   onClick={onRemove}
                   disabled={running.size > 0 || busy}
-                  className="rounded-lg border border-slate-700 px-3 py-1.5 text-xs text-red-400 transition hover:bg-slate-800 disabled:opacity-40"
+                  className="rounded-full border border-slate-700 px-3 py-1.5 text-xs text-red-400 transition hover:bg-slate-800 disabled:opacity-40"
                 >
                   🗑 {t("torrents.torrentDetail.remove")}
                 </button>
diff --git a/portal/src/pages/Users.tsx b/portal/src/pages/Users.tsx
index 160866a..b62902d 100644
--- a/portal/src/pages/Users.tsx
+++ b/portal/src/pages/Users.tsx
@@ -156,7 +156,7 @@ export function Users() {
         <h1 className="text-lg font-semibold text-white">{t("users.users.title")}</h1>
         <button
           onClick={() => setCreating((v) => !v)}
-          className="rounded-lg bg-emerald-600 px-3 py-1.5 text-sm font-medium text-white transition hover:bg-emerald-500"
+          className="rounded-full bg-emerald-600 px-3 py-1.5 text-sm font-medium text-white transition hover:bg-emerald-500"
         >
           {creating ? t("common.cancel") : t("users.users.actions.new")}
         </button>
@@ -174,7 +174,7 @@ export function Users() {
               <input
                 value={form.username}
                 onChange={(e) => setForm({ ...form, username: e.target.value })}
-                className="w-full rounded-lg border border-slate-700 bg-slate-950 px-3 py-2 text-sm text-white outline-none focus:border-emerald-500"
+                className="sg-field w-full"
               />
             </div>
             <div>
@@ -182,7 +182,7 @@ export function Users() {
               <input
                 value={form.display_name}
                 onChange={(e) => setForm({ ...form, display_name: e.target.value })}
-                className="w-full rounded-lg border border-slate-700 bg-slate-950 px-3 py-2 text-sm text-white outline-none focus:border-emerald-500"
+                className="sg-field w-full"
               />
             </div>
             <div>
@@ -190,7 +190,7 @@ export function Users() {
               <input
                 value={form.email}
                 onChange={(e) => setForm({ ...form, email: e.target.value })}
-                className="w-full rounded-lg border border-slate-700 bg-slate-950 px-3 py-2 text-sm text-white outline-none focus:border-emerald-500"
+                className="sg-field w-full"
               />
             </div>
             <div>
@@ -199,7 +199,7 @@ export function Users() {
                 type="password"
                 value={form.password}
                 onChange={(e) => setForm({ ...form, password: e.target.value })}
-                className="w-full rounded-lg border border-slate-700 bg-slate-950 px-3 py-2 text-sm text-white outline-none focus:border-emerald-500"
+                className="sg-field w-full"
               />
             </div>
             <div className="sm:col-span-2">
@@ -218,7 +218,7 @@ export function Users() {
                             : form.roles.filter((x) => x !== r),
                         })
                       }
-                      className="accent-emerald-500"
+                      className="sg-check"
                     />
                     {r}
                   </label>
@@ -230,7 +230,7 @@ export function Users() {
           <button
             onClick={submitCreate}
             disabled={saving}
-            className="rounded-lg bg-emerald-600 px-4 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-50"
+            className="rounded-full bg-emerald-600 px-4 py-2 text-sm font-medium text-white transition hover:bg-emerald-500 disabled:opacity-50"
           >
             {saving ? t("users.users.actions.creating") : t("users.users.actions.create")}
           </button>
@@ -271,7 +271,7 @@ export function Users() {
                                 e.target.checked ? [...editRoles, r] : editRoles.filter((x) => x !== r),
                               )
                             }
-                            className="accent-emerald-500"
+                            className="sg-check"
                           />
                           {r}
                         </label>
@@ -286,7 +286,7 @@ export function Users() {
                     <select
                       value={editStatus}
                       onChange={(e) => setEditStatus(e.target.value)}
-                      className="rounded-lg border border-slate-700 bg-slate-950 px-2 py-1 text-xs text-white outline-none"
+                      className="sg-field-sm sg-select"
                     >
                       {USER_STATUSES.map((st) => (
                         <option key={st} value={st}>
@@ -317,18 +317,18 @@ export function Users() {
                         placeholder={t("users.users.edit.passwordPlaceholder")}
                         value={newPassword}
                         onChange={(e) => setNewPassword(e.target.value)}
-                        className="w-44 rounded-lg border border-slate-700 bg-slate-950 px-2 py-1 text-xs text-white outline-none focus:border-emerald-500"
+                        className="sg-field-sm w-44"
                       />
                       <div className="flex gap-1.5">
                         <button
                           onClick={() => saveEdit(u)}
-                          className="rounded-md bg-emerald-600 px-2.5 py-1 text-xs font-medium text-white hover:bg-emerald-500"
+                          className="rounded-full bg-emerald-600 px-2.5 py-1 text-xs font-medium text-white hover:bg-emerald-500"
                         >
                           {t("common.save")}
                         </button>
                         <button
                           onClick={() => setEditingId(null)}
-                          className="rounded-md bg-slate-700 px-2.5 py-1 text-xs text-slate-200 hover:bg-slate-600"
+                          className="rounded-full bg-slate-700 px-2.5 py-1 text-xs text-slate-200 hover:bg-slate-600"
                         >
                           {t("common.cancel")}
                         </button>
@@ -339,14 +339,14 @@ export function Users() {
                       {me && u.username !== me.username && u.status === "ACTIVE" && (
                         <button
                           onClick={() => remove(u)}
-                          className="rounded-md bg-red-500/15 px-2.5 py-1 text-xs font-medium text-red-400 ring-1 ring-inset ring-red-500/30 transition hover:ring-red-500/70"
+                          className="rounded-full bg-red-500/15 px-2.5 py-1 text-xs font-medium text-red-400 ring-1 ring-inset ring-red-500/30 transition hover:ring-red-500/70"
                         >
                           {t("users.users.actions.disable")}
                         </button>
                       )}
                       <button
                         onClick={() => openEdit(u)}
-                        className="rounded-md bg-slate-700/60 px-2.5 py-1 text-xs text-slate-200 hover:bg-slate-600"
+                        className="rounded-full bg-slate-700/60 px-2.5 py-1 text-xs text-slate-200 hover:bg-slate-600"
                       >
                         {t("users.users.actions.edit")}
                       </button>
diff --git a/portal/src/pages/publish/TrackerUploadPanel.tsx b/portal/src/pages/publish/TrackerUploadPanel.tsx
index c42ba61..e38cfa0 100644
--- a/portal/src/pages/publish/TrackerUploadPanel.tsx
+++ b/portal/src/pages/publish/TrackerUploadPanel.tsx
@@ -450,7 +450,7 @@ export function TrackerUploadPanel({
             })}
           </p>
         )}
-        <button onClick={onClose} className="rounded-lg bg-slate-700 px-4 py-2 text-sm text-white hover:bg-slate-600">
+        <button onClick={onClose} className="rounded-full bg-slate-700 px-4 py-2 text-sm text-white hover:bg-slate-600">
           {t("common.close")}
         </button>
       </div>
@@ -526,7 +526,7 @@ export function TrackerUploadPanel({
                   type="button"
                   onClick={runGameSearch}
                   disabled={gameBusy}
-                  className="shrink-0 rounded-lg bg-fuchsia-600 px-3 py-2 text-sm text-white transition hover:bg-fuchsia-500 disabled:opacity-40"
+                  className="shrink-0 rounded-full bg-fuchsia-600 px-3 py-2 text-sm text-white transition hover:bg-fuchsia-500 disabled:opacity-40"
                 >
                   {gameBusy ? "…" : t("publish.trackerUploadPanel.game.searchBtn")}
                 </button>
@@ -609,7 +609,7 @@ export function TrackerUploadPanel({
                   onClick={handleGenerateScreenshots}
                   disabled={genLoading}
                   title={t("publish.trackerUploadPanel.actions.genScreenshotsTitle")}
-                  className="rounded border border-slate-700 px-2 py-0.5 text-xs text-sky-300 transition hover:bg-slate-800 disabled:opacity-40"
+                  className="rounded-full border border-slate-700 px-2 py-0.5 text-xs text-sky-300 transition hover:bg-slate-800 disabled:opacity-40"
                 >
                   {genLoading ? t("publish.trackerUploadPanel.actions.genScreenshotsLoading") : t("publish.trackerUploadPanel.actions.genScreenshots")}
                 </button>
@@ -619,7 +619,7 @@ export function TrackerUploadPanel({
                     onClick={handleGenerateCard}
                     disabled={genLoading}
                     title={t("publish.trackerUploadPanel.actions.genSheetTitle")}
-                    className="rounded border border-slate-700 px-2 py-0.5 text-xs text-sky-300 transition hover:bg-slate-800 disabled:opacity-50"
+                    className="rounded-full border border-slate-700 px-2 py-0.5 text-xs text-sky-300 transition hover:bg-slate-800 disabled:opacity-50"
                   >
                     {genLoading ? t("publish.trackerUploadPanel.actions.genSheetLoading") : t("publish.trackerUploadPanel.actions.genSheet")}
                   </button>
@@ -742,7 +742,7 @@ export function TrackerUploadPanel({
             <button
               onClick={preview ? publish : openPreview}
               disabled={busy || (!!dupes && dupes.candidates.length > 0 && !dupeAck)}
-              className="rounded-lg bg-sky-600 px-4 py-2 text-sm font-medium text-white transition hover:bg-sky-500 disabled:opacity-50"
+              className="rounded-full bg-sky-600 px-4 py-2 text-sm font-medium text-white transition hover:bg-sky-500 disabled:opacity-50"
             >
               {busy
                 ? preview
@@ -752,7 +752,7 @@ export function TrackerUploadPanel({
                   ? t("publish.trackerUploadPanel.actions.publish", { tracker: tracker.source || tracker.name })
                   : t("publish.trackerUploadPanel.actions.check")}
             </button>
-            <button onClick={onClose} disabled={busy} className="rounded-lg px-4 py-2 text-sm text-slate-400 hover:text-white disabled:opacity-50">
+            <button onClick={onClose} disabled={busy} className="rounded-full px-4 py-2 text-sm text-slate-400 hover:text-white disabled:opacity-50">
               {t("publish.trackerUploadPanel.actions.notNow")}
             </button>
           </div>