diff --git a/MCPForUnity/Editor/Dependencies/UvInstaller.cs b/MCPForUnity/Editor/Dependencies/UvInstaller.cs
new file mode 100644
index 000000000..002ae69e0
--- /dev/null
+++ b/MCPForUnity/Editor/Dependencies/UvInstaller.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Runtime.InteropServices;
+using MCPForUnity.Editor.Helpers;
+
+namespace MCPForUnity.Editor.Dependencies
+{
+    /// <summary>
+    /// Runs the official uv installer for the current platform. UI-agnostic: build the command,
+    /// run it (off the main thread), and report the outcome. The caller owns confirmation and
+    /// re-checking dependencies afterwards.
+    /// Installer reference: https://docs.astral.sh/uv/getting-started/installation/
+    /// </summary>
+    public static class UvInstaller
+    {
+        public readonly struct UvInstallResult
+        {
+            public readonly bool Success;
+            public readonly string Output;
+
+            public UvInstallResult(bool success, string output)
+            {
+                Success = success;
+                Output = output ?? string.Empty;
+            }
+        }
+
+        /// <summary>One-click install is available on Windows, macOS and Linux.</summary>
+        public static bool IsSupported =>
+            RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ||
+            RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ||
+            RuntimeInformation.IsOSPlatform(OSPlatform.Linux);
+
+        /// <summary>
+        /// Build the installer invocation for the current platform. Pure and testable — the
+        /// returned command is exactly what <see cref="Run"/> executes and what the confirm
+        /// dialog shows the user.
+        /// </summary>
+        public static (string file, string arguments) BuildInstallCommand()
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                return ("powershell",
+                    "-NoProfile -ExecutionPolicy ByPass -c \"irm https://astral.sh/uv/install.ps1 | iex\"");
+            }
+
+            // macOS and Linux share the POSIX shell installer.
+            return ("/bin/sh", "-c \"curl -LsSf https://astral.sh/uv/install.sh | sh\"");
+        }
+
+        /// <summary>Human-readable one-line description of the command that will run.</summary>
+        public static string DescribeCommand()
+        {
+            var (file, arguments) = BuildInstallCommand();
+            return $"{file} {arguments}";
+        }
+
+        /// <summary>
+        /// Run the installer and return the outcome. Blocks until the installer exits or the
+        /// timeout elapses, so call it off the main thread (e.g. via Task.Run).
+        /// </summary>
+        public static UvInstallResult Run(int timeoutMs = 180000)
+        {
+            try
+            {
+                var (file, arguments) = BuildInstallCommand();
+                bool ok = ExecPath.TryRun(file, arguments, null, out string stdout, out string stderr, timeoutMs);
+                return new UvInstallResult(ok, Combine(stdout, stderr));
+            }
+            catch (Exception ex)
+            {
+                return new UvInstallResult(false, ex.Message);
+            }
+        }
+
+        private static string Combine(string stdout, string stderr)
+        {
+            string outText = (stdout ?? string.Empty).Trim();
+            string errText = (stderr ?? string.Empty).Trim();
+            string combined =
+                string.IsNullOrEmpty(errText) ? outText :
+                string.IsNullOrEmpty(outText) ? errText :
+                outText + "\n" + errText;
+
+            // Keep dialogs readable — echo only the tail of long installer output.
+            const int max = 1500;
+            if (combined.Length > max)
+            {
+                combined = "…" + combined.Substring(combined.Length - max);
+            }
+            return combined;
+        }
+    }
+}
diff --git a/MCPForUnity/Editor/Dependencies/UvInstaller.cs.meta b/MCPForUnity/Editor/Dependencies/UvInstaller.cs.meta
new file mode 100644
index 000000000..d3fe2b3c1
--- /dev/null
+++ b/MCPForUnity/Editor/Dependencies/UvInstaller.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 55a5a123f9454b75906bdb5b7d008990
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/MCPForUnity/Editor/Helpers/ExecPath.cs b/MCPForUnity/Editor/Helpers/ExecPath.cs
index 350689821..412542139 100644
--- a/MCPForUnity/Editor/Helpers/ExecPath.cs
+++ b/MCPForUnity/Editor/Helpers/ExecPath.cs
@@ -34,6 +34,7 @@ internal static string ResolveClaude()
                     "/opt/homebrew/bin/claude",
                     "/usr/local/bin/claude",
                     Path.Combine(home, ".local", "bin", "claude"),
+                    Path.Combine(home, ".claude", "local", "claude"), // `claude migrate-installer` location
                 };
                 foreach (string c in candidates) { if (File.Exists(c)) return c; }
                 // Try NVM-installed claude under ~/.nvm/versions/node/*/bin/claude
@@ -59,6 +60,7 @@ internal static string ResolveClaude()
                     Path.Combine(localAppData, "Programs", "claude", "claude.exe"),
                     Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "claude", "claude.exe"),
                     Path.Combine(home, ".local", "bin", "claude.exe"),
