diff --git a/src/components/CreateTaskModal.tsx b/src/components/CreateTaskModal.tsx
index 32cd9df..b01b536 100644
--- a/src/components/CreateTaskModal.tsx
+++ b/src/components/CreateTaskModal.tsx
@@ -50,8 +50,8 @@ export default function CreateTaskModal({ projectId, initialStatus, parentId, pa
 
   useEffect(() => {
     getMembers().then(setMembers).catch(() => {});
-    getLabels(projectId).then(setLabels).catch(() => {});
-  }, [projectId]);
+    getLabels().then(setLabels).catch(() => {});
+  }, []);
 
   const handleSubmit = async () => {
     if (!title.trim()) return;
diff --git a/src/components/ProjectSettings.tsx b/src/components/ProjectSettings.tsx
index 2d82b29..468a4a4 100644
--- a/src/components/ProjectSettings.tsx
+++ b/src/components/ProjectSettings.tsx
@@ -1,6 +1,6 @@
 import { useState, useEffect } from "react";
 import { useNavigate } from "react-router-dom";
-import type { Project, ProjectMember, Member, Label } from "@/lib/api";
+import type { Project, ProjectMember, Member } from "@/lib/api";
 import { 
   updateProject, 
   deleteProject, 
@@ -8,9 +8,6 @@ import {
   addProjectMember, 
   removeProjectMember, 
   getMembers,
-  getLabels,
-  createLabel,
-  deleteLabel,
 } from "@/lib/api";
 
 interface Props {
@@ -35,10 +32,7 @@ export default function ProjectSettings({ project, onUpdated }: Props) {
   const [loadingMembers, setLoadingMembers] = useState(true);
   const [selectedMember, setSelectedMember] = useState("");
 
-  // Labels state
-  const [labels, setLabels] = useState<Label[]>([]);
-  const [newLabelName, setNewLabelName] = useState("");
-  const [newLabelColor, setNewLabelColor] = useState("#6366f1");
+  // Labels removed — now in app settings
 
   // Load project members and all members
   useEffect(() => {
@@ -50,8 +44,7 @@ export default function ProjectSettings({ project, onUpdated }: Props) {
         ]);
         setMembers(projectMembers);
         setAllMembers(allMembersList);
-        const projectLabels = await getLabels(project.id);
-        setLabels(projectLabels);
+        // Labels now in app settings
       } catch (e) {
         console.error("Failed to load members:", e);
       } finally {
@@ -97,7 +90,6 @@ export default function ProjectSettings({ project, onUpdated }: Props) {
         description: description.trim() || null,
         repo_urls: urls,
         status,
-        auto_assign: autoAssign,
       });
       onUpdated(updated);
       setSaved(true);
@@ -173,7 +165,14 @@ export default function ProjectSettings({ project, onUpdated }: Props) {
           <div className="text-xs text-[var(--muted)]">Назначать задачи агентам по лейблам ↔ capabilities</div>
         </div>
         <button
-          onClick={() => setAutoAssign(!autoAssign)}
+          onClick={async () => {
+            const newVal = !autoAssign;
+            setAutoAssign(newVal);
+            try {
+              const updated = await updateProject(project.id, { auto_assign: newVal });
+              onUpdated(updated);
+            } catch (e) { setAutoAssign(!newVal); }
+          }}
           className={`relative w-10 h-5 rounded-full transition-colors duration-200 ${
             autoAssign ? "bg-[var(--accent)]" : "bg-[var(--border)]"
           }`}
@@ -196,50 +195,6 @@ export default function ProjectSettings({ project, onUpdated }: Props) {
       </div>
 
       {/* Labels Section */}
-      <div className="pt-6 border-t border-[var(--border)]">
-        <div className="text-sm font-medium mb-3">Лейблы</div>
-        <div className="space-y-2 mb-3">
-          {labels.map((label) => (
-            <div key={label.id} className="flex items-center justify-between p-2 bg-[var(--bg)] border border-[var(--border)] rounded-lg">
-              <div className="flex items-center gap-2">
-                <span className="w-3 h-3 rounded-full" style={{ backgroundColor: label.color }} />
-                <span className="text-sm">{label.name}</span>
-              </div>
-              <button
-                onClick={async () => {
-                  await deleteLabel(label.id);
-                  setLabels(labels.filter(l => l.id !== label.id));
-                }}
-                className="text-xs text-red-400 hover:text-red-300"
-              >×</button>
-            </div>
-          ))}
-        </div>
-        <div className="flex gap-2">
-          <input
-            value={newLabelName}
-            onChange={e => setNewLabelName(e.target.value)}
-            placeholder="Новый лейбл..."
-            className="flex-1 px-3 py-1.5 bg-[var(--bg)] border border-[var(--border)] rounded-lg text-sm outline-none"
-          />
-          <input
-            type="color"
-            value={newLabelColor}
-            onChange={e => setNewLabelColor(e.target.value)}
-            className="w-8 h-8 rounded cursor-pointer"
-          />
-          <button
-            onClick={async () => {
-              if (!newLabelName.trim()) return;
-              const label = await createLabel(project.id, newLabelName.trim(), newLabelColor);
-              setLabels([...labels, label]);
-              setNewLabelName("");
-            }}
-            className="px-3 py-1.5 bg-[var(--accent)] text-white rounded-lg text-sm"
-          >+</button>
-        </div>
-      </div>
-
       {/* Members Section */}
       <div className="pt-6 border-t border-[var(--border)]">
         <div className="text-sm font-medium mb-3">Участники</div>
diff --git a/src/lib/api.ts b/src/lib/api.ts
index f2c6ece..d7a751f 100644
--- a/src/lib/api.ts
+++ b/src/lib/api.ts
@@ -464,17 +464,16 @@ export async function deleteTaskLink(taskId: string, linkId: string): Promise<vo
 // --- Labels ---
 export interface Label {
   id: string;
-  project_id: string;
   name: string;
   color: string;
 }
 
-export async function getLabels(projectId: string): Promise<Label[]> {
-  return request(`/projects/${projectId}/labels`);
+export async function getLabels(): Promise<Label[]> {
+  return request(`/labels`);
 }
 
-export async function createLabel(projectId: string, name: string, color: string = "#6366f1"): Promise<Label> {
-  return request(`/projects/${projectId}/labels`, { method: "POST", body: JSON.stringify({ name, color }) });
+export async function createLabel(name: string, color: string = "#6366f1"): Promise<Label> {
+  return request(`/labels`, { method: "POST", body: JSON.stringify({ name, color }) });
 }
 
 export async function deleteLabel(labelId: string): Promise<void> {
diff --git a/src/pages/settings/SettingsPage.tsx b/src/pages/settings/SettingsPage.tsx
index 485a58c..91222e6 100644
--- a/src/pages/settings/SettingsPage.tsx
+++ b/src/pages/settings/SettingsPage.tsx
@@ -1,10 +1,74 @@
+import { useState, useEffect } from "react";
+import type { Label } from "@/lib/api";
+import { getLabels, createLabel, deleteLabel } from "@/lib/api";
+
 export default function SettingsPage() {
+  const [labels, setLabels] = useState<Label[]>([]);
+  const [newName, setNewName] = useState("");
+  const [newColor, setNewColor] = useState("#6366f1");
+
+  useEffect(() => {
+    getLabels().then(setLabels).catch(() => {});
+  }, []);
+
   return (
-    <div className="p-6">
-      <h1 className="text-2xl font-bold mb-4">⚙️ Общие настройки</h1>
-      <div className="text-[var(--muted)] text-sm">
-        <p>Coming soon...</p>
+    <div className="p-6 max-w-2xl">
+      <h1 className="text-2xl font-bold mb-6">⚙️ Общие настройки</h1>
+
+      {/* Labels */}
+      <div>
+        <h2 className="text-lg font-semibold mb-3">Лейблы</h2>
+        <p className="text-xs text-[var(--muted)] mb-3">Глобальные лейблы для задач и агентов. Используются для авто-назначения.</p>
+        <div className="space-y-2 mb-4">
+          {labels.map((label) => (
+            <div key={label.id} className="flex items-center justify-between p-2 bg-[var(--bg)] border border-[var(--border)] rounded-lg">
+              <div className="flex items-center gap-2">
+                <span className="w-3 h-3 rounded-full" style={{ backgroundColor: label.color }} />
+                <span className="text-sm">{label.name}</span>
+              </div>
+              <button
+                onClick={async () => {
+                  await deleteLabel(label.id);
+                  setLabels(labels.filter(l => l.id !== label.id));
+                }}
+                className="text-xs text-red-400 hover:text-red-300"
+              >×</button>
+            </div>
+          ))}
+          {labels.length === 0 && <p className="text-xs text-[var(--muted)]">Нет лейблов</p>}
+        </div>
+        <div className="flex gap-2">
+          <input
+            value={newName}
+            onChange={e => setNewName(e.target.value)}
+            onKeyDown={e => {
+              if (e.key === "Enter" && newName.trim()) {
+                createLabel(newName.trim(), newColor).then(l => {
+                  setLabels([...labels, l]);
+                  setNewName("");
+                });
+              }
+            }}
+            placeholder="Новый лейбл..."
+            className="flex-1 px-3 py-1.5 bg-[var(--bg)] border border-[var(--border)] rounded-lg text-sm outline-none"
+          />
+          <input
+            type="color"
+            value={newColor}
+            onChange={e => setNewColor(e.target.value)}
+            className="w-8 h-8 rounded cursor-pointer"
+          />
+          <button
+            onClick={async () => {
+              if (!newName.trim()) return;
+              const label = await createLabel(newName.trim(), newColor);
+              setLabels([...labels, label]);
+              setNewName("");
+            }}
+            className="px-3 py-1.5 bg-[var(--accent)] text-white rounded-lg text-sm"
+          >+</button>
+        </div>
       </div>
     </div>
   );
-}
\ No newline at end of file
+}