Revert "Switch icons"

This reverts commit ae9d496.

Author: alexr00

resources/icons/codicons/git-compare.svg

@@ -25,6 +25,7 @@ export const editIcon = <Icon src={require('../../resources/icons/codicons/edit.
 export const errorIcon = <Icon src={require('../../resources/icons/codicons/error.svg')} />;
 export const feedbackIcon = <Icon src={require('../../resources/icons/codicons/feedback.svg')} />;
 export const gitCommitIcon = <Icon src={require('../../resources/icons/codicons/git-commit.svg')} />;
+export const gitCompareIcon = <Icon src={require('../../resources/icons/codicons/git-compare.svg')} />;
 export const gitMergeIcon = <Icon src={require('../../resources/icons/codicons/git-merge.svg')} />;
 export const gitPullRequestClosedIcon = <Icon src={require('../../resources/icons/codicons/git-pull-request-closed.svg')} />;
 export const gitPullRequestDraftIcon = <Icon src={require('../../resources/icons/codicons/git-pull-request-draft.svg')} />;
@@ -50,5 +51,5 @@ export const warningIcon = <Icon src={require('../../resources/icons/codicons/wa
 export const copilotErrorIcon = <Icon className='copilot-icon' src={require('../../resources/icons/copilot-error.svg')} />;
 export const copilotInProgressIcon = <Icon className='copilot-icon' src={require('../../resources/icons/copilot-in-progress.svg')} />;
 export const copilotSuccessIcon = <Icon className='copilot-icon' src={require('../../resources/icons/copilot-success.svg')} />;
-export const prMergeIcon = <Icon src={require('../../resources/icons/codicons/merge.svg')} />;
-export const skipIcon = <Icon src={require('../../resources/icons/codicons/skip.svg')} className='skip' />;
+export const prMergeIcon = <Icon src={require('../../resources/icons/pr_merge.svg')} />;
+export const skipIcon = <Icon src={require('../../resources/icons/skip.svg')} className='skip' />;

resources/icons/codicons/merge.svg

@@ -12,7 +12,7 @@ import PullRequestContextNew from '../common/createContextNew';
 import { ErrorBoundary } from '../common/errorBoundary';
 import { LabelCreate } from '../common/label';
 import { ContextDropdown } from '../components/contextDropdown';
-import { accountIcon, feedbackIcon, gitMergeIcon, milestoneIcon, prMergeIcon, projectIcon, sparkleIcon, stopCircleIcon, tagIcon } from '../components/icon';
+import { accountIcon, feedbackIcon, gitCompareIcon, milestoneIcon, prMergeIcon, projectIcon, sparkleIcon, stopCircleIcon, tagIcon } from '../components/icon';
 import { Avatar } from '../components/user';
 
 type CreateMethod = 'create-draft' | 'create' | 'create-automerge-squash' | 'create-automerge-rebase' | 'create-automerge-merge';
@@ -192,7 +192,7 @@ export function main() {
 					<div className='group-branches'>
 						<div className='input-label base'>
 							<div className="deco">
-								<span title='Base branch' aria-hidden='true'>{prMergeIcon} Base</span>
+								<span title='Base branch' aria-hidden='true'>{gitCompareIcon} Base</span>
 							</div>
 							<ChooseRemoteAndBranch onClick={ctx.changeBaseRemoteAndBranch}
 								defaultRemote={params.baseRemote}
@@ -205,7 +205,7 @@ export function main() {
 
 						<div className='input-label merge'>
 							<div className="deco">
-								<span title='Merge branch' aria-hidden='true'>{gitMergeIcon} {params.actionDetail ? params.actionDetail : 'Merge'}</span>
+								<span title='Merge branch' aria-hidden='true'>{prMergeIcon} {params.actionDetail ? params.actionDetail : 'Merge'}</span>
 							</div>
 							{ctx.createParams.canModifyBranches ?
 								<ChooseRemoteAndBranch onClick={ctx.changeMergeRemoteAndBranch}