diff --git a/src/components/common/FullScreenPanel.tsx b/src/components/common/FullScreenPanel.tsx
index 9d16d87..b98d2e4 100644
--- a/src/components/common/FullScreenPanel.tsx
+++ b/src/components/common/FullScreenPanel.tsx
@@ -32,33 +32,39 @@ export const FullScreenPanel: React.FC<FullScreenPanelProps> = ({
     >
       {/* Header */}
       <div
-        className="flex-shrink-0 px-6 py-4 flex items-center gap-4"
+        className="flex-shrink-0 py-4 border-b border-border-default"
         style={{ backgroundColor: "hsl(var(--background))" }}
       >
-        <Button
-          type="button"
-          variant="ghost"
-          size="icon"
-          onClick={onClose}
-          className="hover:bg-black/5 dark:hover:bg-white/5"
-        >
-          <ArrowLeft className="h-5 w-5" />
-        </Button>
-        <h2 className="text-lg font-semibold text-foreground">{title}</h2>
+        <div className="mx-auto max-w-[60rem] px-6 flex items-center gap-4">
+          <Button
+            type="button"
+            variant="ghost"
+            size="icon"
+            onClick={onClose}
+            className="hover:bg-black/5 dark:hover:bg-white/5"
+          >
+            <ArrowLeft className="h-5 w-5" />
+          </Button>
+          <h2 className="text-lg font-semibold text-foreground">{title}</h2>
+        </div>
       </div>
 
       {/* Content */}
-      <div className="flex-1 overflow-y-auto px-6 py-6 space-y-6 max-w-5xl mx-auto w-full">
-        {children}
+      <div className="flex-1 overflow-y-auto">
+        <div className="mx-auto max-w-[60rem] px-6 py-6 space-y-6 w-full">
+          {children}
+        </div>
       </div>
 
       {/* Footer */}
       {footer && (
         <div
-          className="flex-shrink-0 px-6 py-4 flex items-center justify-end gap-3"
+          className="flex-shrink-0 py-4 border-t border-border-default"
           style={{ backgroundColor: "hsl(var(--background))" }}
         >
-          {footer}
+          <div className="mx-auto max-w-[60rem] px-6 flex items-center justify-end gap-3">
+            {footer}
+          </div>
         </div>
       )}
     </div>,
diff --git a/src/components/mcp/McpFormModal.tsx b/src/components/mcp/McpFormModal.tsx
index 43d1421..b7af81d 100644
--- a/src/components/mcp/McpFormModal.tsx
+++ b/src/components/mcp/McpFormModal.tsx
@@ -409,241 +409,11 @@ const McpFormModal: React.FC<McpFormModalProps> = ({
 
   return (
     <>
-      <FullScreenPanel isOpen={true} title={getFormTitle()} onClose={onClose}>
-        {/* 预设选择（仅新增时展示） */}
-        {!isEditing && (
-          <div>
-            <label className="block text-sm font-medium text-foreground mb-3">
-              {t("mcp.presets.title")}
-            </label>
-            <div className="flex flex-wrap gap-2">
-              <button
-                type="button"
-                onClick={applyCustom}
-                className={`inline-flex items-center gap-2 px-4 py-2 rounded-lg text-sm font-medium transition-colors ${
-                  selectedPreset === -1
-                    ? "bg-emerald-500 text-white dark:bg-emerald-600"
-                    : "bg-accent text-muted-foreground hover:bg-accent/80"
-                }`}
-              >
-                {t("presetSelector.custom")}
-              </button>
-              {mcpPresets.map((preset, idx) => {
-                const descriptionKey = `mcp.presets.${preset.id}.description`;
-                return (
-                  <button
-                    key={preset.id}
-                    type="button"
-                    onClick={() => applyPreset(idx)}
-                    className={`inline-flex items-center gap-2 px-4 py-2 rounded-lg text-sm font-medium transition-colors ${
-                      selectedPreset === idx
-                        ? "bg-emerald-500 text-white dark:bg-emerald-600"
-                        : "bg-accent text-muted-foreground hover:bg-accent/80"
-                    }`}
-                    title={t(descriptionKey)}
-                  >
-                    {preset.id}
-                  </button>
-                );
-              })}
-            </div>
-          </div>
-        )}
-
-        {/* ID (标题) */}
-        <div>
-          <div className="flex items-center justify-between mb-2">
-            <label className="block text-sm font-medium text-foreground">
-              {t("mcp.form.title")} <span className="text-red-500">*</span>
-            </label>
-            {!isEditing && idError && (
-              <span className="text-xs text-red-500 dark:text-red-400">
-                {idError}
-              </span>
-            )}
-          </div>
-          <Input
-            type="text"
-            placeholder={t("mcp.form.titlePlaceholder")}
-            value={formId}
-            onChange={(e) => handleIdChange(e.target.value)}
-            disabled={isEditing}
-          />
-        </div>
-
-        {/* Name */}
-        <div>
-          <label className="block text-sm font-medium text-foreground mb-2">
-            {t("mcp.form.name")}
-          </label>
-          <Input
-            type="text"
-            placeholder={t("mcp.form.namePlaceholder")}
-            value={formName}
-            onChange={(e) => setFormName(e.target.value)}
-          />
-        </div>
-
-        {/* 启用到哪些应用 */}
-        <div>
-          <label className="block text-sm font-medium text-foreground mb-3">
-            {t("mcp.form.enabledApps")}
-          </label>
-          <div className="flex flex-wrap gap-4">
-            <div className="flex items-center gap-2">
-              <Checkbox
-                id="enable-claude"
-                checked={enabledApps.claude}
-                onCheckedChange={(checked: boolean) =>
-                  setEnabledApps({ ...enabledApps, claude: checked })
-                }
-              />
-              <label
-                htmlFor="enable-claude"
-                className="text-sm text-foreground cursor-pointer select-none"
-              >
-                {t("mcp.unifiedPanel.apps.claude")}
-              </label>
-            </div>
-
-            <div className="flex items-center gap-2">
-              <Checkbox
-                id="enable-codex"
-                checked={enabledApps.codex}
-                onCheckedChange={(checked: boolean) =>
-                  setEnabledApps({ ...enabledApps, codex: checked })
-                }
-              />
-              <label
-                htmlFor="enable-codex"
-                className="text-sm text-foreground cursor-pointer select-none"
-              >
-                {t("mcp.unifiedPanel.apps.codex")}
-              </label>
-            </div>
-
-            <div className="flex items-center gap-2">
-              <Checkbox
-                id="enable-gemini"
-                checked={enabledApps.gemini}
-                onCheckedChange={(checked: boolean) =>
-                  setEnabledApps({ ...enabledApps, gemini: checked })
-                }
-              />
-              <label
-                htmlFor="enable-gemini"
-                className="text-sm text-foreground cursor-pointer select-none"
-              >
-                {t("mcp.unifiedPanel.apps.gemini")}
-              </label>
-            </div>
-          </div>
-        </div>
-
-        {/* 可折叠的附加信息按钮 */}
-        <div>
-          <button
-            type="button"
-            onClick={() => setShowMetadata(!showMetadata)}
-            className="flex items-center gap-2 text-sm font-medium text-muted-foreground hover:text-foreground transition-colors"
-          >
-            {showMetadata ? <ChevronUp size={16} /> : <ChevronDown size={16} />}
-            {t("mcp.form.additionalInfo")}
-          </button>
-        </div>
-
-        {/* 附加信息区域（可折叠） */}
-        {showMetadata && (
-          <>
-            <div>
-              <label className="block text-sm font-medium text-foreground mb-2">
-                {t("mcp.form.description")}
-              </label>
-              <Input
-                type="text"
-                placeholder={t("mcp.form.descriptionPlaceholder")}
-                value={formDescription}
-                onChange={(e) => setFormDescription(e.target.value)}
-              />
-            </div>
-
-            <div>
-              <label className="block text-sm font-medium text-foreground mb-2">
-                {t("mcp.form.tags")}
-              </label>
-              <Input
-                type="text"
-                placeholder={t("mcp.form.tagsPlaceholder")}
-                value={formTags}
-                onChange={(e) => setFormTags(e.target.value)}
-              />
-            </div>
-
-            <div>
-              <label className="block text-sm font-medium text-foreground mb-2">
-                {t("mcp.form.homepage")}
-              </label>
-              <Input
-                type="text"
-                placeholder={t("mcp.form.homepagePlaceholder")}
-                value={formHomepage}
-                onChange={(e) => setFormHomepage(e.target.value)}
-              />
-            </div>
-
-            <div>
-              <label className="block text-sm font-medium text-foreground mb-2">
-                {t("mcp.form.docs")}
-              </label>
-              <Input
-                type="text"
-                placeholder={t("mcp.form.docsPlaceholder")}
-                value={formDocs}
-                onChange={(e) => setFormDocs(e.target.value)}
-              />
-            </div>
-          </>
-        )}
-
-        {/* 配置输入框 */}
-        <div>
-          <div className="flex items-center justify-between mb-2">
-            <label className="text-sm font-medium text-foreground">
-              {useToml ? t("mcp.form.tomlConfig") : t("mcp.form.jsonConfig")}
-            </label>
-            {(isEditing || selectedPreset === -1) && (
-              <button
-                type="button"
-                onClick={() => setIsWizardOpen(true)}
-                className="text-sm text-blue-500 dark:text-blue-400 hover:text-blue-600 dark:hover:text-blue-300 transition-colors"
-              >
-                {t("mcp.form.useWizard")}
-              </button>
-            )}
-          </div>
-          <JsonEditor
-            value={formConfig}
-            onChange={handleConfigChange}
-            placeholder={
-              useToml
-                ? t("mcp.form.tomlPlaceholder")
-                : t("mcp.form.jsonPlaceholder")
-            }
-            darkMode={isDarkMode}
-            rows={12}
-            showValidation={!useToml}
-            language={useToml ? "javascript" : "json"}
-            height="300px"
-          />
-          {configError && (
-            <div className="flex items-center gap-2 mt-2 text-red-500 dark:text-red-400 text-sm">
-              <AlertCircle size={16} />
-              <span>{configError}</span>
-            </div>
-          )}
-        </div>
-
-        <div className="flex justify-end pt-6">
+      <FullScreenPanel
+        isOpen={true}
+        title={getFormTitle()}
+        onClose={onClose}
+        footer={
           <Button
             type="button"
             onClick={handleSubmit}
@@ -657,6 +427,245 @@ const McpFormModal: React.FC<McpFormModalProps> = ({
                 ? t("common.save")
                 : t("common.add")}
           </Button>
+        }
+      >
+        <div className="glass rounded-xl p-6 border border-white/10 space-y-6">
+          {/* 预设选择（仅新增时展示） */}
+          {!isEditing && (
+            <div>
+              <label className="block text-sm font-medium text-foreground mb-3">
+                {t("mcp.presets.title")}
+              </label>
+              <div className="flex flex-wrap gap-2">
+                <button
+                  type="button"
+                  onClick={applyCustom}
+                  className={`inline-flex items-center gap-2 px-4 py-2 rounded-lg text-sm font-medium transition-colors ${selectedPreset === -1
+                      ? "bg-emerald-500 text-white dark:bg-emerald-600"
+                      : "bg-accent text-muted-foreground hover:bg-accent/80"
+                    }`}
+                >
+                  {t("presetSelector.custom")}
+                </button>
+                {mcpPresets.map((preset, idx) => {
+                  const descriptionKey = `mcp.presets.${preset.id}.description`;
+                  return (
+                    <button
+                      key={preset.id}
+                      type="button"
+                      onClick={() => applyPreset(idx)}
+                      className={`inline-flex items-center gap-2 px-4 py-2 rounded-lg text-sm font-medium transition-colors ${selectedPreset === idx
+                          ? "bg-emerald-500 text-white dark:bg-emerald-600"
+                          : "bg-accent text-muted-foreground hover:bg-accent/80"
+                        }`}
+                      title={t(descriptionKey)}
+                    >
+                      {preset.id}
+                    </button>
+                  );
+                })}
+              </div>
+            </div>
+          )}
+
+          {/* ID (标题) */}
+          <div>
+            <div className="flex items-center justify-between mb-2">
+              <label className="block text-sm font-medium text-foreground">
+                {t("mcp.form.title")} <span className="text-red-500">*</span>
+              </label>
+              {!isEditing && idError && (
+                <span className="text-xs text-red-500 dark:text-red-400">
+                  {idError}
+                </span>
+              )}
+            </div>
+            <Input
+              type="text"
+              placeholder={t("mcp.form.titlePlaceholder")}
+              value={formId}
+              onChange={(e) => handleIdChange(e.target.value)}
+              disabled={isEditing}
+            />
+          </div>
+
+          {/* Name */}
+          <div>
+            <label className="block text-sm font-medium text-foreground mb-2">
+              {t("mcp.form.name")}
+            </label>
+            <Input
+              type="text"
+              placeholder={t("mcp.form.namePlaceholder")}
+              value={formName}
+              onChange={(e) => setFormName(e.target.value)}
+            />
+          </div>
+
+          {/* 启用到哪些应用 */}
+          <div>
+            <label className="block text-sm font-medium text-foreground mb-3">
+              {t("mcp.form.enabledApps")}
+            </label>
+            <div className="flex flex-wrap gap-4">
+              <div className="flex items-center gap-2">
+                <Checkbox
+                  id="enable-claude"
+                  checked={enabledApps.claude}
+                  onCheckedChange={(checked: boolean) =>
+                    setEnabledApps({ ...enabledApps, claude: checked })
+                  }
+                />
+                <label
+                  htmlFor="enable-claude"
+                  className="text-sm text-foreground cursor-pointer select-none"
+                >
+                  {t("mcp.unifiedPanel.apps.claude")}
+                </label>
+              </div>
+
+              <div className="flex items-center gap-2">
+                <Checkbox
+                  id="enable-codex"
+                  checked={enabledApps.codex}
+                  onCheckedChange={(checked: boolean) =>
+                    setEnabledApps({ ...enabledApps, codex: checked })
+                  }
+                />
+                <label
+                  htmlFor="enable-codex"
+                  className="text-sm text-foreground cursor-pointer select-none"
+                >
+                  {t("mcp.unifiedPanel.apps.codex")}
+                </label>
+              </div>
+
+              <div className="flex items-center gap-2">
+                <Checkbox
+                  id="enable-gemini"
+                  checked={enabledApps.gemini}
+                  onCheckedChange={(checked: boolean) =>
+                    setEnabledApps({ ...enabledApps, gemini: checked })
+                  }
+                />
+                <label
+                  htmlFor="enable-gemini"
+                  className="text-sm text-foreground cursor-pointer select-none"
+                >
+                  {t("mcp.unifiedPanel.apps.gemini")}
+                </label>
+              </div>
+            </div>
+          </div>
+
+          {/* 可折叠的附加信息按钮 */}
+          <div>
+            <button
+              type="button"
+              onClick={() => setShowMetadata(!showMetadata)}
+              className="flex items-center gap-2 text-sm font-medium text-muted-foreground hover:text-foreground transition-colors"
+            >
+              {showMetadata ? (
+                <ChevronUp size={16} />
+              ) : (
+                <ChevronDown size={16} />
+              )}
+              {t("mcp.form.additionalInfo")}
+            </button>
+          </div>
+
+          {/* 附加信息区域（可折叠） */}
+          {showMetadata && (
+            <>
+              <div>
+                <label className="block text-sm font-medium text-foreground mb-2">
+                  {t("mcp.form.description")}
+                </label>
+                <Input
+                  type="text"
+                  placeholder={t("mcp.form.descriptionPlaceholder")}
+                  value={formDescription}
+                  onChange={(e) => setFormDescription(e.target.value)}
+                />
+              </div>
+
+              <div>
+                <label className="block text-sm font-medium text-foreground mb-2">
+                  {t("mcp.form.tags")}
+                </label>
+                <Input
+                  type="text"
+                  placeholder={t("mcp.form.tagsPlaceholder")}
+                  value={formTags}
+                  onChange={(e) => setFormTags(e.target.value)}
+                />
+              </div>
+
+              <div>
+                <label className="block text-sm font-medium text-foreground mb-2">
+                  {t("mcp.form.homepage")}
+                </label>
+                <Input
+                  type="text"
+                  placeholder={t("mcp.form.homepagePlaceholder")}
+                  value={formHomepage}
+                  onChange={(e) => setFormHomepage(e.target.value)}
+                />
+              </div>
+
+              <div>
+                <label className="block text-sm font-medium text-foreground mb-2">
+                  {t("mcp.form.docs")}
+                </label>
+                <Input
+                  type="text"
+                  placeholder={t("mcp.form.docsPlaceholder")}
+                  value={formDocs}
+                  onChange={(e) => setFormDocs(e.target.value)}
+                />
+              </div>
+            </>
+          )}
+
+          {/* 配置输入框 */}
+          <div>
+            <div className="flex items-center justify-between mb-2">
+              <label className="text-sm font-medium text-foreground">
+                {useToml
+                  ? t("mcp.form.tomlConfig")
+                  : t("mcp.form.jsonConfig")}
+              </label>
+              {(isEditing || selectedPreset === -1) && (
+                <button
+                  type="button"
+                  onClick={() => setIsWizardOpen(true)}
+                  className="text-sm text-blue-500 dark:text-blue-400 hover:text-blue-600 dark:hover:text-blue-300 transition-colors"
+                >
+                  {t("mcp.form.useWizard")}
+                </button>
+              )}
+            </div>
+            <JsonEditor
+              value={formConfig}
+              onChange={handleConfigChange}
+              placeholder={
+                useToml
+                  ? t("mcp.form.tomlPlaceholder")
+                  : t("mcp.form.jsonPlaceholder")
+              }
+              darkMode={isDarkMode}
+              rows={12}
+              showValidation={!useToml}
+              language={useToml ? "javascript" : "json"}
+              height="300px"
+            />
+            {configError && (
+              <div className="flex items-center gap-2 mt-2 text-red-500 dark:text-red-400 text-sm">
+                <AlertCircle size={16} />
+                <span>{configError}</span>
+              </div>
+            )}
+          </div>
         </div>
       </FullScreenPanel>
 
diff --git a/src/components/mcp/UnifiedMcpPanel.tsx b/src/components/mcp/UnifiedMcpPanel.tsx
index 4ebfb48..b740753 100644
--- a/src/components/mcp/UnifiedMcpPanel.tsx
+++ b/src/components/mcp/UnifiedMcpPanel.tsx
@@ -115,9 +115,9 @@ const UnifiedMcpPanel = React.forwardRef<
   };
 
   return (
-    <div className="mx-auto max-w-5xl flex flex-col h-[calc(100vh-8rem)] overflow-hidden">
+    <div className="mx-auto max-w-[60rem] px-6 flex flex-col h-[calc(100vh-8rem)] overflow-hidden">
       {/* Info Section */}
-      <div className="flex-shrink-0 px-6 py-4 glass rounded-xl border border-white/10 mb-4">
+      <div className="flex-shrink-0 py-4 glass rounded-xl border border-white/10 mb-4 px-6">
         <div className="text-sm text-muted-foreground">
           {t("mcp.serverCount", { count: serverEntries.length })} ·{" "}
           {t("mcp.unifiedPanel.apps.claude")}: {enabledCounts.claude} ·{" "}
@@ -127,7 +127,7 @@ const UnifiedMcpPanel = React.forwardRef<
       </div>
 
       {/* Content - Scrollable */}
-      <div className="flex-1 overflow-y-auto overflow-x-hidden px-6 pb-24">
+      <div className="flex-1 overflow-y-auto overflow-x-hidden pb-24">
         {isLoading ? (
           <div className="text-center py-12 text-gray-500 dark:text-gray-400">
             {t("mcp.loading")}
@@ -233,112 +233,110 @@ const UnifiedMcpListItem: React.FC<UnifiedMcpListItemProps> = ({
   };
 
   return (
-    <div className="min-h-16 rounded-lg border border-border-default bg-card p-4 transition-[border-color,box-shadow] duration-200 hover:border-border-hover hover:shadow-sm">
-      <div className="flex items-center gap-4">
-        {/* 左侧：服务器信息 */}
-        <div className="flex-1 min-w-0">
-          <div className="flex items-center gap-2 mb-1">
-            <h3 className="font-medium text-gray-900 dark:text-gray-100">
-              {name}
-            </h3>
-            {docsUrl && (
-              <Button
-                type="button"
-                variant="ghost"
-                size="sm"
-                onClick={openDocs}
-                title={t("mcp.presets.docs")}
-              >
-                {t("mcp.presets.docs")}
-              </Button>
-            )}
-          </div>
-          {description && (
-            <p className="text-sm text-gray-500 dark:text-gray-400 line-clamp-2">
-              {description}
-            </p>
-          )}
-          {!description && tags && tags.length > 0 && (
-            <p className="text-xs text-gray-400 dark:text-gray-500 truncate">
-              {tags.join(", ")}
-            </p>
+    <div className="group relative flex items-center gap-4 p-4 rounded-xl border border-white/10 bg-gray-900/40 hover:bg-gray-900/60 transition-all duration-300">
+      {/* 左侧：服务器信息 */}
+      <div className="flex-1 min-w-0">
+        <div className="flex items-center gap-2 mb-1">
+          <h3 className="font-medium text-gray-900 dark:text-gray-100">
+            {name}
+          </h3>
+          {docsUrl && (
+            <Button
+              type="button"
+              variant="ghost"
+              size="sm"
+              onClick={openDocs}
+              title={t("mcp.presets.docs")}
+            >
+              {t("mcp.presets.docs")}
+            </Button>
           )}
         </div>
+        {description && (
+          <p className="text-sm text-gray-500 dark:text-gray-400 line-clamp-2">
+            {description}
+          </p>
+        )}
+        {!description && tags && tags.length > 0 && (
+          <p className="text-xs text-gray-400 dark:text-gray-500 truncate">
+            {tags.join(", ")}
+          </p>
+        )}
+      </div>
 
-        {/* 中间：应用开关 */}
-        <div className="flex flex-col gap-2 flex-shrink-0 min-w-[120px]">
-          <div className="flex items-center justify-between gap-3">
-            <label
-              htmlFor={`${id}-claude`}
-              className="text-sm text-gray-700 dark:text-gray-300 cursor-pointer"
-            >
-              {t("mcp.unifiedPanel.apps.claude")}
-            </label>
-            <Switch
-              id={`${id}-claude`}
-              checked={server.apps.claude}
-              onCheckedChange={(checked: boolean) =>
-                onToggleApp(id, "claude", checked)
-              }
-            />
-          </div>
-
-          <div className="flex items-center justify-between gap-3">
-            <label
-              htmlFor={`${id}-codex`}
-              className="text-sm text-gray-700 dark:text-gray-300 cursor-pointer"
-            >
-              {t("mcp.unifiedPanel.apps.codex")}
-            </label>
-            <Switch
-              id={`${id}-codex`}
-              checked={server.apps.codex}
-              onCheckedChange={(checked: boolean) =>
-                onToggleApp(id, "codex", checked)
-              }
-            />
-          </div>
-
-          <div className="flex items-center justify-between gap-3">
-            <label
-              htmlFor={`${id}-gemini`}
-              className="text-sm text-gray-700 dark:text-gray-300 cursor-pointer"
-            >
-              {t("mcp.unifiedPanel.apps.gemini")}
-            </label>
-            <Switch
-              id={`${id}-gemini`}
-              checked={server.apps.gemini}
-              onCheckedChange={(checked: boolean) =>
-                onToggleApp(id, "gemini", checked)
-              }
-            />
-          </div>
+      {/* 中间：应用开关 */}
+      <div className="flex flex-col gap-2 flex-shrink-0 min-w-[120px]">
+        <div className="flex items-center justify-between gap-3">
+          <label
+            htmlFor={`${id}-claude`}
+            className="text-sm text-gray-700 dark:text-gray-300 cursor-pointer"
+          >
+            {t("mcp.unifiedPanel.apps.claude")}
+          </label>
+          <Switch
+            id={`${id}-claude`}
+            checked={server.apps.claude}
+            onCheckedChange={(checked: boolean) =>
+              onToggleApp(id, "claude", checked)
+            }
+          />
         </div>
 
-        {/* 右侧：操作按钮 */}
-        <div className="flex items-center gap-2 flex-shrink-0">
-          <Button
-            type="button"
-            variant="ghost"
-            size="icon"
-            onClick={() => onEdit(id)}
-            title={t("common.edit")}
+        <div className="flex items-center justify-between gap-3">
+          <label
+            htmlFor={`${id}-codex`}
+            className="text-sm text-gray-700 dark:text-gray-300 cursor-pointer"
           >
-            <Edit3 size={16} />
-          </Button>
-
-          <Button
-            type="button"
-            variant="ghost"
-            size="icon"
-            onClick={() => onDelete(id)}
-            className="hover:text-red-500 hover:bg-red-100 dark:hover:text-red-400 dark:hover:bg-red-500/10"
-            title={t("common.delete")}
-          >
-            <Trash2 size={16} />
-          </Button>
+            {t("mcp.unifiedPanel.apps.codex")}
+          </label>
+          <Switch
+            id={`${id}-codex`}
+            checked={server.apps.codex}
+            onCheckedChange={(checked: boolean) =>
+              onToggleApp(id, "codex", checked)
+            }
+          />
         </div>
+
+        <div className="flex items-center justify-between gap-3">
+          <label
+            htmlFor={`${id}-gemini`}
+            className="text-sm text-gray-700 dark:text-gray-300 cursor-pointer"
+          >
+            {t("mcp.unifiedPanel.apps.gemini")}
+          </label>
+          <Switch
+            id={`${id}-gemini`}
+            checked={server.apps.gemini}
+            onCheckedChange={(checked: boolean) =>
+              onToggleApp(id, "gemini", checked)
+            }
+          />
+        </div>
+      </div>
+
+      {/* 右侧：操作按钮 */}
+      <div className="flex items-center gap-2 flex-shrink-0">
+        <Button
+          type="button"
+          variant="ghost"
+          size="icon"
+          onClick={() => onEdit(id)}
+          title={t("common.edit")}
+        >
+          <Edit3 size={16} />
+        </Button>
+
+        <Button
+          type="button"
+          variant="ghost"
+          size="icon"
+          onClick={() => onDelete(id)}
+          className="hover:text-red-500 hover:bg-red-100 dark:hover:text-red-400 dark:hover:bg-red-500/10"
+          title={t("common.delete")}
+        >
+          <Trash2 size={16} />
+        </Button>
       </div>
     </div>
   );
diff --git a/src/components/prompts/PromptFormPanel.tsx b/src/components/prompts/PromptFormPanel.tsx
index fe83615..be0ab4a 100644
--- a/src/components/prompts/PromptFormPanel.tsx
+++ b/src/components/prompts/PromptFormPanel.tsx
@@ -91,47 +91,11 @@ const PromptFormPanel: React.FC<PromptFormPanelProps> = ({
     : t("prompts.addTitle", { appName });
 
   return (
-    <FullScreenPanel isOpen={true} title={title} onClose={onClose}>
-      <div>
-        <Label htmlFor="name" className="text-foreground">
-          {t("prompts.name")}
-        </Label>
-        <Input
-          id="name"
-          value={name}
-          onChange={(e) => setName(e.target.value)}
-          placeholder={t("prompts.namePlaceholder")}
-          className="mt-2"
-        />
-      </div>
-
-      <div>
-        <Label htmlFor="description" className="text-foreground">
-          {t("prompts.description")}
-        </Label>
-        <Input
-          id="description"
-          value={description}
-          onChange={(e) => setDescription(e.target.value)}
-          placeholder={t("prompts.descriptionPlaceholder")}
-          className="mt-2"
-        />
-      </div>
-
-      <div>
-        <Label htmlFor="content" className="block mb-2 text-foreground">
-          {t("prompts.content")}
-        </Label>
-        <MarkdownEditor
-          value={content}
-          onChange={setContent}
-          placeholder={t("prompts.contentPlaceholder", { filename })}
-          darkMode={isDarkMode}
-          minHeight="500px"
-        />
-      </div>
-
-      <div className="flex justify-end pt-6">
+    <FullScreenPanel
+      isOpen={true}
+      title={title}
+      onClose={onClose}
+      footer={
         <Button
           type="button"
           onClick={handleSave}
@@ -140,6 +104,47 @@ const PromptFormPanel: React.FC<PromptFormPanelProps> = ({
         >
           {saving ? t("common.saving") : t("common.save")}
         </Button>
+      }
+    >
+      <div className="glass rounded-xl p-6 border border-white/10 space-y-6">
+        <div>
+          <Label htmlFor="name" className="text-foreground">
+            {t("prompts.name")}
+          </Label>
+          <Input
+            id="name"
+            value={name}
+            onChange={(e) => setName(e.target.value)}
+            placeholder={t("prompts.namePlaceholder")}
+            className="mt-2"
+          />
+        </div>
+
+        <div>
+          <Label htmlFor="description" className="text-foreground">
+            {t("prompts.description")}
+          </Label>
+          <Input
+            id="description"
+            value={description}
+            onChange={(e) => setDescription(e.target.value)}
+            placeholder={t("prompts.descriptionPlaceholder")}
+            className="mt-2"
+          />
+        </div>
+
+        <div>
+          <Label htmlFor="content" className="block mb-2 text-foreground">
+            {t("prompts.content")}
+          </Label>
+          <MarkdownEditor
+            value={content}
+            onChange={setContent}
+            placeholder={t("prompts.contentPlaceholder", { filename })}
+            darkMode={isDarkMode}
+            minHeight="500px"
+          />
+        </div>
       </div>
     </FullScreenPanel>
   );
diff --git a/src/components/prompts/PromptListItem.tsx b/src/components/prompts/PromptListItem.tsx
index f80a178..b3ff132 100644
--- a/src/components/prompts/PromptListItem.tsx
+++ b/src/components/prompts/PromptListItem.tsx
@@ -25,7 +25,7 @@ const PromptListItem: React.FC<PromptListItemProps> = ({
   const enabled = prompt.enabled === true;
 
   return (
-    <div className="h-16 rounded-lg border border-border-default bg-card p-4 transition-[border-color,box-shadow] duration-200 hover:border-border-hover hover:shadow-sm">
+    <div className="group relative h-16 rounded-xl border border-white/10 bg-gray-900/40 p-4 transition-all duration-300 hover:bg-gray-900/60 hover:border-white/20 hover:shadow-sm">
       <div className="flex items-center gap-4 h-full">
         {/* Toggle 开关 */}
         <div className="flex-shrink-0">
diff --git a/src/components/providers/forms/BasicFormFields.tsx b/src/components/providers/forms/BasicFormFields.tsx
index 91c19ed..3ba73f3 100644
--- a/src/components/providers/forms/BasicFormFields.tsx
+++ b/src/components/providers/forms/BasicFormFields.tsx
@@ -80,18 +80,11 @@ export function BasicFormFields({ form }: BasicFormFieldsProps) {
                     <ArrowLeft className="h-5 w-5" />
                   </Button>
                 </DialogClose>
-                <div className="space-y-1">
-                  <p className="text-lg font-semibold leading-tight">
-                    {t("providerIcon.selectIcon", {
-                      defaultValue: "选择图标",
-                    })}
-                  </p>
-                  <p className="text-sm text-muted-foreground">
-                    {t("providerIcon.selectDescription", {
-                      defaultValue: "为供应商选择一个图标",
-                    })}
-                  </p>
-                </div>
+                <p className="text-lg font-semibold leading-tight">
+                  {t("providerIcon.selectIcon", {
+                    defaultValue: "选择图标",
+                  })}
+                </p>
               </div>
               <div className="flex-1 overflow-y-auto px-6 py-6">
                 <div className="space-y-6 max-w-5xl mx-auto w-full">
diff --git a/src/components/providers/forms/ProviderForm.tsx b/src/components/providers/forms/ProviderForm.tsx
index 11258c5..a38ed45 100644
--- a/src/components/providers/forms/ProviderForm.tsx
+++ b/src/components/providers/forms/ProviderForm.tsx
@@ -655,7 +655,7 @@ export function ProviderForm({
       <form
         id="provider-form"
         onSubmit={form.handleSubmit(handleSubmit)}
-        className="space-y-6"
+        className="space-y-6 glass rounded-xl p-6 border border-white/10"
       >
         {/* 预设供应商选择（仅新增模式显示） */}
         {!initialData && (
diff --git a/src/components/settings/SettingsPage.tsx b/src/components/settings/SettingsPage.tsx
index 654c266..58c87f8 100644
--- a/src/components/settings/SettingsPage.tsx
+++ b/src/components/settings/SettingsPage.tsx
@@ -168,7 +168,7 @@ export function SettingsPage({
   const isBusy = useMemo(() => isLoading && !settings, [isLoading, settings]);
 
   return (
-    <div className="mx-auto max-w-5xl flex flex-col h-[calc(100vh-8rem)]">
+    <div className="mx-auto max-w-[60rem] flex flex-col h-[calc(100vh-8rem)] px-6">
       {isBusy ? (
         <div className="flex flex-1 items-center justify-center">
           <Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
diff --git a/src/components/skills/RepoManagerPanel.tsx b/src/components/skills/RepoManagerPanel.tsx
index bb3a7b5..9cd46b5 100644
--- a/src/components/skills/RepoManagerPanel.tsx
+++ b/src/components/skills/RepoManagerPanel.tsx
@@ -93,7 +93,7 @@ export function RepoManagerPanel({
       onClose={onClose}
     >
       {/* 添加仓库表单 */}
-      <div className="space-y-4 glass-card rounded-xl p-6 border border-border/10">
+      <div className="space-y-4 glass rounded-xl p-6 border border-white/10">
         <h3 className="text-base font-semibold text-foreground">
           添加技能仓库
         </h3>
@@ -156,7 +156,7 @@ export function RepoManagerPanel({
           {t("skills.repo.list")}
         </h3>
         {repos.length === 0 ? (
-          <div className="text-center py-12 glass-card rounded-xl border border-border/10">
+          <div className="text-center py-12 glass rounded-xl border border-white/10">
             <p className="text-sm text-muted-foreground">
               {t("skills.repo.empty")}
             </p>
@@ -166,7 +166,7 @@ export function RepoManagerPanel({
             {repos.map((repo) => (
               <div
                 key={`${repo.owner}/${repo.name}`}
-                className="flex items-center justify-between rounded-xl border border-border/10 glass-card px-4 py-3"
+                className="flex items-center justify-between rounded-xl border border-white/10 bg-gray-900/40 px-4 py-3"
               >
                 <div>
                   <div className="text-sm font-medium text-foreground">
diff --git a/src/components/skills/SkillCard.tsx b/src/components/skills/SkillCard.tsx
index 689a558..8fe8290 100644
--- a/src/components/skills/SkillCard.tsx
+++ b/src/components/skills/SkillCard.tsx
@@ -57,7 +57,7 @@ export function SkillCard({ skill, onInstall, onUninstall }: SkillCardProps) {
     skill.directory.trim().toLowerCase() !== skill.name.trim().toLowerCase();
 
   return (
-    <Card className="glass-card flex flex-col h-full border-white/5 transition-all duration-300 hover:bg-white/[0.02] hover:border-primary/50 hover:shadow-lg hover:-translate-y-1 group relative overflow-hidden">
+    <Card className="glass flex flex-col h-full border border-white/10 bg-gray-900/40 transition-all duration-300 hover:bg-gray-900/60 hover:border-white/20 hover:shadow-lg group relative overflow-hidden">
       <div className="absolute inset-0 bg-gradient-to-br from-primary/5 to-transparent opacity-0 group-hover:opacity-100 transition-opacity duration-500 pointer-events-none" />
       <CardHeader className="pb-3">
         <div className="flex items-start justify-between gap-2">
diff --git a/src/components/skills/SkillsPage.tsx b/src/components/skills/SkillsPage.tsx
index 0567647..62414cf 100644
--- a/src/components/skills/SkillsPage.tsx
+++ b/src/components/skills/SkillsPage.tsx
@@ -167,39 +167,41 @@ export const SkillsPage = forwardRef<SkillsPageHandle, SkillsPageProps>(
         {/* 顶部操作栏（固定区域）已移除，由 App.tsx 接管 */}
 
         {/* 技能网格（可滚动详情区域） */}
-        <div className="flex-1 min-h-0 overflow-y-auto px-6 py-4 animate-fade-in">
-          {loading ? (
-            <div className="flex items-center justify-center h-64">
-              <RefreshCw className="h-8 w-8 animate-spin text-muted-foreground" />
-            </div>
-          ) : skills.length === 0 ? (
-            <div className="flex flex-col items-center justify-center h-64 text-center">
-              <p className="text-lg font-medium text-gray-900 dark:text-gray-100">
-                {t("skills.empty")}
-              </p>
-              <p className="mt-2 text-sm text-gray-500 dark:text-gray-400">
-                {t("skills.emptyDescription")}
-              </p>
-              <Button
-                variant="link"
-                onClick={() => setRepoManagerOpen(true)}
-                className="mt-3 text-sm font-normal"
-              >
-                {t("skills.addRepo")}
-              </Button>
-            </div>
-          ) : (
-            <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-              {skills.map((skill) => (
-                <SkillCard
-                  key={skill.key}
-                  skill={skill}
-                  onInstall={handleInstall}
-                  onUninstall={handleUninstall}
-                />
-              ))}
-            </div>
-          )}
+        <div className="flex-1 min-h-0 overflow-y-auto animate-fade-in">
+          <div className="mx-auto max-w-[60rem] px-6 py-4">
+            {loading ? (
+              <div className="flex items-center justify-center h-64">
+                <RefreshCw className="h-8 w-8 animate-spin text-muted-foreground" />
+              </div>
+            ) : skills.length === 0 ? (
+              <div className="flex flex-col items-center justify-center h-64 text-center">
+                <p className="text-lg font-medium text-gray-900 dark:text-gray-100">
+                  {t("skills.empty")}
+                </p>
+                <p className="mt-2 text-sm text-gray-500 dark:text-gray-400">
+                  {t("skills.emptyDescription")}
+                </p>
+                <Button
+                  variant="link"
+                  onClick={() => setRepoManagerOpen(true)}
+                  className="mt-3 text-sm font-normal"
+                >
+                  {t("skills.addRepo")}
+                </Button>
+              </div>
+            ) : (
+              <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+                {skills.map((skill) => (
+                  <SkillCard
+                    key={skill.key}
+                    skill={skill}
+                    onInstall={handleInstall}
+                    onUninstall={handleUninstall}
+                  />
+                ))}
+              </div>
+            )}
+          </div>
         </div>
 
         {/* 仓库管理面板 */}