diff --git a/frontend/src/components/CreateGroupForm.tsx b/frontend/src/components/CreateGroupForm.tsx
index 9e40252..3c8a524 100644
--- a/frontend/src/components/CreateGroupForm.tsx
+++ b/frontend/src/components/CreateGroupForm.tsx
@@ -4,6 +4,7 @@ import { ApiError } from "../api/client";
 import { useToast } from "../context/ToastContext";
 import { useCreateGroup } from "../hooks/groups";
 import { useExpansions } from "../hooks/reference";
+import { Switch } from "./Switch";
 
 export function CreateGroupForm({ onCreated }: { onCreated?: () => void }) {
   const { data: expansions } = useExpansions();
@@ -47,9 +48,7 @@ export function CreateGroupForm({ onCreated }: { onCreated?: () => void }) {
                 {e.name_ru}
                 {e.is_base && <span className="muted small"> (всегда включено)</span>}
               </span>
-              <input
-                type="checkbox"
-                style={{ width: "auto" }}
+              <Switch
                 disabled={e.is_base}
                 checked={e.is_base || selected.has(e.id)}
                 onChange={() => toggle(e.id)}
diff --git a/frontend/src/components/Switch.tsx b/frontend/src/components/Switch.tsx
new file mode 100644
index 0000000..435878c
--- /dev/null
+++ b/frontend/src/components/Switch.tsx
@@ -0,0 +1,27 @@
+/**
+ * Тумблер вкл/выкл (стили .switch в global.css) — единый контрол для булевых опций
+ * (дополнения группы, фильтры, флаги). Вместо нативных чекбоксов.
+ */
+export function Switch({
+  checked,
+  disabled,
+  onChange,
+}: {
+  checked: boolean;
+  disabled?: boolean;
+  onChange?: (checked: boolean) => void;
+}) {
+  return (
+    <span className="switch">
+      <input
+        type="checkbox"
+        checked={checked}
+        disabled={disabled}
+        onChange={(e) => onChange?.(e.target.checked)}
+      />
+      <span className="switch-track">
+        <span className="switch-thumb" />
+      </span>
+    </span>
+  );
+}
diff --git a/frontend/src/pages/GroupSettingsPage.tsx b/frontend/src/pages/GroupSettingsPage.tsx
index 6e82776..c71a0b8 100644
--- a/frontend/src/pages/GroupSettingsPage.tsx
+++ b/frontend/src/pages/GroupSettingsPage.tsx
@@ -4,6 +4,7 @@ import { useEffect, useState } from "react";
 import { ApiError } from "../api/client";
 import { PlayerLink } from "../components/PlayerLink";
 import { Spinner } from "../components/Spinner";
+import { Switch } from "../components/Switch";
 import { MAX_GROUP_SIZE } from "../domain/constants";
 import { useToast } from "../context/ToastContext";
 import { useMe } from "../hooks/auth";
@@ -73,24 +74,20 @@ export function GroupSettingsPage() {
       <div className="card">
         <h3>Дополнения</h3>
         <div className="stack">
-          {(expansions ?? [])
-            .filter((e) => !e.is_base)
-            .map((e) => (
-              <label key={e.id} className="row" style={{ justifyContent: "space-between" }}>
-                <span>{e.name_ru}</span>
-                <span className="switch">
-                  <input
-                    type="checkbox"
-                    disabled={!isOwner}
-                    checked={selected.has(e.id)}
-                    onChange={() => toggle(e.id)}
-                  />
-                  <span className="switch-track">
-                    <span className="switch-thumb" />
-                  </span>
-                </span>
-              </label>
-            ))}
+          {/* Базовые дополнения показываем, как и при создании группы: включены и заблокированы. */}
+          {(expansions ?? []).map((e) => (
+            <label key={e.id} className="row" style={{ justifyContent: "space-between" }}>
+              <span>
+                {e.name_ru}
+                {e.is_base && <span className="muted small"> (всегда включено)</span>}
+              </span>
+              <Switch
+                disabled={e.is_base || !isOwner}
+                checked={e.is_base || selected.has(e.id)}
+                onChange={() => toggle(e.id)}
+              />
+            </label>
+          ))}
         </div>
         {isOwner && (
           <button className="btn btn-primary" style={{ marginTop: 10 }} onClick={saveExpansions}>
diff --git a/frontend/src/pages/admin/AdminMatchEdit.tsx b/frontend/src/pages/admin/AdminMatchEdit.tsx
index 07eba02..7e81778 100644
--- a/frontend/src/pages/admin/AdminMatchEdit.tsx
+++ b/frontend/src/pages/admin/AdminMatchEdit.tsx
@@ -3,6 +3,7 @@ import { useEffect, useState } from "react";
 import { ApiError } from "../../api/client";
 import { MatchMedia } from "../../components/MatchMedia";
 import { Spinner } from "../../components/Spinner";
+import { Switch } from "../../components/Switch";
 import { WIN_REASONS, type WinReason } from "../../domain/winReasons";
 import { useToast } from "../../context/ToastContext";
 import {
@@ -141,12 +142,7 @@ export function AdminMatchEdit({ matchId, onClose }: { matchId: number; onClose:
                       />
                     </div>
                     <label className="row small" style={{ flex: "0 0 auto", gap: 4 }}>
-                      <input
-                        type="checkbox"
-                        style={{ width: "auto" }}
-                        checked={r.eliminated}
-                        onChange={(e) => upd(i, { eliminated: e.target.checked })}
-                      />
+                      <Switch checked={r.eliminated} onChange={(v) => upd(i, { eliminated: v })} />
                       выбыл
                     </label>
                   </div>
diff --git a/frontend/src/pages/admin/AdminRecordsPage.tsx b/frontend/src/pages/admin/AdminRecordsPage.tsx
index 5364427..7fd1c7a 100644
--- a/frontend/src/pages/admin/AdminRecordsPage.tsx
+++ b/frontend/src/pages/admin/AdminRecordsPage.tsx
@@ -2,6 +2,7 @@ import { Pencil, Trash2 } from "lucide-react";
 import { useMemo, useState } from "react";
 
 import { Spinner } from "../../components/Spinner";
+import { Switch } from "../../components/Switch";
 import { useToast } from "../../context/ToastContext";
 import {
   useAdminDeleteMatch,
@@ -112,12 +113,7 @@ export function AdminRecordsPage() {
             ))}
           </select>
           <label className="row" style={{ gap: 8 }}>
-            <input
-              type="checkbox"
-              style={{ width: "auto" }}
-              checked={grouped}
-              onChange={(e) => setGrouped(e.target.checked)}
-            />
+            <Switch checked={grouped} onChange={setGrouped} />
             Группировать по группам
           </label>
         </div>