diff --git a/code/setup.dm b/code/setup.dm
index 82d89e277b..14f924a9c5 100644
--- a/code/setup.dm
+++ b/code/setup.dm
@@ -960,8 +960,8 @@ var/list/be_special_flags = list(
 // Convoluted setup so defines can be supplied by Bay12 main server compile script.
 // Should still work fine for people jamming the icons into their repo.
 #ifndef CUSTOM_ITEM_OBJ
-#define CUSTOM_ITEM_OBJ 'icons/obj/custom_items.dmi'
+#define CUSTOM_ITEM_OBJ 'icons/obj/custom_items_obj.dmi'
 #endif
 #ifndef CUSTOM_ITEM_MOB
-#define CUSTOM_ITEM_MOB 'icons/mob/custom_items.dmi'
+#define CUSTOM_ITEM_MOB 'icons/mob/custom_items_mob.dmi'
 #endif
\ No newline at end of file
diff --git a/icons/mob/custom_items.dmi b/icons/mob/custom_items_mob.dmi
similarity index 100%
rename from icons/mob/custom_items.dmi
rename to icons/mob/custom_items_mob.dmi
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items_obj.dmi
similarity index 100%
rename from icons/obj/custom_items.dmi
rename to icons/obj/custom_items_obj.dmi