diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm
index 2dc770aa66d..1787eeea637 100644
--- a/code/modules/admin/modify_robot.dm
+++ b/code/modules/admin/modify_robot.dm
@@ -6,7 +6,8 @@
 		return
 
 	var/datum/eventkit/modify_robot/modify_robot = new()
-	modify_robot.target = target
+	modify_robot.target = isrobot(target) ? target : null
+	modify_robot.selected_ai = target.is_slaved()
 	modify_robot.tgui_interact(src.mob)
 
 /datum/eventkit/modify_robot
@@ -50,6 +51,7 @@
 		.["target"]["name"] = target.name
 		.["target"]["ckey"] = target.ckey
 		.["target"]["module"] = target.module
+		.["target"]["emagged"] = target.emagged
 		.["target"]["crisis_override"] = target.crisis_override
 		.["target"]["active_restrictions"] = target.restrict_modules_to
 		var/list/possible_restrictions = list()
@@ -130,7 +132,7 @@
 			continue
 		active_ais += list(list("displayText" = "[ai]", "value" = "\ref[ai]"))
 	.["active_ais"] = active_ais
-	.["selected_ai"] = selected_ai
+	.["selected_ai"] = selected_ai ? selected_ai.name : null
 
 	var/list/channels = list()
 	for(var/ch_name in target.law_channels())
@@ -154,8 +156,10 @@
 			target.real_name = params["new_name"]
 			return TRUE
 		if("select_target")
-			target = locate(params["new_target"])
-			log_and_message_admins("changed robot modifictation target to [target]")
+			var/new_target = locate(params["new_target"])
+			if(new_target != target)
+				target = locate(params["new_target"])
+				log_and_message_admins("changed robot modifictation target to [target]")
 			return TRUE
 		if("toggle_crisis")
 			target.crisis_override = !target.crisis_override
@@ -511,18 +515,37 @@
 		if("select_ai")
 			selected_ai = locate(params["new_ai"])
 			return TRUE
-		if("toggle_sync")
+		if("swap_sync")
+			var/new_ai = selected_ai ? selected_ai : select_active_ai_with_fewest_borgs()
+			if(new_ai)
+				target.lawupdate = 1
+				target.connect_to_ai(new_ai)
+			return TRUE
+		if("disconnect_ai")
 			if(target.is_slaved())
 				target.disconnect_from_ai()
 				target.lawupdate = 0
-			else
-				var/new_ai = selected_ai ? selected_ai : select_active_ai_with_fewest_borgs()
-				if(new_ai)
-					target.lawupdate = 1
-					target.connect_to_ai(new_ai)
 			return TRUE
