diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 1c8af09d9e..5a988e3100 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -43,10 +43,6 @@
 	icon_state = "pen_red"
 	colour = "red"
 
-/obj/item/weapon/pen/fountain
-	desc = "A well made fountain pen."
-	icon_state = "pen_fountain"
-
 /obj/item/weapon/pen/multi
 	desc = "It's a pen with multiple colors of ink!"
 	var/selectedColor = 1
@@ -75,6 +71,46 @@
 	icon_state = "pen"
 	colour = "white"
 
+//Fountain Pens
+
+/obj/item/weapon/pen/fountain
+	desc = "A well made fountain pen with a faux-wood finish."
+	icon_state = "pen_fountain"
+
+/obj/item/weapon/pen/fountain2
+	desc = "A well made fountain pen, with a faux wood body. This one has golden accents."
+	icon_state = "pen_fountain2"
+
+/obj/item/weapon/pen/fountain3
+	desc = "A well made expensive rosewood pen with golden accents. Very pretty."
+	icon_state = "red_fountain"
+
+/obj/item/weapon/pen/fountain4
+	desc = "A well made and expensive fountain pen. This one has silver accents."
+	icon_state = "blues_fountain"
+
+/obj/item/weapon/pen/fountain5
+	desc = "A well made and expensive fountain pen. This one has gold accents."
+	icon_state = "blueg_fountain"
+
+/obj/item/weapon/pen/fountain6
+	desc = "A well made and expensive fountain pen. The nib is quite sharp."
+	icon_state = "command_fountain"
+
+/obj/item/weapon/pen/fountain7
+	desc = "A well made and expensive fountain pen made from gold."
+	icon_state = "gold_fountain"
+
+/obj/item/weapon/pen/fountain8
+	desc = "A well made and expensive fountain pen."
+	icon_state = "black_fountain"
+
+/obj/item/weapon/pen/fountain9
+	desc = "A well made and expensive fountain pen made for gesturing."
+	icon_state = "mime_fountain"
+
+
+
 /*
  * Reagent pens
  */
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 5d554b05d3..738017e5d7 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -2,8 +2,8 @@
 	name = "photocopier"
 	desc = "Copy all your important papers here!"
 	icon = 'icons/obj/library.dmi'
-	icon_state = "bigscanner"
-	var/insert_anim = "bigscanner1"
+	icon_state = "photocopier"
+	var/insert_anim = "photocopier_scan"
 	anchored = 1
 	density = 1
 	use_power = USE_POWER_IDLE
@@ -72,12 +72,14 @@
 			sleep(11)
 			copy(copyitem)
 			audible_message("<span class='notice'>You can hear [src] whirring as it finishes printing.</span>", runemessage = "whirr")
+			flick("photocopier_print", src)
 			playsound(src, "sound/machines/buzzbeep.ogg", 30)
 		else if (istype(copyitem, /obj/item/weapon/photo))
 			playsound(loc, "sound/machines/copier.ogg", 100, 1)
 			sleep(11)
 			photocopy(copyitem)
 			audible_message("<span class='notice'>You can hear [src] whirring as it finishes printing.</span>", runemessage = "whirr")
+			flick("photocopier_print", src)
 			playsound(src, "sound/machines/buzzbeep.ogg", 30)
 		else if (istype(copyitem, /obj/item/weapon/paper_bundle))
 			sleep(11)
@@ -85,6 +87,7 @@
 			var/obj/item/weapon/paper_bundle/B = bundlecopy(copyitem)
 			sleep(11*B.pages.len)
 			audible_message("<span class='notice'>You can hear [src] whirring as it finishes printing.</span>", runemessage = "whirr")
+			flick("photocopier_print", src)
 			playsound(src, "sound/machines/buzzbeep.ogg", 30)
 		else
 			to_chat(user, "<span class='warning'>\The [copyitem] can't be copied by [src].</span>")
@@ -151,11 +154,15 @@
 		if(toner <= 10) //allow replacing when low toner is affecting the print darkness
 			user.drop_item()
 			to_chat(user, "<span class='notice'>You insert the toner cartridge into \the [src].</span>")
+			flick("photocopier_toner", src)
+			playsound(loc, 'sound/machines/click.ogg', 50, 1)
 			var/obj/item/device/toner/T = O
 			toner += T.toner_amount
 			qdel(O)
 		else
 			to_chat(user, "<span class='notice'>This cartridge is not yet ready for replacement! Use up the rest of the toner.</span>")
+			flick("photocopier_notoner", src)
+			playsound(loc, 'sound/machines/buzz-two.ogg', 75, 1)
 	else if(O.is_wrench())
 		playsound(src, O.usesound, 50, 1)
 		anchored = !anchored
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index 449f08e723..f567cf478a 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -48,6 +48,10 @@
 	icon_state = "stamp-deny"
 	attack_verb = list("DENIED")
 
+/obj/item/weapon/stamp/accepted
+	name = "\improper ACCEPTED rubber stamp"
+	icon_state = "stamp-ok"
+
 /obj/item/weapon/stamp/clown
 	name = "clown's rubber stamp"
 	icon_state = "stamp-clown"
@@ -72,6 +76,21 @@
 	name = "\improper Sol Government rubber stamp"
 	icon_state = "stamp-sg"
 
+/obj/item/weapon/stamp/solgovlogo
+	name = "\improper Sol Government logo stamp"
+	icon_state = "stamp-sol"
+
+/obj/item/stamp/einstein
+	name = "\improper Einstein Engines rubber stamp"
+	icon_state = "stamp-einstein"
+
+/obj/item/stamp/hephaestus
+	name = "\improper Hephaestus Industries rubber stamp"
+	icon_state = "stamp-heph"
+
+/obj/item/stamp/zeng_hu
+	name = "\improper Zeng-Hu Pharmaceuticals rubber stamp"
+	icon_state = "stamp-zenghu"
 
 // Syndicate stamp to forge documents.
 /obj/item/weapon/stamp/chameleon/attack_self(mob/user as mob)
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index e45c3d2f40..32b465fb34 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi
index c3f730e586..bc8cba2747 100644
Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ
diff --git a/icons/obj/papershredder.dmi b/icons/obj/papershredder.dmi
index 36764945df..5670b38553 100644
Binary files a/icons/obj/papershredder.dmi and b/icons/obj/papershredder.dmi differ