diff --git a/core/assets-raw/sprites/items/ammo/item-armor-piercing-bullet.png b/core/assets-raw/sprites/items/ammo/item-armor-piercing-bullet.png
new file mode 100644
index 0000000000..182634b8f6
Binary files /dev/null and b/core/assets-raw/sprites/items/ammo/item-armor-piercing-bullet.png differ
diff --git a/core/assets-raw/sprites/items/ammo/item-composite-flak.png b/core/assets-raw/sprites/items/ammo/item-composite-flak.png
new file mode 100644
index 0000000000..f0d47144aa
Binary files /dev/null and b/core/assets-raw/sprites/items/ammo/item-composite-flak.png differ
diff --git a/core/assets-raw/sprites/items/ammo/item-explosive-shell.png b/core/assets-raw/sprites/items/ammo/item-explosive-shell.png
new file mode 100644
index 0000000000..a42f4928c8
Binary files /dev/null and b/core/assets-raw/sprites/items/ammo/item-explosive-shell.png differ
diff --git a/core/assets-raw/sprites/items/ammo/item-frag-shell.png b/core/assets-raw/sprites/items/ammo/item-frag-shell.png
new file mode 100644
index 0000000000..163d8dc368
Binary files /dev/null and b/core/assets-raw/sprites/items/ammo/item-frag-shell.png differ
diff --git a/core/assets-raw/sprites/items/ammo/item-homing-bullet.png b/core/assets-raw/sprites/items/ammo/item-homing-bullet.png
new file mode 100644
index 0000000000..344402d11b
Binary files /dev/null and b/core/assets-raw/sprites/items/ammo/item-homing-bullet.png differ
diff --git a/core/assets-raw/sprites/items/ammo/item-incendiary-mortar-shell.png b/core/assets-raw/sprites/items/ammo/item-incendiary-mortar-shell.png
new file mode 100644
index 0000000000..8ae3d955f2
Binary files /dev/null and b/core/assets-raw/sprites/items/ammo/item-incendiary-mortar-shell.png differ
diff --git a/core/assets-raw/sprites/items/ammo/item-lead-bullet.png b/core/assets-raw/sprites/items/ammo/item-lead-bullet.png
new file mode 100644
index 0000000000..f971aaddcc
Binary files /dev/null and b/core/assets-raw/sprites/items/ammo/item-lead-bullet.png differ
diff --git a/core/assets-raw/sprites/items/ammo/item-scythe-missile.png b/core/assets-raw/sprites/items/ammo/item-scythe-missile.png
new file mode 100644
index 0000000000..b207d6e751
Binary files /dev/null and b/core/assets-raw/sprites/items/ammo/item-scythe-missile.png differ
diff --git a/core/assets-raw/sprites/items/ammo/item-surge-mortar-shell.png b/core/assets-raw/sprites/items/ammo/item-surge-mortar-shell.png
new file mode 100644
index 0000000000..45faa9479a
Binary files /dev/null and b/core/assets-raw/sprites/items/ammo/item-surge-mortar-shell.png differ
diff --git a/core/assets-raw/sprites/items/ammo/item-swarm-missile.png b/core/assets-raw/sprites/items/ammo/item-swarm-missile.png
new file mode 100644
index 0000000000..c54ff3d340
Binary files /dev/null and b/core/assets-raw/sprites/items/ammo/item-swarm-missile.png differ
diff --git a/core/assets-raw/sprites/items/ammo/item-thorium-shell.png b/core/assets-raw/sprites/items/ammo/item-thorium-shell.png
new file mode 100644
index 0000000000..25a91e67a9
Binary files /dev/null and b/core/assets-raw/sprites/items/ammo/item-thorium-shell.png differ
diff --git a/core/assets-raw/sprites/items/ammo/item-tracer-bullet.png b/core/assets-raw/sprites/items/ammo/item-tracer-bullet.png
new file mode 100644
index 0000000000..7bc343e09f
Binary files /dev/null and b/core/assets-raw/sprites/items/ammo/item-tracer-bullet.png differ
diff --git a/core/assets-raw/sprites/items/item-rdx.png b/core/assets-raw/sprites/items/item-rdx.png
index c29bcec2c9..eda970bf5c 100644
Binary files a/core/assets-raw/sprites/items/item-rdx.png and b/core/assets-raw/sprites/items/item-rdx.png differ
diff --git a/core/assets-raw/sprites/items/item-sand.png b/core/assets-raw/sprites/items/item-sand.png
index c403b33cfc..57a5be0aad 100644
Binary files a/core/assets-raw/sprites/items/item-sand.png and b/core/assets-raw/sprites/items/item-sand.png differ
diff --git a/core/assets-raw/sprites/items/item-silicon.png b/core/assets-raw/sprites/items/item-silicon.png
index 7950ca9ca2..348ddd4a55 100644
Binary files a/core/assets-raw/sprites/items/item-silicon.png and b/core/assets-raw/sprites/items/item-silicon.png differ
diff --git a/core/assets-raw/sprites/items/item-steel.png b/core/assets-raw/sprites/items/item-steel.png
index 7a7acaa344..1041b9b05a 100644
Binary files a/core/assets-raw/sprites/items/item-steel.png and b/core/assets-raw/sprites/items/item-steel.png differ
diff --git a/core/assets-raw/sprites/items/item-thorium.png b/core/assets-raw/sprites/items/item-thorium.png
index 8d27ce7004..3f4bc57bfe 100644
Binary files a/core/assets-raw/sprites/items/item-thorium.png and b/core/assets-raw/sprites/items/item-thorium.png differ
diff --git a/core/assets-raw/sprites/items/item-titanium.png b/core/assets-raw/sprites/items/item-titanium.png
index 5ee7ecc63c..de982e6445 100644
Binary files a/core/assets-raw/sprites/items/item-titanium.png and b/core/assets-raw/sprites/items/item-titanium.png differ
diff --git a/core/assets/sprites/sprites.atlas b/core/assets/sprites/sprites.atlas
index 72b4b598f7..671f6dab11 100644
--- a/core/assets/sprites/sprites.atlas
+++ b/core/assets/sprites/sprites.atlas
@@ -118,98 +118,98 @@ core
   index: -1
 junction
   rotate: false
