diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 431b5ca4d7f..7dcc429d27b 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -211,7 +211,7 @@
 	var/baseline_max_storage_space = 16 //should be equal to default backpack capacity
 	var/storage_cap_width = 2 //length of sprite for start and end of the box representing total storage space
 	var/stored_cap_width = 4 //length of sprite for start and end of the box representing the stored item
-	var/storage_width = min( round( 224 * max_storage_space/baseline_max_storage_space ,1) ,284) //length of sprite for the box representing total storage space
+	var/storage_width = min( round( 224 * max_storage_space/baseline_max_storage_space ,1) ,274) //length of sprite for the box representing total storage space
 
 	storage_start.overlays.Cut()
 
@@ -552,7 +552,7 @@
 
 	src.closer = new /obj/screen/close(  )
 	src.closer.master = src
-	src.closer.icon_state = "x"
+	src.closer.icon_state = "storage_close"
 	src.closer.layer = 20
 	orient2hud()
 	return
diff --git a/code/modules/detectivework/tools/storage.dm b/code/modules/detectivework/tools/storage.dm
index e0cdabaafdd..9c45028e93d 100644
--- a/code/modules/detectivework/tools/storage.dm
+++ b/code/modules/detectivework/tools/storage.dm
@@ -8,16 +8,18 @@
 
 /obj/item/weapon/storage/box/swabs/New()
 	..()
-	for(var/i=0;i<storage_slots,i++) // Fill 'er up.
+	for(var/i = 1 to storage_slots) // Fill 'er up.
 		new /obj/item/weapon/forensics/swab(src)
 
 /obj/item/weapon/storage/box/evidence
 	name = "evidence bag box"
 	desc = "A box claiming to contain evidence bags."
+	storage_slots = 7
+	can_hold = list(/obj/item/weapon/evidencebag)
 
 /obj/item/weapon/storage/box/evidence/New()
 	..()
-	for(var/i=0;i<storage_slots,i++)
+	for(var/i = 1 to storage_slots)
 		new /obj/item/weapon/evidencebag(src)
 
 /obj/item/weapon/storage/box/fingerprints
@@ -30,5 +32,5 @@
 
 /obj/item/weapon/storage/box/fingerprints/New()
 	..()
-	for(var/i=0;i<storage_slots,i++)
+	for(var/i = 1 to storage_slots)
 		new /obj/item/weapon/sample/print(src)
\ No newline at end of file
diff --git a/icons/mob/screen1.dmi b/icons/mob/screen1.dmi
index 3fb762334c4..077b0e80403 100644
Binary files a/icons/mob/screen1.dmi and b/icons/mob/screen1.dmi differ