diff --git a/code/game/objects/items/weapons/RFD.dm b/code/game/objects/items/weapons/RFD.dm
index b16cd82ae88..d5a9a9f0192 100644
--- a/code/game/objects/items/weapons/RFD.dm
+++ b/code/game/objects/items/weapons/RFD.dm
@@ -4,6 +4,7 @@
 	desc = "A device used for rapid fabrication. The matter decompression matrix is untuned, rendering it useless."
 	icon = 'icons/obj/tools.dmi'
 	icon_state = "rfd"
+	item_state = "rfd"
 	opacity = 0
 	density = 0
 	anchored = 0.0
@@ -262,6 +263,8 @@ RFD Service-Class
 /obj/item/rfd/service
 	name = "\improper Rapid-Fabrication-Device S-Class"
 	desc = "A RFD, modified to deploy service items."
+	icon_state = "rfd-s"
+	item_state = "rfd-s"
 	modes = list("Cigarette", "Drinking Glass","Paper","Pen","Dice Pack")
 	number_of_modes = 5
 
@@ -322,6 +325,8 @@ RFD Mining-Class
 /obj/item/rfd/mining
 	name = "\improper Rapid-Fabrication-Device M-Class"
 	desc = "A RFD, modified to deploy mine tracks."
+	icon_state = "rfd-m"
+	item_state = "rfd-m"
 
 /obj/item/rfd/mining/afterattack(atom/A, mob/user as mob, proximity)
 
@@ -426,7 +431,9 @@ RFD Piping-Class
 
 /obj/item/rfd/piping
 	name = "\improper Rapid-Fabrication-Device P-Class"
-	desc = "A RFD, modified to construct pipes and piping accessories."
+	desc = "A heavily modified RFD, modified to construct pipes and piping accessories."
+	icon_state = "rfd-p"
+	item_state = "rfd-p"
 	modes = list(STANDARD_PIPE, SUPPLY_PIPE, SCRUBBER_PIPE, DEVICES)
 	var/selected_mode = STANDARD_PIPE
 	var/pipe_examine = "Pipe" // used in the examine proc to see what you're putting down at a glance
diff --git a/html/changelogs/Ferner-200312-mapping_emperorsnewturfs.yml b/html/changelogs/Ferner-200312-mapping_emperorsnewturfs.yml
deleted file mode 100644
index 1468bc49907..00000000000
--- a/html/changelogs/Ferner-200312-mapping_emperorsnewturfs.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-author: Ferner, Happy_Fox, Kyres1
-changes: []
diff --git a/html/changelogs/wezzy_new_rfd_sprites.yml b/html/changelogs/wezzy_new_rfd_sprites.yml
new file mode 100644
index 00000000000..d08518af5cc
--- /dev/null
+++ b/html/changelogs/wezzy_new_rfd_sprites.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: Wowzewow (Wezzy), r4d6
+
+# 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: "New RPD and RFD derivative sprites (and inhands)."
diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi
index e03bd8e57ad..cdff18456bf 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 7994313b670..ec454777bc7 100644
Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index 4c436ffa041..a20a226f68d 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