-  xy: 708, 274
+  xy: 728, 268
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconduit
   rotate: false
-  xy: 712, 284
+  xy: 738, 268
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconduit-arrow
   rotate: false
-  xy: 722, 288
+  xy: 748, 268
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconduit-bridge
   rotate: false
-  xy: 732, 288
+  xy: 758, 275
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconduit-end
   rotate: false
-  xy: 742, 288
+  xy: 758, 265
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconveyor
   rotate: false
-  xy: 752, 288
+  xy: 768, 274
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconveyor-arrow
   rotate: false
-  xy: 718, 274
+  xy: 768, 264
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconveyor-bridge
   rotate: false
-  xy: 728, 278
+  xy: 778, 274
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 laserconveyor-end
   rotate: false
-  xy: 738, 278
+  xy: 778, 264
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidjunction
   rotate: false
-  xy: 758, 275
+  xy: 420, 53
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidrouter
   rotate: false
-  xy: 758, 265
+  xy: 410, 43
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidrouter-bottom
   rotate: false
-  xy: 768, 274
+  xy: 420, 43
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidrouter-liquid
   rotate: false
-  xy: 768, 264
+  xy: 410, 33
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidrouter-top
   rotate: false
-  xy: 778, 274
+  xy: 420, 33
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -244,77 +244,77 @@ multiplexer
   index: -1
 overflowgate
   rotate: false
-  xy: 420, 33
+  xy: 597, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 poweredconveyor
   rotate: false
-  xy: 567, 195
+  xy: 617, 180
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 poweredconveyormove
   rotate: false
-  xy: 557, 185
+  xy: 577, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulseconduit-bottom
   rotate: false
-  xy: 577, 188
+  xy: 617, 170
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulseconduit-top
   rotate: false
-  xy: 587, 188
+  xy: 495, 94
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 router
   rotate: false
-  xy: 495, 94
+  xy: 925, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sortedunloader
   rotate: false
-  xy: 845, 449
+  xy: 965, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sorter
   rotate: false
-  xy: 855, 449
+  xy: 975, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 splitter
   rotate: false
-  xy: 875, 449
+  xy: 995, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steelconveyor
   rotate: false
-  xy: 885, 449
+  xy: 1005, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steelconveyormove
   rotate: false
-  xy: 895, 449
+  xy: 1015, 447
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -328,7 +328,7 @@ teleporter-top
   index: -1
 unloader
   rotate: false
