diff --git a/src/shared/versions.ts b/src/shared/versions.ts
index 234be0c..ef77b08 100644
--- a/src/shared/versions.ts
+++ b/src/shared/versions.ts
@@ -1,7 +1,7 @@
 export const HARBOR_VERSIONS = Object.freeze({
-  macClient: '0.28.0',
-  gatewayClient: '0.29.0',
-  gatewayBackend: '0.29.1',
+  macClient: '0.29.0',
+  gatewayClient: '0.30.0',
+  gatewayBackend: '0.30.0',
 });
 
 export interface ParsedVersion {
diff --git a/src/web/features/failover/FailoverFeature.tsx b/src/web/features/failover/FailoverFeature.tsx
index b1eb969..340451c 100644
--- a/src/web/features/failover/FailoverFeature.tsx
+++ b/src/web/features/failover/FailoverFeature.tsx
@@ -1,4 +1,5 @@
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { useEffect, useMemo, useRef, useState, type KeyboardEvent as ReactKeyboardEvent } from 'react';
+import { flushSync } from 'react-dom';
 import { CONNECTIVITY_SITES, MAX_CUSTOM_DIAGNOSTIC_SERVICES, type DiagnosticSettings } from '../../../shared/connectivityDiagnostics.js';
 import { normalizeFailoverPolicy, type FailoverPolicy, type FailoverSnapshot } from '../../../shared/failover.js';
 import type { ProfileSnapshot } from '../../../shared/contracts/state.js';
@@ -101,6 +102,142 @@ function targetLabel(profiles: ProfileSnapshot[], target: { profileId: string; s
   return profile && server ? `${profile.label} · ${server.label}` : 'Не выбран';
 }
 
+function HarborSwitch({ checked, label, disabled, onChange }: {
+  checked: boolean;
+  label: string;
+  disabled?: boolean;
+  onChange: (checked: boolean) => void;
+}) {
+  return <button
+    className="client-failover-switch"
+    type="button"
+    role="switch"
+    aria-checked={checked}
+    aria-label={label}
+    disabled={disabled}
+    onClick={() => onChange(!checked)}
+  ><span aria-hidden="true" /></button>;
+}
+
+interface PickerOption {
+  id: string;
+  label: string;
+  disabled?: boolean;
+}
+
+function FailoverPicker({ id, label, value, options, open, disabled, onOpenChange, onChange }: {
+  id: string;
+  label: string;
+  value: string;
+  options: PickerOption[];
+  open: boolean;
+  disabled?: boolean;
+  onOpenChange: (open: boolean) => void;
+  onChange: (id: string) => void;
+}) {
+  const rootRef = useRef<HTMLDivElement>(null);
+  const triggerRef = useRef<HTMLButtonElement>(null);
+  const optionRefs = useRef<Array<HTMLButtonElement | null>>([]);
+  const onOpenChangeRef = useRef(onOpenChange);
+  onOpenChangeRef.current = onOpenChange;
+  const enabledIndexes = useMemo(
+    () => options.flatMap((option, index) => option.disabled ? [] : [index]),
+    [options],
+  );
+  const selectedIndex = options.findIndex((option) => option.id === value && !option.disabled);
+
+  useEffect(() => {
+    if (!open) return undefined;
+    const frame = requestAnimationFrame(() => {
+      optionRefs.current[selectedIndex >= 0 ? selectedIndex : enabledIndexes[0]]?.focus();
+    });
+    const close = (event: PointerEvent | globalThis.KeyboardEvent) => {
+      if (event.type === 'keydown') {
+        if ((event as globalThis.KeyboardEvent).key !== 'Escape') return;
+        event.preventDefault();
+        onOpenChangeRef.current(false);
+        triggerRef.current?.focus();
+        return;
+      }
+      if (rootRef.current?.contains(event.target as Node)) return;
+      onOpenChangeRef.current(false);
+    };
+    document.addEventListener('pointerdown', close);
+    document.addEventListener('keydown', close);
+    return () => {
+      cancelAnimationFrame(frame);
+      document.removeEventListener('pointerdown', close);
+      document.removeEventListener('keydown', close);
+    };
+  }, [enabledIndexes, open, selectedIndex]);
+
+  const move = (event: ReactKeyboardEvent<HTMLButtonElement>, offset: number) => {
+    if (!['ArrowDown', 'ArrowUp', 'Home', 'End', 'Escape'].includes(event.key)) return;
+    event.preventDefault();
+    if (event.key === 'Escape') {
+      event.stopPropagation();
+      onOpenChangeRef.current(false);
+      triggerRef.current?.focus();
+      return;
+    }
+    const current = optionRefs.current.indexOf(document.activeElement as HTMLButtonElement);
+    const position = Math.max(0, enabledIndexes.indexOf(current));
+    const next = event.key === 'Home'
+      ? enabledIndexes[0]
+      : event.key === 'End'
+        ? enabledIndexes.at(-1)
+        : enabledIndexes[(position + offset + enabledIndexes.length) % enabledIndexes.length];
+    if (next !== undefined) optionRefs.current[next]?.focus();
+  };
+
+  return <div className={`client-failover-picker${open ? ' is-open' : ''}`} ref={rootRef}>
+    <button
+      ref={triggerRef}
+      className="client-failover-picker-trigger"
+      type="button"
+      aria-label={label}
+      aria-haspopup="listbox"
+      aria-expanded={open}
+      aria-controls={id}
+      disabled={disabled}
+      onClick={() => onOpenChange(!open)}
+      onKeyDown={(event) => {
+        if (event.key === 'Escape' && open) {
+          event.preventDefault();
+          event.stopPropagation();
+          onOpenChange(false);
+          return;
+        }
+        if (!['ArrowDown', 'ArrowUp'].includes(event.key)) return;
+        event.preventDefault();
+        onOpenChange(true);
+      }}
+    >
+      <span>{value ? options.find((option) => option.id === value)?.label || label : label}</span>
+      <svg viewBox="0 0 12 8" aria-hidden="true"><path d="m1 1 5 5 5-5" /></svg>
+    </button>
+    <div className="client-failover-picker-list" id={id} role="listbox" aria-hidden={!open} inert={!open ? true : undefined}>
+      {options.map((option, index) => <button
+        ref={(node) => { optionRefs.current[index] = node; }}
+        type="button"
+        role="option"
+        aria-selected={option.id === value}
+        aria-disabled={option.disabled || undefined}
+        tabIndex={open && !option.disabled ? 0 : -1}
+        key={option.id}
+        style={{ '--picker-index': Math.min(index, 5) } as React.CSSProperties}
+        onClick={() => {
+          if (option.disabled) return;
+          onChange(option.id);
+          onOpenChange(false);
+          triggerRef.current?.focus();
+        }}
+        onKeyDown={(event) => move(event, event.key === 'ArrowUp' ? -1 : 1)}
+      >{option.label}</button>)}
+    </div>
+  </div>;
+}
+
 export function FailoverPanel({
   feature,
   snapshot,
@@ -131,6 +268,8 @@ export function FailoverPanel({
   const [serviceName, setServiceName] = useState('');
   const [serviceUrl, setServiceUrl] = useState('');
   const [serviceError, setServiceError] = useState('');
+  const [openPicker, setOpenPicker] = useState('');
+  const [removingCheckId, setRemovingCheckId] = useState('');
   useEffect(() => {
     if (!dirty) setDraft(snapshot.policy);
   }, [snapshot.policy, dirty]);
@@ -154,15 +293,42 @@ export function FailoverPanel({
     ...CONNECTIVITY_SITES,
     ...diagnostics.customServices,
   ], [diagnostics.customServices]);
+  const channelOptions = useMemo(() => profiles.flatMap((profile) => profile.servers.map((server) => ({
+    id: `${profile.id}\u001f${server.id}`,
+    label: `${profile.label} · ${server.label}`,
+    target: { profileId: profile.id, serverId: server.id },
+  }))), [profiles]);
+  const channelPickerOptions = useMemo(() => ({
+    primary: channelOptions.map((option) => {
+      const duplicate = option.target.profileId === draft.reserve.profileId && option.target.serverId === draft.reserve.serverId;
+      return { id: option.id, label: `${option.label}${duplicate ? ' · уже выбран' : ''}`, disabled: duplicate };
+    }),
+    reserve: channelOptions.map((option) => {
+      const duplicate = option.target.profileId === draft.primary.profileId && option.target.serverId === draft.primary.serverId;
+      return { id: option.id, label: `${option.label}${duplicate ? ' · уже выбран' : ''}`, disabled: duplicate };
+    }),
+  }), [
+    channelOptions,
+    draft.primary.profileId,
+    draft.primary.serverId,
+    draft.reserve.profileId,
+    draft.reserve.serverId,
+  ]);
+  const servicePickerOptions = useMemo(() => [
+    ...services.filter((service) => !draft.checks.some(({ serviceId }) => serviceId === service.id)).map((service) => ({ id: service.id, label: service.label })),
+    ...(diagnostics.customServices.length < MAX_CUSTOM_DIAGNOSTIC_SERVICES ? [{ id: '__new-service', label: 'Новый HTTPS-сервис…' }] : []),
+  ], [diagnostics.customServices.length, draft.checks, services]);
   const update = (value: Partial<FailoverPolicy>) => {
     setDraft((current) => normalizeFailoverPolicy({ ...current, ...value }));
     setDirty(true);
   };
-  const updateTarget = (role: 'primary' | 'reserve', patch: Partial<FailoverPolicy[typeof role]>) => {
-    const next = { ...draft[role], ...patch };
-    const profile = profiles.find(({ id }) => id === next.profileId);
-    if (patch.profileId !== undefined) next.serverId = profile?.desiredServerId || profile?.servers[0]?.id || '';
-    update({ [role]: next } as Partial<FailoverPolicy>);
+  const updateChecks = (change: (checks: FailoverPolicy['checks']) => FailoverPolicy['checks']) => {
+    setDraft((current) => normalizeFailoverPolicy({ ...current, checks: change(current.checks) }));
+    setDirty(true);
+  };
+  const updateTarget = (channel: 'primary' | 'reserve', optionId: string) => {
+    const target = channelOptions.find(({ id }) => id === optionId)?.target;
+    if (target) update({ [channel]: target } as Partial<FailoverPolicy>);
   };
   const role = snapshot.currentRole === 'primary' || snapshot.currentRole === 'reserve'
     ? snapshot.currentRole
@@ -173,7 +339,7 @@ export function FailoverPanel({
     .find(({ id }) => id === target.profileId)?.servers.some(({ id }) => id === target.serverId);
   const targetsValid = targetExists(draft.primary) && targetExists(draft.reserve)
     && (draft.primary.profileId !== draft.reserve.profileId || draft.primary.serverId !== draft.reserve.serverId);
-  const draftValid = Boolean(targetsValid && draft.checks.length);
+  const draftValid = !draft.enabled || Boolean(targetsValid && draft.checks.length);
   const quietElapsed = activity?.quietSince
     ? Math.max(0, Date.now() - Date.parse(activity.quietSince))
     : 0;
@@ -195,6 +361,19 @@ export function FailoverPanel({
       setServiceError(error instanceof Error ? error.message : 'Проверьте адрес.');
     }
   };
+  const removeCheck = (serviceId: string) => {
+    const finish = () => updateChecks((checks) => checks.filter((check) => check.serviceId !== serviceId));
+    if (matchMedia('(prefers-reduced-motion: reduce)').matches) finish();
+    else setRemovingCheckId(serviceId);
+  };
+  const finishRemoveCheck = (serviceId: string) => {
+    const finish = () => flushSync(() => {
+      setRemovingCheckId('');
+      updateChecks((checks) => checks.filter((check) => check.serviceId !== serviceId));
+    });
+    if (!document.startViewTransition || matchMedia('(prefers-reduced-motion: reduce)').matches) finish();
+    else document.startViewTransition(finish);
+  };
 
   return <Drawer
     panelRef={feature.panelRef}
@@ -208,7 +387,19 @@ export function FailoverPanel({
   >
     <header className="client-failover-header">
       <span>Gateway</span>
-      <h2>Резервный канал</h2>
+      <div className="client-failover-heading">
+        <h2>Резервный канал</h2>
+        <HarborSwitch
+          checked={draft.enabled}
+          label={draft.enabled ? 'Выключить резервный канал' : 'Включить резервный канал'}
+          disabled={blocked}
+          onChange={(enabled) => {
+            setOpenPicker('');
+            if (!enabled) setAddingService(false);
+            update({ enabled });
+          }}
+        />
+      </div>
       <p>Переключает только новые соединения. Уже открытые соединения Harbor не закрывает.</p>
     </header>
 
@@ -216,15 +407,12 @@ export function FailoverPanel({
       event.preventDefault();
       void onSave(draft).then((result) => { if (result !== false) setDirty(false); });
     }}>
-      <label className="client-failover-master">
-        <span><strong>Использовать резерв</strong><small>{draft.enabled ? 'Мониторинг включён' : 'Полностью пассивен'}</small></span>
-        <input type="checkbox" checked={draft.enabled} onChange={(event) => update({ enabled: event.target.checked })} />
-      </label>
-
       {(['primary', 'reserve'] as const).map((channel) => {
-        const profile = profiles.find(({ id }) => id === draft[channel].profileId);
         const health = snapshot[channel].health;
         const missing = Boolean(snapshot[channel].target.profileId) && !targetExists(snapshot[channel].target);
+        const selectedId = channelOptions.find(({ target }) => (
+          target.profileId === draft[channel].profileId && target.serverId === draft[channel].serverId
+        ))?.id || '';
         const healthLabel = missing
           ? 'Цель недоступна'
           : channel === 'primary' && snapshot.reason === 'failure-window'
@@ -237,69 +425,104 @@ export function FailoverPanel({
             <span>{channel === 'primary' ? 'Основной' : 'Резервный'}</span>
             <strong className={health === 'healthy' ? 'is-healthy' : health === 'unhealthy' || missing ? 'is-unhealthy' : ''}>{healthLabel}</strong>
           </div>
-          <label><span>Подписка</span><select value={draft[channel].profileId} onChange={(event) => updateTarget(channel, { profileId: event.target.value })}>
-            <option value="">Не выбрана</option>
-            {profiles.map((item) => <option value={item.id} key={item.id}>{item.label}</option>)}
-          </select></label>
-          <label><span>Сервер</span><select value={draft[channel].serverId} onChange={(event) => updateTarget(channel, { serverId: event.target.value })} disabled={!profile}>
-            <option value="">Не выбран</option>
-            {profile?.servers.map((server) => <option value={server.id} key={server.id}>{server.label}</option>)}
-          </select></label>
+          <FailoverPicker
+            id={`client-failover-${channel}-options`}
+            label={draft[channel].profileId ? 'Цель недоступна' : 'Выбрать канал'}
+            value={selectedId}
+            options={channelPickerOptions[channel]}
+            open={openPicker === channel && !blocked && draft.enabled}
+            disabled={blocked || !draft.enabled || channelOptions.length === 0}
+            onOpenChange={(open) => setOpenPicker(open ? channel : '')}
+            onChange={(optionId) => updateTarget(channel, optionId)}
+          />
         </section>;
       })}
 
       <fieldset className="client-failover-services">
         <legend>Что проверять</legend>
-        {services.map((service) => {
-          const check = draft.checks.find(({ serviceId }) => serviceId === service.id);
-          return <div className="client-failover-service" key={service.id}>
-            <label>
-            <input type="checkbox" checked={Boolean(check)} onChange={(event) => update({
-              checks: event.target.checked
-                ? [...draft.checks, { serviceId: service.id, timeoutMs: 6_000 }]
-                : draft.checks.filter(({ serviceId }) => serviceId !== service.id),
-            })} />
-            <span>{service.label}</span>
-            </label>
-            {check && <label className="client-failover-service-timeout">
+        {draft.checks.map((check) => {
+          const service = services.find(({ id }) => check.serviceId === id);
+          const removing = removingCheckId === check.serviceId;
+          return <div
+            className={`client-failover-service${removing ? ' is-removing' : ''}`}
+            key={check.serviceId}
+            inert={removing ? true : undefined}
+            style={{ viewTransitionName: removing ? 'none' : `failover-check-${check.serviceId}` }}
+            onAnimationEnd={(event) => {
+              if (removing && event.target === event.currentTarget) finishRemoveCheck(check.serviceId);
+            }}
+          >
+            <span className="client-failover-service-name">{service?.label || 'Сервис недоступен'}</span>
+            <label className="client-failover-service-timeout">
               <span>таймаут, сек</span>
               <input
                 type="number"
                 min="2"
                 max="30"
-                aria-label={`Таймаут проверки: ${service.label}`}
+                aria-label={`Таймаут проверки: ${service?.label || 'сервис недоступен'}`}
                 value={seconds(check.timeoutMs)}
-                onChange={(event) => update({ checks: draft.checks.map((item) => item.serviceId === service.id
+                disabled={blocked || !draft.enabled}
+                onChange={(event) => updateChecks((checks) => checks.map((item) => item.serviceId === check.serviceId
                   ? { ...item, timeoutMs: milliseconds(event.target.value, item.timeoutMs) }
-                  : item) })}
+                  : item))}
               />
-            </label>}
+            </label>
+            <button
+              className="client-failover-remove-service"
+              type="button"
+              aria-label={`Убрать проверку: ${service?.label || 'сервис недоступен'}`}
+              disabled={blocked || !draft.enabled || draft.checks.length === 1 || Boolean(removingCheckId)}
+              onClick={() => removeCheck(check.serviceId)}
+            >×</button>
           </div>;
         })}
-        {!addingService && <button type="button" className="client-failover-add-service" disabled={diagnostics.customServices.length >= MAX_CUSTOM_DIAGNOSTIC_SERVICES} onClick={() => setAddingService(true)}>+ Добавить HTTPS-сервис</button>}
+        {!addingService && <FailoverPicker
+          id="client-failover-service-options"
+          label="+ Добавить проверку"
+          value=""
+          options={servicePickerOptions}
+          open={openPicker === 'services' && !blocked && draft.enabled}
+          disabled={blocked || !draft.enabled || (
+            services.every((service) => draft.checks.some(({ serviceId }) => serviceId === service.id))
+            && diagnostics.customServices.length >= MAX_CUSTOM_DIAGNOSTIC_SERVICES
+          )}
+          onOpenChange={(open) => setOpenPicker(open ? 'services' : '')}
+          onChange={(serviceId) => {
+            if (serviceId === '__new-service') setAddingService(true);
+            else updateChecks((checks) => [...checks, { serviceId, timeoutMs: 6_000 }]);
+          }}
+        />}
         {addingService && <div className="client-failover-service-editor">
-          <input aria-label="Название HTTPS-сервиса" placeholder="Название" value={serviceName} onChange={(event) => setServiceName(event.target.value)} />
-          <input aria-label="HTTPS-адрес сервиса" placeholder="https://example.com/health" value={serviceUrl} onChange={(event) => setServiceUrl(event.target.value)} />
+          <input aria-label="Название HTTPS-сервиса" placeholder="Название" disabled={blocked || !draft.enabled} value={serviceName} onChange={(event) => setServiceName(event.target.value)} />
+          <input aria-label="HTTPS-адрес сервиса" placeholder="https://example.com/health" disabled={blocked || !draft.enabled} value={serviceUrl} onChange={(event) => setServiceUrl(event.target.value)} />
           {serviceError && <span role="alert">{serviceError}</span>}
-          <button type="button" onClick={() => void addService()}>Добавить</button>
-          <button type="button" onClick={() => { setAddingService(false); setServiceError(''); }}>Отмена</button>
+          <button type="button" disabled={blocked || !draft.enabled || !serviceUrl.trim()} onClick={() => void addService()}>Добавить</button>
+          <button type="button" disabled={blocked || !draft.enabled} onClick={() => { setAddingService(false); setServiceError(''); }}>Отмена</button>
         </div>}
       </fieldset>
 
       <section className="client-failover-timing" aria-label="Пороги переключения">
-        <label><span>Проверять каждые, сек</span><input type="number" min="15" max="900" value={seconds(draft.intervalMs)} onChange={(event) => update({ intervalMs: milliseconds(event.target.value, draft.intervalMs) })} /></label>
-        <label><span>Сбой должен длиться, сек</span><input type="number" min={seconds(draft.intervalMs * 2)} max="1800" value={seconds(draft.failureWindowMs)} onChange={(event) => update({ failureWindowMs: milliseconds(event.target.value, draft.failureWindowMs) })} /></label>
-        <label><span>Восстановление, сек</span><input type="number" min="60" max="86400" value={seconds(draft.recoveryWindowMs)} onChange={(event) => update({ recoveryWindowMs: milliseconds(event.target.value, draft.recoveryWindowMs) })} /></label>
-        <label><span>Не переключать во время работы</span><input type="checkbox" checked={draft.trafficGuard.enabled} onChange={(event) => update({ trafficGuard: { ...draft.trafficGuard, enabled: event.target.checked } })} /></label>
-        <label><span>Тишина перед переключением, сек</span><input type="number" min="5" max="600" value={seconds(draft.trafficGuard.quietWindowMs)} onChange={(event) => update({ trafficGuard: { ...draft.trafficGuard, quietWindowMs: milliseconds(event.target.value, draft.trafficGuard.quietWindowMs) } })} /></label>
-        <label><span>Активный трафик, КБ/с</span><input type="number" min="1" max="102400" value={Math.round(draft.trafficGuard.thresholdBytesPerSecond / 1024)} onChange={(event) => update({ trafficGuard: { ...draft.trafficGuard, thresholdBytesPerSecond: Number(event.target.value) * 1024 } })} /></label>
+        <label><span>Проверять каждые, сек</span><input type="number" min="15" max="900" disabled={blocked || !draft.enabled} value={seconds(draft.intervalMs)} onChange={(event) => update({ intervalMs: milliseconds(event.target.value, draft.intervalMs) })} /></label>
+        <label><span>Сбой должен длиться, сек</span><input type="number" min={seconds(draft.intervalMs * 2)} max="1800" disabled={blocked || !draft.enabled} value={seconds(draft.failureWindowMs)} onChange={(event) => update({ failureWindowMs: milliseconds(event.target.value, draft.failureWindowMs) })} /></label>
+        <label><span>Восстановление, сек</span><input type="number" min="60" max="86400" disabled={blocked || !draft.enabled} value={seconds(draft.recoveryWindowMs)} onChange={(event) => update({ recoveryWindowMs: milliseconds(event.target.value, draft.recoveryWindowMs) })} /></label>
+        <div className="client-failover-traffic-switch">
+          <span><strong>Переключение во время работы</strong><small>{draft.trafficGuard.enabled ? 'Ждать тишины перед автоматическим переключением' : 'Переключать сразу после подтверждённого сбоя'}</small></span>
+          <HarborSwitch
+            checked={draft.trafficGuard.enabled}
+            label={draft.trafficGuard.enabled ? 'Не ждать завершения активной работы' : 'Ждать завершения активной работы'}
+            disabled={blocked || !draft.enabled}
+            onChange={(enabled) => update({ trafficGuard: { ...draft.trafficGuard, enabled } })}
+          />
+        </div>
+        <label><span>Тишина перед переключением, сек</span><input type="number" min="5" max="600" disabled={blocked || !draft.enabled || !draft.trafficGuard.enabled} value={seconds(draft.trafficGuard.quietWindowMs)} onChange={(event) => update({ trafficGuard: { ...draft.trafficGuard, quietWindowMs: milliseconds(event.target.value, draft.trafficGuard.quietWindowMs) } })} /></label>
+        <label><span>Активный трафик, КБ/с</span><input type="number" min="1" max="102400" disabled={blocked || !draft.enabled || !draft.trafficGuard.enabled} value={Math.round(draft.trafficGuard.thresholdBytesPerSecond / 1024)} onChange={(event) => update({ trafficGuard: { ...draft.trafficGuard, thresholdBytesPerSecond: Number(event.target.value) * 1024 } })} /></label>
       </section>
 
       <details className="client-failover-advanced"><summary>Защита от повторных сбоев</summary>
-        <label><span>Минимум на резерве, сек</span><input type="number" min="60" max="86400" value={seconds(draft.minimumReserveMs)} onChange={(event) => update({ minimumReserveMs: milliseconds(event.target.value, draft.minimumReserveMs) })} /></label>
-        <label><span>Падений до карантина</span><input type="number" min="2" max="10" value={draft.flapProtection.count} onChange={(event) => update({ flapProtection: { ...draft.flapProtection, count: Number(event.target.value) } })} /></label>
-        <label><span>Окно повторных сбоев, ч</span><input type="number" min="1" max="72" value={Math.round(draft.flapProtection.windowMs / 3_600_000)} onChange={(event) => update({ flapProtection: { ...draft.flapProtection, windowMs: Number(event.target.value) * 3_600_000 } })} /></label>
-        <label><span>Карантин основного, мин</span><input type="number" min="10" max="10080" value={Math.round(draft.flapProtection.quarantineMs / 60_000)} onChange={(event) => update({ flapProtection: { ...draft.flapProtection, quarantineMs: Number(event.target.value) * 60_000 } })} /></label>
+        <label><span>Минимум на резерве, сек</span><input type="number" min="60" max="86400" disabled={blocked || !draft.enabled} value={seconds(draft.minimumReserveMs)} onChange={(event) => update({ minimumReserveMs: milliseconds(event.target.value, draft.minimumReserveMs) })} /></label>
+        <label><span>Падений до карантина</span><input type="number" min="2" max="10" disabled={blocked || !draft.enabled} value={draft.flapProtection.count} onChange={(event) => update({ flapProtection: { ...draft.flapProtection, count: Number(event.target.value) } })} /></label>
+        <label><span>Окно повторных сбоев, ч</span><input type="number" min="1" max="72" disabled={blocked || !draft.enabled} value={Math.round(draft.flapProtection.windowMs / 3_600_000)} onChange={(event) => update({ flapProtection: { ...draft.flapProtection, windowMs: Number(event.target.value) * 3_600_000 } })} /></label>
+        <label><span>Карантин основного, мин</span><input type="number" min="10" max="10080" disabled={blocked || !draft.enabled} value={Math.round(draft.flapProtection.quarantineMs / 60_000)} onChange={(event) => update({ flapProtection: { ...draft.flapProtection, quarantineMs: Number(event.target.value) * 60_000 } })} /></label>
       </details>
 
       <div className="client-failover-runtime">
@@ -312,7 +535,7 @@ export function FailoverPanel({
         {activity && activity.blockers.length > 2 && <small>Ещё {activity.blockers.length - 2}</small>}
       </div>
 
-      {!draftValid && <p className="client-failover-validation">Выберите два разных сервера. Они могут быть из одной подписки.</p>}
+      {!draftValid && <p className="client-failover-validation">Выберите два разных сервера и хотя бы одну проверку.</p>}
       {confirmDiscard && <div className="client-failover-discard" role="alert">
         <span>Отменить несохранённые изменения?</span>
         <button type="button" onClick={() => { setDraft(snapshot.policy); setDirty(false); setConfirmDiscard(false); feature.beforeCloseRef.current = () => true; feature.close(); }}>Отменить изменения</button>
diff --git a/src/web/styles/features/failover.css b/src/web/styles/features/failover.css
index 13c909d..ae365ab 100644
--- a/src/web/styles/features/failover.css
+++ b/src/web/styles/features/failover.css
@@ -1,33 +1,62 @@
 .client-failover-header { display: grid; gap: 8px; margin: 0 8px 30px; }
 .client-failover-header > span, .client-failover-channel-title > span, .client-failover-services legend { color: var(--client-muted); font: var(--type-label); letter-spacing: var(--type-label-tracking); text-transform: var(--type-label-transform); }
+.client-failover-heading { min-height: 44px; display: flex; align-items: center; justify-content: space-between; gap: 20px; padding-right: 52px; }
 .client-failover-header h2 { margin: 0; font: var(--type-drawer-title); letter-spacing: var(--type-drawer-title-tracking); text-transform: var(--type-drawer-title-transform); }
 .client-failover-header p { margin: 0; color: var(--client-muted); font: var(--type-body); letter-spacing: var(--type-body-tracking); text-transform: var(--type-body-transform); }
 .client-failover-form { display: grid; gap: 24px; margin: 0 8px; }
-.client-failover-master { min-height: 54px; display: flex; align-items: center; justify-content: space-between; gap: 20px; border-bottom: 1px solid color-mix(in oklch, var(--client-border) 48%, transparent); }
-.client-failover-master > span { display: grid; gap: 3px; }
-.client-failover-master strong { font: var(--type-body); letter-spacing: var(--type-body-tracking); text-transform: var(--type-body-transform); }
-.client-failover-master small { color: var(--client-muted); font: var(--type-label); letter-spacing: var(--type-label-tracking); text-transform: var(--type-label-transform); }
-.client-failover-master input { width: 42px; height: 22px; }
-.client-failover-channel { display: grid; gap: 10px; }
+.client-failover-switch { position: relative; flex: 0 0 auto; width: 44px; height: 44px; padding: 0; border: 0; background: transparent; color: var(--client-muted); cursor: pointer; }
+.client-failover-switch::before { content: ''; position: absolute; inset: 11px 1px; border-radius: 999px; background: color-mix(in oklch, var(--client-muted) 24%, transparent); box-shadow: inset 0 0 0 1px color-mix(in oklch, var(--client-muted) 24%, transparent); transition: background 240ms cubic-bezier(0.16, 1, 0.3, 1), box-shadow 240ms cubic-bezier(0.16, 1, 0.3, 1); }
+.client-failover-switch > span { position: absolute; top: 13px; left: 3px; width: 18px; height: 18px; border-radius: 50%; background: color-mix(in oklch, var(--client-text) 88%, var(--client-bg)); box-shadow: 0 2px 8px color-mix(in oklch, black 30%, transparent); transform: translateX(0); transition: background 240ms cubic-bezier(0.16, 1, 0.3, 1), box-shadow 240ms cubic-bezier(0.16, 1, 0.3, 1), transform 240ms cubic-bezier(0.16, 1, 0.3, 1); }
+.client-failover-switch[aria-checked='true']::before { background: color-mix(in oklch, var(--client-accent) 72%, transparent); box-shadow: inset 0 0 0 1px color-mix(in oklch, var(--client-accent) 58%, transparent), 0 0 14px color-mix(in oklch, var(--client-accent) 28%, transparent); }
+.client-failover-switch[aria-checked='true'] > span { background: var(--client-text); box-shadow: 0 0 10px color-mix(in oklch, var(--client-accent) 46%, transparent); transform: translateX(20px); }
+.client-failover-switch:disabled { cursor: default; opacity: .42; }
+.client-failover-switch:focus-visible { outline: 2px solid var(--client-accent); outline-offset: 0; border-radius: 999px; }
+.client-failover-channel { position: relative; display: grid; gap: 6px; }
 .client-failover-channel-title { min-height: 28px; display: flex; align-items: center; justify-content: space-between; gap: 12px; }
-.client-failover-channel-title strong { color: var(--client-muted); font: var(--type-label); letter-spacing: var(--type-label-tracking); text-transform: var(--type-label-transform); transition: color 600ms ease, filter 600ms ease; }
+.client-failover-channel-title strong { min-width: 0; color: var(--client-muted); font: var(--type-label); letter-spacing: var(--type-label-tracking); text-transform: var(--type-label-transform); text-align: right; transition: color 600ms ease, filter 600ms ease; }
 .client-failover-channel-title strong.is-healthy { color: var(--client-accent); }
 .client-failover-channel-title strong.is-unhealthy { color: oklch(0.68 0.15 28); }
-.client-failover-channel label, .client-failover-timing label, .client-failover-advanced label { display: grid; grid-template-columns: minmax(0, 1fr) minmax(150px, 48%); align-items: center; gap: 16px; min-height: 38px; color: var(--client-muted); font: var(--type-label); letter-spacing: var(--type-label-tracking); text-transform: var(--type-label-transform); }
-.client-failover-channel select, .client-failover-timing input, .client-failover-advanced input { min-width: 0; min-height: 34px; border: 0; border-bottom: 1px solid var(--client-border); background: transparent; color: var(--client-text); font: var(--type-body); letter-spacing: var(--type-body-tracking); text-transform: var(--type-body-transform); }
+.client-failover-picker { position: relative; min-width: 0; z-index: 1; }
+.client-failover-picker.is-open { z-index: 6; }
+.client-failover-picker-trigger { width: 100%; min-height: 42px; display: flex; align-items: center; justify-content: space-between; gap: 12px; padding: 0 2px; border: 0; border-bottom: 1px solid var(--client-border); background: transparent; color: var(--client-text); font: var(--type-body); letter-spacing: var(--type-body-tracking); text-transform: var(--type-body-transform); text-align: left; box-shadow: 0 1px 0 transparent; cursor: pointer; transition: color 220ms ease, box-shadow 300ms ease, text-shadow 300ms ease; }
+.client-failover-picker-trigger span { min-width: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
+.client-failover-picker-trigger svg { flex: 0 0 auto; width: 9px; fill: none; stroke: currentColor; stroke-width: 1.5; transition: transform 240ms cubic-bezier(0.16, 1, 0.3, 1); }
+.client-failover-picker.is-open .client-failover-picker-trigger { color: var(--client-accent); box-shadow: 0 1px 0 color-mix(in oklch, var(--client-accent) 64%, transparent); text-shadow: 0 0 10px color-mix(in oklch, var(--client-accent) 34%, transparent); }
+.client-failover-picker.is-open .client-failover-picker-trigger svg { transform: rotate(180deg); }
+.client-failover-picker-trigger:disabled { color: var(--client-muted); cursor: default; opacity: .45; }
+.client-failover-picker-trigger:focus-visible { outline: 2px solid var(--client-accent); outline-offset: 2px; }
+.client-failover-picker-list { position: absolute; top: calc(100% + 3px); left: -8px; z-index: 5; width: calc(100% + 16px); max-height: min(320px, 48vh); display: grid; gap: 1px; padding: 7px 8px; overflow-y: auto; background: color-mix(in oklch, var(--client-bg) 92%, transparent); -webkit-backdrop-filter: blur(18px); backdrop-filter: blur(18px); opacity: 0; visibility: hidden; filter: blur(6px); transform: translateY(-6px); pointer-events: none; transition: opacity 180ms ease, filter 180ms ease, transform 180ms cubic-bezier(0.16, 1, 0.3, 1), visibility 0s 180ms; }
+.client-failover-picker.is-open .client-failover-picker-list { opacity: 1; visibility: visible; filter: blur(0); transform: translateY(0); pointer-events: auto; transition: opacity 240ms ease, filter 240ms ease, transform 240ms cubic-bezier(0.16, 1, 0.3, 1), visibility 0s; }
+.client-failover-picker-list button { min-height: 34px; padding: 6px; border: 0; background: transparent; color: var(--client-muted); font: var(--type-label); letter-spacing: var(--type-label-tracking); text-transform: var(--type-label-transform); text-align: left; cursor: pointer; opacity: 0; filter: blur(5px); transform: translateY(-4px); transition: color 180ms ease, opacity 180ms ease, filter 180ms ease, transform 240ms cubic-bezier(0.16, 1, 0.3, 1); }
+.client-failover-picker.is-open .client-failover-picker-list button { opacity: 1; filter: blur(0); transform: translateY(0); transition-delay: calc(var(--picker-index) * 30ms); }
+.client-failover-picker-list button:hover, .client-failover-picker-list button:focus-visible, .client-failover-picker-list button[aria-selected='true'] { outline: 0; color: var(--client-accent); text-shadow: 0 0 9px color-mix(in oklch, var(--client-accent) 38%, transparent); }
+.client-failover-picker-list button[aria-disabled='true'] { color: color-mix(in oklch, var(--client-muted) 58%, transparent); cursor: default; text-shadow: none; }
+.client-failover-timing label, .client-failover-advanced label { display: grid; grid-template-columns: minmax(0, 1fr) minmax(150px, 48%); align-items: center; gap: 16px; min-height: 38px; color: var(--client-muted); font: var(--type-label); letter-spacing: var(--type-label-tracking); text-transform: var(--type-label-transform); }
+.client-failover-timing input, .client-failover-advanced input { min-width: 0; min-height: 34px; border: 0; border-bottom: 1px solid var(--client-border); background: transparent; color: var(--client-text); font: var(--type-body); letter-spacing: var(--type-body-tracking); text-transform: var(--type-body-transform); }
+.client-failover-timing input:disabled, .client-failover-advanced input:disabled { color: var(--client-muted); opacity: .45; }
 .client-failover-services { display: grid; gap: 9px; margin: 0; padding: 0; border: 0; }
 .client-failover-services legend { margin-bottom: 10px; }
-.client-failover-service { display: grid; grid-template-columns: minmax(0, 1fr) auto; align-items: center; gap: 12px; min-height: 34px; }
-.client-failover-service > label { display: flex; align-items: center; gap: 10px; font: var(--type-body); letter-spacing: var(--type-body-tracking); text-transform: var(--type-body-transform); }
-.client-failover-service > .client-failover-service-timeout { color: var(--client-muted); font: var(--type-label); letter-spacing: var(--type-label-tracking); text-transform: var(--type-label-transform); }
+.client-failover-service { display: grid; grid-template-columns: minmax(0, 1fr) auto 32px; align-items: center; gap: 12px; min-height: 38px; animation: failover-service-in 260ms cubic-bezier(0.16, 1, 0.3, 1) both; }
+.client-failover-service.is-removing { animation: failover-service-out 180ms ease both; pointer-events: none; }
+.client-failover-service-name { min-width: 0; overflow: hidden; color: var(--client-text); font: var(--type-body); letter-spacing: var(--type-body-tracking); text-overflow: ellipsis; text-transform: var(--type-body-transform); white-space: nowrap; }
+.client-failover-service-timeout { display: flex; align-items: center; gap: 8px; color: var(--client-muted); font: var(--type-label); letter-spacing: var(--type-label-tracking); text-transform: var(--type-label-transform); }
 .client-failover-service-timeout input { width: 52px; min-height: 30px; border: 0; border-bottom: 1px solid var(--client-border); background: transparent; color: var(--client-text); font: var(--type-body); letter-spacing: var(--type-body-tracking); text-transform: var(--type-body-transform); }
-.client-failover-add-service { justify-self: start; padding: 7px 0; border: 0; background: transparent; color: var(--client-accent); font: var(--type-control); letter-spacing: var(--type-control-tracking); text-transform: var(--type-control-transform); cursor: pointer; }
-.client-failover-add-service:disabled { color: var(--client-muted); cursor: default; opacity: .45; }
-.client-failover-service-editor { display: grid; grid-template-columns: minmax(0, 1fr) minmax(0, 1.6fr); gap: 8px 12px; padding: 8px 0; }
+.client-failover-remove-service { width: 32px; height: 32px; padding: 0; border: 0; background: transparent; color: var(--client-muted); font: var(--type-icon-close); cursor: pointer; transition: color 180ms ease, transform 240ms cubic-bezier(0.16, 1, 0.3, 1); }
+.client-failover-remove-service:hover:not(:disabled), .client-failover-remove-service:focus-visible { outline: 0; color: oklch(0.68 0.15 28); transform: scale(1.08); }
+.client-failover-remove-service:disabled { cursor: default; opacity: .28; }
+.client-failover-services > .client-failover-picker { justify-self: start; min-width: 210px; }
+.client-failover-services > .client-failover-picker .client-failover-picker-trigger { color: var(--client-accent); font: var(--type-control); letter-spacing: var(--type-control-tracking); text-transform: var(--type-control-transform); }
+.client-failover-services > .client-failover-picker .client-failover-picker-list { width: max-content; min-width: calc(100% + 16px); }
+.client-failover-service-editor { display: grid; grid-template-columns: minmax(0, 1fr) minmax(0, 1.6fr); gap: 8px 12px; padding: 8px 0; animation: failover-service-in 260ms cubic-bezier(0.16, 1, 0.3, 1) both; }
 .client-failover-service-editor input { min-width: 0; min-height: 34px; border: 0; border-bottom: 1px solid var(--client-border); background: transparent; color: var(--client-text); font: var(--type-body); letter-spacing: var(--type-body-tracking); text-transform: var(--type-body-transform); }
 .client-failover-service-editor span { grid-column: 1 / -1; color: oklch(0.68 0.15 28); font: var(--type-label); letter-spacing: var(--type-label-tracking); text-transform: var(--type-label-transform); }
 .client-failover-service-editor button { justify-self: start; padding: 4px 0; border: 0; background: transparent; color: var(--client-accent); font: var(--type-control); letter-spacing: var(--type-control-tracking); text-transform: var(--type-control-transform); cursor: pointer; }
+.client-failover-service-editor button:disabled { color: var(--client-muted); cursor: default; opacity: .45; }
 .client-failover-timing { display: grid; gap: 5px; }
+.client-failover-traffic-switch { min-height: 58px; display: flex; align-items: center; justify-content: space-between; gap: 18px; margin: 8px 0 4px; }
+.client-failover-traffic-switch > span { min-width: 0; display: grid; gap: 3px; }
+.client-failover-traffic-switch strong { color: var(--client-text); font: var(--type-body); letter-spacing: var(--type-body-tracking); text-transform: var(--type-body-transform); }
+.client-failover-traffic-switch small { color: var(--client-muted); font: var(--type-label); letter-spacing: var(--type-label-tracking); text-transform: var(--type-label-transform); }
 .client-failover-advanced summary { min-height: 38px; color: var(--client-accent); font: var(--type-control); letter-spacing: var(--type-control-tracking); text-transform: var(--type-control-transform); cursor: pointer; }
 .client-failover-runtime { min-height: 132px; display: grid; align-content: center; gap: 5px; padding: 14px 0; border-top: 1px solid color-mix(in oklch, var(--client-border) 48%, transparent); border-bottom: 1px solid color-mix(in oklch, var(--client-border) 48%, transparent); font-variant-numeric: var(--numeric-tabular); }
 .client-failover-runtime strong { font: var(--type-body); letter-spacing: var(--type-body-tracking); text-transform: var(--type-body-transform); }
@@ -40,6 +69,8 @@
 .client-failover-actions button { padding: 7px 0; border: 0; background: transparent; color: var(--client-accent); font: var(--type-control); letter-spacing: var(--type-control-tracking); text-transform: var(--type-control-transform); cursor: pointer; }
 .client-failover-actions small { flex-basis: 100%; margin-top: -14px; color: var(--client-muted); font: var(--type-label); letter-spacing: var(--type-label-tracking); text-transform: var(--type-label-transform); }
 .client-failover-actions button:disabled { color: var(--client-muted); cursor: default; opacity: .45; }
-.client-failover-actions button:focus-visible, .client-failover-form input:focus-visible, .client-failover-form select:focus-visible, .client-failover-advanced summary:focus-visible, .client-failover-add-service:focus-visible, .client-failover-service-editor button:focus-visible, .client-failover-discard button:focus-visible { outline: 2px solid var(--client-accent); outline-offset: 2px; }
-@media (max-width: 560px) { .client-failover-channel label, .client-failover-timing label, .client-failover-advanced label { grid-template-columns: 1fr; gap: 4px; } .client-failover-service, .client-failover-service-editor { grid-template-columns: 1fr; gap: 2px; } }
-@media (prefers-reduced-motion: reduce) { .client-failover-channel-title strong { transition: none; } }
+.client-failover-actions button:focus-visible, .client-failover-form input:focus-visible, .client-failover-advanced summary:focus-visible, .client-failover-service-editor button:focus-visible, .client-failover-discard button:focus-visible { outline: 2px solid var(--client-accent); outline-offset: 2px; }
+@keyframes failover-service-in { from { opacity: 0; filter: blur(5px); transform: translateY(-4px); } to { opacity: 1; filter: blur(0); transform: translateY(0); } }
+@keyframes failover-service-out { from { opacity: 1; filter: blur(0); transform: translateY(0); } to { opacity: 0; filter: blur(5px); transform: translateY(-4px); } }
+@media (max-width: 560px) { .client-failover-heading { padding-right: 44px; } .client-failover-channel-title { align-items: start; } .client-failover-channel-title strong { max-width: 60%; } .client-failover-timing label, .client-failover-advanced label { grid-template-columns: 1fr; gap: 4px; } .client-failover-service { grid-template-columns: minmax(0, 1fr) 32px; gap: 6px 10px; } .client-failover-service-timeout { grid-column: 1; grid-row: 2; justify-self: start; } .client-failover-remove-service { grid-column: 2; grid-row: 1 / span 2; } .client-failover-service-editor { grid-template-columns: 1fr; gap: 2px; } }
+@media (prefers-reduced-motion: reduce) { .client-failover-channel-title strong, .client-failover-switch::before, .client-failover-switch > span, .client-failover-picker-trigger, .client-failover-picker-trigger svg, .client-failover-picker-list, .client-failover-picker-list button, .client-failover-remove-service { transition: none; } .client-failover-service, .client-failover-service-editor { animation: none; } }
diff --git a/test/web/failover-feature-contract.test.js b/test/web/failover-feature-contract.test.js
index 4523374..1edfd93 100644
--- a/test/web/failover-feature-contract.test.js
+++ b/test/web/failover-feature-contract.test.js
@@ -16,17 +16,29 @@ test('reserve is a Gateway-only drawer immediately after subscriptions', () => {
   assert.match(feature, /Уже открытые соединения Harbor не закрывает/);
 });
 
-test('failover settings expose an off switch, channel targets, checks and per-service timeouts', () => {
-  assert.match(feature, /Использовать резерв[\s\S]*Полностью пассивен/);
-  assert.match(feature, /\['primary', 'reserve'\][\s\S]*Подписка[\s\S]*Сервер/);
+test('failover settings use Harbor switches, two pair pickers and added check rows', () => {
+  assert.match(feature, /client-failover-heading[\s\S]*<h2>Резервный канал<\/h2>[\s\S]*<HarborSwitch/);
+  assert.match(feature, /role="switch"[\s\S]*aria-checked=\{checked\}/);
+  assert.doesNotMatch(feature, /type="checkbox"|<select/);
+  assert.match(feature, /\['primary', 'reserve'\][\s\S]*client-failover-\$\{channel\}-options[\s\S]*updateTarget\(channel, optionId\)/);
+  assert.match(feature, /profile\.label} · \$\{server\.label/);
+  assert.match(feature, /ArrowDown[\s\S]*Home[\s\S]*End[\s\S]*Escape/);
+  assert.match(feature, /role="listbox"[\s\S]*role="option"/);
   assert.match(feature, /Что проверять/);
   assert.match(feature, /min="2"[\s\S]*max="30"[\s\S]*Таймаут проверки:/);
   assert.match(feature, /Проверять каждые, сек[\s\S]*Сбой должен длиться, сек[\s\S]*Восстановление, сек/);
-  assert.match(feature, /Не переключать во время работы[\s\S]*Тишина перед переключением[\s\S]*Активный трафик, КБ\/с/);
+  assert.match(feature, /Переключение во время работы[\s\S]*Ждать тишины перед автоматическим переключением[\s\S]*Тишина перед переключением[\s\S]*Активный трафик, КБ\/с/);
   assert.match(feature, /Защита от повторных сбоев[\s\S]*Окно повторных сбоев[\s\S]*Карантин основного/);
-  assert.match(feature, /Добавить HTTPS-сервис/);
+  assert.match(feature, /\+ Добавить проверку/);
+  assert.match(feature, /Новый HTTPS-сервис…/);
+  assert.match(feature, /Убрать проверку:/);
+  assert.match(feature, /finishRemoveCheck/);
+  assert.match(feature, /startViewTransition/);
   assert.match(feature, /Проверить оба канала/);
   assert.match(feature, /beforeunload/);
+  assert.match(styles, /\.client-failover-switch\[aria-checked='true'\][\s\S]*translateX\(20px\)/);
+  assert.match(styles, /\.client-failover-picker-list[\s\S]*opacity:\s*0[\s\S]*\.client-failover-picker\.is-open[\s\S]*opacity:\s*1/);
+  assert.match(styles, /failover-service-out 180ms[\s\S]*@media \(prefers-reduced-motion: reduce\)/);
 });
 
 test('runtime status keeps fixed geometry and explains active traffic without motion dependence', () => {
diff --git a/test/web/style-boundaries.test.js b/test/web/style-boundaries.test.js
index 59d8614..c0e8f7a 100644
--- a/test/web/style-boundaries.test.js
+++ b/test/web/style-boundaries.test.js
@@ -39,26 +39,26 @@ const expectedImports = [
 const sha256 = (value) => crypto.createHash('sha256').update(value).digest('hex');
 const acceptedLedger = {
   counts: {
-    cascadeEdges: 984,
+    cascadeEdges: 1015,
     customProperties: 106,
-    declarations: 3805,
+    declarations: 3987,
     important: 0,
-    keyframes: 48,
+    keyframes: 50,
     media: 17,
-    rules: 1045,
-    variableReferences: 977,
+    rules: 1085,
+    variableReferences: 1011,
   },
   hashes: {
-    cascadeEdges: '423d29f846b45c3522fdc101b5aa1399264f2abe5953b9687b380d5fb865bd07',
+    cascadeEdges: 'f90d8086d1e3e30462b4c7b9c293069940006ab2ac2be069c7e3f293b411d390',
     customProperties: 'fd6f16069f9fe3526f09d4d574431ddae67150d8e7a8a40e04c9fd2d179ec7ac',
-    declarations: '52b5bcd795dbea19950afee0259c62cb0fb1aaca094d553cfaaae046a5f747f9',
+    declarations: 'dffddfea7b28b9de1a4af74f16d25920974879c9cecff19141841691e63468dd',
     duplicateKeyframes: '4f53cda18c2baa0c0354bb5f9a3ecbe5ed12ab4d8e11ba873c2f11161202b945',
     duplicateSelectors: '8982145dba05b33bf1c93b2d54cfbe76305b276ff3c657aa020144016ada5848',
-    keyframes: 'a0d69c5b3e5f235d3a76ed04bdd64f67a73fafc9c59fe2635ffda603709c0ad9',
-    ruleDeclarationSequences: 'bd8d10966c15df58eb76d67fc5a21acaeec524a64805797d5fb33af3b942292e',
-    selectors: '76d2d373aa9ecfd5cac3f95a47ed0fa2c44a659ac98f02f6bfd2f4505de23226',
-    variableReferences: 'bea2b082cf2366041936c2da22ac3e0ab83b3e5cead1326a0f65a015daedbb3b',
-    witnesses: '605555d8bae9b8d64b1c960c398b14cf910e624d547b72e4fcfced85eec30991',
+    keyframes: '21e640e8d2bf5921d346563823dd332cb4c0fc376292b555d10e1670cd81d74c',
+    ruleDeclarationSequences: '144d9f148f8fa2b57bd7d40a02f75f6d6894d7d1e0b6a44ec6f18b22eb876055',
+    selectors: '279ee9d08e470259ee573e063d8dec8aabb7c43fc49f3c7942cc8d5af46e4828',
+    variableReferences: '00358fb265ec9e847a36fbf157224d01b634477c546f1a6b72a70e8d05394a57',
+    witnesses: 'c45f872c163e079f58d28c481db0b9cf919d5d4e1d053ddfdc00103bd20ae737',
   },
 };
 
@@ -211,7 +211,7 @@ test('client typography uses the shared semantic scale outside the token owner',
 
 test('accepted stylesheet has pinned declaration, selector, keyframe, variable, and cascade ledgers', () => {
   const witnesses = readStyleWitnesses(root);
-  assert.equal(witnesses.length, 1021);
+  assert.equal(witnesses.length, 1024);
   assert.equal(witnesses.filter((witness) => witness.unknown || witness.ancestorUnknown).length, 0);
   const ledger = createStyleLedger(readStyleSource(root), { witnesses });
   assert.deepEqual(ledger.counts, acceptedLedger.counts);
@@ -407,8 +407,8 @@ test('main owns one public stylesheet and the regrouped production CSS is determ
   assert.equal((main.match(/import ['"][^'"]+\.css['"]/g) || []).length, 1);
 
   const assets = fs.readdirSync(path.join(root, 'dist/assets')).filter((file) => file.endsWith('.css'));
-  assert.deepEqual(assets, ['index-DaioW5qf.css']);
+  assert.deepEqual(assets, ['index-CWWRFYvR.css']);
   const built = fs.readFileSync(path.join(root, 'dist/assets', assets[0]));
-  assert.equal(built.byteLength, 144728);
-  assert.equal(sha256(built), '7d175321821b38be6a947a76457e310cf519e2af4b9ee95fbb0097933ca70a28');
+  assert.equal(built.byteLength, 151327);
+  assert.equal(sha256(built), '95bdf0125b40fe1349abd6396a40462a9c6bee40ff258078d3787b62e9213028');
 });