diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index a0ee3f5e755..76bd9de12d5 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -178,7 +178,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
 
 /obj/item/weapon/book/tome
 	name = "arcane tome"
-	icon = 'icons/obj/weapons.dmi'
+	icon = 'icons/obj/library.dmi'
 	icon_state ="tome"
 	throw_speed = 1
 	throw_range = 5
diff --git a/code/game/objects/items/weapons/improvised_components.dm b/code/game/objects/items/weapons/improvised_components.dm
index 18e8aba2439..e6b3fb78505 100644
--- a/code/game/objects/items/weapons/improvised_components.dm
+++ b/code/game/objects/items/weapons/improvised_components.dm
@@ -1,7 +1,7 @@
 /obj/item/weapon/material/butterflyconstruction
 	name = "unfinished concealed knife"
 	desc = "An unfinished concealed knife, it looks like the screws need to be tightened."
-	icon = 'icons/obj/buildingobject.dmi'
+	icon = 'icons/obj/weapons_build.dmi'
 	icon_state = "butterflystep1"
 	force_divisor = 0.1
 	thrown_force_divisor = 0.1
@@ -16,7 +16,7 @@
 /obj/item/weapon/material/butterflyblade
 	name = "knife blade"
 	desc = "A knife blade. Unusable as a weapon without a grip."
-	icon = 'icons/obj/buildingobject.dmi'
+	icon = 'icons/obj/weapons_build.dmi'
 	icon_state = "butterfly2"
 	force_divisor = 0.1
 	thrown_force_divisor = 0.1
@@ -24,7 +24,7 @@
 /obj/item/weapon/material/butterflyhandle
 	name = "concealed knife grip"
 	desc = "A plasteel grip with screw fittings for a blade."
-	icon = 'icons/obj/buildingobject.dmi'
+	icon = 'icons/obj/weapons_build.dmi'
 	icon_state = "butterfly1"
 	force_divisor = 0.1
 	thrown_force_divisor = 0.1
@@ -74,6 +74,7 @@
 /obj/item/weapon/material/shaft
 	name = "shaft"
 	desc = "A large stick, you could probably attach something to it."
+	icon = 'icons/obj/weapons_build.dmi'
 	icon_state = "shaft"
 	item_state = "rods"
 	force = 5
@@ -103,6 +104,7 @@
 /obj/item/weapon/material/spearhead
 	name = "spearhead"
 	desc = "A pointy spearhead, not really useful without a shaft."
+	icon = 'icons/obj/weapons_build.dmi'
 	icon_state = "spearhead"
 	force = 5
 	throwforce = 5
@@ -149,7 +151,7 @@
 /obj/item/woodcirclet
 	name = "wood circlet"
 	desc = "A small wood circlet for making a flower crown."
-	icon = 'icons/obj/buildingobject.dmi'
+	icon = 'icons/obj/weapons_build.dmi'
 	icon_state = "woodcirclet"
 	item_state = "woodcirclet"
 	w_class = ITEMSIZE_SMALL
diff --git a/code/game/objects/items/weapons/material/knives.dm b/code/game/objects/items/weapons/material/knives.dm
index 68645444600..a6adcd01284 100644
--- a/code/game/objects/items/weapons/material/knives.dm
+++ b/code/game/objects/items/weapons/material/knives.dm
@@ -30,6 +30,7 @@
 	desc = "The unearthly energies that once powered this blade are now dormant."
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "render"
+	item_state = "knife"
 	applies_material_colour = 0
 
 /obj/item/weapon/material/knife/bayonet
diff --git a/code/game/objects/items/weapons/material/misc.dm b/code/game/objects/items/weapons/material/misc.dm
index 5f0751e661f..aaff9459d76 100644
--- a/code/game/objects/items/weapons/material/misc.dm
+++ b/code/game/objects/items/weapons/material/misc.dm
@@ -60,7 +60,7 @@
 	attack_verb = list("slashed", "sliced", "cut", "clawed")
 
 /obj/item/weapon/material/scythe
-	icon_state = "scythe0"
+	icon_state = "scythe"
 	name = "scythe"
 	desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow."
 	force_divisor = 0.275 // 16 with hardness 60 (steel)
diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index d1fcdf2a0e1..603602ce272 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -48,8 +48,10 @@
 /obj/item/weapon/mop/update_icon()
 	if(reagents.total_volume < 1)
 		icon_state = "mop"
+		item_state = "mop"
 	if(reagents.total_volume > 1)
 		icon_state = "mop_wet"
+		item_state = "mop_wet"
 
 /obj/item/weapon/mop/on_reagent_change()
 	update_icon()
diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm
index 7ba9f8bdafe..64e17597f35 100644
--- a/code/game/objects/items/weapons/storage/bible.dm
+++ b/code/game/objects/items/weapons/storage/bible.dm
@@ -2,6 +2,7 @@
 	name = "bible"
 	desc = "Apply to head repeatedly."
 	icon_state ="bible"
+	icon = 'icons/obj/library.dmi'
 	throw_speed = 1
 	throw_range = 5
 	w_class = 3.0
@@ -51,29 +52,29 @@
 		name = book_name
 		SSticker.Bible_name = book_name
 
-	var/new_book_style = input(user,"Which bible style would you like?") in list("Bible", "Koran", "Scrapbook", "Creeper", "White Bible", "Holy Light", "Atheist", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "the bible melts", "Necronomicon")
+	var/new_book_style = input(user,"Which bible style would you like?") in list("Bible", "Quran", "Scrapbook", "Creeper", "White Bible", "Holy Light", "Atheist", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "the bible melts", "Necronomicon")
 	switch(new_book_style)
