diff --git a/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm b/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm
index 4a051099254..9ed2ddf0f8f 100644
--- a/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/anti_photon_grenade.dm
@@ -2,8 +2,8 @@
 	desc = "An experimental device for temporarily removing light in a limited area."
 	name = "photon disruption grenade"
 	icon = 'icons/obj/grenade.dmi'
-	icon_state = "emp"
-	item_state = "emp"
+	icon_state = "photon"
+	item_state = "photon"
 	det_time = 20
 	origin_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 4)
 
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index d454d1ce64a..88a409f28b8 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 = "grenade"
+	item_state = "chemg"
 	desc = "A hand made chemical grenade."
 	w_class = 2.0
 	force = 2.0
@@ -185,6 +185,7 @@
 	name = "large chem grenade"
 	desc = "An oversized grenade that affects a larger area."
 	icon_state = "large_grenade"
+	item_state = "largechemg"
 	allowed_containers = list(/obj/item/weapon/reagent_containers/glass)
 	origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3)
 	affected_area = 4
@@ -253,7 +254,7 @@
 
 	beakers += B1
 	beakers += B2
-	icon_state = "grenade"
+	icon_state = initial(icon_state) +"_locked"
 
 /obj/item/weapon/grenade/chem_grenade/gas
 	name = "NT. 53 'Sandman' grenade"
diff --git a/code/game/objects/items/weapons/grenades/emgrenade.dm b/code/game/objects/items/weapons/grenades/emgrenade.dm
index 59275096c74..260917e4c08 100644
--- a/code/game/objects/items/weapons/grenades/emgrenade.dm
+++ b/code/game/objects/items/weapons/grenades/emgrenade.dm
@@ -1,7 +1,7 @@
 /obj/item/weapon/grenade/empgrenade
 	name = "classic emp grenade"
 	icon_state = "emp"
-	item_state = "empgrenade"
+	item_state = "emp"
 	origin_tech = list(TECH_MATERIAL = 2, TECH_MAGNET = 3)
 
 /obj/item/weapon/grenade/empgrenade/prime()
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index 575bec889b1..30415fef794 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -9,6 +9,7 @@
 	throw_range = 20
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
+	contained_sprite = 1
 	var/active = 0
 	var/det_time = 30
 	var/fake = FALSE
diff --git a/html/changelogs/Ferner-190609-sprites_grenades.yml b/html/changelogs/Ferner-190609-sprites_grenades.yml
new file mode 100644
index 00000000000..6ad361eb7fd
--- /dev/null
+++ b/html/changelogs/Ferner-190609-sprites_grenades.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.  
+author: AmoryBlaine, Ferner
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - imageadd: "Replaced the grenade sprites with new ones made by AmoryBlaine."
diff --git a/icons/obj/grenade.dmi b/icons/obj/grenade.dmi
index 74a58efc546..20b99d22025 100644
Binary files a/icons/obj/grenade.dmi and b/icons/obj/grenade.dmi differ