diff --git a/code/game/objects/items/devices/radio/electropack.dm b/code/game/objects/items/devices/radio/electropack.dm
index ce89071d1b304..a1a0513376ab9 100644
--- a/code/game/objects/items/devices/radio/electropack.dm
+++ b/code/game/objects/items/devices/radio/electropack.dm
@@ -1,6 +1,7 @@
 /obj/item/device/radio/electropack
 	name = "electropack"
 	desc = "Dance my monkeys! DANCE!!!"
+	icon = 'icons/obj/electropack.dmi'
 	icon_state = "electropack0"
 	item_state = "electropack"
 	frequency = 1449
diff --git a/code/game/objects/items/weapons/staff.dm b/code/game/objects/items/weapons/staff.dm
index 1ce4b7815ce3f..13370290d35cc 100644
--- a/code/game/objects/items/weapons/staff.dm
+++ b/code/game/objects/items/weapons/staff.dm
@@ -1,7 +1,7 @@
 /obj/item/staff
 	name = "wizard's staff"
 	desc = "Apparently a staff used by the wizard."
-	icon = 'icons/obj/cult.dmi'
+	icon = 'icons/obj/staffs.dmi'
 	icon_state = "staff"
 	force = 3.0
 	throwforce = 5.0
@@ -13,7 +13,7 @@
 /obj/item/staff/broom
 	name = "broom"
 	desc = "Used for sweeping, and flying into the night while cackling. Black cat not included."
-	icon = 'icons/obj/cult.dmi'
+	icon = 'icons/obj/staffs.dmi'
 	icon_state = "broom"
 
 /obj/item/staff/gentcane
diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm
index 562af17b7a726..cb8aa6bc6954b 100644
--- a/code/game/objects/items/weapons/teleportation.dm
+++ b/code/game/objects/items/weapons/teleportation.dm
@@ -11,7 +11,7 @@
 	name = "locator"
 	desc = "Used to track those with locater implants."
 	icon = 'icons/obj/tools/pinpointer.dmi'
-	icon_state = "locator"
+	icon_state = "pinoff"
 	var/temp = null
 	var/frequency = 1451
 	var/broadcasting = null
diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm
index 4931cf38a3acc..6b9eee32e876f 100644
--- a/code/game/objects/structures/barsign.dm
+++ b/code/game/objects/structures/barsign.dm
@@ -1,7 +1,7 @@
 /obj/structure/sign/double/barsign
 	desc = "A jumbo-sized LED sign. This one seems to be showing its age."
 	icon = 'icons/obj/structures/barsigns.dmi'
-	icon_state = "empty"
+	icon_state = "on"
 	appearance_flags = DEFAULT_APPEARANCE_FLAGS
 	anchored = TRUE
 	var/cult = 0
diff --git a/code/modules/power/fusion/kinetic_harvester.dm b/code/modules/power/fusion/kinetic_harvester.dm
index 86660ff37f5da..76b82df21d0a6 100644
--- a/code/modules/power/fusion/kinetic_harvester.dm
+++ b/code/modules/power/fusion/kinetic_harvester.dm
@@ -5,7 +5,7 @@
 	anchored = TRUE
 	use_power = POWER_USE_IDLE
 	icon = 'icons/obj/machines/kinetic_harvester.dmi'
-	icon_state = "off"
+	icon_state = "harvester"
 	var/initial_id_tag
 	var/list/stored =     list()
 	var/list/harvesting = list()
diff --git a/code/modules/reagents/Chemistry-Sublimator.dm b/code/modules/reagents/Chemistry-Sublimator.dm
index c7c3d428b470f..c280d79966a10 100644
--- a/code/modules/reagents/Chemistry-Sublimator.dm
+++ b/code/modules/reagents/Chemistry-Sublimator.dm
@@ -41,7 +41,7 @@
 	machine_name = "reagent sublimator"
 	machine_desc = "Sublimators draw reagents from a provided container and converts them into gases."
 
-	var/icon_set = "subliminator"
+	var/icon_set = "sublimator"
 	var/sublimated_units_per_tick = 20
 	var/obj/item/reagent_containers/container
 	var/list/reagent_whitelist //if this is set, the subliminator will only work with the listed reagents
diff --git a/code/modules/spells/spellbook.dm b/code/modules/spells/spellbook.dm
index f155f20e59a2d..7d862800ab49a 100644
--- a/code/modules/spells/spellbook.dm
+++ b/code/modules/spells/spellbook.dm
@@ -22,7 +22,7 @@ var/global/list/artefact_feedback = list(/obj/structure/closet/wizard/armor =
 	name = "master spell book"
 	desc = "The legendary book of spells of the wizard."
 	icon = 'icons/obj/library.dmi'
-	icon_state = "spellbook"
+	icon_state = "book"
 	throw_speed = 1
 	throw_range = 5
 	w_class = ITEM_SIZE_NORMAL
diff --git a/icons/mob/onmob/onmob_feet.dmi b/icons/mob/onmob/onmob_feet.dmi
index 3b9add2da9a79..954ce5656840e 100644
Binary files a/icons/mob/onmob/onmob_feet.dmi and b/icons/mob/onmob/onmob_feet.dmi differ
diff --git a/icons/obj/clothing/obj_feet.dmi b/icons/obj/clothing/obj_feet.dmi
index 18d7df3ed1928..8d29e712d9cd1 100644
Binary files a/icons/obj/clothing/obj_feet.dmi and b/icons/obj/clothing/obj_feet.dmi differ
diff --git a/maps/away/casino/casino.dmm b/maps/away/casino/casino.dmm
index 3f00a11a95d6c..6a73712977b3a 100644
--- a/maps/away/casino/casino.dmm
+++ b/maps/away/casino/casino.dmm
@@ -4676,7 +4676,6 @@
 "na" = (
 /obj/machinery/door/airlock/external{
 	frequency = 1380;
-	icon_state = "door_locked";
 	id_tag = "escape_pod";
 	locked = 1;
 	name = "Escape Pod"
@@ -5321,7 +5320,6 @@
 "Kb" = (
 /obj/machinery/computer/modular{
 	dir = 8;
-	icon_state = "console";
 	name = "Cameras console"
 	},
 /turf/simulated/floor/tiled,