diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 1a1d84861ee..06ac79bcfa8 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -37,7 +37,8 @@
 		t_has = "have"
 		t_is = "are"
 	else
-		msg += "\icon[src.icon] "
+		if(src.icon)
+			msg += "\icon[src.icon] " //fucking BYOND: this should stop dreamseeker crashing if we -somehow- examine somebody before their icon is generated
 		switch(src.gender)
 			if(MALE)
 				t_He = "He"
@@ -53,30 +54,30 @@
 	//uniform
 	if (src.w_uniform && !skipjumpsuit)
 		if (src.w_uniform.blood_DNA)
-			msg += "<span class='warning'>[t_He] [t_is] wearing \icon[src.w_uniform.icon] [src.w_uniform.gender==PLURAL?"some":"a"] blood-stained [src.w_uniform.name]!</span>\n"
+			msg += "<span class='warning'>[t_He] [t_is] wearing \icon[src.w_uniform] [src.w_uniform.gender==PLURAL?"some":"a"] blood-stained [src.w_uniform.name]!</span>\n"
 		else
 			msg += "[t_He] [t_is] wearing \icon[src.w_uniform] \a [src.w_uniform].\n"
 
 	//head
 	if (src.head)
 		if (src.head.blood_DNA)
-			msg += "<span class='warning'>[t_He] [t_is] wearing \icon[src.head.icon] [src.head.gender==PLURAL?"some":"a"] blood-stained [src.head.name] on [t_his] head!</span>\n"
+			msg += "<span class='warning'>[t_He] [t_is] wearing \icon[src.head] [src.head.gender==PLURAL?"some":"a"] blood-stained [src.head.name] on [t_his] head!</span>\n"
 		else
 			msg += "[t_He] [t_is] wearing \icon[src.head] \a [src.head] on [t_his] head.\n"
 
 	//suit/armour
 	if (src.wear_suit)
 		if (src.wear_suit.blood_DNA)
-			msg += "<span class='warning'>[t_He] [t_is] wearing \icon[src.wear_suit.icon] [src.wear_suit.gender==PLURAL?"some":"a"] blood-stained [src.wear_suit.name]!</span>\n"
+			msg += "<span class='warning'>[t_He] [t_is] wearing \icon[src.wear_suit] [src.wear_suit.gender==PLURAL?"some":"a"] blood-stained [src.wear_suit.name]!</span>\n"
 		else
 			msg += "[t_He] [t_is] wearing \icon[src.wear_suit] \a [src.wear_suit].\n"
 
-	//suit/armour storage
-	if(src.s_store && !skipsuitstorage)
-		if(src.s_store.blood_DNA)
-			msg += "<span class='warning'>[t_He] [t_is] carrying \icon[src.s_store.icon] [src.s_store.gender==PLURAL?"some":"a"] blood-stained [src.s_store.name] on [t_his] [src.wear_suit.name]!</span>\n"
-		else
-			msg += "[t_He] [t_is] carrying \icon[src.s_store] \a [src.s_store] on [t_his] [src.wear_suit.name].\n"
+		//suit/armour storage
+		if(src.s_store && !skipsuitstorage)
+			if(src.s_store.blood_DNA)
+				msg += "<span class='warning'>[t_He] [t_is] carrying \icon[src.s_store] [src.s_store.gender==PLURAL?"some":"a"] blood-stained [src.s_store.name] on [t_his] [src.wear_suit.name]!</span>\n"
+			else
+				msg += "[t_He] [t_is] carrying \icon[src.s_store] \a [src.s_store] on [t_his] [src.wear_suit.name].\n"
 
 	//back
 	if (src.back)
@@ -85,7 +86,7 @@
 	//left hand
 	if (src.l_hand)
 		if (src.l_hand.blood_DNA)
-			msg += "<span class='warning'>[t_He] [t_is] holding \icon[src.l_hand.icon] [src.l_hand.gender==PLURAL?"some":"a"] blood-stained [src.l_hand.name] in [t_his] left hand!</span>\n"
+			msg += "<span class='warning'>[t_He] [t_is] holding \icon[src.l_hand] [src.l_hand.gender==PLURAL?"some":"a"] blood-stained [src.l_hand.name] in [t_his] left hand!</span>\n"
 		else
 			msg += "[t_He] [t_is] holding \icon[src.l_hand] \a [src.l_hand] in [t_his] left hand.\n"
 
