diff --git a/src/MaaWpfGui/Res/Localizations/en-us.xaml b/src/MaaWpfGui/Res/Localizations/en-us.xaml
index 3739d96d67..73ae8840ef 100644
--- a/src/MaaWpfGui/Res/Localizations/en-us.xaml
+++ b/src/MaaWpfGui/Res/Localizations/en-us.xaml
@@ -284,6 +284,7 @@ You can cancel this popup by clicking the Settings - Issue Report link. Thank yo
 </system:String>
     <system:String x:Key="GlobalSource">Global Source</system:String>
     <system:String x:Key="ForceGithubGlobalSource">Force using GitHub</system:String>
+    <system:String x:Key="ForceGithubGlobalSourceTip">When updates are detected, force download update packages from Github</system:String>
     <system:String x:Key="MirrorChyan">MirrorChyan</system:String>
     <system:String x:Key="MirrorChyanCdkPlaceholder">Fill after switching source</system:String>
     <system:String x:Key="MirrorChyanCdkPlaceholder2">Please enter CDK</system:String>
@@ -559,6 +560,17 @@ The primary instance is 0, and other instances are the numbers after the version
     <system:String x:Key="AssignedMaterial">Material</system:String>
     <system:String x:Key="Quantity">Quantity</system:String>
     <system:String x:Key="Series">Series</system:String>
+    <system:String x:Key="SeriesTip" xml:space="preserve">• AUTO:
+Automatically identify the maximum proxy multiplier of the level, maintain the maximum proxy multiplier and do not overflow sanity after using sanity potion
+
+• Value (1~6):
+Execute proxy according to the set multiplier
+If the current sanity is not enough to complete the set multiplier (such as only enough for 5 times but set to 6 times), you cannot enter the battle
+Or
+If the number of battles is not enough to complete the set multiplier (such as only enough for 5 times but set to 6 times), you will not be able to enter the battle
+
+• Not selected:
+Do not adjust the proxy multiplier setting in the game</system:String>
     <system:String x:Key="StageSelect">Stage</system:String>
     <system:String x:Key="StageSelect2">Alternative</system:String>
     <system:String x:Key="RemainingSanityStage">Remaining Sanity</system:String>
@@ -722,17 +734,20 @@ The video aspect ratio needs to be 16:9 without interference factors such as bla
     <system:String x:Key="FailedToLikeWebJson">An error occurred, the like failed. : &lt;</system:String>
     <system:String x:Key="ThanksForLikeWebJson">Thanks for the likes!\nThe comment section is already open on the web page, please feel free to leave your comment!</system:String>
     <system:String x:Key="AutoSquad">Auto Squad</system:String>
-    <system:String x:Key="AutoSquadTip">｢Favourite｣ marked operators cannot be recognized at this time</system:String>
+    <system:String x:Key="AutoSquadTip">｢Favourite｣ marked operators maybe cannot be recognized</system:String>
     <system:String x:Key="AddTrust">Add low-trust operators</system:String>
     <system:String x:Key="AddUserAdditional">Add custom operators</system:String>
     <system:String x:Key="AddUserAdditionalTip">Use ｢;｣ as the separator, ｢,｣ to separate the operator name and skills, for example: W, 3; Ash, 2</system:String>
     <system:String x:Key="UseCopilotList">Battle list</system:String>
-    <system:String x:Key="UseCopilotListTip" xml:space="preserve">Does not support cross-chapter navigation
-Only supports: the same chapter of the main story, SideStory (does not support jumping from EX chapter to S chapter)
+    <system:String x:Key="UseCopilotListTip" xml:space="preserve">Does not support cross-chapter navigation. Only supports:
+  1. MainStory: Navigation within the same chapter
+  2. SideStory: Navigation within current page (Normal/EX/S cannot jump to each other)
 Please switch to the stage selection page before starting</system:String>
     <system:String x:Key="CopilotTaskRaidStage">(Challenge)</system:String>
-    <system:String x:Key="CopilotAddTask">Right click to add challenge difficulty</system:String>
-    <system:String x:Key="CopilotClearTask">Right click to clear inactive tasks</system:String>
+    <system:String x:Key="CopilotAddTask" xml:space="preserve">Left-click to add Normal difficulty
+Right click to add challenge difficulty</system:String>
+    <system:String x:Key="CopilotClearTask" xml:space="preserve">Left-click to clear all tasks
+Right-click to clear inactive tasks</system:String>
     <system:String x:Key="LoopTimes">Loop Times</system:String>
     <system:String x:Key="Start">Start</system:String>
     <system:String x:Key="VideoLink">Video Link</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
index 2e4ec79244..fcd1fa9170 100644
--- a/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ja-jp.xaml
@@ -285,6 +285,7 @@
 </system:String>
     <system:String x:Key="GlobalSource">グローバルソース</system:String>
     <system:String x:Key="ForceGithubGlobalSource">GitHub を強制使用</system:String>
+    <system:String x:Key="ForceGithubGlobalSourceTip">更新を検出後、Githubから強制的に更新パッケージをダウンロード</system:String>
     <system:String x:Key="MirrorChyan">MirrorChyan</system:String>
     <system:String x:Key="MirrorChyanCdkPlaceholder">更新ソース切替後入力</system:String>
     <system:String x:Key="MirrorChyanCdkPlaceholder2">CDKを入力してください</system:String>
@@ -563,6 +564,17 @@ C:\\leidian\\LDPlayer9
     <system:String x:Key="AssignedMaterial">素材の指定</system:String>
     <system:String x:Key="Quantity">ドロップ数</system:String>
     <system:String x:Key="Series">連戦回数</system:String>
+    <system:String x:Key="SeriesTip" xml:space="preserve">• 自動:
+レベルの最大代理乗数を自動で判別し、最大代理乗数を維持し、正気ポーション使用後に正気度オーバーフローが発生しないようにします。
+
+• 値 (1～6):
+設定された乗数に従って代理を実行します。
+現在の正気度が設定された乗数を満たしていない場合（例えば、5回分しか残っていないのに6回に設定している場合）、バトルに参加できません。
+または
+バトル回数が設定された乗数を満たしていない場合（例えば、5回分しか残っていないのに6回に設定している場合）、バトルに参加できません。
+
+• 選択しない場合:
+ゲーム内で代理乗数の設定を調整しません。</system:String>
     <system:String x:Key="StageSelect">ステージ</system:String>
     <system:String x:Key="StageSelect2">代替ステージ</system:String>
     <system:String x:Key="RemainingSanityStage">余剰理性の消費</system:String>
@@ -731,12 +743,15 @@ C:\\leidian\\LDPlayer9
     <system:String x:Key="AddUserAdditional">カスタムで指定したオペレーターを追加する</system:String>
     <system:String x:Key="AddUserAdditionalTip">｢;｣ はセパレータ、｢,｣ でオペレーターの名前とスキルを区切ります。例: Surtr, 3; Eyjafjalla,1</system:String>
     <system:String x:Key="UseCopilotList">バトルリスト</system:String>
-    <system:String x:Key="UseCopilotListTip" xml:space="preserve">チャプター間の移動はサポートされていません
-メインストーリーの同じチャプター、サイドストーリーのみサポートされています（EXチャプターからSチャプターへの移動はサポートされていません）
+    <system:String x:Key="UseCopilotListTip" xml:space="preserve">チャプター間の移動はサポートされていません。サポートのみです:
+  1. メインストーリー：同一章内でのナビゲーション
+  2. SideStory：現在のページ内ナビゲーション（通常/EX/S 相互移動不可）
 開始前にステージ選択ページに切り替えてください</system:String>
     <system:String x:Key="CopilotTaskRaidStage">(強襲)</system:String>
-    <system:String x:Key="CopilotAddTask">右クリックしてレイドの難易度を追加します</system:String>
-    <system:String x:Key="CopilotClearTask">右クリックして非アクティブなタスクをクリアします</system:String>
+    <system:String x:Key="CopilotAddTask" xml:space="preserve">左クリックで通常難易度を追加
+右クリックしてレイドの難易度を追加します</system:String>
+    <system:String x:Key="CopilotClearTask" xml:space="preserve">左クリックですべてのタスクをクリア
+右クリックで非アクティブなタスクをクリア</system:String>
     <system:String x:Key="LoopTimes">ループ回数</system:String>
     <system:String x:Key="Start">開始</system:String>
     <system:String x:Key="VideoLink">映像へのハイパーリンク</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
index ffee492542..2c43248aaf 100644
--- a/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
+++ b/src/MaaWpfGui/Res/Localizations/ko-kr.xaml
@@ -284,6 +284,7 @@
 </system:String>
     <system:String x:Key="GlobalSource">글로벌 소스</system:String>
     <system:String x:Key="ForceGithubGlobalSource">GitHub 강제 사용</system:String>
+    <system:String x:Key="ForceGithubGlobalSourceTip">업데이트 감지 후, Github에서 강제로 업데이트 패키지 다운로드</system:String>
     <system:String x:Key="MirrorChyan">MirrorChyan</system:String>
     <system:String x:Key="MirrorChyanCdkPlaceholder">소스 전환 후 입력</system:String>
     <system:String x:Key="MirrorChyanCdkPlaceholder2">CDK를 입력해 주세요</system:String>
@@ -440,7 +441,7 @@ OF-1 스테이지가 개방되지 않은 경우에는 선택하지 마세요.</s
     <system:String x:Key="UseRemainingSanityStageTip">주 작업을 완료한 후 지정된 스테이지를 실행하며, 이성 회복제/오리지늄을 사용하지 않습니다</system:String>
     <system:String x:Key="UseExpiringMedicine">48시간 미만 남은 이성 회복제 사용</system:String>
     <system:String x:Key="HideUnavailableStage">미개방 스테이지 숨기기</system:String>
-    <system:String x:Key="HideSeries">연속 전투 횟수 숨기기</system:String>
+    <system:String x:Key="HideSeries">연속 전투 숨기기</system:String>
     <system:String x:Key="CustomInfrastPlanShowInFightSettings">기반시설 계획 표시</system:String>
     <system:String x:Key="MainViewButtonFeature">메인 화면 버튼의 기능</system:String>
     <system:String x:Key="CustomStageCode">스테이지 코드 수동 입력</system:String>
@@ -561,7 +562,18 @@ C:\\leidian\\LDPlayer9
     <system:String x:Key="PerformBattles">횟수 제한</system:String>
     <system:String x:Key="AssignedMaterial">드롭 제한</system:String>
     <system:String x:Key="Quantity">드롭 수</system:String>
-    <system:String x:Key="Series">연속 전투 횟수</system:String>
+    <system:String x:Key="Series">연속 전투</system:String>
+    <system:String x:Key="SeriesTip" xml:space="preserve">AUTO:
+스테이지의 가능한 최대 대리 지휘 횟수의 배수를 감지하고, 자동으로 최대 대리 지휘 횟수를 유지하며, 이성 회복제 사용 후 이성이 남지 않도록 합니다.
+
+단순 배수 (1~6):
+설정된 배수에 따라 대리 지휘 횟수를 실행합니다.
+현재 이성 수치가 설정된 배수를 완료하기에 충분하지 않은 경우(예: 5회만 가능하지만 6회로 설정), 전투를 시작하지 않습니다.
+또는
+스테이지가 설정된 배수를 완료하기에 충분하지 않은 경우(예: 5회만 가능하지만 6회로 설정), 전투를 시작하지 않습니다.
+
+미선택:
+연속 대리 지휘 횟수를 조정하지 않습니다.</system:String>
     <system:String x:Key="StageSelect">스테이지 선택</system:String>
     <system:String x:Key="StageSelect2">대안</system:String>
     <system:String x:Key="RemainingSanityStage">남은 이성</system:String>
@@ -730,12 +742,15 @@ C:\\leidian\\LDPlayer9
     <system:String x:Key="AddUserAdditional">커스텀 오퍼레이터 추가</system:String>
     <system:String x:Key="AddUserAdditionalTip">｢;｣ 로 오퍼레이터를 구분하고, ｢,｣ 로 스킬을 구분합니다. 예시: W, 3; Ash, 2</system:String>
     <system:String x:Key="UseCopilotList">전투 목록</system:String>
