diff --git a/code/_onclick/hud/ai.dm b/code/_onclick/hud/ai.dm
index eff2cb71b1..00b772abac 100644
--- a/code/_onclick/hud/ai.dm
+++ b/code/_onclick/hud/ai.dm
@@ -118,18 +118,9 @@
 	using.layer = SCREEN_LAYER
 	HUD.adding += using
 
-//PDA message
+//PDA Messenger
 	using = new /atom/movable/screen()
-	using.name = "PDA - Send Message"
-	using.icon = HUD.ui_style
-	using.icon_state = "pda_send"
-	using.screen_loc = ui_ai_pda_send
-	using.layer = SCREEN_LAYER
-	HUD.adding += using
-
-//PDA log
-	using = new /atom/movable/screen()
-	using.name = "PDA - Show Message Log"
+	using.name = "PDA - Messenger"
 	using.icon = HUD.ui_style
 	using.icon_state = "pda_receive"
 	using.screen_loc = ui_ai_pda_log
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index f4c605226f..059ae39c88 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -606,13 +606,7 @@
 				var/mob/living/silicon/ai/ai_user = usr
 				ai_user.ai_checklaws()
 
-		if("PDA - Send Message")
-			if(isAI(usr))
-				var/mob/living/silicon/ai/ai_user = usr
-				ai_user.aiPDA.start_program(ai_user.aiPDA.find_program(/datum/data/pda/app/messenger))
-				ai_user.aiPDA.cmd_pda_open_ui(usr)
-
-		if("PDA - Show Message Log")
+		if("PDA - Messenger")
 			if(isAI(usr))
 				var/mob/living/silicon/ai/ai_user = usr
 				ai_user.aiPDA.start_program(ai_user.aiPDA.find_program(/datum/data/pda/app/messenger))
diff --git a/code/datums/outfits/jobs/job.dm b/code/datums/outfits/jobs/job.dm
index fdb7af5dbe..3e78803e4a 100644
--- a/code/datums/outfits/jobs/job.dm
+++ b/code/datums/outfits/jobs/job.dm
@@ -18,6 +18,8 @@
 
 /decl/hierarchy/outfit/job/equip_id(mob/living/carbon/human/H, rank, assignment)
 	var/obj/item/card/id/C = ..()
+	if(!C)
+		return
 	var/datum/job/J = job_master.GetJob(rank)
 	if(J)
 		C.access = J.get_access()
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 24e8acf664..dcb8d2cd65 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -108,8 +108,8 @@
 		//clean the message if it's not sent by a high-rank admin
 		if(!check_rights(R_SERVER|R_DEBUG, FALSE)||irc)//no sending html to the poor bots
 			msg = trim(sanitize(copytext(msg,1,MAX_MESSAGE_LEN)))
-			if(!msg)
-				return
+		if(!msg)
+			return
 
 		if (src.handle_spam_prevention(MUTE_ADMINHELP))
 			return
diff --git a/code/modules/balloon_alert/balloon_alert.dm b/code/modules/balloon_alert/balloon_alert.dm
index a14c0da030..dc864e33bb 100644
--- a/code/modules/balloon_alert/balloon_alert.dm
+++ b/code/modules/balloon_alert/balloon_alert.dm
@@ -40,16 +40,19 @@
 		return //no! I don't want that.
 
 
-	if (isnull(viewer_client))
+	if(isnull(viewer_client))
 		return
 
-	if (isbelly(src.loc))
+	if(isbelly(src.loc))
 		return
 
 	var/bound_width = world.icon_size
-	if (ismovable(src))
+	if(ismovable(src))
 		var/atom/movable/movable_source = src
 		bound_width = movable_source.bound_width
+	if(isrobot(src) || isanimal(src))
+		bound_width += get_oversized_icon_offsets()["x"]
+
 
 	var/image/balloon_alert = image(loc = isturf(src) ? src : get_atom_on_turf(src), layer = ABOVE_MOB_LAYER)
 	balloon_alert.plane = PLANE_RUNECHAT
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 9656c2c8bc..49ce9b347f 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -1477,6 +1477,8 @@
 		screen_icon.icon = HUD.ui_style
 		screen_icon.color = HUD.ui_color
 		screen_icon.alpha = HUD.ui_alpha
+	if(isAI(user))
+		screen_icon.screen_loc = ui_ai_pda_send
 	LAZYADD(HUD.other_important, screen_icon)
 	user.client?.screen += screen_icon
 
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index f505373bd8..a6a04b3f18 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -1282,6 +1282,8 @@
 		screen_icon.icon = HUD.ui_style
 		screen_icon.color = HUD.ui_color
 		screen_icon.alpha = HUD.ui_alpha
+	if(isAI(user))
+		screen_icon.screen_loc = ui_ai_pda_send
 	LAZYADD(HUD.other_important, screen_icon)
 	user.client?.screen += screen_icon
 
diff --git a/icons/mob/screen_ai.dmi b/icons/mob/screen_ai.dmi
index 0e0d680666..df94668cfa 100644
Binary files a/icons/mob/screen_ai.dmi and b/icons/mob/screen_ai.dmi differ