diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
index 7951db5196a..5a9b45bfca3 100644
--- a/code/_onclick/hud/hud.dm
+++ b/code/_onclick/hud/hud.dm
@@ -255,6 +255,8 @@ datum/hud/New(mob/owner)
 
 	if(ishuman(mymob))
 		human_hud(ui_style, ui_color, ui_alpha, mymob) // Pass the player the UI style chosen in preferences
+	else if(isrobot(mymob))
+		robot_hud()
 	else if(issmall(mymob))
 		monkey_hud(ui_style, ui_color, ui_alpha)
 	else if(isbrain(mymob))
@@ -265,8 +267,6 @@ datum/hud/New(mob/owner)
 		slime_hud()
 	else if(isAI(mymob))
 		ai_hud()
-	else if(isrobot(mymob))
-		robot_hud()
 	else if(isobserver(mymob))
 		ghost_hud()
 	else
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index 56d608fd658..6b38a7c4652 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -42,7 +42,7 @@ var/list/mob_hat_cache = list()
 	mob_push_flags = SIMPLE_ANIMAL
 	mob_always_swap = 1
 
-	mob_size = MOB_TINY
+	mob_size = MOB_LARGE // Small mobs can't open doors, it's a huge pain for drones.
 
 	//Used for self-mailing.
 	var/mail_destination = ""
@@ -70,7 +70,6 @@ var/list/mob_hat_cache = list()
 	can_pull_mobs = 1
 	hat_x_offset = 1
 	hat_y_offset = -12
-	mob_size = MOB_SMALL
 
 /mob/living/silicon/robot/drone/New()
 
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 76fe6a8e401..d7719d26741 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -219,14 +219,15 @@
 	return ..()
 
 /mob/living/silicon/robot/proc/set_module_sprites(var/list/new_sprites)
-	module_sprites = new_sprites.Copy()
-	//Custom_sprite check and entry
-	if (custom_sprite == 1)
-		module_sprites["Custom"] = "[src.ckey]-[modtype]"
-		icontype = "Custom"
-	else
-		icontype = module_sprites[1]
-	icon_state = module_sprites[icontype]
+	if(new_sprites && new_sprites.len)
+		module_sprites = new_sprites.Copy()
+		//Custom_sprite check and entry
+		if (custom_sprite == 1)
+			module_sprites["Custom"] = "[src.ckey]-[modtype]"
+			icontype = "Custom"
+		else
+			icontype = module_sprites[1]
+			icon_state = module_sprites[icontype]
 	updateicon()
 	return module_sprites
 
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 3cc1482f9d0..0bb42b99618 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/items/lefthand_holder.dmi b/icons/mob/items/lefthand_holder.dmi
index 2e951a7a364..c5ca5e96aa5 100644
Binary files a/icons/mob/items/lefthand_holder.dmi and b/icons/mob/items/lefthand_holder.dmi differ
diff --git a/icons/mob/items/righthand_holder.dmi b/icons/mob/items/righthand_holder.dmi
index 246d7413459..39293e833cb 100644
Binary files a/icons/mob/items/righthand_holder.dmi and b/icons/mob/items/righthand_holder.dmi differ