-    <system:String x:Key="UseCopilotListTip" xml:space="preserve">챕터 간 이동은 지원하지 않습니다.
-지원: 메인 스토리의 동일 챕터, 사이드 스토리(EX 챕터에서 S 챕터로의 이동은 지원하지 않습니다.)
+    <system:String x:Key="UseCopilotListTip" xml:space="preserve">챕터 간 이동은 지원하지 않습니다. 지원:
+  1. 메인 스토리: 동일 챕터 내 네비게이션
+  2. SideStory: 현재 페이지 내 네비게이션（일반/EX/S 서로 이동 불가）
 시작하기 전에 스테이지 선택 화면으로 전환하세요</system:String>
     <system:String x:Key="CopilotTaskRaidStage">(하드)</system:String>
-    <system:String x:Key="CopilotAddTask">하드 모드를 추가하려면 마우스 오른쪽 버튼을 클릭하세요</system:String>
-    <system:String x:Key="CopilotClearTask">다 끝난 작업을 제거하려면 마우스 오른쪽 버튼을 클릭하세요</system:String>
+    <system:String x:Key="CopilotAddTask" xml:space="preserve">좌클릭으로 일반 난이도 추가
+하드 모드를 추가하려면 마우스 오른쪽 버튼을 클릭하세요</system:String>
+    <system:String x:Key="CopilotClearTask" xml:space="preserve">좌클릭으로 모든 작업 지우기
+우클릭으로 비활성 작업 지우기</system:String>
     <system:String x:Key="LoopTimes">반복 횟수</system:String>
     <system:String x:Key="Start">시작</system:String>
     <system:String x:Key="VideoLink">영상 링크</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
index 78f02ebbb7..6e1ac4f32c 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-cn.xaml
@@ -285,6 +285,7 @@
 </system:String>
     <system:String x:Key="GlobalSource">海外源</system:String>
     <system:String x:Key="ForceGithubGlobalSource">强制使用 GitHub</system:String>
+    <system:String x:Key="ForceGithubGlobalSourceTip">检测到更新后，强制从 Github 下载更新包</system:String>
     <system:String x:Key="MirrorChyan">Mirror酱</system:String>
     <system:String x:Key="MirrorChyanCdkPlaceholder">切换更新源后填写</system:String>
     <system:String x:Key="MirrorChyanCdkPlaceholder2">请输入 CDK</system:String>
@@ -559,10 +560,21 @@ C:\\leidian\\LDPlayer9。\n
     <!--  战斗设置  -->
     <system:String x:Key="UseSanityPotion">吃理智药</system:String>
     <system:String x:Key="UseOriginitePrime">吃源石</system:String>
-    <system:String x:Key="PerformBattles">作战次数</system:String>
+    <system:String x:Key="PerformBattles">指定次数</system:String>
     <system:String x:Key="AssignedMaterial">指定材料</system:String>
     <system:String x:Key="Quantity">刷取数量</system:String>
     <system:String x:Key="Series">代理倍率</system:String>
+    <system:String x:Key="SeriesTip" xml:space="preserve">• AUTO:
+自动识别关卡最大代理倍率, 保持最大代理倍率且使用理智药后理智不溢出
+
+• 数值 (1~6):
+按设定倍率执行代理
+若当前理智不足完成设定倍率 (如仅够 5 次但设为 6 倍), 则无法进入战斗
+ 或者
+战斗次数不足完成设定倍率 (如仅够 5 次但设为 6 倍), 也将无法进入战斗
+
+• 不选择:
+不调整游戏内代理倍率设定</system:String>
     <system:String x:Key="StageSelect">关卡选择</system:String>
     <system:String x:Key="StageSelect2">备选</system:String>
     <system:String x:Key="RemainingSanityStage">剩余理智</system:String>
@@ -726,18 +738,21 @@ C:\\leidian\\LDPlayer9。\n
     <system:String x:Key="FailedToLikeWebJson">出现错误，评价失败 : &lt;</system:String>
     <system:String x:Key="ThanksForLikeWebJson">感谢评价！\n网页已经开放评论区，欢迎前往留下你的评论！</system:String>
     <system:String x:Key="AutoSquad">自动编队</system:String>
-    <system:String x:Key="AutoSquadTip">自动编队可能暂时无法识别带有 ｢特别关注｣ 标记的干员</system:String>
+    <system:String x:Key="AutoSquadTip">自动编队可能无法识别带有 ｢特别关注｣ 标记的干员</system:String>
     <system:String x:Key="AddTrust">补充低信赖干员</system:String>
     <system:String x:Key="AddUserAdditional">追加自定干员</system:String>
     <system:String x:Key="AddUserAdditionalTip">以英文 ｢;｣ 为分隔符，英文 ｢,｣ 分隔干员名与技能，例: 史尔特尔,3;艾雅法拉,1</system:String>
     <system:String x:Key="LoopTimes">循环次数</system:String>
     <system:String x:Key="UseCopilotList">战斗列表</system:String>
-    <system:String x:Key="UseCopilotListTip" xml:space="preserve">不支持跨章节导航
-仅支持: 主线关同一章节, SideStory (不支持从 EX 跳转 S)
+    <system:String x:Key="UseCopilotListTip" xml:space="preserve">不支持跨章节导航。仅支持:
+  1. 主线关卡：同一章节内导航
+  2. SideStory：当前页面内导航（普通/EX/S 相互不可跳转）
 开始前请切换至关卡选择页面</system:String>
     <system:String x:Key="CopilotTaskRaidStage">(突袭)</system:String>
-    <system:String x:Key="CopilotAddTask">右键添加突袭难度</system:String>
-    <system:String x:Key="CopilotClearTask">右键清除未激活任务</system:String>
+    <system:String x:Key="CopilotAddTask" xml:space="preserve">左键添加普通难度
+右键添加突袭难度</system:String>
+    <system:String x:Key="CopilotClearTask" xml:space="preserve">左键清除所有任务
+右键清除未激活任务</system:String>
     <system:String x:Key="Start">开始</system:String>
     <system:String x:Key="VideoLink">视频链接</system:String>
     <system:String x:Key="CopilotSkill">技能</system:String>
diff --git a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
index e45e1200b1..4c730d2ee0 100644
--- a/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
+++ b/src/MaaWpfGui/Res/Localizations/zh-tw.xaml
@@ -284,6 +284,7 @@
 </system:String>
     <system:String x:Key="GlobalSource">全域來源</system:String>
     <system:String x:Key="ForceGithubGlobalSource">強制使用 GitHub</system:String>
+    <system:String x:Key="ForceGithubGlobalSourceTip">檢測到更新後，強制從 Github 下載更新包</system:String>
     <system:String x:Key="MirrorChyan">MirrorChyan</system:String>
     <system:String x:Key="MirrorChyanCdkPlaceholder">切換更新源後填寫</system:String>
     <system:String x:Key="MirrorChyanCdkPlaceholder2">請輸入 CDK</system:String>
@@ -557,10 +558,21 @@ C:\\leidian\\LDPlayer9。\n
     <!--  戰鬥設定  -->
     <system:String x:Key="UseSanityPotion">吃理智藥</system:String>
     <system:String x:Key="UseOriginitePrime">吃源石</system:String>
-    <system:String x:Key="PerformBattles">战斗次數</system:String>
+    <system:String x:Key="PerformBattles">指定次数</system:String>
     <system:String x:Key="AssignedMaterial">指定材料</system:String>
     <system:String x:Key="Quantity">刷取數量</system:String>
     <system:String x:Key="Series">代理倍率</system:String>
+    <system:String x:Key="SeriesTip" xml:space="preserve">• AUTO:
+自動辨識關卡最大代理倍率, 保持最大代理倍率且使用理智藥後理智不溢出
+
+• 數值 (1~6):
+按設定倍率執行代理
+若當前理智不足完成設定倍率 (如僅夠 5 次但設為 6 倍), 則無法進入戰鬥
+ 或者
+戰鬥次數不足完成設定倍率 (如僅夠 5 次但設為 6 倍), 也將無法進入戰鬥
+
+• 不選擇:
+不調整遊戲內代理倍率設定</system:String>
     <system:String x:Key="StageSelect">關卡選擇</system:String>
     <system:String x:Key="StageSelect2">備選</system:String>
     <system:String x:Key="RemainingSanityStage">剩餘理智</system:String>
@@ -724,17 +736,20 @@ C:\\leidian\\LDPlayer9。\n
     <system:String x:Key="FailedToLikeWebJson">出現錯誤，評價失敗 : &lt;</system:String>
     <system:String x:Key="ThanksForLikeWebJson">感謝評價！\n網頁已經開放評論區，歡迎前往留下你的評論！</system:String>
     <system:String x:Key="AutoSquad">自動編隊</system:String>
-    <system:String x:Key="AutoSquadTip">自動編隊暫時無法辨識 ｢特別關注｣ 的幹員</system:String>
+    <system:String x:Key="AutoSquadTip">自動編隊可能無法辨識 ｢特別關注｣ 的幹員</system:String>
     <system:String x:Key="AddTrust">補充低信賴幹員</system:String>
     <system:String x:Key="AddUserAdditional">追加自定幹員</system:String>
     <system:String x:Key="AddUserAdditionalTip">使用 ｢;｣ 作為分隔符，用 ｢,｣ 分隔操作員姓名和技能，例：史尔特尔,3;艾雅法拉,1</system:String>
     <system:String x:Key="UseCopilotList">戰鬥列表</system:String>
-    <system:String x:Key="UseCopilotListTip" xml:space="preserve">不支援跨章節導航
-僅支援: 主線關同一章節, SideStory (不支援從 EX 跳轉 S)
+    <system:String x:Key="UseCopilotListTip" xml:space="preserve">不支援跨章節導航。僅支援:
+  1. 主線關卡：同一章節內導航
+  2. SideStory：當前頁面內導航（普通/EX/S 相互不可跳轉）
 開始前請切換至關卡選擇頁面</system:String>
     <system:String x:Key="CopilotTaskRaidStage">(突襲)</system:String>
-    <system:String x:Key="CopilotAddTask">右鍵添加突襲難度</system:String>
-    <system:String x:Key="CopilotClearTask">右鍵清除未激活任務</system:String>
+    <system:String x:Key="CopilotAddTask" xml:space="preserve">左鍵添加普通難度
+右鍵添加突襲難度</system:String>
+    <system:String x:Key="CopilotClearTask" xml:space="preserve">左键清除所有任务
+右键清除未激活任务</system:String>
     <system:String x:Key="LoopTimes">循環次數</system:String>
     <system:String x:Key="Start">開始</system:String>
     <system:String x:Key="VideoLink">影片連結</system:String>
diff --git a/src/MaaWpfGui/Styles/Controls/TooltipBlock.xaml b/src/MaaWpfGui/Styles/Controls/TooltipBlock.xaml
index e3a8a460bc..b3d51e662b 100644
--- a/src/MaaWpfGui/Styles/Controls/TooltipBlock.xaml
+++ b/src/MaaWpfGui/Styles/Controls/TooltipBlock.xaml
@@ -11,11 +11,13 @@
     <Border
         Width="15"
         Height="15"
-        Margin="5,0,0,0"
+        Margin="2,0,0,0"
+        HorizontalAlignment="Left"
+        VerticalAlignment="Center"
         Background="{DynamicResource MouseOverRegionBrush}"
         Style="{StaticResource BorderCircular}"
-        ToolTipService.InitialShowDelay="0"
-        ToolTipService.IsEnabled="{c:Binding (TooltipTextEmpty ? \'False\' : \'True\')}">
+        ToolTipService.InitialShowDelay="{Binding InitialShowDelay}"
+        ToolTipService.IsEnabled="{c:Binding 'TooltipTextEmpty ? \'False\' : \'True\''}">
         <Border.ToolTip>
             <TextBlock
                 MaxWidth="{Binding TooltipMaxWidth}"
diff --git a/src/MaaWpfGui/Styles/Controls/TooltipBlock.xaml.cs b/src/MaaWpfGui/Styles/Controls/TooltipBlock.xaml.cs
index 411026d843..c072804e16 100644
--- a/src/MaaWpfGui/Styles/Controls/TooltipBlock.xaml.cs
+++ b/src/MaaWpfGui/Styles/Controls/TooltipBlock.xaml.cs
@@ -11,8 +11,10 @@
 // but WITHOUT ANY WARRANTY
 // </copyright>
 #nullable enable