+                    Path.Combine(home, ".claude", "local", "claude.exe"), // `claude migrate-installer` location
                     // npm global locations (.cmd preferred for non-interactive processes)
                     Path.Combine(appData, "npm", "claude.cmd"),
                     Path.Combine(localAppData, "npm", "claude.cmd"),
@@ -81,6 +83,7 @@ internal static string ResolveClaude()
                     "/usr/local/bin/claude",
                     "/usr/bin/claude",
                     Path.Combine(home, ".local", "bin", "claude"),
+                    Path.Combine(home, ".claude", "local", "claude"), // `claude migrate-installer` location
                 };
                 foreach (string c in candidates) { if (File.Exists(c)) return c; }
                 // Try NVM-installed claude under ~/.nvm/versions/node/*/bin/claude
diff --git a/MCPForUnity/Editor/Services/PathResolverService.cs b/MCPForUnity/Editor/Services/PathResolverService.cs
index 94adb88e5..c233d8680 100644
--- a/MCPForUnity/Editor/Services/PathResolverService.cs
+++ b/MCPForUnity/Editor/Services/PathResolverService.cs
@@ -107,60 +107,10 @@ public string GetClaudeCliPath()
                 return null;
             }
 
-            // No override - use platform-specific discovery
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                string[] candidates = new[]
-                {
-                    Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Programs", "claude", "claude.exe"),
-                    Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "claude", "claude.exe"),
-                    Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "bin", "claude.exe"),
-                };
-
-                foreach (var c in candidates)
-                {
-                    if (File.Exists(c)) return c;
-                }
-
-#if UNITY_EDITOR_WIN
-                // Fall back to PATH search (handles non-standard install locations and npm shims)
-                foreach (var name in new[] { "claude.exe", "claude.cmd", "claude.ps1" })
-                {
-                    string fromPath = ExecPath.FindInPathWindows(name);
-                    if (!string.IsNullOrEmpty(fromPath)) return fromPath;
-                }
-#endif
-            }
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-            {
-                string[] candidates = new[]
-                {
-                    "/opt/homebrew/bin/claude",
-                    "/usr/local/bin/claude",
-                    Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "bin", "claude")
-                };
-
-                foreach (var c in candidates)
-                {
-                    if (File.Exists(c)) return c;
-                }
-            }
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-            {
-                string[] candidates = new[]
-                {
-                    "/usr/bin/claude",
-                    "/usr/local/bin/claude",
-                    Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "bin", "claude")
-                };
-
-                foreach (var c in candidates)
-                {
-                    if (File.Exists(c)) return c;
-                }
-            }
-
-            return null;
+            // No override: delegate to the shared discovery in ExecPath, which covers the
+            // native-installer, npm, NVM and PATH-scan locations for every platform. Kept in
+            // one place so both call sites (this and ExecPath's own callers) stay in sync.
+            return ExecPath.ResolveClaude();
         }
 
         public bool IsPythonDetected()
