diff --git a/public/images/ui/summary_moves.png b/public/images/ui/summary_moves.png
new file mode 100644
index 00000000000..bf5111e4a03
Binary files /dev/null and b/public/images/ui/summary_moves.png differ
diff --git a/public/images/ui/summary_moves_effect.png b/public/images/ui/summary_moves_effect.png
new file mode 100644
index 00000000000..1c90a345082
Binary files /dev/null and b/public/images/ui/summary_moves_effect.png differ
diff --git a/public/images/ui/summary_profile.png b/public/images/ui/summary_profile.png
new file mode 100644
index 00000000000..79e67347ec2
Binary files /dev/null and b/public/images/ui/summary_profile.png differ
diff --git a/src/battle-phase.ts b/src/battle-phase.ts
index 84d866c1175..21c4b541330 100644
--- a/src/battle-phase.ts
+++ b/src/battle-phase.ts
@@ -687,7 +687,7 @@ export class SwitchPhase extends BattlePhase {
   start() {
     super.start();
 
-    this.scene.ui.setMode(Mode.PARTY, this.isModal ? PartyUiMode.SWITCH : PartyUiMode.FORCE_SWITCH, (slotIndex: integer) => {
+    this.scene.ui.setMode(Mode.PARTY, this.isModal ? PartyUiMode.SWITCH : PartyUiMode.FAINT_SWITCH, (slotIndex: integer) => {
       if (slotIndex && slotIndex < 6)
         this.scene.unshiftPhase(new SwitchSummonPhase(this.scene, slotIndex, this.doReturn));
       this.scene.ui.setMode(Mode.MESSAGE);
diff --git a/src/ui/party-ui-handler.ts b/src/ui/party-ui-handler.ts
index 3d905dfcc62..fed8420c6fc 100644
--- a/src/ui/party-ui-handler.ts
+++ b/src/ui/party-ui-handler.ts
@@ -10,7 +10,8 @@ const defaultMessage = 'Choose a Pokémon.';
 
 export enum PartyUiMode {
   SWITCH,
-  FORCE_SWITCH,
+  FAINT_SWITCH,
+  POST_BATTLE_SWITCH,
   MODIFIER
 }
 
@@ -193,13 +194,13 @@ export default class PartyUiHandler extends MessageUiHandler {
         if (this.cursor < 6) {
           this.showOptions();
           ui.playSelect();
-        } else if (this.partyUiMode === PartyUiMode.FORCE_SWITCH)
+        } else if (this.partyUiMode === PartyUiMode.FAINT_SWITCH)
           ui.playError();
         else
           this.processInput(keyCodes.X);
         return;
       } else if (keyCode === keyCodes.X) {
-        if (this.partyUiMode !== PartyUiMode.FORCE_SWITCH) {
+        if (this.partyUiMode !== PartyUiMode.FAINT_SWITCH) {
           if (this.selectCallback) {
             const selectCallback = this.selectCallback;
             this.selectCallback = null;
@@ -305,8 +306,10 @@ export default class PartyUiHandler extends MessageUiHandler {
         if (this.cursor)
           this.options.push(PartyOption.SHIFT);
         break;
-      case PartyUiMode.FORCE_SWITCH:
-        this.options.push(PartyOption.SEND_OUT);
+      case PartyUiMode.FAINT_SWITCH:
+      case PartyUiMode.POST_BATTLE_SWITCH:
+        if (this.cursor)
+          this.options.push(PartyOption.SEND_OUT);
         break;
       case PartyUiMode.MODIFIER:
         this.options.push(PartyOption.APPLY);