+using System;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media.Animation;
 
 namespace MaaWpfGui.Styles.Controls;
 
@@ -25,11 +27,22 @@ public partial class TooltipBlock : UserControl
     {
         InitializeComponent();
         DataContext = this;
+
+        Opacity = NormalOpacity;
+
+        MouseEnter += OnMouseEnter;
+        MouseLeave += OnMouseLeave;
     }
 
-    public static readonly DependencyProperty TooltipTextProperty = DependencyProperty.Register(nameof(TooltipText), typeof(string), typeof(TooltipBlock), new PropertyMetadata(string.Empty));
+    public static readonly DependencyProperty TooltipTextProperty = DependencyProperty.Register(nameof(TooltipText), typeof(string), typeof(TooltipBlock), new(string.Empty));
 
-    public static readonly DependencyProperty TooltipMaxWidthProperty = DependencyProperty.Register(nameof(TooltipMaxWidth), typeof(double), typeof(TooltipBlock), new PropertyMetadata(double.MaxValue));
+    public static readonly DependencyProperty TooltipMaxWidthProperty = DependencyProperty.Register(nameof(TooltipMaxWidth), typeof(double), typeof(TooltipBlock), new(double.MaxValue));
+
+    public static readonly DependencyProperty NormalOpacityProperty = DependencyProperty.Register(nameof(NormalOpacity), typeof(double), typeof(TooltipBlock), new(0.7, OnOpacityChanged));
+
+    public static readonly DependencyProperty HoverOpacityProperty = DependencyProperty.Register(nameof(HoverOpacity), typeof(double), typeof(TooltipBlock), new(1.0, OnOpacityChanged));
+
+    public static readonly DependencyProperty InitialShowDelayProperty = DependencyProperty.Register(nameof(InitialShowDelay), typeof(int), typeof(TooltipBlock), new(200));
 
     public string TooltipText
     {
@@ -44,4 +57,52 @@ public partial class TooltipBlock : UserControl
         get => (double)GetValue(TooltipMaxWidthProperty);
         set => SetValue(TooltipMaxWidthProperty, value);
     }
+
+    public double NormalOpacity
+    {
+        get => (double)GetValue(NormalOpacityProperty);
+        set => SetValue(NormalOpacityProperty, value);
+    }
+
+    public double HoverOpacity
+    {
+        get => (double)GetValue(HoverOpacityProperty);
+        set => SetValue(HoverOpacityProperty, value);
+    }
+
+    public int InitialShowDelay
+    {
+        get => (int)GetValue(InitialShowDelayProperty);
+        set => SetValue(InitialShowDelayProperty, value);
+    }
+
+    private static void OnOpacityChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        if (d is TooltipBlock { IsMouseOver: false } tooltipBlock)
+        {
+            tooltipBlock.Opacity = tooltipBlock.NormalOpacity;
+        }
+    }
+
+    private void OnMouseEnter(object sender, EventArgs e)
+    {
+        AnimateOpacity(HoverOpacity);
+    }
+
+    private void OnMouseLeave(object sender, EventArgs e)
+    {
+        AnimateOpacity(NormalOpacity);
+    }
+
+    private void AnimateOpacity(double targetOpacity)
+    {
+        var animation = new DoubleAnimation
+        {
+            To = targetOpacity,
+            Duration = new(TimeSpan.FromMilliseconds(InitialShowDelay)),
+            FillBehavior = FillBehavior.HoldEnd,
+        };
+
+        BeginAnimation(OpacityProperty, animation);
+    }
 }
diff --git a/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs b/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs
index ad8f68d5ce..2cfebbe4be 100644
--- a/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs
+++ b/src/MaaWpfGui/ViewModels/UI/CopilotViewModel.cs
@@ -182,7 +182,14 @@ namespace MaaWpfGui.ViewModels.UI
             {
                 SetAndNotify(ref _filename, value);
                 ClearLog();
-                UpdateFilename(value);
+                if (string.IsNullOrWhiteSpace(value))
+                {
+                    AddLog(LocalizationHelper.GetString("CopilotTip"), showTime: false);
+                }
+                else
+                {
+                    UpdateFilename(value);
+                }
             }
         }
 
@@ -522,16 +529,6 @@ namespace MaaWpfGui.ViewModels.UI
             RateCopilot(CopilotId, false);
         }
 
-        private void EasterEgg(string text)
-        {
-            switch (text)
-            {
-                case "/help":
-                    AddLog(LocalizationHelper.GetString("HelloWorld"), UiLogColor.Message, showTime: false);
-                    break;
-            }
-        }
-
         #endregion 方法
 
         #endregion UI绑定及操作
@@ -589,8 +586,7 @@ namespace MaaWpfGui.ViewModels.UI
             }
             else
             {
-                EasterEgg(filename);
-                return;
+                payload = null;
             }
 
             if (payload is CopilotModel copilot)
diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs
index 9c70597d87..ac36b58480 100644
--- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs
+++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/FightSettingsUserControlModel.cs
@@ -461,7 +461,7 @@ public class FightSettingsUserControlModel : TaskViewModel
         }
     }
 
-    public Dictionary<string, int> SeriesList { get; } = new()
+    public static Dictionary<string, int> SeriesList { get; } = new()
     {
         { "AUTO", 0 },
         { "6", 6 },
@@ -478,7 +478,7 @@ public class FightSettingsUserControlModel : TaskViewModel
     private static int InitFightSeries()
     {
         var series = ConfigurationHelper.GetValue(ConfigurationKeys.SeriesQuantity, 0);
-        if (Enumerable.Range(-1, 8).Contains(series))
+        if (SeriesList.ContainsValue(series))
         {
             return series;
         }
diff --git a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs
index e120c0c55c..a8794b70fd 100644
--- a/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs
+++ b/src/MaaWpfGui/ViewModels/UserControl/TaskQueue/InfrastSettingsUserControlModel.cs
@@ -103,8 +103,6 @@ public class InfrastSettingsUserControlModel : TaskViewModel
 
         InfrastItemViewModels = new ObservableCollection<DragItemViewModel>(tempOrderList!);
         InfrastItemViewModels.CollectionChanged += InfrastOrderSelectionChanged;
-
-        _dormThresholdLabel = LocalizationHelper.GetString("DormThreshold") + ": " + _dormThreshold + "%";
     }
 
     /// <summary>
@@ -150,22 +148,10 @@ public class InfrastSettingsUserControlModel : TaskViewModel
         set
         {
             SetAndNotify(ref _dormThreshold, value);
-            DormThresholdLabel = LocalizationHelper.GetString("DormThreshold") + ": " + _dormThreshold + "%";
             ConfigurationHelper.SetValue(ConfigurationKeys.DormThreshold, value.ToString());
         }
     }
 
-    private string _dormThresholdLabel = string.Empty;
-
-    /// <summary>
-    /// Gets or sets the label of dormitory threshold.
-    /// </summary>
-    public string DormThresholdLabel
-    {
-        get => _dormThresholdLabel;
-        set => SetAndNotify(ref _dormThresholdLabel, value);
-    }
-
     /// <summary>
     /// Gets infrast order list.
     /// </summary>
diff --git a/src/MaaWpfGui/Views/UI/CopilotView.xaml b/src/MaaWpfGui/Views/UI/CopilotView.xaml
index 309a1cc6be..fb4d46e4a6 100644
--- a/src/MaaWpfGui/Views/UI/CopilotView.xaml
+++ b/src/MaaWpfGui/Views/UI/CopilotView.xaml
@@ -53,6 +53,7 @@
                         <ColumnDefinition Width="Auto" />
                     </Grid.ColumnDefinitions>
                     <ComboBox
+                        Grid.Column="0"
                         Height="30"
                         hc:BorderElement.CornerRadius="4,0,0,4"
                         DropDownOpened="{s:Action OnDropDownOpened}"
@@ -67,8 +68,7 @@
                         hc:IconElement.Geometry="{StaticResource FolderOpen20Regular}"
                         BorderThickness="0,1,1,1"
                         Command="{s:Action SelectFile}"
-                        IsEnabled="{c:Binding '(Idle) and (StartEnabled)'}"
-                        ToolTip="{DynamicResource SelectTheFileTip}" />
+                        IsEnabled="{c:Binding '(Idle) and (StartEnabled)'}" />
                     <Button
                         Grid.Column="2"
                         Height="30"
@@ -78,8 +78,21 @@
                         BorderThickness="0,1,1,1"
                         Command="{s:Action PasteClipboard}"
                         IsEnabled="{c:Binding '(Idle) and (StartEnabled)'}"
-                        MouseRightButtonUp="{s:Action PasteClipboardCopilotSet}"
-                        ToolTip="{DynamicResource PasteClipboardTip}" />
+                        MouseRightButtonUp="{s:Action PasteClipboardCopilotSet}" />
+                    <controls:TooltipBlock
+                        Grid.Column="1"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        MouseLeftButtonDown="{s:Action SelectFile}"
+                        NormalOpacity="0.25"
+                        TooltipText="{DynamicResource SelectTheFileTip}" />
+                    <controls:TooltipBlock
+                        Grid.Column="2"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        MouseLeftButtonDown="{s:Action PasteClipboard}"
+                        NormalOpacity="0.25"
+                        TooltipText="{DynamicResource PasteClipboardTip}" />
                 </Grid>
             </StackPanel>
 
@@ -91,24 +104,22 @@
                     Height="30"
                     HorizontalAlignment="Center"
                     Orientation="Horizontal">
-                    <CheckBox
-                        Margin="0,0,20,0"
-                        HorizontalAlignment="Center"
-                        Content="{DynamicResource AutoSquad}"
-                        IsChecked="{Binding Form}"
-                        IsEnabled="{Binding Idle}"
-                        ToolTip="{DynamicResource AutoSquadTip}" />
-                    <CheckBox
-                        HorizontalAlignment="Center"
-                        IsChecked="{Binding UseCopilotList}"
-                        IsEnabled="{Binding Idle}"
-                        ToolTipService.InitialShowDelay="0"
-                        ToolTip="{DynamicResource UseCopilotListTip}">
-                        <StackPanel Orientation="Horizontal">
-                            <controls:TextBlock Text="{DynamicResource UseCopilotList}" />
-                            <controls:TooltipBlock />
-                        </StackPanel>
-                    </CheckBox>
+                    <StackPanel Margin="0,0,10,0" Orientation="Horizontal">
+                        <CheckBox
+                            HorizontalAlignment="Center"
+                            Content="{DynamicResource AutoSquad}"
+                            IsChecked="{Binding Form}"
+                            IsEnabled="{Binding Idle}" />
+                        <controls:TooltipBlock TooltipText="{DynamicResource AutoSquadTip}" />
+                    </StackPanel>
+                    <StackPanel Orientation="Horizontal">
+                        <CheckBox
+                            HorizontalAlignment="Center"
+                            Content="{DynamicResource UseCopilotList}"
+                            IsChecked="{Binding UseCopilotList}"
+                            IsEnabled="{Binding Idle}" />
+                        <controls:TooltipBlock TooltipText="{DynamicResource UseCopilotListTip}" />
+                    </StackPanel>
                 </StackPanel>
                 <StackPanel
                     Height="30"
@@ -116,20 +127,20 @@
                     Orientation="Horizontal"
                     Visibility="{c:Binding Form}">
                     <CheckBox
-                        Margin="0,0,10,0"
                         Content="{DynamicResource AddUserAdditional}"
                         IsChecked="{Binding AddUserAdditional}"
-                        IsEnabled="{Binding Idle}"
-                        ToolTip="{DynamicResource AddUserAdditionalTip}" />
+                        IsEnabled="{Binding Idle}" />
                     <TextBox
                         MinWidth="140"
                         MaxWidth="200"
+                        Margin="10,0,0,0"
                         VerticalContentAlignment="Center"
                         IsEnabled="{c:Binding '(Form) and (Idle)'}"
                         IsHitTestVisible="{Binding AddUserAdditional}"
                         MaxLines="1"
                         Text="{Binding UserAdditional, UpdateSourceTrigger=LostFocus}"
                         ToolTip="{DynamicResource AddUserAdditionalTip}"
+                        ToolTipService.InitialShowDelay="0"
                         Visibility="{c:Binding AddUserAdditional}" />
                 </StackPanel>
 
