diff --git a/document/tips-switch-leader.png b/document/tips-switch-leader.png
new file mode 100644
index 00000000..56db6cd9
Binary files /dev/null and b/document/tips-switch-leader.png differ
diff --git a/help.md b/help.md
index c0d0cc34..1bdbd252 100644
--- a/help.md
+++ b/help.md
@@ -12,6 +12,9 @@ Use back to undo the last edit.
 * 拖拽怪物头像即可快速交换位置或复制怪物，也支持手机触屏。  
 Drag monster avatars to quickly swap positions or copy monster, also supports mobile touch screen.  
 ![切换位置](document/tips-interchangeCard.png)
+* 如果你希望使用技能切换队长，使用切换按钮。这样可以保留原始队长强调边框，和76版面图标。  
+If you want switch leader by skill, use the switch button. This preserves the original leader accent border, and the 76 board icon.  
+![切换位置](document/tips-switch-leader.png)
 * 可以在编辑界面的怪物ID输入**怪物名称**或**标签**来搜索怪物。（键入回车以执行）  
 You can search for monsters by entering the **Monster Name** or **Tags** in the monster ID of the editing interface.(Type Enter to execute)  
 ![搜索怪物名称](document/tips-search-name.png)  
diff --git a/script.js b/script.js
index 8e2bbb71..0977de43 100644
--- a/script.js
+++ b/script.js
@@ -2634,10 +2634,7 @@ function refreshLatent(latent, monid, iconArr) {
 //点击怪物头像，出现编辑窗
 function editMon(teamNum, isAssist, indexInTeam) {
 	//数据
-	const team =  formation.teams[teamNum];
-	let mapIdx = indexInTeam == 0 ? team[3] : (indexInTeam == team[3] ? 0 : indexInTeam);
-
-	const mon = team[isAssist][mapIdx];
+	const mon = formation.teams[teamNum][isAssist][indexInTeam];
 
 	const teamBigBox = teamBigBoxs[teamNum];
 	const teamBox = teamBigBox.querySelector(".team-box");
@@ -2650,7 +2647,7 @@ function editMon(teamNum, isAssist, indexInTeam) {
 
 	editBox.isAssist = isAssist;
 	editBox.monsterHead = monsterHead;
-	editBox.memberIdx = [teamNum, isAssist, mapIdx]; //储存队伍数组下标
+	editBox.memberIdx = [teamNum, isAssist, indexInTeam]; //储存队伍数组下标
 	if (!isAssist) {
 		const latentBox = teamBox.querySelector(".team-latents .latents-" + (indexInTeam + 1) + " .latent-ul");
 		editBox.latentBox = latentBox;
@@ -3028,25 +3025,37 @@ function refreshAll(formationData) {
 		const teamMenberAwokenDom = teamBigBox.querySelector(".team-menber-awoken"); //队员觉醒
 		const teamAssistAwokenDom = teamBigBox.querySelector(".team-assist-awoken"); //辅助觉醒
 		for (let ti = 0, ti_len = membersDom.querySelectorAll(".member").length; ti < ti_len; ti++) {
-			let domIdx = ti == 0 ? teamData[3] + 1 : (ti == teamData[3] ? 1 : ti+1);
-
-			const member = membersDom.querySelector(`.member-${domIdx} .monster`);
-			const latent = latentsDom.querySelector(`.latents-${domIdx} .latent-ul`);
-			const assist = assistsDom.querySelector(`.member-${domIdx} .monster`);
+			//开始设置换队长
+			const leaderIdx = teamData[3];
+			const memberLi = membersDom.querySelector(`.member-${ti+1}`);
+			const latentLi = latentsDom.querySelector(`.latents-${ti+1}`);
+			const assistsLi = assistsDom.querySelector(`.member-${ti+1}`);
+			const teamAbilityLi = teamAbilityDom.querySelector(`.abilitys-${ti+1}`);
+			const teamMenberAwokenLi = teamMenberAwokenDom.querySelector(`.menber-awoken-${ti+1}`);
+			const teamAssistAwokenLi = teamAssistAwokenDom.querySelector(`.menber-awoken-${ti+1}`);
+			[memberLi,latentLi,assistsLi,teamAbilityLi,teamMenberAwokenLi,teamAssistAwokenLi].forEach(dom=>{
+				if (leaderIdx & ti == 0)
+				{
+					dom.style.transform = `translateX(${leaderIdx*108}px)`;
+				}
+				else if (leaderIdx && ti == leaderIdx)
+				{
+					dom.style.transform = `translateX(${ti*-108}px)`;
+				}else
+				{
+					dom.style.transform = null;
+				}
+			});
+			//修改显示内容
+			const member = memberLi.querySelector(`.monster`);
+			const assist = assistsLi.querySelector(`.monster`);
+			const latent = latentLi.querySelector(`.latent-ul`);
 			changeid(teamData[0][ti], member, latent); //队员
 			changeid(teamData[1][ti], assist); //辅助
 			refreshMemberSkillCD(teamBox, teamData, ti); //技能CD
 			refreshAbility(teamAbilityDom, teamData, ti); //本人能力值
 			refreshMenberAwoken(teamMenberAwokenDom, teamAssistAwokenDom, teamData, ti); //本人觉醒
 
-			//更改换队长之后的队长边框的显示
-			if (ti == 0 || ti == 5)
-			{
-				member.parentNode.classList.add("team-leader");
-			}else
-			{
-				member.parentNode.classList.remove("team-leader");
-			}
 		}
 		const teamTotalInfoDom = teamBigBox.querySelector(".team-total-info"); //队伍能力值合计
 		if (teamTotalInfoDom) refreshTeamTotalHP(teamTotalInfoDom, teamData, teamNum);
@@ -3154,10 +3163,7 @@ function refreshAbility(abilityDom, team, idx) {
 		}
 	}
 	if (!abilityDom) return; //如果没有dom，直接跳过
-
-	let domIdx = idx == 0 ? team[3] + 1 : (idx == team[3] ? 1 : idx+1);
-
-	const abilityLi = abilityDom.querySelector(`.abilitys-${domIdx}`);
+	const abilityLi = abilityDom.querySelector(".abilitys-" + (idx + 1));
 	const hpDom = abilityLi.querySelector(".hp");
 	const atkDom = abilityLi.querySelector(".atk");
 	const rcvDom = abilityLi.querySelector(".rcv");
@@ -3191,10 +3197,8 @@ function refreshMenberAwoken(menberAwokenDom, assistAwokenDom, team, idx) {
 		menberAwokens = menberAwokens.concat(assistAwokens);
 	}*/
 
-	let domIdx = idx == 0 ? team[3] + 1 : (idx == team[3] ? 1 : idx+1);
-
-	const menberAwokenUl = menberAwokenDom.querySelector(`.menber-awoken-${domIdx} .awoken-ul`);
-	const assistAwokenUl = assistAwokenDom.querySelector(`.menber-awoken-${domIdx} .awoken-ul`);
+	const menberAwokenUl = menberAwokenDom.querySelector(`.menber-awoken-${idx + 1} .awoken-ul`);
+	const assistAwokenUl = assistAwokenDom.querySelector(`.menber-awoken-${idx + 1} .awoken-ul`);
 	/* //通用的
 	function countNum(arr) {
 		const map = arr.reduce(function(preMap, value){
@@ -3552,10 +3556,8 @@ function refreshFormationTotalHP(totalDom, teams) {
 }
 //刷新单人技能CD
 function refreshMemberSkillCD(teamDom, team, idx) {
-	let domIdx = idx == 0 ? team[3] + 1 : (idx == team[3] ? 1 : idx+1);
-
-	const memberMonDom = teamDom.querySelector(`.team-members .member-${domIdx} .monster`);
-	const assistMonDom = teamDom.querySelector(`.team-assist .member-${domIdx} .monster`);
+	const memberMonDom = teamDom.querySelector(`.team-members .member-${idx+1} .monster`);
+	const assistMonDom = teamDom.querySelector(`.team-assist .member-${idx+1} .monster`);
 	const member = team[0][idx];
 	const assist = team[1][idx];
 
diff --git a/style.css b/style.css
index 4da19766..525880f5 100644
--- a/style.css
+++ b/style.css
@@ -537,6 +537,14 @@ ul{
 	background-position: center;
 	background-repeat: no-repeat;
 }
+.monster .switch-leader:hover
+{
+	box-shadow: red 0 0 5px;
+}
+.monster .switch-leader:active
+{
+	animation: icon-active 0.2s;
+}
 
 .not-show-awoken-count .formation-box .team-total-info, /*单个队伍血量统计*/
 .not-show-awoken-count .formation-box .team-ability, /*单个队伍三维*/