diff --git a/index.html b/index.html
index b0521e7..056c6d1 100644
--- a/index.html
+++ b/index.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="icon" href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 32 32'><rect width='32' height='32' rx='6' fill='%230d1117'/><rect x='6' y='6' width='9' height='9' fill='%23e5534b'/><rect x='17' y='6' width='9' height='9' fill='%23d9b125'/><rect x='6' y='17' width='9' height='9' fill='%234c8ed9'/><rect x='17' y='17' width='9' height='9' fill='%232ea44f'/></svg>" />
     <title>NTE gear optimizer</title>
   </head>
   <body>
diff --git a/src/ui/CharacterView.tsx b/src/ui/CharacterView.tsx
index 12c4089..7a5c175 100644
--- a/src/ui/CharacterView.tsx
+++ b/src/ui/CharacterView.tsx
@@ -351,6 +351,9 @@ export function CharacterView({
             Equip this build
           </button>
         )}
+        {state.data.undo.length > 0 && (
+          <button onClick={() => void store.undo()}>Undo last equip</button>
+        )}
       </div>
 
       {running && progress && (
diff --git a/src/ui/CharactersTab.tsx b/src/ui/CharactersTab.tsx
index ae3982c..9f5dfb2 100644
--- a/src/ui/CharactersTab.tsx
+++ b/src/ui/CharactersTab.tsx
@@ -10,6 +10,7 @@ import { esperFor, type LoadedData } from "../state/gamedata.ts";
 import { CharacterView } from "./CharacterView.tsx";
 import { Icon } from "./Icon.tsx";
 import { equipmentOf } from "../db/store.ts";
+import type { CharacterRow } from "../db/schema.ts";
 import { hashFor, type Route } from "./router.ts";
 import { useAppState, useStore } from "./useStore.ts";
 
@@ -60,6 +61,31 @@ export function CharactersTab({
   );
 }
 
+/**
+ * What to call a character in the naming dropdown.
+ *
+ * Two espers are both published as "Zero", so a bare display name can send a
+ * whole loadout to the wrong character; where a name is shared the codename
+ * disambiguates it. Seven of the captured roster have no everness record at
+ * all, so their codename is all there is - which is also why the options come
+ * from the capture rather than from the esper list: a character the game says
+ * you own must be nameable even when the game database has never heard of it.
+ */
+function ownerLabel(
+  data: LoadedData,
+  characters: CharacterRow[],
+  characterId: string,
+): string {
+  const esper = esperFor(data.gamedata, characterId);
+  if (!esper) return characterId;
+  const shared = characters.some(
+    (other) =>
+      other.characterId !== characterId &&
+      esperFor(data.gamedata, other.characterId)?.name === esper.name,
+  );
+  return shared ? `${esper.name} (${characterId})` : esper.name;
+}
+
 /**
  * The owner groups nobody has named.
  *
@@ -97,9 +123,9 @@ function UnidentifiedGroups({ groups, data }: { groups: string[]; data: LoadedDa
               }}
             >
               <option value="">name this group…</option>
-              {data.gamedata.espers.map((esper) => (
-                <option key={esper.abilityKey} value={esper.abilityKey}>
-                  {esper.name}
+              {db.characters.map((character) => (
+                <option key={character.characterId} value={character.characterId}>
+                  {ownerLabel(data, db.characters, character.characterId)}
                 </option>
               ))}
             </select>
diff --git a/src/ui/TeamTab.tsx b/src/ui/TeamTab.tsx
index 1dbf8b0..46fc333 100644
--- a/src/ui/TeamTab.tsx
+++ b/src/ui/TeamTab.tsx
@@ -223,6 +223,7 @@ function Result({
   data: LoadedData;
   store: ReturnType<typeof useStore>;
 }) {
+  const state = useAppState();
   if (result.infeasible) {
     return <p className="warning">No conflict-free team could be built from this pool.</p>;
   }
@@ -243,7 +244,9 @@ function Result({
       </div>
       <p className="dim">
         Equipping writes an “app” row you still have to apply in game.{" "}
-        <button onClick={() => void store.undo()}>Undo last equip</button>
+        {state.data.undo.length > 0 && (
+          <button onClick={() => void store.undo()}>Undo last equip</button>
+        )}
       </p>
     </div>
   );