@@ -137,7 +148,6 @@
                     HorizontalAlignment="Center"
                     IsEnabled="{Binding Idle}"
                     Orientation="Horizontal">
-
                     <CheckBox
                         Height="30"
                         Margin="10,0"
@@ -260,54 +270,75 @@
                         </DataTemplate>
                     </ListBox.ItemTemplate>
                 </ListBox>
-                <hc:TextBox
-                    Grid.Row="1"
-                    Grid.Column="1"
-                    Height="30"
-                    HorizontalContentAlignment="Center"
-                    VerticalContentAlignment="Center"
-                    hc:BorderElement.CornerRadius="0"
-                    hc:InfoElement.Placeholder="{DynamicResource CopilotTaskName}"
-                    IsEnabled="{Binding Idle}"
-                    MaxLines="1"
-                    Text="{Binding CopilotTaskName, UpdateSourceTrigger=LostFocus}"
-                    ToolTip="{DynamicResource CopilotTaskNameTip}" />
-                <Button
-                    Grid.Row="1"
-                    Grid.Column="0"
-                    Height="30"
-                    MinWidth="30"
-                    hc:BorderElement.CornerRadius="0,0,0,4"
-                    hc:IconElement.Geometry="{StaticResource FolderAdd20Regular}"
-                    BorderThickness="1,1,0,1"
-                    Command="{s:Action ImportFiles}"
-                    IsEnabled="{c:Binding '(Idle) and (StartEnabled)'}"
-                    ToolTip="{DynamicResource ImportFilesTip}" />
-                <Button
-                    Grid.Row="1"
-                    Grid.Column="3"
-                    Height="30"
-                    MinWidth="30"
-                    hc:BorderElement.CornerRadius="0,0,4,0"
-                    hc:IconElement.Geometry="{StaticResource DismissSquareMultiple20Regular}"
-                    BorderThickness="1"
-                    Command="{s:Action ClearCopilotTask}"
-                    Foreground="{DynamicResource DangerBrush}"
-                    IsEnabled="{c:Binding Idle}"
-                    MouseRightButtonUp="{s:Action CleanUnableCopilotTask}"
-                    ToolTip="{DynamicResource CopilotClearTask}" />
-                <Button
-                    Grid.Row="1"
-                    Grid.Column="2"
-                    Height="30"
-                    MinWidth="30"
-                    hc:BorderElement.CornerRadius="0"
-                    hc:IconElement.Geometry="{StaticResource Add20Regular}"
-                    BorderThickness="0,1"
-                    Command="{s:Action AddCopilotTask}"
-                    IsEnabled="{c:Binding '(Idle) and (StartEnabled)'}"
-                    MouseRightButtonUp="{s:Action AddCopilotTask_Adverse}"
-                    ToolTip="{DynamicResource CopilotAddTask}" />
+                <Grid Grid.Row="1" Grid.Column="1">
+                    <hc:TextBox
+                        Height="30"
+                        HorizontalContentAlignment="Center"
+                        VerticalContentAlignment="Center"
+                        hc:BorderElement.CornerRadius="0"
+                        hc:InfoElement.Placeholder="{DynamicResource CopilotTaskName}"
+                        IsEnabled="{Binding Idle}"
+                        MaxLines="1"
+                        Text="{Binding CopilotTaskName, UpdateSourceTrigger=LostFocus}" />
+                    <controls:TooltipBlock
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        NormalOpacity="0.25"
+                        TooltipText="{DynamicResource CopilotTaskNameTip}" />
+                </Grid>
+                <Grid Grid.Row="1" Grid.Column="0">
+                    <Button
+                        Height="30"
+                        MinWidth="30"
+                        hc:BorderElement.CornerRadius="0,0,0,4"
+                        hc:IconElement.Geometry="{StaticResource FolderAdd20Regular}"
+                        BorderThickness="1,1,0,1"
+                        Command="{s:Action ImportFiles}"
+                        IsEnabled="{c:Binding '(Idle) and (StartEnabled)'}" />
+                    <controls:TooltipBlock
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        MouseLeftButtonDown="{s:Action ImportFiles}"
+                        NormalOpacity="0.25"
+                        TooltipText="{DynamicResource ImportFilesTip}" />
+                </Grid>
+                <Grid Grid.Row="1" Grid.Column="2">
+                    <Button
+                        Height="30"
+                        MinWidth="30"
+                        hc:BorderElement.CornerRadius="0"
+                        hc:IconElement.Geometry="{StaticResource Add20Regular}"
+                        BorderThickness="0,1"
+                        Command="{s:Action AddCopilotTask}"
+                        IsEnabled="{c:Binding '(Idle) and (StartEnabled)'}"
+                        MouseRightButtonUp="{s:Action AddCopilotTask_Adverse}" />
+                    <controls:TooltipBlock
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        MouseLeftButtonDown="{s:Action AddCopilotTask}"
+                        MouseRightButtonUp="{s:Action AddCopilotTask_Adverse}"
+                        NormalOpacity="0.25"
+                        TooltipText="{DynamicResource CopilotAddTask}" />
+                </Grid>
+                <Grid Grid.Row="1" Grid.Column="3">
+                    <Button
+                        Height="30"
+                        MinWidth="30"
+                        hc:BorderElement.CornerRadius="0,0,4,0"
+                        hc:IconElement.Geometry="{StaticResource DismissSquareMultiple20Regular}"
+                        BorderThickness="1"
+                        Command="{s:Action ClearCopilotTask}"
+                        Foreground="{DynamicResource DangerBrush}"
+                        IsEnabled="{c:Binding Idle}"
+                        MouseRightButtonUp="{s:Action CleanUnableCopilotTask}" />
+                    <controls:TooltipBlock
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Top"
+                        MouseLeftButtonDown="{s:Action ClearCopilotTask}"
+                        MouseRightButtonUp="{s:Action CleanUnableCopilotTask}"
+                        NormalOpacity="0.25"
+                        TooltipText="{DynamicResource CopilotClearTask}" />
+                </Grid>
             </Grid>
 
             <Grid
diff --git a/src/MaaWpfGui/Views/UI/RecognizerView.xaml b/src/MaaWpfGui/Views/UI/RecognizerView.xaml
index b043883862..c071866f79 100644
--- a/src/MaaWpfGui/Views/UI/RecognizerView.xaml
+++ b/src/MaaWpfGui/Views/UI/RecognizerView.xaml
@@ -62,14 +62,16 @@
                             Margin="5"
                             Content="{DynamicResource AutoSettingTime}"
                             IsChecked="{Binding RecruitAutoSetTime}" />
-                        <CheckBox
-                            MaxWidth="200"
-                            Margin="5"
-                            HorizontalAlignment="Left"
-                            IsChecked="{Binding RecruitmentShowPotential}"
-                            ToolTip="{DynamicResource RecruitmentShowPotentialTips}">
-                            <controls:TextBlock Text="{DynamicResource RecruitmentShowPotential}" TextWrapping="Wrap" />
-                        </CheckBox>
+                        <StackPanel Orientation="Horizontal">
+                            <CheckBox
+                                MaxWidth="200"
+                                Margin="5,5,0,5"
+                                HorizontalAlignment="Left"
+                                IsChecked="{Binding RecruitmentShowPotential}">
+                                <controls:TextBlock Text="{DynamicResource RecruitmentShowPotential}" TextWrapping="Wrap" />
+                            </CheckBox>
+                            <controls:TooltipBlock TooltipText="{DynamicResource RecruitmentShowPotentialTips}" />
+                        </StackPanel>
                     </StackPanel>
 
                     <StackPanel VerticalAlignment="Center">
diff --git a/src/MaaWpfGui/Views/UserControl/GuideUserControl.xaml b/src/MaaWpfGui/Views/UserControl/GuideUserControl.xaml
index 47a8cac172..2027c3daee 100644
--- a/src/MaaWpfGui/Views/UserControl/GuideUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/GuideUserControl.xaml
@@ -156,11 +156,13 @@
                                     Foreground="{DynamicResource InfoBrush}"
                                     Text="{DynamicResource GuideStepClarification}"
                                     TextWrapping="Wrap" />
-                                <CheckBox
-                                    Margin="0,10"
-                                    Content="{DynamicResource AutoDetectConnection}"
-                                    IsChecked="{Binding AutoDetectConnection}"
-                                    ToolTip="{DynamicResource AutoDetectConnectionTip}" />
+                                <StackPanel Orientation="Horizontal">
+                                    <CheckBox
+                                        Margin="0,10"
+                                        Content="{DynamicResource AutoDetectConnection}"
+                                        IsChecked="{Binding AutoDetectConnection}" />
+                                    <controls:TooltipBlock TooltipText="{DynamicResource AutoDetectConnectionTip}" />
+                                </StackPanel>
                                 <CheckBox
                                     Margin="0,10"
                                     Content="{DynamicResource AlwaysAutoDetectConnection}"
@@ -187,38 +189,44 @@
                                         Content="{DynamicResource Select}" />
                                 </Grid>
 
-                                <hc:ComboBox
-                                    Margin="0,5"
-                                    HorizontalContentAlignment="Stretch"
-                                    hc:InfoElement.Title="{DynamicResource ConnectionAddress}"
-                                    IsEditable="True"
-                                    ItemsSource="{Binding ConnectAddressHistory}"
-                                    Text="{Binding ConnectAddress, UpdateSourceTrigger=LostFocus}"
-                                    ToolTip="{DynamicResource ConnectionAddressTip}"
-                                    Visibility="{c:Binding !AutoDetectConnection}">
-                                    <ComboBox.ItemTemplate>
-                                        <DataTemplate>
-                                            <Grid>
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="*" />
-                                                    <ColumnDefinition Width="Auto" />
-                                                </Grid.ColumnDefinitions>
-                                                <TextBlock
-                                                    Grid.Column="0"
-                                                    HorizontalAlignment="Left"
-                                                    VerticalAlignment="Center"
-                                                    Text="{Binding}" />
-                                                <Button
-                                                    Grid.Column="1"
-                                                    HorizontalAlignment="Right"
-                                                    Command="{s:Action RemoveAddressClick}"
-                                                    CommandParameter="{Binding}"
-                                                    Content="×"
-                                                    FontWeight="Bold" />
-                                            </Grid>
-                                        </DataTemplate>
-                                    </ComboBox.ItemTemplate>
-                                </hc:ComboBox>
+                                <Grid Visibility="{c:Binding !AutoDetectConnection}">
+                                    <hc:ComboBox
+                                        Margin="0,5"
+                                        HorizontalContentAlignment="Stretch"
+                                        hc:InfoElement.Title="{DynamicResource ConnectionAddress}"
+                                        IsEditable="True"
+                                        ItemsSource="{Binding ConnectAddressHistory}"
+                                        Text="{Binding ConnectAddress, UpdateSourceTrigger=LostFocus}">
+                                        <ComboBox.ItemTemplate>
+                                            <DataTemplate>
+                                                <Grid>
+                                                    <Grid.ColumnDefinitions>
+                                                        <ColumnDefinition Width="*" />
+                                                        <ColumnDefinition Width="Auto" />
+                                                    </Grid.ColumnDefinitions>
+                                                    <TextBlock
+                                                        Grid.Column="0"
+                                                        HorizontalAlignment="Left"
+                                                        VerticalAlignment="Center"
+                                                        Text="{Binding}" />
+                                                    <Button
+                                                        Grid.Column="1"
+                                                        HorizontalAlignment="Right"
+                                                        Command="{s:Action RemoveAddressClick}"
+                                                        CommandParameter="{Binding}"
+                                                        Content="×"
+                                                        FontWeight="Bold" />
+                                                </Grid>
+                                            </DataTemplate>
+                                        </ComboBox.ItemTemplate>
+                                    </hc:ComboBox>
+                                    <controls:TooltipBlock
+                                        Margin="0,5,0,0"
+                                        HorizontalAlignment="Right"
+                                        VerticalAlignment="Top"
+                                        TooltipText="{DynamicResource ConnectionAddressTip}" />
+                                </Grid>
+
                                 <hc:ComboBox
                                     Margin="0,5"
                                     hc:InfoElement.Title="{DynamicResource ConnectionPreset}"
@@ -248,16 +256,11 @@
                                     Name="ToolTipGuide"
                                     Margin="0,10"
                                     Text="{DynamicResource ToolTipGuide}" />
