diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/bombs/homemade_grenade.png b/gfx/MShockXotto+/pngs_small_20x20/items/bombs/homemade_grenade.png
new file mode 100644
index 0000000000..fafa6f29bf
Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/bombs/homemade_grenade.png differ
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/bombs/homemade_grenade_act.png b/gfx/MShockXotto+/pngs_small_20x20/items/bombs/homemade_grenade_act.png
new file mode 100644
index 0000000000..2ff7b9d0a6
Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/bombs/homemade_grenade_act.png differ
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/bombs/pipebomb.png b/gfx/MShockXotto+/pngs_small_20x20/items/bombs/pipebomb.png
new file mode 100644
index 0000000000..fca9164c0b
Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/bombs/pipebomb.png differ
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/bombs/pipebomb_act.png b/gfx/MShockXotto+/pngs_small_20x20/items/bombs/pipebomb_act.png
new file mode 100644
index 0000000000..0a716f7b62
Binary files /dev/null and b/gfx/MShockXotto+/pngs_small_20x20/items/bombs/pipebomb_act.png differ
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/pipebomb/credits.txt b/gfx/MShockXotto+/pngs_small_20x20/items/pipebomb/credits.txt
deleted file mode 100644
index c8d6c499d1..0000000000
--- a/gfx/MShockXotto+/pngs_small_20x20/items/pipebomb/credits.txt
+++ /dev/null
@@ -1 +0,0 @@
-Ryu
\ No newline at end of file
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/pipebomb/pipebomb.png b/gfx/MShockXotto+/pngs_small_20x20/items/pipebomb/pipebomb.png
deleted file mode 100644
index cc535ef370..0000000000
Binary files a/gfx/MShockXotto+/pngs_small_20x20/items/pipebomb/pipebomb.png and /dev/null differ
diff --git a/gfx/MShockXotto+/pngs_small_20x20/items/pipebomb/pipebomb_act.png b/gfx/MShockXotto+/pngs_small_20x20/items/pipebomb/pipebomb_act.png
deleted file mode 100644
index 14c01f7089..0000000000
Binary files a/gfx/MShockXotto+/pngs_small_20x20/items/pipebomb/pipebomb_act.png and /dev/null differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/Explosives/overlay_wielded_homemade_grenade.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/Explosives/overlay_wielded_homemade_grenade.png
new file mode 100644
index 0000000000..cfc7790b3d
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/Explosives/overlay_wielded_homemade_grenade.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/Explosives/overlay_wielded_homemade_grenade_act.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/Explosives/overlay_wielded_homemade_grenade_act.png
new file mode 100644
index 0000000000..1ffbf7f9fa
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/Explosives/overlay_wielded_homemade_grenade_act.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/Explosives/overlay_wielded_pipebomb.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/Explosives/overlay_wielded_pipebomb.png
new file mode 100644
index 0000000000..f671c7daa5
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/Explosives/overlay_wielded_pipebomb.png differ
diff --git a/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/Explosives/overlay_wielded_pipebomb_act.png b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/Explosives/overlay_wielded_pipebomb_act.png
new file mode 100644
index 0000000000..1d50116576
Binary files /dev/null and b/gfx/MShockXotto+/pngs_tiles_32x32/character/overlay/wielded/Explosives/overlay_wielded_pipebomb_act.png differ