diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index 42a4967bfe0..b1eea451308 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -2,9 +2,9 @@
 	name = "flash"
 	desc = "Used for blinding and being an asshole."
 	icon_state = "flash"
-	item_state = "flash"
+	item_state = "flashtool"
 	throwforce = 5
-	w_class = 2.0
+	w_class = 2
 	throw_speed = 4
 	throw_range = 10
 	flags = CONDUCT
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index caaa82adcbb..b559527ef7e 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -1,7 +1,7 @@
 /obj/item/weapon/grenade/chem_grenade
 	name = "grenade casing"
 	icon_state = "chemg"
-	item_state = "flashbang"
+	item_state = "grenade"
 	desc = "A hand made chemical grenade."
 	w_class = 2.0
 	force = 2.0
diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm
index c354aa40396..c14615146da 100644
--- a/code/game/objects/items/weapons/grenades/emgrenade.dm
+++ b/code/game/objects/items/weapons/grenades/emgrenade.dm
@@ -1,8 +1,8 @@
 /obj/item/weapon/grenade/empgrenade
 	name = "classic emp grenade"
-	icon_state = "emp"
-	item_state = "emp"
-	origin_tech = "materials=2;magnets=3"
+	icon_state = "emp"
+	item_state = "empgrenade"
+	origin_tech = "materials=2;magnets=3"
 
 	prime()
 		..()
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index 1565d321b67..16d8a620f97 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -4,7 +4,7 @@
 	w_class = 2.0
 	icon = 'icons/obj/grenade.dmi'
 	icon_state = "grenade"
-	item_state = "flashbang"
+	item_state = "grenade"
 	throw_speed = 4
 	throw_range = 20
 	flags = CONDUCT
diff --git a/html/changelogs/HarpyEagle-dev-freeze.yml b/html/changelogs/HarpyEagle-dev-freeze.yml
index a999f1236dc..c5e49e70d86 100644
--- a/html/changelogs/HarpyEagle-dev-freeze.yml
+++ b/html/changelogs/HarpyEagle-dev-freeze.yml
@@ -1,3 +1,4 @@
 author: HarpyEagle
-changes: []
+changes:
+  - imageadd: "Added inhand sprites for flashes, flashbangs, emp and other grenades."
 delete-after: false
diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi
index ed6383ba7c1..018309c7093 100644
Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ
diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi
index e7042ca3ad2..f3850933159 100644
Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