-                                <Border
-                                    Name="PerformBattlesGuide"
-                                    Margin="5"
-                                    Padding="5"
+                                <controls:TooltipBlock
+                                    x:Name="PerformBattlesGuide"
+                                    Margin="0,10,0,10"
                                     hc:RelativePanel.RightOf="{Binding ElementName=ToolTipGuide}"
-                                    BorderBrush="{DynamicResource BorderBrush}"
-                                    BorderThickness="1"
-                                    CornerRadius="4">
-                                    <TextBlock Text="{DynamicResource PerformBattles}" ToolTip="{DynamicResource CheckBoxesNotSaved}" />
-                                </Border>
+                                    TooltipText="{DynamicResource CheckBoxesNotSaved}" />
                                 <Border
                                     Name="Task"
                                     Padding="5,0,0,0"
diff --git a/src/MaaWpfGui/Views/UserControl/HotKeyEditorUserControl.xaml b/src/MaaWpfGui/Views/UserControl/HotKeyEditorUserControl.xaml
index 096a91bad3..2cd6293531 100644
--- a/src/MaaWpfGui/Views/UserControl/HotKeyEditorUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/HotKeyEditorUserControl.xaml
@@ -1,4 +1,4 @@
-<UserControl
+<UserControl
     x:Class="MaaWpfGui.Views.UserControl.HotKeyEditorUserControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -17,10 +17,9 @@
         IsReadOnlyCaretVisible="False"
         IsUndoEnabled="False"
         PreviewKeyDown="HotKeyTextBox_PreviewKeyDown"
-        Text="{Binding HotKey, ElementName=UserControl, Mode=OneWay, TargetNullValue=&lt; not set &gt;}"
-        ToolTip="{DynamicResource HotKeyChangingTip}">
+        Text="{Binding HotKey, ElementName=UserControl, Mode=OneWay, TargetNullValue=&lt; not set &gt;}">
         <TextBox.ContextMenu>
             <ContextMenu Visibility="Collapsed" />
         </TextBox.ContextMenu>
     </TextBox>
-</UserControl>
\ No newline at end of file
+</UserControl>
diff --git a/src/MaaWpfGui/Views/UserControl/HotKeySettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/HotKeySettingsUserControl.xaml
index 953c3f2599..a4f888d861 100644
--- a/src/MaaWpfGui/Views/UserControl/HotKeySettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/HotKeySettingsUserControl.xaml
@@ -39,9 +39,10 @@
                 Block.TextAlignment="Center"
                 Text="{DynamicResource HotKeyShowGui}" />
             <userControl:HotKeyEditorUserControl
-                Margin="10"
+                Margin="10,10,0,10"
                 HorizontalAlignment="Right"
                 HotKey="{Binding HotKeyShowGui}" />
+            <controls:TooltipBlock TooltipText="{DynamicResource HotKeyChangingTip}" />
         </StackPanel>
         <StackPanel
             HorizontalAlignment="Right"
@@ -52,9 +53,10 @@
                 Block.TextAlignment="Center"
                 Text="{DynamicResource HotKeyLinkStart}" />
             <userControl:HotKeyEditorUserControl
-                Margin="10"
+                Margin="10,10,0,10"
                 HorizontalAlignment="Right"
                 HotKey="{Binding HotKeyLinkStart}" />
+            <controls:TooltipBlock TooltipText="{DynamicResource HotKeyChangingTip}" />
         </StackPanel>
     </StackPanel>
 </UserControl>
diff --git a/src/MaaWpfGui/Views/UserControl/Settings/ConnectSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/Settings/ConnectSettingsUserControl.xaml
index a11e970a74..68579d534b 100644
--- a/src/MaaWpfGui/Views/UserControl/Settings/ConnectSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/Settings/ConnectSettingsUserControl.xaml
@@ -34,13 +34,15 @@
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
             Orientation="Horizontal">
-            <CheckBox
-                Margin="10"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Content="{DynamicResource AutoDetectConnection}"
-                IsChecked="{Binding AutoDetectConnection}"
-                ToolTip="{DynamicResource AutoDetectConnectionTip}" />
+            <StackPanel Orientation="Horizontal">
+                <CheckBox
+                    Margin="10,10,0,10"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Content="{DynamicResource AutoDetectConnection}"
+                    IsChecked="{Binding AutoDetectConnection}" />
+                <controls:TooltipBlock TooltipText="{DynamicResource AutoDetectConnectionTip}" />
+            </StackPanel>
             <CheckBox
                 Margin="10"
                 VerticalAlignment="Center"
@@ -69,42 +71,48 @@
                 Content="{DynamicResource Select}" />
         </StackPanel>
 
-        <hc:ComboBox
+        <StackPanel
             Grid.Row="2"
-            Width="300"
-            Height="30"
-            Margin="10"
-            HorizontalContentAlignment="Stretch"
-            hc:TitleElement.Title="{DynamicResource ConnectionAddress}"
-            hc:TitleElement.TitlePlacement="Left"
-            IsEditable="True"
-            IsEnabled="{c:Binding !AutoDetectConnection}"
-            ItemsSource="{Binding ConnectAddressHistory}"
-            Text="{Binding ConnectAddress, UpdateSourceTrigger=LostFocus}"
-            ToolTip="{DynamicResource ConnectionAddressTip}">
-            <ComboBox.ItemTemplate>
-                <DataTemplate>
-                    <Grid>
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <TextBlock
-                            Grid.Column="0"
-                            HorizontalAlignment="Left"
-                            VerticalAlignment="Center"
-                            Text="{Binding}" />
-                        <Button
-                            Grid.Column="1"
-                            HorizontalAlignment="Right"
-                            Command="{s:Action RemoveAddressClick}"
-                            CommandParameter="{Binding}"
-                            Content="×"
-                            FontWeight="Bold" />
-                    </Grid>
-                </DataTemplate>
-            </ComboBox.ItemTemplate>
-        </hc:ComboBox>
+            HorizontalAlignment="Center"
+            Orientation="Horizontal">
+            <!--  对称居中  -->
+            <controls:TooltipBlock Visibility="Hidden" />
+            <hc:ComboBox
+                Width="300"
+                Height="30"
+                Margin="10"
+                hc:TitleElement.Title="{DynamicResource ConnectionAddress}"
+                hc:TitleElement.TitlePlacement="Left"
+                IsEditable="True"
+                IsEnabled="{c:Binding !AutoDetectConnection}"
+                ItemsSource="{Binding ConnectAddressHistory}"
+                Text="{Binding ConnectAddress, UpdateSourceTrigger=LostFocus}">
+                <ComboBox.ItemTemplate>
+                    <DataTemplate>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <TextBlock
+                                Grid.Column="0"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Text="{Binding}" />
+                            <Button
+                                Grid.Column="1"
+                                HorizontalAlignment="Right"
+                                Command="{s:Action RemoveAddressClick}"
+                                CommandParameter="{Binding}"
+                                Content="×"
+                                FontWeight="Bold" />
+                        </Grid>
+                    </DataTemplate>
+                </ComboBox.ItemTemplate>
+            </hc:ComboBox>
+            <controls:TooltipBlock TooltipText="{DynamicResource ConnectionAddressTip}" />
+        </StackPanel>
+
 
         <StackPanel Grid.Row="3" IsEnabled="{c:Binding !AutoDetectConnection}">
             <hc:ComboBox
@@ -206,11 +214,13 @@
             Text="{c:Binding ScreencapCost}" />
 
         <StackPanel Grid.Row="6" HorizontalAlignment="Center">
-            <CheckBox
-                Margin="20,10"
-                Content="{DynamicResource RetryOnDisconnected}"
-                IsChecked="{Binding RetryOnDisconnected}"
-                ToolTip="{DynamicResource RetryOnDisconnectedTip}" />
+            <StackPanel Orientation="Horizontal">
+                <CheckBox
+                    Margin="20,10,0,10"
+                    Content="{DynamicResource RetryOnDisconnected}"
+                    IsChecked="{Binding RetryOnDisconnected}" />
+                <controls:TooltipBlock TooltipText="{DynamicResource RetryOnDisconnectedTip}" />
+            </StackPanel>
             <CheckBox
                 Margin="20,10"
                 Content="{DynamicResource AllowAdbRestart}"
diff --git a/src/MaaWpfGui/Views/UserControl/Settings/ExternalNotificationSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/Settings/ExternalNotificationSettingsUserControl.xaml
index 5ca8165d27..b53442e2c2 100644
--- a/src/MaaWpfGui/Views/UserControl/Settings/ExternalNotificationSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/Settings/ExternalNotificationSettingsUserControl.xaml
@@ -437,26 +437,32 @@
             Orientation="Vertical"
             Visibility="{c:Binding CustomWebhookEnabled}">
             <hc:Divider Content="{DynamicResource ExternalNotificationCustomWebhook}" />
-            <hc:TextBox
-                x:Name="CustomWebhookUrl"
-                Width="400"
-                Height="30"
-                Margin="10"
-                hc:InfoElement.Title="{DynamicResource ExternalNotificationCustomWebhookUrl}"
-                Text="{c:Binding CustomWebhookUrl}" />
-            <hc:TextBox
-                x:Name="CustomWebhookBody"
-                Width="400"
-                MinHeight="20"
-                Margin="10"
-                hc:InfoElement.Placeholder="{DynamicResource ExternalNotificationCustomWebhookPlaceholders}"
-                hc:InfoElement.Title="{DynamicResource ExternalNotificationCustomWebhookBody}"
-                AcceptsReturn="True"
-                GotFocus="{s:Action CustomWebhookBodyGotFocus}"
-                LostFocus="{s:Action CustomWebhookBodyLostFocus}"
-                Text="{c:Binding CustomWebhookBody}"
-                TextWrapping="Wrap"
-                ToolTip="{DynamicResource ExternalNotificationCustomWebhookPlaceholders}" />
+            <StackPanel Orientation="Horizontal">
+                <hc:TextBox
+                    x:Name="CustomWebhookUrl"
+                    Width="400"
+                    Height="30"
+                    Margin="10,10,0,10"
+                    hc:InfoElement.Title="{DynamicResource ExternalNotificationCustomWebhookUrl}"
+                    Text="{c:Binding CustomWebhookUrl}" />
+                <!--  整个相同控件占位，保持控件长度一致  -->
+                <controls:TooltipBlock Visibility="Hidden" />
+            </StackPanel>
+            <StackPanel Orientation="Horizontal">
+                <hc:TextBox
+                    x:Name="CustomWebhookBody"
+                    Width="400"
+                    MinHeight="20"
+                    Margin="10,10,0,10"
+                    hc:InfoElement.Placeholder="{DynamicResource ExternalNotificationCustomWebhookPlaceholders}"
+                    hc:InfoElement.Title="{DynamicResource ExternalNotificationCustomWebhookBody}"
+                    AcceptsReturn="True"
+                    GotFocus="{s:Action CustomWebhookBodyGotFocus}"
+                    LostFocus="{s:Action CustomWebhookBodyLostFocus}"
+                    Text="{c:Binding CustomWebhookBody}"
+                    TextWrapping="Wrap" />
+                <controls:TooltipBlock TooltipText="{DynamicResource ExternalNotificationCustomWebhookPlaceholders}" />
+            </StackPanel>
         </StackPanel>
     </Grid>
 </UserControl>
diff --git a/src/MaaWpfGui/Views/UserControl/Settings/GuiSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/Settings/GuiSettingsUserControl.xaml
index a3f8fa38e8..8f7f856cdc 100644
--- a/src/MaaWpfGui/Views/UserControl/Settings/GuiSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/Settings/GuiSettingsUserControl.xaml
@@ -57,12 +57,13 @@
                     Margin="10"
                     Content="{DynamicResource WindowTitleScrollable}"
                     IsChecked="{Binding WindowTitleScrollable}" />
-                <CheckBox
-                    Margin="10"
-                    Content="{DynamicResource MainTasksNullFunctionality}"
-                    IsChecked="{Binding MainTasksInvertNullFunction}"
-                    ToolTip="{DynamicResource MainTasksNullFunctionalityTip}"
-                    ToolTipService.InitialShowDelay="0" />
+                <StackPanel Orientation="Horizontal">
+                    <CheckBox
+                        Margin="10,10,0,10"
+                        Content="{DynamicResource MainTasksNullFunctionality}"
+                        IsChecked="{Binding MainTasksInvertNullFunction}" />
+                    <controls:TooltipBlock TooltipText="{DynamicResource MainTasksNullFunctionalityTip}" />
+                </StackPanel>
                 <hc:CheckComboBox
                     Width="180"
                     Margin="10"
