diff --git a/code/WorkInProgress/Cameras.dm b/code/WorkInProgress/Cameras.dm
index 5349ed3703..1977d268d8 100644
--- a/code/WorkInProgress/Cameras.dm
+++ b/code/WorkInProgress/Cameras.dm
@@ -1,6 +1,6 @@
 /obj/item/weapon/storage/photo_album
 	name = "Photo album"
-	icon = 'old_or_unused.dmi'
+	icon = 'items.dmi'
 	icon_state = "album"
 	item_state = "briefcase"
 
@@ -59,7 +59,7 @@
 
 /obj/item/weapon/camera_test
 	name = "camera"
-	icon = 'old_or_unused.dmi'
+	icon = 'items.dmi'
 	desc = "A one use - polaroid camera. 10 photos left."
 	icon_state = "camera"
 	item_state = "electropack"
@@ -74,7 +74,7 @@
 
 /obj/item/weapon/photo
 	name = "photo"
-	icon = 'old_or_unused.dmi'
+	icon = 'items.dmi'
 	icon_state = "photo"
 	item_state = "clipboard"
 	w_class = 1.0
@@ -95,7 +95,7 @@
 
 	var/turf/the_turf = get_turf(target)
 
-	var/icon/photo = icon('old_or_unused.dmi',"photo")
+	var/icon/photo = icon('items.dmi',"photo")
 
 	var/icon/turficon = build_composite_icon(the_turf)
 	turficon.Scale(22,20)
diff --git a/code/WorkInProgress/KeelinsStuff.dm b/code/WorkInProgress/KeelinsStuff.dm
index 170b7c244c..9929a6e0af 100644
--- a/code/WorkInProgress/KeelinsStuff.dm
+++ b/code/WorkInProgress/KeelinsStuff.dm
@@ -1,5 +1,5 @@
 /obj/signpost
-	icon = 'old_or_unused.dmi'
+	icon = 'stationobjs.dmi'
 	icon_state = "signpost"
 	anchored = 1
 	density = 1
@@ -89,7 +89,7 @@
 		src.throw_at(target, throw_range, throw_speed)
 
 /obj/item/weapon/hand_labeler
-	icon = 'old_or_unused.dmi'
+	icon = 'items.dmi'
 	icon_state = "labeler"
 	item_state = "flight"
 	name = "Hand labeler"
diff --git a/code/defines/obj/decal.dm b/code/defines/obj/decal.dm
index fc0f6c6d4c..f7c9b0bf1a 100644
--- a/code/defines/obj/decal.dm
+++ b/code/defines/obj/decal.dm
@@ -174,7 +174,7 @@
 	density = 0
 	anchored = 1
 	layer = 2
-	icon = 'old_or_unused.dmi'
+	icon = 'effects.dmi'
 	icon_state = "dirt"
 
 /obj/decal/cleanable/greenglow
@@ -192,7 +192,7 @@
 	density = 0
 	anchored = 1
 	layer = 3
-	icon = 'old_or_unused.dmi'
+	icon = 'effects.dmi'
 	icon_state = "cobweb1"
 
 /obj/decal/cleanable/molten_item
@@ -210,7 +210,7 @@
 	density = 0
 	anchored = 1
 	layer = 3
-	icon = 'old_or_unused.dmi'
+	icon = 'effects.dmi'
 	icon_state = "cobweb2"
 
 // Used for spray that you spray at walls, tables, hydrovats etc
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 20236fe1fc..becb0ee43a 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -771,7 +771,7 @@
 
 /obj/item/weapon/paint
 	name = "Paint Can"
-	icon = 'old_or_unused.dmi'
+	icon = 'items.dmi'
 	icon_state = "paint_neutral"
 	var/color = "neutral"
 	item_state = "paintcan"
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index 81d69e9184..29a4ef1a5f 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/misc/old_or_unused.dmi b/icons/misc/old_or_unused.dmi
index 570c58f10c..539f59e54f 100644
Binary files a/icons/misc/old_or_unused.dmi and b/icons/misc/old_or_unused.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 742930c104..2c875cd0df 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index 10f2169c7e..33b8b41c69 100644
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