diff --git a/frontend-web/src/components/workspace/agents/agent-manage-dialog.tsx b/frontend-web/src/components/workspace/agents/agent-manage-dialog.tsx
index 5cebb4e5..12977b66 100644
--- a/frontend-web/src/components/workspace/agents/agent-manage-dialog.tsx
+++ b/frontend-web/src/components/workspace/agents/agent-manage-dialog.tsx
@@ -136,21 +136,21 @@ export function AgentManageDialog({
                 {agents.map((agent, index) => (
                   <div
                     key={agent.id}
-                    className="flex items-center gap-2 px-3 py-2 hover:bg-accent/30"
+                    className="flex min-w-0 items-start gap-2 px-3 py-2 hover:bg-accent/30"
                   >
                     <span className="text-muted-foreground w-6 shrink-0 text-center text-xs tabular-nums">
                       {index + 1}
                     </span>
-                    <BotIcon className="text-muted-foreground size-4 shrink-0" />
+                    <BotIcon className="text-muted-foreground mt-0.5 size-4 shrink-0" />
                     <div className="flex min-w-0 flex-1 flex-col">
                       <span className="truncate text-sm">{agent.name}</span>
                       {agent.description && (
-                        <span className="truncate text-[11px] text-muted-foreground">
+                        <span className="line-clamp-2 whitespace-normal break-words text-[11px] leading-snug text-muted-foreground">
                           {agent.description}
                         </span>
                       )}
                     </div>
-                    <div className="flex items-center gap-0.5">
+                    <div className="flex shrink-0 items-center gap-0.5">
                       <Tooltip content="上移">
                         <Button
                           size="icon"
@@ -222,13 +222,13 @@ export function AgentManageDialog({
                       key={agent.id}
                       value={`${agent.name} ${agent.description ?? ""}`}
                       onSelect={() => void add(agent)}
-                      className="flex min-w-0 items-center overflow-hidden"
+                      className="flex w-full min-w-0 items-start overflow-hidden"
                     >
-                      <BotIcon className="text-muted-foreground mr-2 size-4 shrink-0" />
+                      <BotIcon className="text-muted-foreground mr-2 mt-0.5 size-4 shrink-0" />
                       <div className="flex min-w-0 flex-1 flex-col">
                         <span className="truncate text-sm">{agent.name}</span>
                         {agent.description && (
-                          <span className="truncate text-[10px] text-muted-foreground">
+                          <span className="line-clamp-2 whitespace-normal break-words text-[10px] leading-snug text-muted-foreground">
                             {agent.description}
                           </span>
                         )}
diff --git a/frontend-web/src/components/workspace/agents/agent-selector.tsx b/frontend-web/src/components/workspace/agents/agent-selector.tsx
index dc1d43f8..8b9f3a79 100644
--- a/frontend-web/src/components/workspace/agents/agent-selector.tsx
+++ b/frontend-web/src/components/workspace/agents/agent-selector.tsx
@@ -120,15 +120,15 @@ export function AgentSelector({
                       value={`${agent.name} ${agent.description ?? ""}`}
                       onSelect={() => handleSelect(agent)}
                       className={cn(
-                        "flex min-w-0 items-center gap-2 overflow-hidden",
+                        "flex w-full min-w-0 items-start gap-2 overflow-hidden",
                         agent.id === selectedAgentId && "bg-accent",
                       )}
                     >
-                      <BotIcon className="text-muted-foreground size-4 shrink-0" />
+                      <BotIcon className="text-muted-foreground mt-0.5 size-4 shrink-0" />
                       <div className="flex min-w-0 flex-1 flex-col">
                         <span className="truncate text-sm">{agent.name}</span>
                         {agent.description && (
-                          <span className="truncate text-[10px] text-muted-foreground">
+                          <span className="line-clamp-2 whitespace-normal break-words text-[10px] leading-snug text-muted-foreground">
                             {agent.description}
                           </span>
                         )}
diff --git a/frontend-web/src/components/workspace/input-box.tsx b/frontend-web/src/components/workspace/input-box.tsx
index 0a664cb9..0c209a7f 100644
--- a/frontend-web/src/components/workspace/input-box.tsx
+++ b/frontend-web/src/components/workspace/input-box.tsx
@@ -86,7 +86,8 @@ import {
   DropdownMenuTrigger,
 } from "../ui/dropdown-menu";
 
-import { useRecommendedQuestions } from "@/core/recommended-questions/hooks";
+import { useRecommendedQuestions } from "@/core/recommended-questions/hooks";
+import { useUserPreferences } from "@/core/user-preferences";
 import {
   isThreadRagModeLocked,
   lockThreadRagMode,
@@ -204,7 +205,11 @@ export function InputBox({
     null,
   );
 
-  const { questions: recommendedQuestions } = useRecommendedQuestions();
+  const { questions: recommendedQuestions } = useRecommendedQuestions();
+  const userPreferences = useUserPreferences();
+  const showAdminRecommendedQuestions =
+    !userPreferences.hide_admin_prompt_prefix &&
+    recommendedQuestions.length > 0;
 
   useEffect(() => {
     if (models.length === 0) {
@@ -511,7 +516,7 @@ export function InputBox({
         </div>
       )}
 
-      {isNewThread && searchParams.get("mode") !== "skill" && recommendedQuestions.length > 0 && (
+      {isNewThread && searchParams.get("mode") !== "skill" && showAdminRecommendedQuestions && (
         <div className="flex flex-wrap justify-center gap-2.5 px-4 mb-[10px]">
           {recommendedQuestions.map((q) => (
             <button
diff --git a/frontend-web/src/components/workspace/settings/skill-settings-page.tsx b/frontend-web/src/components/workspace/settings/skill-settings-page.tsx
index 5f114792..6fdec3c5 100644
--- a/frontend-web/src/components/workspace/settings/skill-settings-page.tsx
+++ b/frontend-web/src/components/workspace/settings/skill-settings-page.tsx
@@ -1,6 +1,6 @@
 "use client";
 
-import {
+import {
   AlertCircle,
   ArchiveIcon,
   ArrowDownUpIcon,
@@ -22,9 +22,9 @@ import {
   Trash2Icon,
   TrendingUpIcon,
   Upload,
-} from "lucide-react";
-import { useRouter } from "next/navigation";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+} from "lucide-react";
+import { useRouter } from "next/navigation";
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { toast } from "sonner";
 
 import { Badge } from "@/components/ui/badge";
@@ -45,9 +45,8 @@ import {
   DialogTitle,
 } from "@/components/ui/dialog";
 import {
-  Empty,
-  EmptyContent,
-  EmptyDescription,
+  Empty,
+  EmptyDescription,
   EmptyHeader,
   EmptyMedia,
   EmptyTitle,
@@ -145,11 +144,11 @@ const rescanErrorToastDarkOptions = {
   icon: <AlertCircle className="size-4 shrink-0 text-[#F5222D]" />,
 } as const;
 
-function SkillSettingsList({ onClose }: { onClose?: () => void }) {
-  const { t } = useI18n();
-  const { theme } = useTheme();
-  const router = useRouter();
-  const [filter, setFilter] = useState<string>("mine");
+function SkillSettingsList({ onClose }: { onClose?: () => void }) {
+  const { t } = useI18n();
+  const { theme } = useTheme();
+  const router = useRouter();
+  const [filter, setFilter] = useState<string>("mine");
   const [installOpen, setInstallOpen] = useState(false);
   const [staleSheetOpen, setStaleSheetOpen] = useState(false);
   const [archiveSheetOpen, setArchiveSheetOpen] = useState(false);
@@ -222,12 +221,7 @@ function SkillSettingsList({ onClose }: { onClose?: () => void }) {
     [filteredSkills, page],
   );
 
-  const handleCreateSkill = () => {
-    onClose?.();
-    router.push("/?mode=skill");
-  };
-
-  const handleRescan = async () => {
+  const handleRescan = async () => {
     try {
       const result = await reconcileMutation.mutateAsync();
       if (result.adopted.length > 0) {
@@ -326,12 +320,8 @@ function SkillSettingsList({ onClose }: { onClose?: () => void }) {
             <Upload className="size-4" />
             {t.settings.skills.installSkill}
           </Button>
-          <Button size="sm" onClick={handleCreateSkill}>
-            <SparklesIcon className="size-4" />
-            {t.settings.skills.createSkill}
-          </Button>
-        </div>
-      </header>
+        </div>
+      </header>
       <TagSearchBar
         targetType="skill"
         onSearchChange={setSearch}
@@ -363,9 +353,9 @@ function SkillSettingsList({ onClose }: { onClose?: () => void }) {
         <div className="text-muted-foreground text-sm">{t.common.loading}</div>
       )}
       {error && <div className="text-destructive text-sm">Error: {error.message}</div>}
-      {!isLoading && !error && filteredSkills.length === 0 && (
-        <EmptySkill onCreateSkill={handleCreateSkill} />
-      )}
+      {!isLoading && !error && filteredSkills.length === 0 && (
+        <EmptySkill />
+      )}
       
       {/* —— 原纵向列表布局（保留备查）——
       {!isLoading && !error &&
@@ -986,10 +976,10 @@ export function SkillRow({
   );
 }
 
-function EmptySkill({ onCreateSkill }: { onCreateSkill: () => void }) {
-  const { t } = useI18n();
-  return (
-    <Empty>
+function EmptySkill() {
+  const { t } = useI18n();
+  return (
+    <Empty>
       <EmptyHeader>
         <EmptyMedia variant="icon">
           <SparklesIcon />
@@ -999,12 +989,9 @@ function EmptySkill({ onCreateSkill }: { onCreateSkill: () => void }) {
           {t.settings.skills.emptyDescription}
         </EmptyDescription>
       </EmptyHeader>
-      <EmptyContent>
-        <Button onClick={onCreateSkill}>{t.settings.skills.emptyButton}</Button>
-      </EmptyContent>
-    </Empty>
-  );
-}
+    </Empty>
+  );
+}
 
 function InstallSkillDialog({
   open,