diff --git a/MCPForUnity/Editor/Windows/Components/Branding.meta b/MCPForUnity/Editor/Windows/Components/Branding.meta
new file mode 100644
index 000000000..1dd751339
--- /dev/null
+++ b/MCPForUnity/Editor/Windows/Components/Branding.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d20507fd66884816930ea8f431fd6ce8
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/MCPForUnity/Editor/Windows/Components/Branding/OceanMark.cs b/MCPForUnity/Editor/Windows/Components/Branding/OceanMark.cs
new file mode 100644
index 000000000..c84346d59
--- /dev/null
+++ b/MCPForUnity/Editor/Windows/Components/Branding/OceanMark.cs
@@ -0,0 +1,163 @@
+using UnityEngine;
+using UnityEngine.UIElements;
+
+namespace MCPForUnity.Editor.Windows.Components.Branding
+{
+    /// <summary>
+    /// The MCP for Unity "Ocean split-cube" brand mark.
+    ///
+    /// On Unity 2022.1+ it is drawn as resolution-independent vector geometry via UI Toolkit's
+    /// Painter2D — crisp at any DPI, theme-independent (fixed brand colors matching the source
+    /// SVG), and with no package dependency. Painter2D does not exist on the 2021.3 floor, so
+    /// there we fall back to the raster brand icon (package-icon.png) that ships with the package.
+    ///
+    /// Geometry is transcribed from website/static/img/logo-mark.svg (viewBox "30 30 140 140"),
+    /// which remains the human-facing source of truth. Size the element via USS (width/height);
+    /// the drawing scales to the resolved content box.
+    /// </summary>
+    public sealed class OceanMark : VisualElement
+    {
+        public OceanMark()
+        {
+#if UNITY_2022_1_OR_NEWER
+            generateVisualContent += OnGenerateVisualContent;
+            RegisterCallback<GeometryChangedEvent>(_ => MarkDirtyRepaint());
+#else
+            ApplyRasterFallback();
+#endif
+            pickingMode = PickingMode.Ignore; // purely decorative
+        }
+
+#if UNITY_2022_1_OR_NEWER
+        // The source SVG viewBox spans 30..170 on both axes (a 140-unit square).
+        private const float SvgOrigin = 30f;
+        private const float SvgSize = 140f;
+
+        // Brand palette (hex values lifted directly from logo-mark.svg).
+        private static readonly Color LeftFill = FromHex(0x2563EB);   // blue cube faces
+        private static readonly Color LeftStroke = FromHex(0x60A5FA); // blue cube outline
+        private static readonly Color RightFill = FromHex(0x0D9488);  // teal cube faces
+        private static readonly Color RightStroke = FromHex(0x2DD4BF);// teal cube outline
+        private static readonly Color Bridge = FromHex(0x22D3EE);     // cyan bridge
+
+        private void OnGenerateVisualContent(MeshGenerationContext mgc)
+        {
+            Rect rect = contentRect;
+            float box = Mathf.Min(rect.width, rect.height);
+            if (box <= 1f) return; // not laid out yet / too small to draw
+
+            float scale = box / SvgSize;
+            Vector2 P(float x, float y) => MapSvgPoint(x, y, rect);
+            float S(float w) => w * scale;
+
+            Painter2D p = mgc.painter2D;
+            p.lineJoin = LineJoin.Round;
+            p.lineCap = LineCap.Round;
+
+            // --- Left cube (blue) ---
+            FillPoly(p, WithAlpha(LeftFill, 0.22f), P(94, 40), P(42, 70), P(94, 100));
+            FillPoly(p, WithAlpha(LeftFill, 0.12f), P(42, 70), P(42, 130), P(94, 160), P(94, 100));
+            StrokePath(p, LeftStroke, S(3f), true, P(94, 40), P(42, 70), P(42, 130), P(94, 160));
+            StrokePath(p, WithAlpha(LeftStroke, 0.65f), S(1.8f), false, P(42, 70), P(94, 100));
+
+            // --- Right cube (teal) ---
+            FillPoly(p, WithAlpha(RightFill, 0.22f), P(106, 40), P(158, 70), P(106, 100));
+            FillPoly(p, WithAlpha(RightFill, 0.12f), P(158, 70), P(158, 130), P(106, 160), P(106, 100));
+            StrokePath(p, RightStroke, S(3f), true, P(106, 40), P(158, 70), P(158, 130), P(106, 160));
+            StrokePath(p, WithAlpha(RightStroke, 0.65f), S(1.8f), false, P(158, 70), P(106, 100));
+
+            // --- Bridge rungs (cyan) ---
+            StrokePath(p, Bridge, S(3f), false, P(94, 70), P(106, 70));
+            StrokePath(p, Bridge, S(3f), false, P(94, 100), P(106, 100));
+            StrokePath(p, Bridge, S(3f), false, P(94, 130), P(106, 130));
+
+            // --- Bridge dots (cyan) ---
+            float dot = S(2.2f);
+            FillDot(p, Bridge, P(94, 70), dot);
+            FillDot(p, Bridge, P(106, 70), dot);
+            FillDot(p, Bridge, P(94, 100), dot);
+            FillDot(p, Bridge, P(106, 100), dot);
+            FillDot(p, Bridge, P(94, 130), dot);
+            FillDot(p, Bridge, P(106, 130), dot);
+        }
+
+        private static void FillPoly(Painter2D p, Color color, params Vector2[] pts)
+        {
+            p.fillColor = color;
+            p.BeginPath();
+            p.MoveTo(pts[0]);
+            for (int i = 1; i < pts.Length; i++) p.LineTo(pts[i]);
+            p.ClosePath();
+            p.Fill();
+        }
+
+        private static void StrokePath(Painter2D p, Color color, float width, bool closed, params Vector2[] pts)
+        {
+            p.strokeColor = color;
+            p.lineWidth = width;
+            p.BeginPath();
+            p.MoveTo(pts[0]);
+            for (int i = 1; i < pts.Length; i++) p.LineTo(pts[i]);
+            if (closed) p.ClosePath();
+            p.Stroke();
+        }
+
+        private static void FillDot(Painter2D p, Color color, Vector2 center, float radius)
+        {
+            if (radius <= 0.01f) return;
+            p.fillColor = color;
+            p.BeginPath();
+            p.Arc(center, radius, new Angle(0f, AngleUnit.Degree), new Angle(360f, AngleUnit.Degree));
+            p.Fill();
+        }
+
+        private static Color WithAlpha(Color c, float a)
+        {
+            c.a = a;
+            return c;
+        }
+
+        /// <summary>Map a point from SVG viewBox space into the element's content rect (square, centered).</summary>
+        private static Vector2 MapSvgPoint(float svgX, float svgY, Rect content)
+        {
+            float box = Mathf.Min(content.width, content.height);
+            float scale = box / SvgSize;
+            float offsetX = (content.width - box) * 0.5f;
+            float offsetY = (content.height - box) * 0.5f;
+            return new Vector2(
+                offsetX + (svgX - SvgOrigin) * scale,
+                offsetY + (svgY - SvgOrigin) * scale);
+        }
+
+        /// <summary>Convert a 0xRRGGBB literal into an opaque Color.</summary>
+        private static Color FromHex(int rgb) => new Color(
+            ((rgb >> 16) & 0xFF) / 255f,
+            ((rgb >> 8) & 0xFF) / 255f,
+            (rgb & 0xFF) / 255f,
+            1f);
+#else
+        // Painter2D is unavailable before Unity 2022.1 — show the raster brand icon instead.
+        private void ApplyRasterFallback()
+        {
+            Texture2D tex = LoadBrandTexture();
+            if (tex == null) return;
+            style.backgroundImage = new StyleBackground(tex);
+            style.unityBackgroundScaleMode = ScaleMode.ScaleToFit;
+        }
+
+        private static Texture2D LoadBrandTexture()
+        {
+            try
+            {
+                string root = MCPForUnity.Editor.Helpers.AssetPathUtility.GetMcpPackageRootPath();
+                return UnityEditor.AssetDatabase.LoadAssetAtPath<Texture2D>($"{root}/package-icon.png");
+            }
+            catch (System.Exception ex)
+            {
+                MCPForUnity.Editor.Helpers.McpLog.Warn($"OceanMark: failed to load brand icon fallback: {ex.Message}");
+                return null;
+            }
+        }
+#endif
+    }
+}
diff --git a/MCPForUnity/Editor/Windows/Components/Branding/OceanMark.cs.meta b/MCPForUnity/Editor/Windows/Components/Branding/OceanMark.cs.meta
new file mode 100644
index 000000000..3526141e2
--- /dev/null
+++ b/MCPForUnity/Editor/Windows/Components/Branding/OceanMark.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: a5a6cc86fe9844309b97362a718c3edd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/MCPForUnity/Editor/Windows/Components/Common.uss b/MCPForUnity/Editor/Windows/Components/Common.uss
index ecffd6a9c..c380799d7 100644
--- a/MCPForUnity/Editor/Windows/Components/Common.uss
+++ b/MCPForUnity/Editor/Windows/Components/Common.uss
@@ -170,6 +170,23 @@
     -unity-text-align: middle-left;
 }
 