-  xy: 944, 439
+  xy: 841, 419
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -601,7 +601,7 @@ iron3
   index: -1
 lava
   rotate: false
-  xy: 748, 278
+  xy: 782, 284
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -615,63 +615,63 @@ lavaedge
   index: -1
 lead1
   rotate: false
-  xy: 772, 284
+  xy: 788, 264
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead2
   rotate: false
-  xy: 728, 268
+  xy: 609, 190
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 lead3
   rotate: false
-  xy: 738, 268
+  xy: 619, 190
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor1
   rotate: false
-  xy: 788, 274
+  xy: 557, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor2
   rotate: false
-  xy: 788, 264
+  xy: 557, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor3
   rotate: false
-  xy: 609, 190
+  xy: 567, 185
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor4
   rotate: false
-  xy: 619, 190
+  xy: 567, 175
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor5
   rotate: false
-  xy: 410, 53
+  xy: 577, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 metalfloor6
   rotate: false
-  xy: 420, 53
+  xy: 587, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -685,14 +685,14 @@ metalflooredge
   index: -1
 mossblock
   rotate: false
-  xy: 410, 43
+  xy: 577, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 oil
   rotate: false
-  xy: 420, 43
+  xy: 597, 188
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -706,56 +706,56 @@ oiledge
   index: -1
 rock1
   rotate: false
-  xy: 607, 170
+  xy: 905, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rock2
   rotate: false
-  xy: 617, 170
+  xy: 915, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand1
   rotate: false
-  xy: 835, 459
+  xy: 955, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand2
   rotate: false
-  xy: 845, 459
+  xy: 965, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sand3
   rotate: false
-  xy: 855, 459
+  xy: 975, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sandblock1
   rotate: false
-  xy: 865, 459
+  xy: 985, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sandblock2
   rotate: false
-  xy: 875, 459
+  xy: 995, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 sandblock3
   rotate: false
-  xy: 885, 459
+  xy: 1005, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -769,56 +769,56 @@ sandedge
   index: -1
 shrub
   rotate: false
-  xy: 955, 459
+  xy: 855, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shrubshadow
   rotate: false
-  xy: 965, 459
+  xy: 865, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow1
   rotate: false
-  xy: 995, 459
+  xy: 895, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow2
   rotate: false
-  xy: 1005, 459
+  xy: 905, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snow3
   rotate: false
-  xy: 1015, 457
+  xy: 915, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snowblock1
   rotate: false
-  xy: 815, 447
+  xy: 925, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snowblock2
   rotate: false
-  xy: 814, 437
+  xy: 935, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 snowblock3
   rotate: false
-  xy: 825, 449
+  xy: 945, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -832,7 +832,7 @@ snowedge
   index: -1
 space
   rotate: false
-  xy: 865, 449
+  xy: 985, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -846,42 +846,42 @@ spaceedge
   index: -1
 stone1
   rotate: false
-  xy: 945, 449
+  xy: 834, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone2
   rotate: false
-  xy: 955, 449
+  xy: 844, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stone3
   rotate: false
-  xy: 965, 449
+  xy: 854, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneblock1
   rotate: false
-  xy: 975, 449
+  xy: 864, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneblock2
   rotate: false
-  xy: 985, 449
+  xy: 874, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneblock3
   rotate: false
-  xy: 995, 449
+  xy: 884, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -895,49 +895,49 @@ stoneedge
   index: -1
 thorium1
   rotate: false
-  xy: 821, 407
+  xy: 934, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium2
   rotate: false
-  xy: 824, 437
+  xy: 944, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 thorium3
   rotate: false
-  xy: 834, 439
+  xy: 954, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium1
   rotate: false
-  xy: 844, 439
+  xy: 964, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium2
   rotate: false
-  xy: 854, 439
+  xy: 974, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titanium3
   rotate: false
-  xy: 864, 439
+  xy: 984, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 water
   rotate: false
-  xy: 974, 439
+  xy: 851, 419
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1028,7 +1028,7 @@ nuclearreactor-shadow
   index: -1
 playerspawn
   rotate: false
-  xy: 557, 195
+  xy: 607, 180
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1217,7 +1217,7 @@ largesolarpanel
   index: -1
 liquidcombustiongenerator
   rotate: false