diff --git a/src/MaaWpfGui/Views/UserControl/Settings/TimerSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/Settings/TimerSettingsUserControl.xaml
index 0322bfe74b..93ccc8d3fb 100644
--- a/src/MaaWpfGui/Views/UserControl/Settings/TimerSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/Settings/TimerSettingsUserControl.xaml
@@ -35,22 +35,25 @@
             Grid.Row="1"
             HorizontalAlignment="Center"
             Orientation="Horizontal">
-            <CheckBox
-                Height="30"
-                Margin="5,0"
-                HorizontalAlignment="Center"
-                VerticalContentAlignment="Center"
-                Content="{DynamicResource ForceScheduledStart}"
-                IsChecked="{Binding ForceScheduledStart}"
-                ToolTip="{DynamicResource ForceScheduledStartTip}" />
-            <CheckBox
-                Height="30"
-                Margin="5,0"
-                HorizontalAlignment="Center"
-                VerticalContentAlignment="Center"
-                Content="{DynamicResource TimerCustomConfig}"
-                IsChecked="{Binding CustomConfig}"
-                ToolTip="{DynamicResource TimerCustomConfigTip}" />
+            <StackPanel Margin="5,0" Orientation="Horizontal">
+                <CheckBox
+                    Height="30"
+                    HorizontalAlignment="Center"
+                    VerticalContentAlignment="Center"
+                    Content="{DynamicResource ForceScheduledStart}"
+                    IsChecked="{Binding ForceScheduledStart}" />
+                <controls:TooltipBlock TooltipText="{DynamicResource ForceScheduledStartTip}" />
+            </StackPanel>
+
+            <StackPanel Margin="5,0" Orientation="Horizontal">
+                <CheckBox
+                    Height="30"
+                    HorizontalAlignment="Center"
+                    VerticalContentAlignment="Center"
+                    Content="{DynamicResource TimerCustomConfig}"
+                    IsChecked="{Binding CustomConfig}" />
+                <controls:TooltipBlock TooltipText="{DynamicResource TimerCustomConfigTip}" />
+            </StackPanel>
         </StackPanel>
 
         <StackPanel
diff --git a/src/MaaWpfGui/Views/UserControl/Settings/VersionUpdateSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/Settings/VersionUpdateSettingsUserControl.xaml
index abb7b892a8..b0c709ba8d 100644
--- a/src/MaaWpfGui/Views/UserControl/Settings/VersionUpdateSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/Settings/VersionUpdateSettingsUserControl.xaml
@@ -46,13 +46,14 @@
                         Content="{DynamicResource StartupUpdateCheck}"
                         IsChecked="{Binding StartupUpdateCheck}"
                         IsEnabled="False" />
-                    <CheckBox
-                        Margin="8"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Content="{DynamicResource UpdateAutoCheck}"
-                        IsChecked="{Binding UpdateAutoCheck}"
-                        ToolTip="{DynamicResource UpdateAutoCheckTip}" />
+                    <StackPanel Margin="8" Orientation="Horizontal">
+                        <CheckBox
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Content="{DynamicResource UpdateAutoCheck}"
+                            IsChecked="{Binding UpdateAutoCheck}" />
+                        <controls:TooltipBlock TooltipText="{DynamicResource UpdateAutoCheckTip}" />
+                    </StackPanel>
                     <CheckBox
                         Margin="8"
                         HorizontalAlignment="Left"
@@ -65,13 +66,15 @@
                         VerticalAlignment="Center"
                         Content="{DynamicResource AutoInstallUpdatePackage}"
                         IsChecked="{Binding AutoInstallUpdatePackage}" />
-                    <CheckBox
-                        Margin="8"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Center"
-                        Content="{DynamicResource ForceGithubGlobalSource}"
-                        IsChecked="{Binding ForceGithubGlobalSource}"
-                        Visibility="{c:Binding 'UpdateSource == &quot;Github&quot;'}" />
+                    <StackPanel Margin="8" Orientation="Horizontal">
+                        <CheckBox
+                            HorizontalAlignment="Left"
+                            VerticalAlignment="Center"
+                            Content="{DynamicResource ForceGithubGlobalSource}"
+                            IsChecked="{Binding ForceGithubGlobalSource}"
+                            Visibility="{c:Binding 'UpdateSource == &quot;Github&quot;'}" />
+                        <controls:TooltipBlock TooltipText="{DynamicResource ForceGithubGlobalSourceTip}" />
+                    </StackPanel>
                     <StackPanel Margin="8">
                         <controls:TextBlock
                             Margin="8,0,0,5"
diff --git a/src/MaaWpfGui/Views/UserControl/TaskQueue/AwardSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TaskQueue/AwardSettingsUserControl.xaml
index a2f7967972..9415a0bcc7 100644
--- a/src/MaaWpfGui/Views/UserControl/TaskQueue/AwardSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/TaskQueue/AwardSettingsUserControl.xaml
@@ -25,12 +25,12 @@
                 Margin="0,10"
                 Content="{DynamicResource ReceiveMail}"
                 IsChecked="{Binding ReceiveMail}" />
-            <CheckBox
-                Margin="0,10"
-                IsChecked="{Binding ReceiveFreeRecruit}"
-                ToolTip="{DynamicResource ReceiveFreeRecruitTip}">
-                <controls:TextBlock Text="{DynamicResource ReceiveFreeRecruit}" TextWrapping="Wrap" />
-            </CheckBox>
+            <StackPanel Margin="0,10" Orientation="Horizontal">
+                <CheckBox IsChecked="{Binding ReceiveFreeRecruit}">
+                    <controls:TextBlock Text="{DynamicResource ReceiveFreeRecruit}" TextWrapping="Wrap" />
+                </CheckBox>
+                <controls:TooltipBlock TooltipText="{DynamicResource ReceiveFreeRecruitTip}" />
+            </StackPanel>
             <CheckBox Margin="0,10" IsChecked="{Binding ReceiveOrundum}">
                 <controls:TextBlock Text="{DynamicResource ReceiveOrundum}" TextWrapping="Wrap" />
             </CheckBox>
diff --git a/src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml
index 0970cca5f6..9f19e48108 100644
--- a/src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/TaskQueue/FightSettingsUserControl.xaml
@@ -101,15 +101,21 @@
                     <ColumnDefinition />
                 </Grid.ColumnDefinitions>
                 <StackPanel Orientation="Vertical">
-                    <CheckBox
-                        Height="30"
-                        Margin="6"
-                        VerticalContentAlignment="Center"
-                        Content="{DynamicResource AssignedMaterial}"
-                        IsChecked="{Binding IsSpecifiedDropsWithNull}"
-                        MouseRightButtonUp="{s:Action ToggleCheckBoxNullOnRightClick,
-                                                      Target={x:Type helper:CheckBoxHelper}}"
-                        ToolTip="{DynamicResource NoAutoNavigation}" />
+                    <Grid Margin="6">
+                        <CheckBox
+                            Height="30"
+                            VerticalContentAlignment="Center"
+                            Content="{DynamicResource AssignedMaterial}"
+                            IsChecked="{Binding IsSpecifiedDropsWithNull}"
+                            MouseRightButtonUp="{s:Action ToggleCheckBoxNullOnRightClick,
+                                                          Target={x:Type helper:CheckBoxHelper}}"
+                            ToolTip="{DynamicResource CheckBoxesNotSavedAsNull}" />
+                        <controls:TooltipBlock
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            NormalOpacity="0.25"
+                            TooltipText="{DynamicResource NoAutoNavigation}" />
+                    </Grid>
                     <Grid Height="42" Visibility="{c:Binding IsSpecifiedDropsWithNull}">
                         <controls:TextBlock
                             HorizontalAlignment="Center"
@@ -154,12 +160,19 @@
                 <StackPanel Orientation="Vertical">
                     <Grid Height="42">
                         <controls:TextBlock
-                            Margin="6"
+                            x:Name="SeriesTextBlock"
+                            Margin="0,6"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Text="{DynamicResource Series}"
                             TextAlignment="Center"
                             TextWrapping="Wrap" />
+                        <controls:TooltipBlock
+                            Margin="0,5,6,0"
+                            HorizontalAlignment="Right"
+                            VerticalAlignment="Top"
+                            NormalOpacity="0.25"
+                            TooltipText="{DynamicResource SeriesTip}" />
                     </Grid>
                 </StackPanel>
                 <StackPanel Grid.Column="1" Orientation="Vertical">
@@ -167,11 +180,11 @@
                         Height="30"
                         Margin="6"
                         VerticalContentAlignment="Center"
+                        DisplayMemberPath="Key"
                         IsHitTestVisible="{c:Binding !FightTaskRunning,
                                                      Source={x:Static helper:Instances.TaskQueueViewModel}}"
                         ItemsSource="{Binding SeriesList}"
                         SelectedValue="{Binding Series}"
-                        DisplayMemberPath="Key"
                         SelectedValuePath="Value" />
                 </StackPanel>
             </Grid>
@@ -183,12 +196,21 @@
                 <StackPanel Orientation="Vertical">
                     <Grid Height="42">
                         <controls:TextBlock
+                            x:Name="StageSelectTextBlock"
                             Margin="6"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Text="{DynamicResource StageSelect}"
                             TextAlignment="Center"
                             TextWrapping="Wrap" />
+                        <Grid Visibility="{c:Binding CustomStageCode}">
+                            <controls:TooltipBlock
+                                Margin="0,5,6,0"
+                                HorizontalAlignment="Right"
+                                VerticalAlignment="Top"
+                                NormalOpacity="0.25"
+                                TooltipText="{DynamicResource CustomStageCodeTip}" />
+                        </Grid>
                     </Grid>
                     <Grid Height="42" Visibility="{c:Binding UseAlternateStage}">
                         <controls:TextBlock
@@ -211,12 +233,18 @@
                     </Grid>
                     <Grid Height="42" Visibility="{c:Binding UseRemainingSanityStage}">
                         <controls:TextBlock
+                            x:Name="RemainingSanityStageTextBlock"
                             Margin="6"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
                             Text="{DynamicResource RemainingSanityStage}"
                             TextAlignment="Center"
                             TextWrapping="Wrap" />
+                        <controls:TooltipBlock TooltipText="{DynamicResource UseRemainingSanityStageTip}">
+                            <controls:TooltipBlock.RenderTransform>
+                                <TranslateTransform d:X="30" X="{c:Binding 'ActualWidth/2 + 10', ElementName=RemainingSanityStageTextBlock}" />
+                            </controls:TooltipBlock.RenderTransform>
+                        </controls:TooltipBlock>
                     </Grid>
                 </StackPanel>
                 <StackPanel Grid.Column="1" Orientation="Vertical">
@@ -270,7 +298,6 @@
                             ItemsSource="{Binding RemainingSanityStageList}"
                             SelectedValue="{Binding RemainingSanityStage}"
                             SelectedValuePath="Value"
-                            ToolTip="{DynamicResource UseRemainingSanityStageTip}"
                             Visibility="{c:Binding UseRemainingSanityStage}" />
                     </StackPanel>
                     <StackPanel
@@ -314,7 +341,6 @@
                             IsHitTestVisible="{c:Binding !FightTaskRunning,
                                                          Source={x:Static helper:Instances.TaskQueueViewModel}}"
                             Text="{Binding RemainingSanityStage, UpdateSourceTrigger=PropertyChanged}"
-                            ToolTip="{DynamicResource UseRemainingSanityStageTip}"
                             Visibility="{c:Binding UseRemainingSanityStage}" />
                     </StackPanel>
                 </StackPanel>
@@ -351,25 +377,22 @@
         </Grid>
 
         <StackPanel Visibility="{c:Binding EnableAdvancedSettings, Source={x:Static setting:TaskQueueViewModel.TaskSettingVisibilities}}">