+/* At narrow widths the connection status label (e.g. "Session Active (Project)") must wrap/shrink
+   instead of sliding under the toggle button. Scoped to the connection section so other shared
+   .status-text rows are unaffected; uses wrapping (not ellipsis) so the text stays fully readable. */
+#connection-section .status-container {
+    flex-shrink: 1;
+    min-width: 0;
+}
+
+#connection-section .status-text {
+    flex-shrink: 1;
+    white-space: normal;
+}
+
+#connection-section #connection-toggle {
+    flex-shrink: 0;
+}
+
 .status-indicator-small {
     width: 8px;
     height: 8px;
diff --git a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
index bd1e05844..085593905 100644
--- a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
+++ b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.cs
@@ -7,6 +7,7 @@
 using MCPForUnity.Editor.Services;
 using MCPForUnity.Editor.Windows.Components.Advanced;
 using MCPForUnity.Editor.Windows.Components.AssetGen;
+using MCPForUnity.Editor.Windows.Components.Branding;
 using MCPForUnity.Editor.Windows.Components.ClientConfig;
 using MCPForUnity.Editor.Windows.Components.Connection;
 using MCPForUnity.Editor.Windows.Components.Resources;
@@ -185,6 +186,15 @@ public void CreateGUI()
                 rootVisualElement.styleSheets.Add(commonStyleSheet);
             }
 
+            // Embed the Ocean brand mark at the left of the header bar
+            var headerLeft = rootVisualElement.Q<VisualElement>("header-left");
+            if (headerLeft != null && headerLeft.Q<OceanMark>() == null)
+            {
+                var logo = new OceanMark { name = "header-logo" };
+                logo.AddToClassList("header-logo");
+                headerLeft.Insert(0, logo);
+            }
+
             // Cache UI elements
             versionLabel = rootVisualElement.Q<Label>("version-label");
             updateNotification = rootVisualElement.Q<VisualElement>("update-notification");
diff --git a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.uss b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.uss
index 212d943aa..43b52851d 100644
--- a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.uss
+++ b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.uss
@@ -21,6 +21,18 @@
     border-color: rgba(0, 0, 0, 0.15);
 }
 
+.header-left {
+    flex-direction: row;
+    align-items: center;
+}
+
+.header-logo {
+    width: 30px;
+    height: 30px;
+    margin-right: 10px;
+    flex-shrink: 0;
+}
+
 .header-title {
     font-size: 16px;
     -unity-font-style: bold;
@@ -35,6 +47,8 @@
     border-radius: 10px;
     border-width: 1px;
     border-color: rgba(80, 150, 220, 0.4);
+    flex-shrink: 0;
+    margin-left: 8px;
 }
 
 /* Update Notification */
@@ -78,12 +92,13 @@
 
 .tab-toolbar .unity-toolbar-button {
     flex-grow: 1;
+    flex-shrink: 1;
     min-height: 32px;
     font-size: 12px;
     border-width: 0px;
     background-color: transparent;
     margin: 0px 2px 0px 0px;
-    padding: 0px 12px;
+    padding: 0px 8px;
     border-radius: 4px 4px 0px 0px;
     margin-bottom: -1px;
 }