-		if("sneaky_toggle")
-			target.lawupdate = !target.lawupdate
+		if("toggle_emag")
+			if(target.emagged)
+				target.emagged = 0
+				target.clear_supplied_laws()
+				target.clear_inherent_laws()
+				target.laws = new global.using_map.default_law_type
+				target.laws.show_laws(target)
+				target.hud_used.update_robot_modules_display()
+			else
+				target.emagged = 1
+				target.lawupdate = 0
+				target.disconnect_from_ai()
+				target.clear_supplied_laws()
+				target.clear_inherent_laws()
+				target.laws = new /datum/ai_laws/syndicate_override
+				if(target.bolt)
+					if(!target.bolt.malfunction)
+						target.bolt.malfunction = MALFUNCTION_PERMANENT
+				target.laws.show_laws(target)
+				target.hud_used.update_robot_modules_display()
 			return TRUE
 
 /datum/eventkit/modify_robot/proc/get_target_items(var/mob/user)
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotAccess.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotAccess.tsx
index a5780f93e3e..92341075892 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotAccess.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotAccess.tsx
@@ -29,7 +29,7 @@ export const ModifyRobotAccess = (props: {
   return (
     <>
       {!target.active && <NoSpriteWarning name={target.name} />}
-      <Flex height={!target.active ? '80%' : '85%'}>
+      <Flex height={!target.active ? '75%' : '80%'}>
         <Flex.Item width="30%" fill>
           <AccessSection
             title="Add Access"
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotComponent.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotComponent.tsx
index 8423630acde..a2ba8e82947 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotComponent.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotComponent.tsx
@@ -38,7 +38,7 @@ export const ModifyRobotComponent = (props: {
   return (
     <>
       {!target.active && <NoSpriteWarning name={target.name} />}
-      <Flex height={!target.active ? '80%' : '85%'}>
+      <Flex height={!target.active ? '75%' : '80%'}>
         <Flex.Item width="35%" fill>
           <ComponentSection
             title="Repair Component"
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotModules.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotModules.tsx
index 67ed0ac3b78..045025ccd56 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotModules.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotModules.tsx
@@ -31,7 +31,7 @@ export const ModifyRobotModules = (props: {
   return (
     <>
       {!target.active && <NoSpriteWarning name={target.name} />}
-      <Flex height={!target.active ? '80%' : '85%'}>
+      <Flex height={!target.active ? '75%' : '80%'}>
         <Flex.Item width="40%" fill>
           <Section title="Source Module" scrollable fill>
             <Box>Robot to salvage</Box>
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotPKA.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotPKA.tsx
index 1662c8053ca..a0cadfb4ec5 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotPKA.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotPKA.tsx
@@ -27,7 +27,7 @@ export const ModifyRobotPKA = (props: { target: Target }) => {
       {!target.pka ? (
         <NoticeBox danger>{target.name} has no PKA installed.</NoticeBox>
       ) : (
-        <Flex height={!target.active ? '80%' : '85%'}>
+        <Flex height={!target.active ? '75%' : '80%'}>
           <Flex.Item width="35%" fill>
             <Divider />
             <Box>Remaining Capacity: {target.pka.capacity}</Box>
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotRadio.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotRadio.tsx
index 5af3a8cd063..02a6828c9dc 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotRadio.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotRadio.tsx
@@ -25,7 +25,7 @@ export const ModifyRobotRadio = (props: { target: Target }) => {
   return (
     <>
       {!target.active && <NoSpriteWarning name={target.name} />}
-      <Flex height={!target.active ? '80%' : '85%'}>
+      <Flex height={!target.active ? '75%' : '80%'}>
         <Flex.Item width="30%" fill>
           <RadioSection
             title="Add Radio Channel"
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotUpgrades.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotUpgrades.tsx
index d34337828a2..28c317b050e 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotUpgrades.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/ModifyRobotTabs/ModifyRobotUpgrades.tsx
@@ -65,7 +65,7 @@ export const ModifyRobotUpgrades = (props: { target: Target }) => {
           />
         </Flex.Item>
       </Flex>
-      <Flex height={!target.active ? '45%' : '50%'}>
+      <Flex height={!target.active ? '40%' : '45%'}>
         <Flex.Item width="25%" fill>
           <UpgradeSection
             title="Utility Upgrade"
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx b/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
index 33a7769c012..253f5996563 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/index.tsx
@@ -95,7 +95,7 @@ export const ModifyRobot = (props) => {
     <LawManagerLaws
       isAdmin
       hasScroll
-      sectionHeight="85%"
+      sectionHeight="80%"
       ion_law_nr={ion_law_nr}
       ion_law={ion_law}
       zeroth_law={zeroth_law}
@@ -117,7 +117,7 @@ export const ModifyRobot = (props) => {
     />
   );
   tabs[7] = (
-    <Section scrollable fill height="85%">
+    <Section scrollable fill height="80%">
       <LawManagerLawSets
         isAdmin
         isMalf={isMalf}
@@ -158,7 +158,7 @@ export const ModifyRobot = (props) => {
                 <>
                   <Stack.Item>
                     <Input
-                      width="300px"
+                      width="200px"
                       value={robotName}
                       onChange={(e, value) => setRobotName(value)}
                     />
@@ -166,7 +166,7 @@ export const ModifyRobot = (props) => {
                   <Stack.Item>
                     <Button
                       disabled={robotName.length < 3}
-                      onClick={(value) =>
+                      onClick={() =>
                         act('rename', {
                           new_name: robotName,
                         })
@@ -175,41 +175,63 @@ export const ModifyRobot = (props) => {
                       Rename
                     </Button>
                   </Stack.Item>
+                  <Stack.Item grow />
                   <Stack.Item>
-                    <Dropdown
-                      selected={selected_ai ? selected_ai.name : ''}
-                      options={active_ais}
-                      onSelected={(value) =>
-                        act('select_ai', {
-                          new_ai: value,
-                        })
+                    <Button
+                      icon={target.emagged ? 'sd-card' : 'bolt'}
+                      color={target.emagged ? 'green' : 'red'}
+                      onClick={() => act('toggle_emag')}
+                      tooltip={
+                        (target.emagged ? 'Disables' : 'Enables') +
+                        ' hacked state'
                       }
-                    />
-                  </Stack.Item>
-                  <Stack.Item>
-                    <Button
-                      disabled={selected_ai?.name === isSlaved}
-                      color={isSlaved ? "red" : "green"}
-                      tooltip={(isSlaved ? "Disconnect from" : "Connect to") + " AI"}
-                      onClick={(value) => act('toggle_sync')}
                     >
-                      {isSlaved ? isSlaved : "Disconnected!"}
-                    </Button>
-                  </Stack.Item>
-                  <Stack.Item>
-                    <Button
-                      disabled={!isSlaved}
-                      color={isMalf ? "red" : "green"}
-                      tooltip={(isMalf ? "Disables" : "Enables") + " lawsync"}
-                      onClick={(value) => act('sneaky_toggle')}
-                    >
-                      Lawsync
+                      EMAG
                     </Button>
                   </Stack.Item>
                 </>
               )}
             </Stack>
           </LabeledList.Item>
+          <LabeledList.Item label="AI Selection">
+            {!!target?.module && (
+              <Stack inline align="baseline">
+                <Stack.Item>
+                  <Dropdown
+                    selected={selected_ai || ''}
+                    options={active_ais}
+                    onSelected={(value) =>
+                      act('select_ai', {
+                        new_ai: value,
+                      })
+                    }
+                  />
+                </Stack.Item>
+                <Stack.Item>
+                  <Button
+                    icon="plug"
+                    disabled={selected_ai === isSlaved}
+                    color="green"
+                    tooltip="Connect the robot to an AI"
+                    onClick={() => act('swap_sync')}
+                  >
+                    {isSlaved ? isSlaved : 'Connect AI'}
+                  </Button>
+                </Stack.Item>
+                <Stack.Item>
+                  <Button
+                    icon="plug-circle-minus"
+                    disabled={!isSlaved}
+                    color="red"
+                    tooltip="Disconnects the robot from the AI"
+                    onClick={() => act('disconnect_ai')}
+                  >
+                    DC
+                  </Button>
+                </Stack.Item>
+              </Stack>
+            )}
+          </LabeledList.Item>
         </LabeledList>
         <Divider />
         {!!target &&
diff --git a/tgui/packages/tgui/interfaces/ModifyRobot/types.ts b/tgui/packages/tgui/interfaces/ModifyRobot/types.ts
index d64bdb92610..5191e384223 100644
--- a/tgui/packages/tgui/interfaces/ModifyRobot/types.ts
+++ b/tgui/packages/tgui/interfaces/ModifyRobot/types.ts
@@ -30,7 +30,7 @@ export type Data = {
   channels: { channel: string }[];
   law_sets: law_pack[];
   active_ais: DropdownEntry[];
-  selected_ai: {name: string; ref: string} | null;
+  selected_ai: string | null;
 };
 
 export type DropdownEntry = {
@@ -42,6 +42,7 @@ export type Target = {
   name: string;
   ckey: string;
   module: string;
+  emagged: BooleanLike;
   active: BooleanLike;
   crisis_override: BooleanLike;
   active_restrictions: string[];