@@ -99,7 +100,7 @@
 	//gloves
 	if (src.gloves && !skipgloves)
 		if (src.gloves.blood_DNA)
-			msg += "<span class='warning'>[t_He] [t_has] \icon[src.gloves.icon] [src.gloves.gender==PLURAL?"some":"a"] blood-stained [src.gloves.name] on [t_his] hands!</span>\n"
+			msg += "<span class='warning'>[t_He] [t_has] \icon[src.gloves] [src.gloves.gender==PLURAL?"some":"a"] blood-stained [src.gloves.name] on [t_his] hands!</span>\n"
 		else
 			msg += "[t_He] [t_has] \icon[src.gloves] \a [src.gloves] on [t_his] hands.\n"
 	else if (src.blood_DNA)
@@ -112,21 +113,21 @@
 	//belt
 	if (src.belt)
 		if (src.belt.blood_DNA)
-			msg += "<span class='warning'>[t_He] [t_has] \icon[src.belt.icon] [src.belt.gender==PLURAL?"some":"a"] blood-stained [src.belt.name] about [t_his] waist!</span>\n"
+			msg += "<span class='warning'>[t_He] [t_has] \icon[src.belt] [src.belt.gender==PLURAL?"some":"a"] blood-stained [src.belt.name] about [t_his] waist!</span>\n"
 		else
 			msg += "[t_He] [t_has] \icon[src.belt] \a [src.belt] about [t_his] waist.\n"
 
 	//shoes
 	if (src.shoes && !skipshoes)
 		if(src.shoes.blood_DNA)
-			msg += "<span class='warning'>[t_He] [t_is] wearing \icon[src.shoes.icon] [src.shoes.gender==PLURAL?"some":"a"] blood-stained [src.shoes.name] on [t_his] feet!</span>\n"
+			msg += "<span class='warning'>[t_He] [t_is] wearing \icon[src.shoes] [src.shoes.gender==PLURAL?"some":"a"] blood-stained [src.shoes.name] on [t_his] feet!</span>\n"
 		else
 			msg += "[t_He] [t_is] wearing \icon[src.shoes] \a [src.shoes] on [t_his] feet.\n"
 
 	//mask
 	if (src.wear_mask && !skipmask)
 		if (src.wear_mask.blood_DNA)
-			msg += "<span class='warning'>[t_He] [t_has] \icon[src.wear_mask.icon] [src.wear_mask.gender==PLURAL?"some":"a"] blood-stained [src.wear_mask.name] on [t_his] face!</span>\n"
+			msg += "<span class='warning'>[t_He] [t_has] \icon[src.wear_mask] [src.wear_mask.gender==PLURAL?"some":"a"] blood-stained [src.wear_mask.name] on [t_his] face!</span>\n"
 		else
 			msg += "[t_He] [t_has] \icon[src.wear_mask] \a [src.wear_mask] on [t_his] face.\n"
 
@@ -156,13 +157,12 @@
 
 	//Jitters
 	if (src.is_jittery)
-		switch(src.jitteriness)
-			if(300 to INFINITY)
-				msg += "<span class='warning'>[t_He] [t_is] convulsing violently!</span>\n"
-			if(200 to 300)
-				msg += "<span class='warning'>[t_He] [t_is] extremely jittery.</span>\n"
-			if(100 to 200)
-				msg += "<span class='warning'>[t_He] [t_is] twitching ever so slightly.</span>\n"
+		if(src.jitteriness >= 300)
+			msg += "<span class='warning'>[t_He] [t_is] convulsing violently!</span>\n"
+		else if(src.jitteriness >= 200)
+			msg += "<span class='warning'>[t_He] [t_is] extremely jittery.</span>\n"
+		else if(src.jitteriness >= 100)
+			msg += "<span class='warning'>[t_He] [t_is] twitching ever so slightly.</span>\n"
 
 	if (src.suiciding == 1)
 		msg += "<span class='warning'>[t_He] [t_has] bitten off [t_his] own tongue and suffered major bloodloss!</span>\n"
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index e78895058ac..0bd0782923f 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/paper.dmi b/icons/obj/paper.dmi
deleted file mode 100644
index 0bbdd220d0b..00000000000
Binary files a/icons/obj/paper.dmi and /dev/null differ