diff --git a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.uxml b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.uxml
index a98ff2a4b..499b43698 100644
--- a/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.uxml
+++ b/MCPForUnity/Editor/Windows/MCPForUnityEditorWindow.uxml
@@ -1,7 +1,10 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="True">
     <ui:VisualElement name="root-container" class="root-layout">
         <ui:VisualElement name="header-bar" class="header-bar">
-            <ui:Label text="MCP for Unity" name="title" class="header-title" />
+            <ui:VisualElement name="header-left" class="header-left">
+                <!-- OceanMark logo is injected here at index 0 in CreateGUI -->
+                <ui:Label text="MCP for Unity" name="title" class="header-title" />
+            </ui:VisualElement>
             <ui:Label text="v9.1.0" name="version-label" class="header-version" />
         </ui:VisualElement>
         <ui:VisualElement name="update-notification" class="update-notification">
diff --git a/MCPForUnity/Editor/Windows/MCPSetupWindow.cs b/MCPForUnity/Editor/Windows/MCPSetupWindow.cs
index 502085640..efbee14e8 100644
--- a/MCPForUnity/Editor/Windows/MCPSetupWindow.cs
+++ b/MCPForUnity/Editor/Windows/MCPSetupWindow.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using MCPForUnity.Editor.Clients;
 using MCPForUnity.Editor.Dependencies;
 using MCPForUnity.Editor.Dependencies.Models;
 using MCPForUnity.Editor.Helpers;
 using MCPForUnity.Editor.Services;
+using MCPForUnity.Editor.Windows.Components.Branding;
 using UnityEditor;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -28,9 +30,13 @@ public class MCPSetupWindow : EditorWindow
         private Label installationInstructions;
         private Button openPythonLinkButton;
         private Button openUvLinkButton;
+        private Button installUvButton;
         private Button refreshButton;
         private Button doneButton;
 
+        // Tracks an in-flight uv install so completion is handled on the main thread.
+        private Task<UvInstaller.UvInstallResult> _uvInstallTask;
+
         // Step 2 (Configure Clients) UI elements
         private VisualElement stepDeps;
         private VisualElement stepClients;
@@ -66,6 +72,15 @@ public void CreateGUI()
 
             visualTree.CloneTree(rootVisualElement);
 
+            // Embed the Ocean brand mark beside the title
+            var setupHeader = rootVisualElement.Q<VisualElement>("setup-header");
+            if (setupHeader != null && setupHeader.Q<OceanMark>() == null)
+            {
+                var logo = new OceanMark { name = "setup-logo" };
+                logo.AddToClassList("setup-logo");
+                setupHeader.Insert(0, logo);
+            }
+
             // Cache UI elements
             pythonIndicator = rootVisualElement.Q<VisualElement>("python-indicator");
             pythonVersion = rootVisualElement.Q<Label>("python-version");
@@ -78,6 +93,7 @@ public void CreateGUI()
             installationInstructions = rootVisualElement.Q<Label>("installation-instructions");
             openPythonLinkButton = rootVisualElement.Q<Button>("open-python-link-button");
             openUvLinkButton = rootVisualElement.Q<Button>("open-uv-link-button");
+            installUvButton = rootVisualElement.Q<Button>("install-uv-button");
             refreshButton = rootVisualElement.Q<Button>("refresh-button");
             doneButton = rootVisualElement.Q<Button>("done-button");
             stepDeps = rootVisualElement.Q<VisualElement>("step-deps");
@@ -91,6 +107,7 @@ public void CreateGUI()
             doneButton.clicked += OnDoneClicked;
             openPythonLinkButton.clicked += OnOpenPythonInstallClicked;
             openUvLinkButton.clicked += OnOpenUvInstallClicked;
+            if (installUvButton != null) installUvButton.clicked += OnInstallUvClicked;
             skipClientsButton.clicked += OnSkipClientsClicked;
             configureSelectedButton.clicked += OnConfigureSelectedClicked;
 
@@ -104,6 +121,13 @@ private void OnEnable()
             {
                 _dependencyResult = DependencyManager.CheckAllDependencies();
             }
+            // Resume polling if a uv install was still in flight when the window was last disabled,
+            // so its completion is still processed (button reset, dependencies re-checked).
+            if (_uvInstallTask != null)
+            {
+                EditorApplication.update -= PollUvInstall;
+                EditorApplication.update += PollUvInstall;
+            }
         }
 
         private void OnRefreshClicked()
@@ -163,7 +187,7 @@ private void OnSkipClientsClicked()
         private void OnConfigureSelectedClicked()
         {
             int success = 0, failure = 0;
-            var messages = new List<string>();
+            var failures = new List<string>();
             foreach (var (c, toggle) in clientToggles)
             {
                 if (!toggle.value) continue;
@@ -171,12 +195,11 @@ private void OnConfigureSelectedClicked()
                 {
                     MCPServiceLocator.Client.ConfigureClient(c);
                     success++;
-                    messages.Add($"✓ {c.DisplayName}");
                 }
                 catch (System.Exception ex)
                 {
                     failure++;
-                    messages.Add($"⚠ {c.DisplayName}: {ex.Message}");
+                    failures.Add($"⚠ {c.DisplayName}: {ex.Message}");
                 }
             }
             if (success == 0 && failure == 0)
@@ -187,9 +210,15 @@ private void OnConfigureSelectedClicked()
                     "OK");
                 return;
             }