-            <CheckBox
-                Margin="0,10"
-                Content="{DynamicResource DrGrandet}"
-                IsChecked="{Binding IsDrGrandet}"
-                ToolTip="{DynamicResource DrGrandetTip}" />
-            <CheckBox
-                Margin="0,10"
-                Content="{DynamicResource CustomStageCode}"
-                IsChecked="{Binding CustomStageCode}"
-                ToolTip="{DynamicResource CustomStageCodeTip}" />
+            <StackPanel Margin="0,10" Orientation="Horizontal">
+                <CheckBox Content="{DynamicResource DrGrandet}" IsChecked="{Binding IsDrGrandet}" />
+                <controls:TooltipBlock TooltipText="{DynamicResource DrGrandetTip}" />
+            </StackPanel>
+            <StackPanel Margin="0,10" Orientation="Horizontal">
+                <CheckBox Content="{DynamicResource CustomStageCode}" IsChecked="{Binding CustomStageCode}" />
+                <controls:TooltipBlock TooltipText="{DynamicResource CustomStageCodeTip}" />
+            </StackPanel>
             <CheckBox
                 Margin="0,10"
                 Content="{DynamicResource UseAlternateStage}"
                 IsChecked="{Binding UseAlternateStage}" />
-            <CheckBox
-                Margin="0,10"
-                Content="{DynamicResource UseRemainingSanityStage}"
-                IsChecked="{Binding UseRemainingSanityStage}"
-                ToolTip="{DynamicResource UseRemainingSanityStageTip}" />
+            <StackPanel Margin="0,10" Orientation="Horizontal">
+                <CheckBox Content="{DynamicResource UseRemainingSanityStage}" IsChecked="{Binding UseRemainingSanityStage}" />
+                <controls:TooltipBlock TooltipText="{DynamicResource UseRemainingSanityStageTip}" />
+            </StackPanel>
             <CheckBox
                 Margin="0,10"
                 Content="{DynamicResource AllowUseStoneSave}"
diff --git a/src/MaaWpfGui/Views/UserControl/TaskQueue/InfrastSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TaskQueue/InfrastSettingsUserControl.xaml
index afdf5dbd49..1050967148 100644
--- a/src/MaaWpfGui/Views/UserControl/TaskQueue/InfrastSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/TaskQueue/InfrastSettingsUserControl.xaml
@@ -88,18 +88,27 @@
                 Visibility="{c:Binding 'InfrastMode == task:InfrastMode.Rotation',
                                        Source={x:Static setting:TaskQueueViewModel.InfrastTask}}" />
             <StackPanel Margin="0" Visibility="{c:Binding 'InfrastMode != task:InfrastMode.Rotation', Source={x:Static setting:TaskQueueViewModel.InfrastTask}}">
-                <TextBlock
+                <StackPanel
                     Margin="0,5"
-                    HorizontalAlignment="Stretch"
-                    Block.TextAlignment="Center"
-                    Foreground="{DynamicResource PrimaryTextBrush}"
-                    Text="{Binding DormThresholdLabel}"
-                    TextWrapping="Wrap" />
+                    HorizontalAlignment="Center"
+                    Orientation="Horizontal">
+                    <controls:TextBlock
+                        MaxWidth="180"
+                        d:Text="{DynamicResource DormThreshold}"
+                        TextWrapping="Wrap">
+                        <controls:TextBlock.Text>
+                            <MultiBinding StringFormat="{}{0}: {1}%">
+                                <Binding Source="{StaticResource DormThreshold}" />
+                                <Binding Path="DormThreshold" />
+                            </MultiBinding>
+                        </controls:TextBlock.Text>
+                    </controls:TextBlock>
+                    <controls:TooltipBlock TooltipText="{DynamicResource InfrastThresholdTip}" />
+                </StackPanel>
                 <Slider
                     Margin="0,5"
                     Maximum="100"
                     Minimum="0"
-                    ToolTip="{DynamicResource InfrastThresholdTip}"
                     Value="{Binding DormThreshold}" />
                 <ListBox
                     Margin="0,5"
@@ -152,16 +161,17 @@
                 IsChecked="{Binding DormTrustEnabled}"
                 Visibility="{c:Binding 'InfrastMode != task:InfrastMode.Rotation',
                                        Source={x:Static setting:TaskQueueViewModel.InfrastTask}}" />
-            <CheckBox
-                Margin="0,10"
-                IsChecked="{c:Binding DormFilterNotStationedEnabled}"
-                Visibility="{c:Binding 'InfrastMode != task:InfrastMode.Rotation',
-                                       Source={x:Static setting:TaskQueueViewModel.InfrastTask}}">
-                <controls:TextBlock
-                    Text="{DynamicResource DormFilterNotStationedEnabled}"
-                    TextWrapping="Wrap"
-                    ToolTip="{DynamicResource DormFilterNotStationedTips}" />
-            </CheckBox>
+            <StackPanel Margin="0,10" Orientation="Horizontal">
+                <CheckBox
+                    MaxWidth="{c:Binding '220 - ActualWidth',
+                                         ElementName=DormFilterNotStationedTipsTooltipBlock}"
+                    IsChecked="{c:Binding DormFilterNotStationedEnabled}"
+                    Visibility="{c:Binding 'InfrastMode != task:InfrastMode.Rotation',
+                                           Source={x:Static setting:TaskQueueViewModel.InfrastTask}}">
+                    <controls:TextBlock Text="{DynamicResource DormFilterNotStationedEnabled}" TextWrapping="Wrap" />
+                </CheckBox>
+                <controls:TooltipBlock x:Name="DormFilterNotStationedTipsTooltipBlock" TooltipText="{DynamicResource DormFilterNotStationedTips}" />
+            </StackPanel>
             <CheckBox Margin="0,10" IsChecked="{Binding OriginiumShardAutoReplenishment}">
                 <controls:TextBlock Text="{DynamicResource OriginiumShardAutoReplenishment}" TextWrapping="Wrap" />
             </CheckBox>
diff --git a/src/MaaWpfGui/Views/UserControl/TaskQueue/MallSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TaskQueue/MallSettingsUserControl.xaml
index fdbfac3134..34eade2e1b 100644
--- a/src/MaaWpfGui/Views/UserControl/TaskQueue/MallSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/TaskQueue/MallSettingsUserControl.xaml
@@ -34,16 +34,21 @@
                 Block.TextAlignment="Left"
                 Content="{DynamicResource SocialPtShop}"
                 IsChecked="{Binding CreditShopping}" />
-            <CheckBox
-                Margin="0,10"
-                Block.TextAlignment="Left"
-                IsChecked="{Binding CreditFightTaskEnabledDisplay}"
-                ToolTip="{DynamicResource CreditFightTip}">
-                <TextBlock
+
+            <StackPanel Margin="0,10" Orientation="Horizontal">
+                <CheckBox
+                    MaxWidth="{c:Binding '220 - ActualWidth',
+                                         ElementName=CreditFightTipTooltipBlock}"
                     Block.TextAlignment="Left"
-                    Text="{DynamicResource CreditFight}"
-                    TextWrapping="Wrap" />
-            </CheckBox>
+                    IsChecked="{Binding CreditFightTaskEnabledDisplay}">
+                    <TextBlock
+                        Block.TextAlignment="Left"
+                        Text="{DynamicResource CreditFight}"
+                        TextWrapping="Wrap" />
+                </CheckBox>
+                <controls:TooltipBlock x:Name="CreditFightTipTooltipBlock" TooltipText="{DynamicResource CreditFightTip}" />
+            </StackPanel>
+
             <ComboBox
                 Margin="0,5"
                 hc:InfoElement.Title="{DynamicResource UseFormation}"
@@ -81,26 +86,32 @@
                     Text="{DynamicResource ForceShoppingIfCreditFull}"
                     TextWrapping="Wrap" />
             </CheckBox>
-            <CheckBox
-                Margin="0,10"
-                IsChecked="{Binding CreditOnlyBuyDiscount}"
-                IsEnabled="{Binding CreditShopping}">
-                <TextBlock
-                    Block.TextAlignment="Left"
-                    Text="{DynamicResource OnlyBuyDiscount}"
-                    TextWrapping="Wrap"
-                    ToolTip="{DynamicResource OnlyBuyDiscountTips}" />
-            </CheckBox>
-            <CheckBox
-                Margin="0,10"
-                IsChecked="{Binding CreditReserveMaxCredit}"
-                IsEnabled="{Binding CreditShopping}">
-                <TextBlock
-                    Block.TextAlignment="Left"
-                    Text="{DynamicResource ReserveMaxCredit}"
-                    TextWrapping="Wrap"
-                    ToolTip="{DynamicResource ReserveMaxCreditTips}" />
-            </CheckBox>
+            <StackPanel Margin="0,10" Orientation="Horizontal">
+                <CheckBox
+                    MaxWidth="{c:Binding '220 - ActualWidth',
+                                         ElementName=OnlyBuyDiscountTipsTooltipBlock}"
+                    IsChecked="{Binding CreditOnlyBuyDiscount}"
+                    IsEnabled="{Binding CreditShopping}">
+                    <TextBlock
+                        Block.TextAlignment="Left"
+                        Text="{DynamicResource OnlyBuyDiscount}"
+                        TextWrapping="Wrap"/>
+                </CheckBox>
+                <controls:TooltipBlock x:Name="OnlyBuyDiscountTipsTooltipBlock" TooltipText="{DynamicResource OnlyBuyDiscountTips}" />
+            </StackPanel>
+            <StackPanel Margin="0,10" Orientation="Horizontal">
+                <CheckBox
+                    MaxWidth="{c:Binding '220 - ActualWidth',
+                                         ElementName=ReserveMaxCreditTipsTooltipBlock}"
+                    IsChecked="{Binding CreditReserveMaxCredit}"
+                    IsEnabled="{Binding CreditShopping}">
+                    <TextBlock
+                        Block.TextAlignment="Left"
+                        Text="{DynamicResource ReserveMaxCredit}"
+                        TextWrapping="Wrap" />
+                </CheckBox>
+                <controls:TooltipBlock x:Name="ReserveMaxCreditTipsTooltipBlock" TooltipText="{DynamicResource ReserveMaxCreditTips}" />
+            </StackPanel>
         </StackPanel>
     </StackPanel>
 </UserControl>
diff --git a/src/MaaWpfGui/Views/UserControl/TaskQueue/PostActionUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TaskQueue/PostActionUserControl.xaml
index bfe85bc9cc..9c204dc849 100644
--- a/src/MaaWpfGui/Views/UserControl/TaskQueue/PostActionUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/TaskQueue/PostActionUserControl.xaml
@@ -19,14 +19,15 @@
     mc:Ignorable="d">
     <StackPanel>
         <StackPanel Visibility="{c:Binding !EnableAdvancedSettings, Source={x:Static setting:TaskQueueViewModel.TaskSettingVisibilities}}">
-            <CheckBox
+            <StackPanel
                 Margin="0,10"
                 HorizontalAlignment="Left"
-                IsChecked="{Binding Once}"
-                ToolTip="{DynamicResource PostActionOnceTip}"
-                ToolTipService.InitialShowDelay="0">
-                <controls:TextBlock Text="{DynamicResource Once}" TextWrapping="Wrap" />
-            </CheckBox>
+                Orientation="Horizontal">
+                <CheckBox IsChecked="{Binding Once}">
+                    <controls:TextBlock Text="{DynamicResource Once}" TextWrapping="Wrap" />
+                </CheckBox>
+                <controls:TooltipBlock TooltipText="{DynamicResource PostActionOnceTip}" />
+            </StackPanel>
             <hc:Divider />
             <CheckBox
                 Margin="0,10"
@@ -71,14 +72,15 @@
                 <controls:TextBlock Text="{DynamicResource Sleep}" TextWrapping="Wrap" />
             </CheckBox>
 
-            <CheckBox
+            <StackPanel
                 Margin="0,10"
-                IsChecked="{Binding Hibernate}"
-                MouseRightButtonUp="{s:Action PostActionsAndOnce}"
-                ToolTip="{DynamicResource HibernateTip}"
-                ToolTipService.InitialShowDelay="0">
-                <controls:TextBlock Text="{DynamicResource Hibernate}" TextWrapping="Wrap" />
-            </CheckBox>
+                HorizontalAlignment="Left"
+                Orientation="Horizontal">
+                <CheckBox IsChecked="{Binding Hibernate}" MouseRightButtonUp="{s:Action PostActionsAndOnce}">
+                    <controls:TextBlock Text="{DynamicResource Hibernate}" TextWrapping="Wrap" />
+                </CheckBox>
+                <controls:TooltipBlock x:Name="DormFilterNotStationedTipsTooltipBlock" TooltipText="{DynamicResource HibernateTip}" />
+            </StackPanel>
             <CheckBox
                 Margin="0,10"
                 IsChecked="{Binding Shutdown}"
