diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/duct_tape/duct_tape.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/duct_tape/duct_tape.png
index e54de14781..a715d9a0f2 100644
Binary files a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/duct_tape/duct_tape.png and b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/duct_tape/duct_tape.png differ
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/pitchfork/pitchfork.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/pitchfork/pitchfork.png
index af3c84780c..41f27f8800 100644
Binary files a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/pitchfork/pitchfork.png and b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/pitchfork/pitchfork.png differ
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/pliers/pliers.json b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/pliers/pliers.json
deleted file mode 100644
index 845f959270..0000000000
--- a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/pliers/pliers.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id": "pliers",
-  "fg": "pliers",
-  "bg": ""
-}
diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/pliers/pliers.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/pliers/pliers.png
deleted file mode 100644
index 11f197aa88..0000000000
Binary files a/gfx/UltimateCataclysm/pngs_incomplete_32x32/items/pliers/pliers.png and /dev/null differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/ace_unsorted/dehydrator.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/ace_unsorted/dehydrator.png
new file mode 100644
index 0000000000..c56950ebac
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/ace_unsorted/dehydrator.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/ace_unsorted/nodachi.json b/gfx/UltimateCataclysm/pngs_normal_32x32/items/ace_unsorted/nodachi.json
new file mode 100644
index 0000000000..ddfee76491
--- /dev/null
+++ b/gfx/UltimateCataclysm/pngs_normal_32x32/items/ace_unsorted/nodachi.json
@@ -0,0 +1,17 @@
+[
+  {
+  "id": "nodachi",
+  "fg": "nodachi",
+  "bg": ""
+  },
+  {
+  "id": "nodachi_fake",
+  "fg": "nodachi",
+  "bg": ""
+  },
+    {
+  "id": "nodachi_inferior",
+  "fg": "nodachi",
+  "bg": ""
+  }
+]
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/ace_unsorted/nodachi.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/ace_unsorted/nodachi.png
new file mode 100644
index 0000000000..c3abd592cc
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/ace_unsorted/nodachi.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/broom/broom.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/broom/broom.png
index 9d1fb24ae5..8a9a3a0107 100644
Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/items/broom/broom.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/broom/broom.png differ
diff --git a/gfx/UltimateCataclysm/pngs_normal_32x32/items/mop/mop.png b/gfx/UltimateCataclysm/pngs_normal_32x32/items/mop/mop.png
index 74cc0f27a1..0e31f42459 100644
Binary files a/gfx/UltimateCataclysm/pngs_normal_32x32/items/mop/mop.png and b/gfx/UltimateCataclysm/pngs_normal_32x32/items/mop/mop.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/atomic_light.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/atomic_light.png
new file mode 100644
index 0000000000..947bbc257f
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/atomic_light.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/atomic_light_off.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/atomic_light_off.png
new file mode 100644
index 0000000000..f5125ebab4
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/atomic_light_off.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/boltcutters.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/boltcutters.png
new file mode 100644
index 0000000000..a611d0a1fb
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/boltcutters.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/chain_link.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/chain_link.png
new file mode 100644
index 0000000000..54281b8da2
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/chain_link.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/chisel.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/chisel.png
new file mode 100644
index 0000000000..fbc97089fe
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/chisel.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/cordless_drill.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/cordless_drill.png
new file mode 100644
index 0000000000..99423a2e46
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/cordless_drill.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/data_card.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/data_card.png
new file mode 100644
index 0000000000..588bb274a1
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/data_card.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge.png
new file mode 100644
index 0000000000..762514d138
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge_engineer.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge_engineer.png
new file mode 100644
index 0000000000..b1951b60ad
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge_engineer.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge_heavy.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge_heavy.png
new file mode 100644
index 0000000000..700f62920a
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge_heavy.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge_short.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge_short.png
new file mode 100644
index 0000000000..cf8c48dcba
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/hammer_sledge_short.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/jackhammer.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/jackhammer.png
new file mode 100644
index 0000000000..b72aefc4fe
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/jackhammer.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/link_sheet.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/link_sheet.png
new file mode 100644
index 0000000000..d7bfd552b7
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/link_sheet.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/pliers.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/pliers.png
new file mode 100644
index 0000000000..08af3aa0d0
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/pliers.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/reading_light.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/reading_light.png
new file mode 100644
index 0000000000..0c485118c6
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/reading_light.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/reading_light_on.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/reading_light_on.png
new file mode 100644
index 0000000000..fcdbc5640c
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/reading_light_on.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/shocktonfa_off.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/shocktonfa_off.png
new file mode 100644
index 0000000000..acadee6640
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/shocktonfa_off.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/shocktonfa_on.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/shocktonfa_on.png
new file mode 100644
index 0000000000..322cd3f618
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/shocktonfa_on.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/swage.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/swage.png
new file mode 100644
index 0000000000..06d3d2eee3
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/swage.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/tonfa.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/tonfa.png
new file mode 100644
index 0000000000..0193a11418
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/tonfa.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/tonfa_wood.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/tonfa_wood.png
new file mode 100644
index 0000000000..f183c6d6d9
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/tonfa_wood.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/tongs.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/tongs.png
new file mode 100644
index 0000000000..e06121caaa
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/tongs.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/water_purifier.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/water_purifier.png
new file mode 100644
index 0000000000..886f5efc78
Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_small_20x20/items/acepleiades_unsorted/water_purifier.png differ
diff --git a/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/tongs.png b/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/tongs.png
deleted file mode 100644
index a5b3d1f0eb..0000000000
Binary files a/gfx/UltimateCataclysm/pngs_small_20x20/items/tools/tongs.png and /dev/null differ
diff --git a/gfx/UltimateCataclysm/pngs_tall_32x64/overlay/wielded/tools_by_ace/jackhammer/jackhammer.json b/gfx/UltimateCataclysm/pngs_tall_32x64/overlay/wielded/tools_by_ace/jackhammer/jackhammer.json
index 9029c1f324..44ef73280a 100644
--- a/gfx/UltimateCataclysm/pngs_tall_32x64/overlay/wielded/tools_by_ace/jackhammer/jackhammer.json
+++ b/gfx/UltimateCataclysm/pngs_tall_32x64/overlay/wielded/tools_by_ace/jackhammer/jackhammer.json
@@ -1,12 +1,12 @@
 [
   {
     "id": "overlay_wielded_jackhammer",
-    "fg": "jackhammer",
+    "fg": "jackhammer_mf",
     "bg": ""
   },
   {
     "id": "overlay_wielded_elec_jackhammer",
-    "fg": "jackhammer",
+    "fg": "jackhammer_mf",
     "bg": ""
   }
 ]
\ No newline at end of file
diff --git a/gfx/UltimateCataclysm/pngs_tall_32x64/overlay/wielded/tools_by_ace/jackhammer/jackhammer.png b/gfx/UltimateCataclysm/pngs_tall_32x64/overlay/wielded/tools_by_ace/jackhammer/jackhammer_mf.png
similarity index 100%
rename from gfx/UltimateCataclysm/pngs_tall_32x64/overlay/wielded/tools_by_ace/jackhammer/jackhammer.png
rename to gfx/UltimateCataclysm/pngs_tall_32x64/overlay/wielded/tools_by_ace/jackhammer/jackhammer_mf.png