+            // Keep the summary short: a count, only the failures (if any), and the next step —
+            // no need to enumerate every successfully-configured client.
+            string failureList = failures.Count > 0 ? "\n\n" + string.Join("\n", failures) : "";
+            string nextStep = (failure == 0 && success > 0)
+                ? "\n\nYou're all set. Ask your AI assistant to create a GameObject in the open scene to confirm the connection."
+                : "";
             EditorUtility.DisplayDialog(
                 "Client Configuration",
-                $"{success} configured, {failure} failed.\n\n{string.Join("\n", messages)}",
+                $"{success} configured, {failure} failed.{failureList}{nextStep}",
                 "OK");
             Setup.SetupWindowService.MarkSetupCompleted();
             Close();
@@ -207,6 +236,79 @@ private void OnOpenUvInstallClicked()
             Application.OpenURL(uvUrl);
         }
 
+        private void OnInstallUvClicked()
+        {
+            if (_uvInstallTask != null) return; // already running
+
+            bool proceed = EditorUtility.DisplayDialog(
+                "Install UV",
+                "This will download and run the official uv installer:\n\n" +
+                UvInstaller.DescribeCommand() +
+                "\n\nContinue?",
+                "Install",
+                "Cancel");
+            if (!proceed) return;
+
+            installUvButton.SetEnabled(false);
+            installUvButton.text = "Installing UV…";
+            statusMessage.text = "Installing uv… this can take a moment.";
+            statusMessage.style.color = new StyleColor(new Color(1f, 0.6f, 0f));
+
+            _uvInstallTask = Task.Run(() => UvInstaller.Run());
+            EditorApplication.update += PollUvInstall;
+        }
+
+        private void PollUvInstall()
+        {
+            // The window/UI may have been torn down while the task ran — stop polling and drop it
+            // (guards against dereferencing UI fields after teardown).
+            if (installUvButton == null || installUvButton.panel == null)
+            {
+                EditorApplication.update -= PollUvInstall;
+                return;
+            }
+            if (_uvInstallTask == null || !_uvInstallTask.IsCompleted) return;
+
+            EditorApplication.update -= PollUvInstall;
+            var task = _uvInstallTask;
+            _uvInstallTask = null;
+
+            installUvButton.SetEnabled(true);
+            installUvButton.text = "Install UV Automatically";
+
+            // UvInstaller.Run catches its own exceptions, so the task always completes with a result.
+            UvInstaller.UvInstallResult result = task.Result;
+
+            if (result.Success)
+            {
+                _dependencyResult = DependencyManager.CheckAllDependencies();
+                UpdateUI();
+                if (!_dependencyResult.IsSystemReady)
+                {
+                    EditorUtility.DisplayDialog(
+                        "Install UV",
+                        "uv installed, but it isn't visible on PATH yet. Restart Unity (or your terminal) so it picks up the new PATH, then click Refresh.\n\n" +
+                        result.Output,
+                        "OK");
+                }
+            }
+            else
+            {
+                // Reset the status label off the "Installing…" state before reporting the failure.
+                UpdateUI();
+                EditorUtility.DisplayDialog(
+                    "Install UV Failed",
+                    "The installer did not complete successfully. You can install uv manually via \"Open UV Install Page\".\n\n" +
+                    result.Output,
+                    "OK");
+            }
+        }
+
+        private void OnDisable()
+        {
+            EditorApplication.update -= PollUvInstall;
+        }
+
         private void UpdateUI()
         {
             if (_dependencyResult == null)
@@ -226,6 +328,14 @@ private void UpdateUI()
                 UpdateDependencyStatus(uvIndicator, uvVersion, uvDetails, uvDep);
             }
 
+            // Offer the one-click uv installer only when uv is actually missing
+            bool uvMissing = uvDep != null && !uvDep.IsAvailable;
+            if (installUvButton != null)
+            {
+                bool showInstall = uvMissing && UvInstaller.IsSupported && _uvInstallTask == null;
+                installUvButton.style.display = showInstall ? DisplayStyle.Flex : DisplayStyle.None;
+            }
+
             // Update overall status
             if (_dependencyResult.IsSystemReady)
             {
diff --git a/MCPForUnity/Editor/Windows/MCPSetupWindow.uss b/MCPForUnity/Editor/Windows/MCPSetupWindow.uss
index 81e536830..7d14304ff 100644
--- a/MCPForUnity/Editor/Windows/MCPSetupWindow.uss
+++ b/MCPForUnity/Editor/Windows/MCPSetupWindow.uss
@@ -6,6 +6,29 @@
     flex-grow: 1;
 }
 