diff --git a/src/MaaWpfGui/Views/UserControl/TaskQueue/RecruitSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TaskQueue/RecruitSettingsUserControl.xaml
index 5874c9d6be..48a43395ef 100644
--- a/src/MaaWpfGui/Views/UserControl/TaskQueue/RecruitSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/TaskQueue/RecruitSettingsUserControl.xaml
@@ -21,11 +21,11 @@
     mc:Ignorable="d">
     <StackPanel>
         <StackPanel Visibility="{c:Binding !EnableAdvancedSettings, Source={x:Static setting:TaskQueueViewModel.TaskSettingVisibilities}}">
-            <CheckBox
-                Margin="0,10"
-                Content="{DynamicResource AutoUseExpedited}"
-                IsChecked="{Binding UseExpeditedWithNull}"
-                ToolTip="{DynamicResource CheckBoxesNotSaved}" />
+            <StackPanel Margin="0,10" Orientation="Horizontal">
+                <CheckBox Content="{DynamicResource AutoUseExpedited}" IsChecked="{Binding UseExpeditedWithNull}" />
+                <controls:TooltipBlock TooltipText="{DynamicResource CheckBoxesNotSaved}" />
+            </StackPanel>
+
             <hc:NumericUpDown
                 Margin="0,5"
                 hc:InfoElement.Title="{DynamicResource RecruitMaxTimes}"
@@ -42,14 +42,19 @@
                 ItemsSource="{Binding AutoRecruitSelectExtraTagsList}"
                 SelectedValue="{Binding SelectExtraTags}"
                 SelectedValuePath="Value" />
-            <hc:CheckComboBox
-                Margin="0,10"
-                hc:InfoElement.Title="{DynamicResource AutoRecruitHighPriority}"
-                hc:ListBoxAttach.SelectedItems="{Binding AutoRecruitFirstList}"
-                DisplayMemberPath="Display"
-                ItemsSource="{Binding AutoRecruitTagShowList}"
-                SelectionMode="Multiple"
-                ToolTip="{DynamicResource AutoRecruitHighPriorityTooltip}" />
+            <Grid Margin="0,10">
+                <hc:CheckComboBox
+                    hc:InfoElement.Title="{DynamicResource AutoRecruitHighPriority}"
+                    hc:ListBoxAttach.SelectedItems="{Binding AutoRecruitFirstList}"
+                    DisplayMemberPath="Display"
+                    ItemsSource="{Binding AutoRecruitTagShowList}"
+                    SelectionMode="Multiple" />
+                <controls:TooltipBlock
+                    Margin="0,0,5,0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    TooltipText="{DynamicResource AutoRecruitHighPriorityTooltip}" />
+            </Grid>
             <CheckBox
                 Margin="0,10"
                 Content="{DynamicResource AutoRefresh}"
@@ -60,11 +65,10 @@
                 IsEnabled="{c:Binding RefreshLevel3}">
                 <controls:TextBlock Text="{DynamicResource ForceRefresh}" TextWrapping="Wrap" />
             </CheckBox>
-            <CheckBox
-                Margin="0,10"
-                Content="{DynamicResource ManuallySelectLevel1}"
-                IsChecked="{Binding NotChooseLevel1}"
-                ToolTip="{DynamicResource Level1Tip}" />
+            <StackPanel Margin="0,10" Orientation="Horizontal">
+                <CheckBox Content="{DynamicResource ManuallySelectLevel1}" IsChecked="{Binding NotChooseLevel1}" />
+                <controls:TooltipBlock TooltipText="{DynamicResource Level1Tip}" />
+            </StackPanel>
             <CheckBox
                 Margin="0,10"
                 Content="{DynamicResource AutoSelectLevel3}"
diff --git a/src/MaaWpfGui/Views/UserControl/TaskQueue/RoguelikeSettingsUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TaskQueue/RoguelikeSettingsUserControl.xaml
index da0fa659fc..8e6abaec30 100644
--- a/src/MaaWpfGui/Views/UserControl/TaskQueue/RoguelikeSettingsUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/TaskQueue/RoguelikeSettingsUserControl.xaml
@@ -74,25 +74,30 @@
                 ItemsSource="{Binding RoguelikeRolesList}"
                 SelectedValue="{Binding RoguelikeRoles}"
                 SelectedValuePath="Value" />
-            <hc:ComboBox
-                Name="StartingCoreCharComboBox"
-                Margin="0,5,0,25"
-                hc:InfoElement.Title="{DynamicResource StartingCoreChar}"
-                DropDownClosed="StartingCoreCharComboBox_DropDownClosed"
-                IsEditable="True"
-                IsTextSearchEnabled="False"
-                ItemsSource="{Binding RoguelikeCoreCharList}"
-                Loaded="{s:Action MakeComboBoxSearchable,
-                                  Target={x:Type setting:SettingsViewModel}}"
-                ToolTip="{DynamicResource StartingCoreCharTip}">
-                <hc:ComboBox.Text>
-                    <Binding Path="RoguelikeCoreChar" UpdateSourceTrigger="PropertyChanged">
-                        <Binding.ValidationRules>
-                            <local:StartingCoreCharRule />
-                        </Binding.ValidationRules>
-                    </Binding>
-                </hc:ComboBox.Text>
-            </hc:ComboBox>
+            <Grid Margin="0,5">
+                <hc:ComboBox
+                    Name="StartingCoreCharComboBox"
+                    hc:InfoElement.Title="{DynamicResource StartingCoreChar}"
+                    DropDownClosed="StartingCoreCharComboBox_DropDownClosed"
+                    IsEditable="True"
+                    IsTextSearchEnabled="False"
+                    ItemsSource="{Binding RoguelikeCoreCharList}"
+                    Loaded="{s:Action MakeComboBoxSearchable,
+                                      Target={x:Type setting:SettingsViewModel}}">
+                    <hc:ComboBox.Text>
+                        <Binding Path="RoguelikeCoreChar" UpdateSourceTrigger="PropertyChanged">
+                            <Binding.ValidationRules>
+                                <local:StartingCoreCharRule />
+                            </Binding.ValidationRules>
+                        </Binding>
+                    </hc:ComboBox.Text>
+                </hc:ComboBox>
+                <controls:TooltipBlock
+                    Margin="0,0,5,0"
+                    HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    TooltipText="{DynamicResource StartingCoreCharTip}" />
+            </Grid>
         </StackPanel>
 
         <StackPanel IsEnabled="{Binding Idle, Source={x:Static setting:TaskQueueViewModel.TaskSettingDataContext}}" Visibility="{c:Binding EnableAdvancedSettings, Source={x:Static setting:TaskQueueViewModel.TaskSettingVisibilities}}">
diff --git a/src/MaaWpfGui/Views/UserControl/TaskQueue/StartUpTaskUserControl.xaml b/src/MaaWpfGui/Views/UserControl/TaskQueue/StartUpTaskUserControl.xaml
index 68f57cf5d7..48678e7f46 100644
--- a/src/MaaWpfGui/Views/UserControl/TaskQueue/StartUpTaskUserControl.xaml
+++ b/src/MaaWpfGui/Views/UserControl/TaskQueue/StartUpTaskUserControl.xaml
@@ -24,12 +24,22 @@
                 <ColumnDefinition />
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
+            <StackPanel
+                HorizontalAlignment="Left"
+                VerticalAlignment="Top"
+                Orientation="Horizontal">
+                <TextBlock
+                    Margin="8,0,0,0"
+                    Text="{DynamicResource AccountSwitch}"
+                    Visibility="Hidden" />
+                <controls:TooltipBlock Margin="0,0,5,0" TooltipText="{DynamicResource AccountSwitchTip}" />
+            </StackPanel>
             <hc:TextBox
+                Grid.Column="0"
                 hc:TitleElement.Title="{DynamicResource AccountSwitch}"
                 IsReadOnly="{c:Binding !Idle,
                                        Source={x:Static helper:Instances.SettingsViewModel}}"
-                Text="{Binding AccountName, UpdateSourceTrigger=PropertyChanged}"
-                ToolTip="{DynamicResource AccountSwitchTip}" />
+                Text="{Binding AccountName, UpdateSourceTrigger=PropertyChanged}" />
             <Button
                 Grid.Column="1"
                 Padding="12,1,12,1"
@@ -42,11 +52,10 @@
         </Grid>
 
         <StackPanel s:View.ActionTarget="{Binding DataContext, RelativeSource={RelativeSource Self}}" DataContext="{Binding Source={x:Static ui:SettingsViewModel.ConnectSettings}}">
-            <CheckBox
-                Margin="0,10"
-                Content="{DynamicResource AutoDetectConnection}"
-                IsChecked="{Binding AutoDetectConnection}"
-                ToolTip="{DynamicResource AutoDetectConnectionTip}" />
+            <StackPanel Margin="0,10" Orientation="Horizontal">
+                <CheckBox Content="{DynamicResource AutoDetectConnection}" IsChecked="{Binding AutoDetectConnection}" />
+                <controls:TooltipBlock TooltipText="{DynamicResource AutoDetectConnectionTip}" />
+            </StackPanel>
             <CheckBox
                 Margin="0,10"
                 Content="{DynamicResource AlwaysAutoDetectConnection}"
@@ -73,38 +82,48 @@
                     Content="{DynamicResource Select}" />
             </Grid>
 
-            <hc:ComboBox
-                Margin="0,5"
-                HorizontalContentAlignment="Stretch"
-                hc:InfoElement.Title="{DynamicResource ConnectionAddress}"
-                IsEditable="True"
-                ItemsSource="{Binding ConnectAddressHistory}"
-                Text="{Binding ConnectAddress, UpdateSourceTrigger=LostFocus}"
-                ToolTip="{DynamicResource ConnectionAddressTip}"
-                Visibility="{c:Binding !AutoDetectConnection}">
-                <ComboBox.ItemTemplate>
-                    <DataTemplate>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <TextBlock
-                                Grid.Column="0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                Text="{Binding}" />
-                            <Button
-                                Grid.Column="1"
-                                HorizontalAlignment="Right"
-                                Command="{s:Action RemoveAddressClick}"
-                                CommandParameter="{Binding}"
-                                Content="×"
-                                FontWeight="Bold" />
-                        </Grid>
-                    </DataTemplate>
-                </ComboBox.ItemTemplate>
-            </hc:ComboBox>
+            <Grid Margin="0,5" Visibility="{c:Binding !AutoDetectConnection}">
+                <StackPanel
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Top"
+                    Orientation="Horizontal">
+                    <TextBlock
+                        Margin="8,0,0,0"
+                        Text="{DynamicResource ConnectionAddress}"
+                        Visibility="Hidden" />
+                    <controls:TooltipBlock Margin="0,0,5,0" TooltipText="{DynamicResource ConnectionAddressTip}" />
+                </StackPanel>
+                <hc:ComboBox
+                    HorizontalContentAlignment="Stretch"
+                    hc:InfoElement.Title="{DynamicResource ConnectionAddress}"
+                    IsEditable="True"
+                    ItemsSource="{Binding ConnectAddressHistory}"
+                    Text="{Binding ConnectAddress, UpdateSourceTrigger=LostFocus}">
+                    <ComboBox.ItemTemplate>
+                        <DataTemplate>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <TextBlock
+                                    Grid.Column="0"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"
+                                    Text="{Binding}" />
+                                <Button
+                                    Grid.Column="1"
+                                    HorizontalAlignment="Right"
+                                    Command="{s:Action RemoveAddressClick}"
+                                    CommandParameter="{Binding}"
+                                    Content="×"
+                                    FontWeight="Bold" />
+                            </Grid>
+                        </DataTemplate>
+                    </ComboBox.ItemTemplate>
+                </hc:ComboBox>
+            </Grid>
+
             <hc:ComboBox
                 Margin="0,5"
                 hc:InfoElement.Title="{DynamicResource ConnectionPreset}"