-		if("Koran")
-			icon_state = "koran"
-			item_state = "koran"
+		if("Quran")
+			icon_state = "quran"
+			item_state = "quran"
 		if("Scrapbook")
 			icon_state = "scrapbook"
 			item_state = "scrapbook"
 		if("Creeper")
 			icon_state = "creeper"
-			item_state = "syringe_kit"
+			item_state = "creeper"
 		if("White Bible")
 			icon_state = "white"
-			item_state = "syringe_kit"
+			item_state = "white"
 		if("Holy Light")
 			icon_state = "holylight"
-			item_state = "syringe_kit"
+			item_state = "holylight"
 		if("Atheist")
-			icon_state = "athiest"
-			item_state = "syringe_kit"
+			icon_state = "atheist"
+			item_state = "atheist"
 		if("Tome")
 			icon_state = "tome"
-			item_state = "syringe_kit"
+			item_state = "tome"
 		if("The King in Yellow")
 			icon_state = "kingyellow"
 			item_state = "kingyellow"
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index ec3c9a40992..c4384f67663 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -138,7 +138,7 @@
 
 /obj/item/weapon/reagent_containers/spray/aspergillum
 	name = "aspergillum"
-	desc = "A ceremonial item for sprinkling holy water, or other liquids, on a subject. It has two sacred bells attached."
+	desc = "A ceremonial item for sprinkling holy water, or other liquids, on a subject."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "aspergillum"
 	item_state = "aspergillum"
diff --git a/code/modules/materials/material_sheets.dm b/code/modules/materials/material_sheets.dm
index 0fdc729aa96..03abba91f64 100644
--- a/code/modules/materials/material_sheets.dm
+++ b/code/modules/materials/material_sheets.dm
@@ -123,8 +123,10 @@
 /obj/item/stack/material/plastic
 	name = "plastic"
 	icon_state = "sheet-plastic"
+	item_state = "sheet-plastic"
 	default_type = "plastic"
 	icon_has_variants = TRUE
+	drop_sound = 'sound/items/drop/card.ogg'
 
 /obj/item/stack/material/gold
 	name = "gold"
@@ -213,7 +215,7 @@
 	icon_state = "sheet-leather"
 	default_type = "leather"
 	icon_has_variants = TRUE
-	drop_sound = 'sound/items/drop/clothing.ogg'
+	drop_sound = 'sound/items/drop/leather.ogg'
 
 /obj/item/stack/material/glass
 	name = "glass"
@@ -231,6 +233,7 @@
 /obj/item/stack/material/glass/reinforced
 	name = "reinforced glass"
 	icon_state = "sheet-rglass"
+	item_state = "sheet-rglass"
 	default_type = "rglass"
 
 /obj/item/stack/material/glass/phoronglass
@@ -238,6 +241,7 @@
 	desc = "This sheet is special platinum-glass alloy designed to withstand large temperatures"
 	singular_name = "borosilicate glass sheet"
 	icon_state = "sheet-phoronglass"
+	item_state = "sheet-pglass"
 	default_type = "borosilicate glass"
 
 /obj/item/stack/material/glass/phoronrglass
@@ -245,6 +249,7 @@
 	desc = "This sheet is special platinum-glass alloy designed to withstand large temperatures. It is reinforced with few rods."
 	singular_name = "reinforced borosilicate glass sheet"
 	icon_state = "sheet-phoronrglass"
+	item_state = "sheet-prglass"
 	default_type = "reinforced borosilicate glass"
 
 /obj/item/stack/material/bronze
diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm
index acfd566d08a..8b3cb369969 100644
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -131,6 +131,7 @@
 	name = "Robust coffee"
 	desc = "Careful, the beverage you're about to enjoy is extremely hot."
 	icon_state = "coffee"
+	item_state = "cont_vapour"
 	drop_sound = 'sound/items/drop/box.ogg'
 	center_of_mass = list("x"=15, "y"=10)
 	Initialize()
diff --git a/html/changelogs/weapon_resprite.yml b/html/changelogs/weapon_resprite.yml
new file mode 100644
index 00000000000..cf94f752b60
--- /dev/null
+++ b/html/changelogs/weapon_resprite.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
+
+# 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: "Resprites bibles, some melee weapons and shields."
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index 5e5a641f16b..bf8cfa646f4 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi
index 871f705f884..a35d8485d8a 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 a9fc763635c..84f62d919d8 100644
Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ
diff --git a/icons/obj/buildingobject.dmi b/icons/obj/buildingobject.dmi
deleted file mode 100644
index d55e9ec99fb..00000000000
Binary files a/icons/obj/buildingobject.dmi and /dev/null differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index a6de9da6955..9386cbeca7a 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi
index 0b2b74befe4..ca1cb8a4f81 100644
Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index f41893f5caf..45cc027a661 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index b0857640672..9b73ff1605d 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/icons/obj/tactshield.dmi b/icons/obj/tactshield.dmi
index 3555f3f42eb..71997205d89 100644
Binary files a/icons/obj/tactshield.dmi and b/icons/obj/tactshield.dmi differ
diff --git a/icons/obj/tools.dmi b/icons/obj/tools.dmi
index 5c23d85fed7..f4cf93b113e 100644
Binary files a/icons/obj/tools.dmi and b/icons/obj/tools.dmi differ
diff --git a/icons/obj/weapons.dmi b/icons/obj/weapons.dmi
index bd97bcbf8cd..365feceb5bb 100644
Binary files a/icons/obj/weapons.dmi and b/icons/obj/weapons.dmi differ
diff --git a/icons/obj/weapons_build.dmi b/icons/obj/weapons_build.dmi
new file mode 100644
index 00000000000..307eca3bb60
Binary files /dev/null and b/icons/obj/weapons_build.dmi differ