+/* Header row (logo + title) */
+.setup-header {
+    flex-direction: row;
+    align-items: center;
+    margin-bottom: 8px;
+}
+
+.setup-logo {
+    width: 34px;
+    height: 34px;
+    margin-right: 12px;
+    flex-shrink: 0;
+}
+
+/* In the header row the title reads as a plain heading beside the logo, not a boxed button. */
+.setup-header .title {
+    margin-bottom: 0;
+    padding: 0;
+    background-color: rgba(0, 0, 0, 0);
+    flex-shrink: 1;
+    white-space: normal;
+}
+
 /* Dependency list */
 #dependency-list {
     margin-top: 8px;
@@ -88,16 +111,30 @@
     margin-top: 0;
 }
 
-/* Button container at bottom */
+/* Button container at bottom — wraps rather than clipping when the window is narrowed. */
 .button-container {
     flex-direction: row;
     align-items: center;
     justify-content: flex-end;
+    flex-wrap: wrap;
 }
 
-/* Button sizing */
+/* Button sizing — grow to fit the label (e.g. "Configure Selected") instead of clipping. */
 .setup-button {
-    width: 96px;
+    min-width: 96px;
+    height: 28px;
+    padding-left: 12px;
+    padding-right: 12px;
+    margin-left: 8px;
+    margin-top: 4px;
+}
+
+/* Footer buttons size to content and sit together on one row. The descendant selector
+   (higher specificity) beats .secondary-button's width:100% regardless of stylesheet order,
+   so Refresh no longer stretches full-width and overflows. */
+.button-container .setup-button {
+    width: auto;
+    flex-grow: 0;
 }
 
 /* Description text spacing */
diff --git a/MCPForUnity/Editor/Windows/MCPSetupWindow.uxml b/MCPForUnity/Editor/Windows/MCPSetupWindow.uxml
index 0d0bfede6..1f69286bd 100644
--- a/MCPForUnity/Editor/Windows/MCPSetupWindow.uxml
+++ b/MCPForUnity/Editor/Windows/MCPSetupWindow.uxml
@@ -2,7 +2,10 @@
     <Style src="Components/Common.uss" />
     <Style src="MCPSetupWindow.uss" />
     <ui:ScrollView name="root-container" mode="Vertical">
-        <ui:Label text="MCP for Unity Setup" name="title" class="title" />
+        <ui:VisualElement name="setup-header" class="setup-header">
+            <!-- OceanMark logo is injected here at index 0 in CreateGUI -->
+            <ui:Label text="MCP for Unity Setup" name="title" class="title" />
+        </ui:VisualElement>
 
         <ui:VisualElement name="step-deps">
             <ui:VisualElement class="section">
@@ -43,6 +46,7 @@
                         <ui:Label text="Installation Instructions" class="installation-title" />
                         <ui:Label name="installation-instructions" class="help-text" />
                         <ui:VisualElement class="install-links-row">
+                            <ui:Button name="install-uv-button" text="Install UV Automatically" class="action-button install-link-button" />
                             <ui:Button name="open-python-link-button" text="Open Python Install Page" class="secondary-button install-link-button" />
                             <ui:Button name="open-uv-link-button" text="Open UV Install Page" class="secondary-button install-link-button" />
                         </ui:VisualElement>
@@ -53,7 +57,7 @@
             <!-- Action Buttons -->
             <ui:VisualElement class="button-container">
                 <ui:Button name="refresh-button" text="Refresh" class="setup-button secondary-button" />
-                <ui:Button name="done-button" text="Done" class="setup-button action-button" />
+                <ui:Button name="done-button" text="Next" class="setup-button action-button" />
             </ui:VisualElement>
         </ui:VisualElement>
 
