diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm
index 78f11baa352..c1a2bf0f473 100644
--- a/code/game/objects/items/stacks/nanopaste.dm
+++ b/code/game/objects/items/stacks/nanopaste.dm
@@ -3,11 +3,9 @@
 	singular_name = "nanite swarm"
 	desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery."
 	icon = 'icons/obj/item/stacks/nanopaste.dmi'
-	item_icons = list(
-		slot_l_hand_str = 'icons/mob/items/stacks/lefthand_nanopaste.dmi',
-		slot_r_hand_str = 'icons/mob/items/stacks/righthand_nanopaste.dmi',
-		)
 	icon_state = "tube"
+	item_state = "tube"
+	contained_sprite = TRUE
 	origin_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3)
 	amount = 10
 	surgerysound = 'sound/items/surgery/bonegel.ogg'
@@ -82,6 +80,7 @@
 	singular_name = "nanite swarm"
 	desc = "A tube of paste containing swarms of repair nanites. This one appears to contain different nanites."
 	icon_state = "tube-surge"
+	item_state = "tube-surge"
 	origin_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 4, TECH_MAGNET = 5, TECH_POWER = 5, TECH_COMBAT = 3, TECH_ILLEGAL = 4)
 	amount = 20
 	var/used = FALSE
diff --git a/html/changelogs/hazelmouse-nanopastefix.yml b/html/changelogs/hazelmouse-nanopastefix.yml
new file mode 100644
index 00000000000..e1bbc34a080
--- /dev/null
+++ b/html/changelogs/hazelmouse-nanopastefix.yml
@@ -0,0 +1,59 @@
+################################
+# 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
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: hazelmouse
+
+# 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, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Nanopaste no longer becomes invisible on character sprites after being partially used."
+  - refactor: "Nanopaste now uses contained sprites."
diff --git a/icons/mob/items/stacks/lefthand_nanopaste.dmi b/icons/mob/items/stacks/lefthand_nanopaste.dmi
deleted file mode 100644
index 50ee391f417..00000000000
Binary files a/icons/mob/items/stacks/lefthand_nanopaste.dmi and /dev/null differ
diff --git a/icons/mob/items/stacks/righthand_nanopaste.dmi b/icons/mob/items/stacks/righthand_nanopaste.dmi
deleted file mode 100644
index 49cc4a5a56f..00000000000
Binary files a/icons/mob/items/stacks/righthand_nanopaste.dmi and /dev/null differ
diff --git a/icons/obj/item/stacks/nanopaste.dmi b/icons/obj/item/stacks/nanopaste.dmi
index 1ed5a8c6a9f..803b3ce483a 100644
Binary files a/icons/obj/item/stacks/nanopaste.dmi and b/icons/obj/item/stacks/nanopaste.dmi differ