-  xy: 748, 268
+  xy: 410, 53
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1245,14 +1245,14 @@ nuclearreactor-lights
   index: -1
 powerinfinite
   rotate: false
-  xy: 557, 175
+  xy: 587, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 powernode
   rotate: false
-  xy: 567, 185
+  xy: 597, 168
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1273,28 +1273,28 @@ powernodelarge-shadow
   index: -1
 powervoid
   rotate: false
-  xy: 567, 175
+  xy: 607, 170
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rtgenerator
   rotate: false
-  xy: 815, 457
+  xy: 935, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 rtgenerator-top
   rotate: false
-  xy: 825, 459
+  xy: 945, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shieldgenerator
   rotate: false
-  xy: 915, 459
+  xy: 814, 437
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1308,7 +1308,7 @@ shieldprojector
   index: -1
 solarpanel
   rotate: false
-  xy: 835, 449
+  xy: 955, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1329,7 +1329,7 @@ teleporter-top
   index: -1
 thermalgenerator
   rotate: false
-  xy: 821, 417
+  xy: 924, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1490,14 +1490,14 @@ irondrill-top
   index: -1
 itemsource
   rotate: false
-  xy: 698, 274
+  xy: 762, 285
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 itemvoid
   rotate: false
-  xy: 702, 284
+  xy: 772, 284
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1525,21 +1525,21 @@ laserdrill-top
   index: -1
 lavasmelter
   rotate: false
-  xy: 762, 285
+  xy: 788, 274
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 liquidsource
   rotate: false
-  xy: 778, 264
+  xy: 557, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 melter
   rotate: false
-  xy: 782, 284
+  xy: 567, 195
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1602,7 +1602,7 @@ oilextractor-top
   index: -1
 oilrefinery
   rotate: false
-  xy: 410, 33
+  xy: 587, 178
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1686,63 +1686,63 @@ siliconsmelter-top
   index: -1
 pulverizer
   rotate: false
-  xy: 577, 178
+  xy: 815, 457
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pulverizer-rotator
   rotate: false
-  xy: 597, 188
+  xy: 825, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 pump
   rotate: false
-  xy: 587, 178
+  xy: 835, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 reinforceddrill
   rotate: false
-  xy: 597, 178
+  xy: 845, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 reinforceddrill-rotator
   rotate: false
-  xy: 607, 180
+  xy: 855, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 reinforceddrill-top
   rotate: false
-  xy: 617, 180
+  xy: 865, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator
   rotate: false
-  xy: 895, 459
+  xy: 1015, 457
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 separator-liquid
   rotate: false
-  xy: 905, 459
+  xy: 815, 447
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 siliconextractor
   rotate: false
-  xy: 975, 459
+  xy: 875, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -1756,56 +1756,56 @@ siliconsmelter
   index: -1
 smelter
   rotate: false
-  xy: 985, 459
+  xy: 885, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steeldrill
   rotate: false
-  xy: 905, 449
+  xy: 821, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steeldrill-rotator
   rotate: false
-  xy: 915, 449
+  xy: 821, 417
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 steeldrill-top
   rotate: false
-  xy: 925, 449
+  xy: 821, 407
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stonedrill
   rotate: false
-  xy: 1005, 449
+  xy: 894, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 stoneformer
   rotate: false
-  xy: 1015, 447
+  xy: 904, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titaniumdrill
   rotate: false
-  xy: 874, 439
+  xy: 994, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titaniumdrill-top
   rotate: false
-  xy: 884, 439
+  xy: 1004, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2113,21 +2113,21 @@ walkerfactory-top-open
   index: -1
 repairpoint
   rotate: false
-  xy: 577, 168
+  xy: 875, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 repairpoint-turret
   rotate: false
-  xy: 587, 168
+  xy: 885, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 resupplypoint
   rotate: false
-  xy: 597, 168
+  xy: 895, 459
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2190,7 +2190,7 @@ ironwall
   index: -1
 steelwall
   rotate: false
-  xy: 935, 449
+  xy: 824, 437
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2204,21 +2204,21 @@ steelwall-large
   index: -1
 stonewall
   rotate: false
-  xy: 821, 427
+  xy: 914, 439
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titaniumshieldwall
   rotate: false
-  xy: 894, 439
+  xy: 1014, 437
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 titaniumwall
   rotate: false
-  xy: 904, 439
+  xy: 831, 427
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2323,7 +2323,7 @@ shell-back
   index: -1
 shot
   rotate: false
-  xy: 945, 459
+  xy: 845, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2337,7 +2337,7 @@ transfer
   index: -1
 transfer-arrow
   rotate: false
-  xy: 914, 439
+  xy: 831, 417
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
@@ -2349,97 +2349,181 @@ transfer-end
   orig: 18, 18
   offset: 0, 0
   index: -1
-item-biomatter
+item-armor-piercing-bullet
   rotate: false
   xy: 765, 295
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-item-coal
-  rotate: false
-  xy: 775, 294
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-item-densealloy
-  rotate: false
-  xy: 642, 284
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-item-iron
+item-composite-flak
   rotate: false
   xy: 648, 274
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-item-lead
-  rotate: false
-  xy: 652, 284
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-item-plastic
+item-explosive-shell
   rotate: false
   xy: 658, 274
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-item-rdx
+item-frag-shell
   rotate: false
   xy: 662, 284
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-item-sand
+item-homing-bullet
   rotate: false
   xy: 668, 274
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-item-silicon
+item-incendiary-mortar-shell
   rotate: false
   xy: 672, 284
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-item-steel
-  rotate: false
-  xy: 678, 274
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-item-stone
-  rotate: false
-  xy: 682, 284
-  size: 8, 8
-  orig: 8, 8
-  offset: 0, 0
-  index: -1
-item-thorium
+item-lead-bullet
   rotate: false
   xy: 688, 274
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
-item-titanium
+item-scythe-missile
+  rotate: false
+  xy: 708, 274
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+item-surge-mortar-shell
+  rotate: false
+  xy: 742, 288
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+item-swarm-missile
+  rotate: false
+  xy: 752, 288
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+item-thorium-shell
+  rotate: false
+  xy: 728, 278
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+item-tracer-bullet
+  rotate: false
+  xy: 748, 278
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+item-biomatter
+  rotate: false
+  xy: 775, 294
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+item-coal
+  rotate: false
+  xy: 642, 284
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+item-densealloy
+  rotate: false
+  xy: 652, 284
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+item-iron
+  rotate: false
+  xy: 678, 274
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+item-lead
+  rotate: false
+  xy: 682, 284
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+item-plastic
   rotate: false
   xy: 692, 284
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
+item-rdx
+  rotate: false
+  xy: 698, 274
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+item-sand
+  rotate: false
+  xy: 702, 284
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+item-silicon
+  rotate: false
+  xy: 712, 284
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+item-steel
+  rotate: false
+  xy: 722, 288
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+item-stone
+  rotate: false
+  xy: 732, 288
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+item-thorium
+  rotate: false
+  xy: 718, 274
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
+item-titanium
+  rotate: false
+  xy: 738, 278
+  size: 8, 8
+  orig: 8, 8
+  offset: 0, 0
+  index: -1
 standard-mech
   rotate: false
   xy: 350, 47
@@ -3548,42 +3632,42 @@ clustergun-equip
   index: -1
 shockgun
   rotate: false
-  xy: 925, 459
+  xy: 825, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 shockgun-equip
   rotate: false
-  xy: 935, 459
+  xy: 835, 449
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 triblaster
   rotate: false
-  xy: 924, 439
+  xy: 831, 407
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 triblaster-equip
   rotate: false
-  xy: 934, 439
+  xy: 841, 429
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 vulcan
   rotate: false
-  xy: 954, 439
+  xy: 851, 429
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
   index: -1
 vulcan-equip
   rotate: false
-  xy: 964, 439
+  xy: 841, 409
   size: 8, 8
   orig: 8, 8
   offset: 0, 0
diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png
index 3bed0ce35e..57d1b4718b 100644
Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ
diff --git a/core/src/io/anuke/mindustry/content/AmmoItems.java b/core/src/io/anuke/mindustry/content/AmmoItems.java
index 1fca459b3e..9c86010701 100644
--- a/core/src/io/anuke/mindustry/content/AmmoItems.java
+++ b/core/src/io/anuke/mindustry/content/AmmoItems.java
@@ -7,51 +7,51 @@ import io.anuke.mindustry.type.ItemType;
 public class AmmoItems {
     public static final Item
 
-    leadBullet = new Item("lead-bullet", Color.GRAY){{
+    leadBullet = new Item("lead-bullet", Color.valueOf("8e85a2")){{
         type = ItemType.ammo;
     }},
 
-    compositeFlak = new Item("composite-flak", Color.GRAY){{
+    armorPiercingBullet = new Item("armor-piercing-bullet", Color.valueOf("f9a3c7")){{
         type = ItemType.ammo;
     }},
 
-    armorPiercingBullet = new Item("armor-piercing-bullet", Color.GRAY){{
+    homingBullet = new Item("homing-bullet", Color.valueOf("6a6c72")){{
         type = ItemType.ammo;
     }},
 
-    homingBullet = new Item("homing-bullet", Color.GRAY){{
+    tracerBullet = new Item("tracer-bullet", Color.valueOf("ffe58b")){{
         type = ItemType.ammo;
     }},
 
-    tracerBullet = new Item("tracer-bullet", Color.GRAY){{
+    compositeFlak = new Item("composite-flak", Color.valueOf("e9ead3")){{
         type = ItemType.ammo;
     }},
 
-    explosiveShell = new Item("explosive-shell", Color.GRAY){{
+    explosiveShell = new Item("explosive-shell", Color.valueOf("ff795e")){{
         type = ItemType.ammo;
     }},
 
-    fragShell = new Item("frag-shell", Color.GRAY){{
+    fragShell = new Item("frag-shell", Color.valueOf("e9ead3")){{
         type = ItemType.ammo;
     }},
 
-    thoriumShell = new Item("thorium-shell", Color.GRAY){{
+    thoriumShell = new Item("thorium-shell", Color.valueOf("f9a3c7")){{
         type = ItemType.ammo;
     }},
 
-    swarmMissile = new Item("swarm-missile", Color.GRAY){{
+    swarmMissile = new Item("swarm-missile", Color.valueOf("ff795e")){{
         type = ItemType.ammo;
     }},
 
-    scytheMissile = new Item("scythe-missile", Color.GRAY){{
+    scytheMissile = new Item("scythe-missile", Color.valueOf("f9a3c7")){{
         type = ItemType.ammo;
     }},
 
-    incendiaryMortarShell = new Item("incendiary-mortar-shell", Color.GRAY){{
+    incendiaryMortarShell = new Item("incendiary-mortar-shell", Color.valueOf("ffe58b")){{
         type = ItemType.ammo;
     }},
 
-    surgeMortarShell = new Item("surge-mortar-shell", Color.GRAY){{
+    surgeMortarShell = new Item("surge-mortar-shell", Color.valueOf("bcddff")){{
         type = ItemType.ammo;
     }};
 }
diff --git a/core/src/io/anuke/mindustry/content/Items.java b/core/src/io/anuke/mindustry/content/Items.java
index 6b5bfa921d..36e65ec738 100644
--- a/core/src/io/anuke/mindustry/content/Items.java
+++ b/core/src/io/anuke/mindustry/content/Items.java
@@ -36,7 +36,7 @@ public class Items {
         hardness = 3;
     }},
 
-    thorium = new Item("thorium", Color.valueOf("bb80bd")) {{
+    thorium = new Item("thorium", Color.valueOf("f9a3c7")) {{
         explosiveness = 0.1f;
         hardness = 4;
     }},
diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java
index 1da08b2f29..31069946d0 100644
--- a/core/src/io/anuke/mindustry/core/Renderer.java
+++ b/core/src/io/anuke/mindustry/core/Renderer.java
@@ -182,6 +182,10 @@ public class Renderer extends RendererModule{
 
 			camera.position.set(lastx - deltax, lasty - deltay, 0);
 		}
+
+		if(debug && !ui.chatfrag.chatOpen()) {
+			renderer.record(); //this only does something if GdxGifRecorder is on the class path, which it usually isn't
+		}
 	}
 
 	@Override
diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java
index f70d86a16f..5bbd123d08 100644
--- a/core/src/io/anuke/mindustry/core/UI.java
+++ b/core/src/io/anuke/mindustry/core/UI.java
@@ -134,10 +134,6 @@ public class UI extends SceneModule{
 		
 		act();
 
-		if(debug && !ui.chatfrag.chatOpen()) {
-            renderer.record(); //this only does something if GdxGifRecorder is on the class path, which it usually isn't
-        }
-
         for(int i = 0; i < players.length; i ++){
 		    InputHandler input = control.input(i);