diff --git a/MCPForUnity/package-icon.png b/MCPForUnity/package-icon.png
new file mode 100644
index 000000000..9542e46a9
Binary files /dev/null and b/MCPForUnity/package-icon.png differ
diff --git a/MCPForUnity/package-icon.png.meta b/MCPForUnity/package-icon.png.meta
new file mode 100644
index 000000000..39673176e
--- /dev/null
+++ b/MCPForUnity/package-icon.png.meta
@@ -0,0 +1,98 @@
+fileFormatVersion: 2
+guid: af1923bd273b4ca7b09fab223b543f69
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 11
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMasterTextureLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID:
+    internalID: 0
+    vertices: []
+    indices:
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  spritePackingTag:
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData:
+  assetBundleName:
+  assetBundleVariant:
diff --git a/TestProjects/UnityMCPTests/Assets/Tests/EditMode/PathResolverClaudeCliTests.cs b/TestProjects/UnityMCPTests/Assets/Tests/EditMode/PathResolverClaudeCliTests.cs
new file mode 100644
index 000000000..37088e758
--- /dev/null
+++ b/TestProjects/UnityMCPTests/Assets/Tests/EditMode/PathResolverClaudeCliTests.cs
@@ -0,0 +1,64 @@
+using System;
+using System.IO;
+using MCPForUnity.Editor.Constants;
+using MCPForUnity.Editor.Services;
+using NUnit.Framework;
+using UnityEditor;
+
+namespace MCPForUnityTests.Editor
+{
+    /// <summary>
+    /// Locks the strict override contract of Claude CLI resolution after discovery was
+    /// consolidated into ExecPath.ResolveClaude(): a valid override is honored, and an
+    /// override that points at a missing file returns null rather than falling back to
+    /// auto-discovery.
+    /// </summary>
+    public class PathResolverClaudeCliTests
+    {
+        private const string Key = EditorPrefKeys.ClaudeCliPathOverride;
+        private bool _hadOverride;
+        private string _savedOverride;
+
+        [SetUp]
+        public void SetUp()
+        {
+            _savedOverride = EditorPrefs.GetString(Key, string.Empty);
+            _hadOverride = !string.IsNullOrEmpty(_savedOverride);
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            if (_hadOverride) EditorPrefs.SetString(Key, _savedOverride);
+            else EditorPrefs.DeleteKey(Key);
+        }
+
+        [Test]
+        public void GetClaudeCliPath_ValidOverride_ReturnsOverride()
+        {
+            string stub = Path.Combine(Path.GetTempPath(), "mcp_claude_stub_" + Guid.NewGuid().ToString("N"));
+            File.WriteAllText(stub, "stub");
+            try
+            {
+                EditorPrefs.SetString(Key, stub);
+                var resolver = new PathResolverService();
+                Assert.AreEqual(stub, resolver.GetClaudeCliPath());
+                Assert.IsTrue(resolver.IsClaudeCliDetected());
+            }
+            finally
+            {
+                File.Delete(stub);
+            }
+        }
+
+        [Test]
+        public void GetClaudeCliPath_InvalidOverride_ReturnsNull_WithoutDiscoveryFallback()
+        {
+            string missing = Path.Combine(Path.GetTempPath(), "mcp_claude_missing_" + Guid.NewGuid().ToString("N"));
+            EditorPrefs.SetString(Key, missing);
+
+            var resolver = new PathResolverService();
+            Assert.IsNull(resolver.GetClaudeCliPath());
+        }
+    }
+}
diff --git a/TestProjects/UnityMCPTests/Assets/Tests/EditMode/PathResolverClaudeCliTests.cs.meta b/TestProjects/UnityMCPTests/Assets/Tests/EditMode/PathResolverClaudeCliTests.cs.meta
new file mode 100644
index 000000000..89845227a
--- /dev/null
+++ b/TestProjects/UnityMCPTests/Assets/Tests/EditMode/PathResolverClaudeCliTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 762a862b7c1c4f3b9526dbff1c7e153a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/TestProjects/UnityMCPTests/Assets/Tests/EditMode/UvInstallerTests.cs b/TestProjects/UnityMCPTests/Assets/Tests/EditMode/UvInstallerTests.cs
new file mode 100644
index 000000000..a93315521
--- /dev/null
+++ b/TestProjects/UnityMCPTests/Assets/Tests/EditMode/UvInstallerTests.cs
@@ -0,0 +1,47 @@
+using System.Runtime.InteropServices;
+using MCPForUnity.Editor.Dependencies;
+using NUnit.Framework;
+
+namespace MCPForUnityTests.Editor
+{
+    /// <summary>
+    /// Verifies the one-click uv installer builds the correct command per platform. The command
+    /// is built by a pure method so it can be asserted without actually running the installer.
+    /// </summary>
+    public class UvInstallerTests
+    {
+        [Test]
+        public void BuildInstallCommand_MatchesPlatform()
+        {
+            var (file, args) = UvInstaller.BuildInstallCommand();
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                Assert.AreEqual("powershell", file);
+                StringAssert.Contains("astral.sh/uv/install.ps1", args);
+                StringAssert.Contains("iex", args);
+            }
+            else
+            {
+                Assert.AreEqual("/bin/sh", file);
+                StringAssert.Contains("-c", args);
+                StringAssert.Contains("astral.sh/uv/install.sh", args);
+            }
+        }
+
+        [Test]
+        public void DescribeCommand_IncludesFileAndInstallerUrl()
+        {
+            var (file, _) = UvInstaller.BuildInstallCommand();
+            string desc = UvInstaller.DescribeCommand();
+            StringAssert.Contains(file, desc);
+            StringAssert.Contains("astral.sh/uv", desc);
+        }
+
+        [Test]
+        public void IsSupported_IsTrueOnDesktopEditorPlatforms()
+        {
+            // EditMode tests only run on Windows/macOS/Linux editors, all of which are supported.
+            Assert.IsTrue(UvInstaller.IsSupported);
+        }
+    }
+}
diff --git a/TestProjects/UnityMCPTests/Assets/Tests/EditMode/UvInstallerTests.cs.meta b/TestProjects/UnityMCPTests/Assets/Tests/EditMode/UvInstallerTests.cs.meta
new file mode 100644
index 000000000..d10c65685
--- /dev/null
+++ b/TestProjects/UnityMCPTests/Assets/Tests/EditMode/UvInstallerTests.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 798b3f7e773c47988d962d79adbfc71a
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: