diff --git a/megamek/data/images/units/Infantry/Infantry_UMU_Platoon.png b/megamek/data/images/units/Infantry/Infantry_UMU_Platoon.png
index d3b5abdb43..b850cdb980 100644
Binary files a/megamek/data/images/units/Infantry/Infantry_UMU_Platoon.png and b/megamek/data/images/units/Infantry/Infantry_UMU_Platoon.png differ
diff --git a/megamek/data/images/units/Infantry/Infantry_UMU_Squad.png b/megamek/data/images/units/Infantry/Infantry_UMU_Squad.png
index dc5ae8ed5c..00c4ddbb50 100644
Binary files a/megamek/data/images/units/Infantry/Infantry_UMU_Squad.png and b/megamek/data/images/units/Infantry/Infantry_UMU_Squad.png differ
diff --git a/megamek/data/images/units/Infantry/Infantry_VTOL_Platoon.png b/megamek/data/images/units/Infantry/Infantry_VTOL_Platoon.png
index 80e37a012d..1f38969bf4 100644
Binary files a/megamek/data/images/units/Infantry/Infantry_VTOL_Platoon.png and b/megamek/data/images/units/Infantry/Infantry_VTOL_Platoon.png differ
diff --git a/megamek/data/images/units/Infantry/Infantry_VTOL_Squad.png b/megamek/data/images/units/Infantry/Infantry_VTOL_Squad.png
index dcec6ae432..b85ad1ca8b 100644
Binary files a/megamek/data/images/units/Infantry/Infantry_VTOL_Squad.png and b/megamek/data/images/units/Infantry/Infantry_VTOL_Squad.png differ
diff --git a/megamek/data/images/units/Infantry/anti-infantry_unit_SLAI.png b/megamek/data/images/units/Infantry/anti-infantry_unit_SLAI.png
new file mode 100644
index 0000000000..cad4721928
Binary files /dev/null and b/megamek/data/images/units/Infantry/anti-infantry_unit_SLAI.png differ
diff --git a/megamek/data/images/units/Infantry/anti-mech_jump_infantry_TUI.png b/megamek/data/images/units/Infantry/anti-mech_jump_infantry_TUI.png
new file mode 100644
index 0000000000..a861c0c529
Binary files /dev/null and b/megamek/data/images/units/Infantry/anti-mech_jump_infantry_TUI.png differ
diff --git a/megamek/data/images/units/Infantry/arrow_fieldgun.png b/megamek/data/images/units/Infantry/arrow_fieldgun.png
index 6ad504903c..d3b53a1c25 100644
Binary files a/megamek/data/images/units/Infantry/arrow_fieldgun.png and b/megamek/data/images/units/Infantry/arrow_fieldgun.png differ
diff --git a/megamek/data/images/units/Infantry/atlas.xcf b/megamek/data/images/units/Infantry/atlas.xcf
new file mode 100644
index 0000000000..e4bdf9b458
Binary files /dev/null and b/megamek/data/images/units/Infantry/atlas.xcf differ
diff --git a/megamek/data/images/units/Infantry/blue_water_marine_response_teams.png b/megamek/data/images/units/Infantry/blue_water_marine_response_teams.png
index a4d0f69566..fc084cfce9 100644
Binary files a/megamek/data/images/units/Infantry/blue_water_marine_response_teams.png and b/megamek/data/images/units/Infantry/blue_water_marine_response_teams.png differ
diff --git a/megamek/data/images/units/Infantry/ceremonial_guard_CRG_MH.png b/megamek/data/images/units/Infantry/ceremonial_guard_CRG_MH.png
new file mode 100644
index 0000000000..5e27dc0f8c
Binary files /dev/null and b/megamek/data/images/units/Infantry/ceremonial_guard_CRG_MH.png differ
diff --git a/megamek/data/images/units/Infantry/clan_foot_infantry_AHP.png b/megamek/data/images/units/Infantry/clan_foot_infantry_AHP.png
new file mode 100644
index 0000000000..4c9c96a4b9
Binary files /dev/null and b/megamek/data/images/units/Infantry/clan_foot_infantry_AHP.png differ
diff --git a/megamek/data/images/units/Infantry/clan_heavy_jump_infantry_HIP.png b/megamek/data/images/units/Infantry/clan_heavy_jump_infantry_HIP.png
new file mode 100644
index 0000000000..dfb2c973e3
Binary files /dev/null and b/megamek/data/images/units/Infantry/clan_heavy_jump_infantry_HIP.png differ
diff --git a/megamek/data/images/units/Infantry/clan_mechanized_infantry_MWCIP.png b/megamek/data/images/units/Infantry/clan_mechanized_infantry_MWCIP.png
new file mode 100644
index 0000000000..2112b99567
Binary files /dev/null and b/megamek/data/images/units/Infantry/clan_mechanized_infantry_MWCIP.png differ
diff --git a/megamek/data/images/units/Infantry/fieldgunac10.png b/megamek/data/images/units/Infantry/fieldgunac10.png
index 870cd08175..f17bf651d7 100644
Binary files a/megamek/data/images/units/Infantry/fieldgunac10.png and b/megamek/data/images/units/Infantry/fieldgunac10.png differ
diff --git a/megamek/data/images/units/Infantry/fieldgunac2.png b/megamek/data/images/units/Infantry/fieldgunac2.png
new file mode 100644
index 0000000000..1853146aff
Binary files /dev/null and b/megamek/data/images/units/Infantry/fieldgunac2.png differ
diff --git a/megamek/data/images/units/Infantry/fieldgunac20.png b/megamek/data/images/units/Infantry/fieldgunac20.png
index 90b5ffd1c5..c5228a9ca4 100644
Binary files a/megamek/data/images/units/Infantry/fieldgunac20.png and b/megamek/data/images/units/Infantry/fieldgunac20.png differ
diff --git a/megamek/data/images/units/Infantry/fieldgunac5.png b/megamek/data/images/units/Infantry/fieldgunac5.png
index 5bd2df2e4b..db9818b4b2 100644
Binary files a/megamek/data/images/units/Infantry/fieldgunac5.png and b/megamek/data/images/units/Infantry/fieldgunac5.png differ
diff --git a/megamek/data/images/units/Infantry/fieldgungauss.png b/megamek/data/images/units/Infantry/fieldgungauss.png
index 2704d92ac9..e4c0605e54 100644
Binary files a/megamek/data/images/units/Infantry/fieldgungauss.png and b/megamek/data/images/units/Infantry/fieldgungauss.png differ
diff --git a/megamek/data/images/units/Infantry/fieldgunlbx10.png b/megamek/data/images/units/Infantry/fieldgunlbx10.png
new file mode 100644
index 0000000000..cbc5ca642c
Binary files /dev/null and b/megamek/data/images/units/Infantry/fieldgunlbx10.png differ
diff --git a/megamek/data/images/units/Infantry/fieldgunlbx2.png b/megamek/data/images/units/Infantry/fieldgunlbx2.png
new file mode 100644
index 0000000000..a4068656e3
Binary files /dev/null and b/megamek/data/images/units/Infantry/fieldgunlbx2.png differ
diff --git a/megamek/data/images/units/Infantry/fieldgunlbx20.png b/megamek/data/images/units/Infantry/fieldgunlbx20.png
new file mode 100644
index 0000000000..a055da366e
Binary files /dev/null and b/megamek/data/images/units/Infantry/fieldgunlbx20.png differ
diff --git a/megamek/data/images/units/Infantry/fieldgunlbx5.png b/megamek/data/images/units/Infantry/fieldgunlbx5.png
new file mode 100644
index 0000000000..b88987686d
Binary files /dev/null and b/megamek/data/images/units/Infantry/fieldgunlbx5.png differ
diff --git a/megamek/data/images/units/Infantry/fieldgunlightgauss.png b/megamek/data/images/units/Infantry/fieldgunlightgauss.png
new file mode 100644
index 0000000000..32fa36606e
Binary files /dev/null and b/megamek/data/images/units/Infantry/fieldgunlightgauss.png differ
diff --git a/megamek/data/images/units/Infantry/fieldgunrac2.png b/megamek/data/images/units/Infantry/fieldgunrac2.png
new file mode 100644
index 0000000000..7777479aaa
Binary files /dev/null and b/megamek/data/images/units/Infantry/fieldgunrac2.png differ
diff --git a/megamek/data/images/units/Infantry/fieldgunrac5.png b/megamek/data/images/units/Infantry/fieldgunrac5.png
new file mode 100644
index 0000000000..d71b816702
Binary files /dev/null and b/megamek/data/images/units/Infantry/fieldgunrac5.png differ
diff --git a/megamek/data/images/units/Infantry/flamer_infantry.png b/megamek/data/images/units/Infantry/flamer_infantry.png
index 20ebd4b6d9..a920700b71 100644
Binary files a/megamek/data/images/units/Infantry/flamer_infantry.png and b/megamek/data/images/units/Infantry/flamer_infantry.png differ
diff --git a/megamek/data/images/units/Infantry/flamer_infantry_platoon.png b/megamek/data/images/units/Infantry/flamer_infantry_platoon.png
index 8006b012f1..1fb63e6faa 100644
Binary files a/megamek/data/images/units/Infantry/flamer_infantry_platoon.png and b/megamek/data/images/units/Infantry/flamer_infantry_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/flamer_jump_infantry.png b/megamek/data/images/units/Infantry/flamer_jump_infantry.png
index 367704413b..7dbe55a1e6 100644
Binary files a/megamek/data/images/units/Infantry/flamer_jump_infantry.png and b/megamek/data/images/units/Infantry/flamer_jump_infantry.png differ
diff --git a/megamek/data/images/units/Infantry/flamer_jump_infantry_platoon.png b/megamek/data/images/units/Infantry/flamer_jump_infantry_platoon.png
index ea9c5616c1..4967f3c967 100644
Binary files a/megamek/data/images/units/Infantry/flamer_jump_infantry_platoon.png and b/megamek/data/images/units/Infantry/flamer_jump_infantry_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/flamer_mecha_h.png b/megamek/data/images/units/Infantry/flamer_mecha_h.png
index fdf3605baf..520fba2c1b 100644
Binary files a/megamek/data/images/units/Infantry/flamer_mecha_h.png and b/megamek/data/images/units/Infantry/flamer_mecha_h.png differ
diff --git a/megamek/data/images/units/Infantry/flamer_mecha_h_platoon.png b/megamek/data/images/units/Infantry/flamer_mecha_h_platoon.png
index 2a6b8e69f8..742255477e 100644
Binary files a/megamek/data/images/units/Infantry/flamer_mecha_h_platoon.png and b/megamek/data/images/units/Infantry/flamer_mecha_h_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/flamer_mecha_t.png b/megamek/data/images/units/Infantry/flamer_mecha_t.png
index 3d4239c6db..ba7b00d456 100644
Binary files a/megamek/data/images/units/Infantry/flamer_mecha_t.png and b/megamek/data/images/units/Infantry/flamer_mecha_t.png differ
diff --git a/megamek/data/images/units/Infantry/flamer_mecha_t_platoon.png b/megamek/data/images/units/Infantry/flamer_mecha_t_platoon.png
index d404c34586..5ea3df0b98 100644
Binary files a/megamek/data/images/units/Infantry/flamer_mecha_t_platoon.png and b/megamek/data/images/units/Infantry/flamer_mecha_t_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/flamer_mecha_w.png b/megamek/data/images/units/Infantry/flamer_mecha_w.png
index f615d3ef80..30e1a49459 100644
Binary files a/megamek/data/images/units/Infantry/flamer_mecha_w.png and b/megamek/data/images/units/Infantry/flamer_mecha_w.png differ
diff --git a/megamek/data/images/units/Infantry/flamer_mecha_w_platoon.png b/megamek/data/images/units/Infantry/flamer_mecha_w_platoon.png
index b041028f2c..b7f43ccff2 100644
Binary files a/megamek/data/images/units/Infantry/flamer_mecha_w_platoon.png and b/megamek/data/images/units/Infantry/flamer_mecha_w_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/flamer_motorized_infantry.png b/megamek/data/images/units/Infantry/flamer_motorized_infantry.png
index 6d3fcff6fb..9d19a71751 100644
Binary files a/megamek/data/images/units/Infantry/flamer_motorized_infantry.png and b/megamek/data/images/units/Infantry/flamer_motorized_infantry.png differ
diff --git a/megamek/data/images/units/Infantry/flamer_motorized_infantry_platoon.png b/megamek/data/images/units/Infantry/flamer_motorized_infantry_platoon.png
index 5218e67e16..1ec43db787 100644
Binary files a/megamek/data/images/units/Infantry/flamer_motorized_infantry_platoon.png and b/megamek/data/images/units/Infantry/flamer_motorized_infantry_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/foot_infantry_RIG.png b/megamek/data/images/units/Infantry/foot_infantry_RIG.png
new file mode 100644
index 0000000000..dd1434440e
Binary files /dev/null and b/megamek/data/images/units/Infantry/foot_infantry_RIG.png differ
diff --git a/megamek/data/images/units/Infantry/jump_infantry.png b/megamek/data/images/units/Infantry/jump_infantry.png
index 703ed98082..fae0e8454e 100644
Binary files a/megamek/data/images/units/Infantry/jump_infantry.png and b/megamek/data/images/units/Infantry/jump_infantry.png differ
diff --git a/megamek/data/images/units/Infantry/jump_infantry_platoon.png b/megamek/data/images/units/Infantry/jump_infantry_platoon.png
index fceccbefbe..15a7f280e0 100644
Binary files a/megamek/data/images/units/Infantry/jump_infantry_platoon.png and b/megamek/data/images/units/Infantry/jump_infantry_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/laser_infantry.png b/megamek/data/images/units/Infantry/laser_infantry.png
index 2d9522cf07..c35d884d35 100644
Binary files a/megamek/data/images/units/Infantry/laser_infantry.png and b/megamek/data/images/units/Infantry/laser_infantry.png differ
diff --git a/megamek/data/images/units/Infantry/laser_infantry_platoon.png b/megamek/data/images/units/Infantry/laser_infantry_platoon.png
index 1133a8bcd3..386d95004a 100644
Binary files a/megamek/data/images/units/Infantry/laser_infantry_platoon.png and b/megamek/data/images/units/Infantry/laser_infantry_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/laser_jump_infantry.png b/megamek/data/images/units/Infantry/laser_jump_infantry.png
index 0c639fd5fb..d7075c68c9 100644
Binary files a/megamek/data/images/units/Infantry/laser_jump_infantry.png and b/megamek/data/images/units/Infantry/laser_jump_infantry.png differ
diff --git a/megamek/data/images/units/Infantry/laser_jump_infantry_platoon.png b/megamek/data/images/units/Infantry/laser_jump_infantry_platoon.png
index 3e2b29980d..9fdea88a3c 100644
Binary files a/megamek/data/images/units/Infantry/laser_jump_infantry_platoon.png and b/megamek/data/images/units/Infantry/laser_jump_infantry_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/laser_mecha_h.png b/megamek/data/images/units/Infantry/laser_mecha_h.png
new file mode 100644
index 0000000000..072e43bc32
Binary files /dev/null and b/megamek/data/images/units/Infantry/laser_mecha_h.png differ
diff --git a/megamek/data/images/units/Infantry/laser_mecha_h_platoon.png b/megamek/data/images/units/Infantry/laser_mecha_h_platoon.png
new file mode 100644
index 0000000000..7dc263739e
Binary files /dev/null and b/megamek/data/images/units/Infantry/laser_mecha_h_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/laser_mecha_t.png b/megamek/data/images/units/Infantry/laser_mecha_t.png
new file mode 100644
index 0000000000..3fbe5094d9
Binary files /dev/null and b/megamek/data/images/units/Infantry/laser_mecha_t.png differ
diff --git a/megamek/data/images/units/Infantry/laser_mecha_t_platoon.png b/megamek/data/images/units/Infantry/laser_mecha_t_platoon.png
new file mode 100644
index 0000000000..8c2be10237
Binary files /dev/null and b/megamek/data/images/units/Infantry/laser_mecha_t_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/laser_mecha_w.png b/megamek/data/images/units/Infantry/laser_mecha_w.png
new file mode 100644
index 0000000000..aebb055df3
Binary files /dev/null and b/megamek/data/images/units/Infantry/laser_mecha_w.png differ
diff --git a/megamek/data/images/units/Infantry/laser_mecha_w_platoon.png b/megamek/data/images/units/Infantry/laser_mecha_w_platoon.png
new file mode 100644
index 0000000000..92c288bc1c
Binary files /dev/null and b/megamek/data/images/units/Infantry/laser_mecha_w_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/laser_motorized_infantry.png b/megamek/data/images/units/Infantry/laser_motorized_infantry.png
new file mode 100644
index 0000000000..b23d34903e
Binary files /dev/null and b/megamek/data/images/units/Infantry/laser_motorized_infantry.png differ
diff --git a/megamek/data/images/units/Infantry/laser_motorized_infantry_platoon.png b/megamek/data/images/units/Infantry/laser_motorized_infantry_platoon.png
new file mode 100644
index 0000000000..58807e17c9
Binary files /dev/null and b/megamek/data/images/units/Infantry/laser_motorized_infantry_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/lrm_infantry.png b/megamek/data/images/units/Infantry/lrm_infantry.png
index 77c5d08b98..72af07661e 100644
Binary files a/megamek/data/images/units/Infantry/lrm_infantry.png and b/megamek/data/images/units/Infantry/lrm_infantry.png differ
diff --git a/megamek/data/images/units/Infantry/lrm_infantry_platoon.png b/megamek/data/images/units/Infantry/lrm_infantry_platoon.png
index adae0944f8..5a3205c3fa 100644
Binary files a/megamek/data/images/units/Infantry/lrm_infantry_platoon.png and b/megamek/data/images/units/Infantry/lrm_infantry_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/lrm_jump_infantry.png b/megamek/data/images/units/Infantry/lrm_jump_infantry.png
index 84746db916..cc34951f23 100644
Binary files a/megamek/data/images/units/Infantry/lrm_jump_infantry.png and b/megamek/data/images/units/Infantry/lrm_jump_infantry.png differ
diff --git a/megamek/data/images/units/Infantry/lrm_jump_infantry_platoon.png b/megamek/data/images/units/Infantry/lrm_jump_infantry_platoon.png
index b55c357dc0..69320f534a 100644
Binary files a/megamek/data/images/units/Infantry/lrm_jump_infantry_platoon.png and b/megamek/data/images/units/Infantry/lrm_jump_infantry_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/lrm_mecha_h.png b/megamek/data/images/units/Infantry/lrm_mecha_h.png
index da512d819d..a769d4a3e5 100644
Binary files a/megamek/data/images/units/Infantry/lrm_mecha_h.png and b/megamek/data/images/units/Infantry/lrm_mecha_h.png differ
diff --git a/megamek/data/images/units/Infantry/lrm_mecha_h_platoon.png b/megamek/data/images/units/Infantry/lrm_mecha_h_platoon.png
index 7c7619b9eb..1131a9f9ba 100644
Binary files a/megamek/data/images/units/Infantry/lrm_mecha_h_platoon.png and b/megamek/data/images/units/Infantry/lrm_mecha_h_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/lrm_mecha_t.png b/megamek/data/images/units/Infantry/lrm_mecha_t.png
index e353e89971..6197cc173f 100644
Binary files a/megamek/data/images/units/Infantry/lrm_mecha_t.png and b/megamek/data/images/units/Infantry/lrm_mecha_t.png differ
diff --git a/megamek/data/images/units/Infantry/lrm_mecha_t_platoon.png b/megamek/data/images/units/Infantry/lrm_mecha_t_platoon.png
index f94e94f960..54d18acfeb 100644
Binary files a/megamek/data/images/units/Infantry/lrm_mecha_t_platoon.png and b/megamek/data/images/units/Infantry/lrm_mecha_t_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/lrm_mecha_w.png b/megamek/data/images/units/Infantry/lrm_mecha_w.png
index 7f7ebe0a3a..a9c805ab01 100644
Binary files a/megamek/data/images/units/Infantry/lrm_mecha_w.png and b/megamek/data/images/units/Infantry/lrm_mecha_w.png differ
diff --git a/megamek/data/images/units/Infantry/lrm_mecha_w_platoon.png b/megamek/data/images/units/Infantry/lrm_mecha_w_platoon.png
index c8fec2c563..7c00c7871e 100644
Binary files a/megamek/data/images/units/Infantry/lrm_mecha_w_platoon.png and b/megamek/data/images/units/Infantry/lrm_mecha_w_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/lrm_motorized_infantry.png b/megamek/data/images/units/Infantry/lrm_motorized_infantry.png
index 0891d53075..c661315f04 100644
Binary files a/megamek/data/images/units/Infantry/lrm_motorized_infantry.png and b/megamek/data/images/units/Infantry/lrm_motorized_infantry.png differ
diff --git a/megamek/data/images/units/Infantry/lrm_motorized_infantry_platoon.png b/megamek/data/images/units/Infantry/lrm_motorized_infantry_platoon.png
index 1be59d789d..5b8eb976e7 100644
Binary files a/megamek/data/images/units/Infantry/lrm_motorized_infantry_platoon.png and b/megamek/data/images/units/Infantry/lrm_motorized_infantry_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/lt_fieldgun.png b/megamek/data/images/units/Infantry/lt_fieldgun.png
index 21109c6fa8..a9cc55aca3 100644
Binary files a/megamek/data/images/units/Infantry/lt_fieldgun.png and b/megamek/data/images/units/Infantry/lt_fieldgun.png differ
diff --git a/megamek/data/images/units/Infantry/manei_domini_attack_squad_TZ.png b/megamek/data/images/units/Infantry/manei_domini_attack_squad_TZ.png
new file mode 100644
index 0000000000..72ce3d3036
Binary files /dev/null and b/megamek/data/images/units/Infantry/manei_domini_attack_squad_TZ.png differ
diff --git a/megamek/data/images/units/Infantry/mecha_h.png b/megamek/data/images/units/Infantry/mecha_h.png
index f9624134a6..2f6e1601fe 100644
Binary files a/megamek/data/images/units/Infantry/mecha_h.png and b/megamek/data/images/units/Infantry/mecha_h.png differ
diff --git a/megamek/data/images/units/Infantry/mecha_h_platoon.png b/megamek/data/images/units/Infantry/mecha_h_platoon.png
index 0cabe7e972..8ea55abcf0 100644
Binary files a/megamek/data/images/units/Infantry/mecha_h_platoon.png and b/megamek/data/images/units/Infantry/mecha_h_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/mecha_t.png b/megamek/data/images/units/Infantry/mecha_t.png
index be0b3221f0..072bc3e2f6 100644
Binary files a/megamek/data/images/units/Infantry/mecha_t.png and b/megamek/data/images/units/Infantry/mecha_t.png differ
diff --git a/megamek/data/images/units/Infantry/mecha_t_platoon.png b/megamek/data/images/units/Infantry/mecha_t_platoon.png
index 9d8a1c03fc..95282e602d 100644
Binary files a/megamek/data/images/units/Infantry/mecha_t_platoon.png and b/megamek/data/images/units/Infantry/mecha_t_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/mecha_w.png b/megamek/data/images/units/Infantry/mecha_w.png
index 2e044ffc0b..6155f3fb50 100644
Binary files a/megamek/data/images/units/Infantry/mecha_w.png and b/megamek/data/images/units/Infantry/mecha_w.png differ
diff --git a/megamek/data/images/units/Infantry/mecha_w_platoon.png b/megamek/data/images/units/Infantry/mecha_w_platoon.png
index 2855575b0e..0a9da24850 100644
Binary files a/megamek/data/images/units/Infantry/mecha_w_platoon.png and b/megamek/data/images/units/Infantry/mecha_w_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/mechwarrior.png b/megamek/data/images/units/Infantry/mechwarrior.png
index 8f29aad312..b6a7be1b4a 100644
Binary files a/megamek/data/images/units/Infantry/mechwarrior.png and b/megamek/data/images/units/Infantry/mechwarrior.png differ
diff --git a/megamek/data/images/units/Infantry/mg_infantry.png b/megamek/data/images/units/Infantry/mg_infantry.png
index 5087075ab5..ec026ad8b3 100644
Binary files a/megamek/data/images/units/Infantry/mg_infantry.png and b/megamek/data/images/units/Infantry/mg_infantry.png differ
diff --git a/megamek/data/images/units/Infantry/mg_infantry_platoon.png b/megamek/data/images/units/Infantry/mg_infantry_platoon.png
index 9c9ac9591d..409b583ce3 100644
Binary files a/megamek/data/images/units/Infantry/mg_infantry_platoon.png and b/megamek/data/images/units/Infantry/mg_infantry_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/mg_jump_infantry.png b/megamek/data/images/units/Infantry/mg_jump_infantry.png
index 7f6ee35dd5..8e6f7ea023 100644
Binary files a/megamek/data/images/units/Infantry/mg_jump_infantry.png and b/megamek/data/images/units/Infantry/mg_jump_infantry.png differ
diff --git a/megamek/data/images/units/Infantry/mg_jump_infantry_platoon.png b/megamek/data/images/units/Infantry/mg_jump_infantry_platoon.png
index 95657ee948..95b4e33ae3 100644
Binary files a/megamek/data/images/units/Infantry/mg_jump_infantry_platoon.png and b/megamek/data/images/units/Infantry/mg_jump_infantry_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/mg_mecha_h.png b/megamek/data/images/units/Infantry/mg_mecha_h.png
index f613ae7508..1122a0570b 100644
Binary files a/megamek/data/images/units/Infantry/mg_mecha_h.png and b/megamek/data/images/units/Infantry/mg_mecha_h.png differ
diff --git a/megamek/data/images/units/Infantry/mg_mecha_h_platoon.png b/megamek/data/images/units/Infantry/mg_mecha_h_platoon.png
index 693206989a..77f345648e 100644
Binary files a/megamek/data/images/units/Infantry/mg_mecha_h_platoon.png and b/megamek/data/images/units/Infantry/mg_mecha_h_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/mg_mecha_t.png b/megamek/data/images/units/Infantry/mg_mecha_t.png
index 53b73681d5..97c1fe04e1 100644
Binary files a/megamek/data/images/units/Infantry/mg_mecha_t.png and b/megamek/data/images/units/Infantry/mg_mecha_t.png differ
diff --git a/megamek/data/images/units/Infantry/mg_mecha_t_platoon.png b/megamek/data/images/units/Infantry/mg_mecha_t_platoon.png
index 561669ac36..df3f9ca274 100644
Binary files a/megamek/data/images/units/Infantry/mg_mecha_t_platoon.png and b/megamek/data/images/units/Infantry/mg_mecha_t_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/mg_mecha_w.png b/megamek/data/images/units/Infantry/mg_mecha_w.png
index 2ef243f85e..e42f20fb7f 100644
Binary files a/megamek/data/images/units/Infantry/mg_mecha_w.png and b/megamek/data/images/units/Infantry/mg_mecha_w.png differ
diff --git a/megamek/data/images/units/Infantry/mg_mecha_w_platoon.png b/megamek/data/images/units/Infantry/mg_mecha_w_platoon.png
index 183cfaed30..4f8d079482 100644
Binary files a/megamek/data/images/units/Infantry/mg_mecha_w_platoon.png and b/megamek/data/images/units/Infantry/mg_mecha_w_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/mg_motorized_infantry.png b/megamek/data/images/units/Infantry/mg_motorized_infantry.png
index e5fcd36642..c1872b3234 100644
Binary files a/megamek/data/images/units/Infantry/mg_motorized_infantry.png and b/megamek/data/images/units/Infantry/mg_motorized_infantry.png differ
diff --git a/megamek/data/images/units/Infantry/mg_motorized_infantry_platoon.png b/megamek/data/images/units/Infantry/mg_motorized_infantry_platoon.png
index 1010f19b55..ea2f164ed5 100644
Binary files a/megamek/data/images/units/Infantry/mg_motorized_infantry_platoon.png and b/megamek/data/images/units/Infantry/mg_motorized_infantry_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/motorized_infantry.png b/megamek/data/images/units/Infantry/motorized_infantry.png
index f1475a083b..9362882031 100644
Binary files a/megamek/data/images/units/Infantry/motorized_infantry.png and b/megamek/data/images/units/Infantry/motorized_infantry.png differ
diff --git a/megamek/data/images/units/Infantry/motorized_infantry_platoon.png b/megamek/data/images/units/Infantry/motorized_infantry_platoon.png
index 7f4ccc587a..e870afd938 100644
Binary files a/megamek/data/images/units/Infantry/motorized_infantry_platoon.png and b/megamek/data/images/units/Infantry/motorized_infantry_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/skaret_assassins.png b/megamek/data/images/units/Infantry/skaret_assassins.png
index dc0181bf9d..8faa9b5cde 100644
Binary files a/megamek/data/images/units/Infantry/skaret_assassins.png and b/megamek/data/images/units/Infantry/skaret_assassins.png differ
diff --git a/megamek/data/images/units/Infantry/sniper_fieldgun.png b/megamek/data/images/units/Infantry/sniper_fieldgun.png
new file mode 100644
index 0000000000..b114fd78ad
Binary files /dev/null and b/megamek/data/images/units/Infantry/sniper_fieldgun.png differ
diff --git a/megamek/data/images/units/Infantry/srm_infantry.png b/megamek/data/images/units/Infantry/srm_infantry.png
index f70e54bc32..de048d5828 100644
Binary files a/megamek/data/images/units/Infantry/srm_infantry.png and b/megamek/data/images/units/Infantry/srm_infantry.png differ
diff --git a/megamek/data/images/units/Infantry/srm_infantry_platoon.png b/megamek/data/images/units/Infantry/srm_infantry_platoon.png
index f0e94a0862..56ea90a329 100644
Binary files a/megamek/data/images/units/Infantry/srm_infantry_platoon.png and b/megamek/data/images/units/Infantry/srm_infantry_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/srm_jump_infantry.png b/megamek/data/images/units/Infantry/srm_jump_infantry.png
index 95329486a1..962441220e 100644
Binary files a/megamek/data/images/units/Infantry/srm_jump_infantry.png and b/megamek/data/images/units/Infantry/srm_jump_infantry.png differ
diff --git a/megamek/data/images/units/Infantry/srm_jump_infantry_platoon.png b/megamek/data/images/units/Infantry/srm_jump_infantry_platoon.png
index 3208fbc12d..b41fe03a1e 100644
Binary files a/megamek/data/images/units/Infantry/srm_jump_infantry_platoon.png and b/megamek/data/images/units/Infantry/srm_jump_infantry_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/srm_mecha_h.png b/megamek/data/images/units/Infantry/srm_mecha_h.png
index f4e3cf039e..bc6565ac48 100644
Binary files a/megamek/data/images/units/Infantry/srm_mecha_h.png and b/megamek/data/images/units/Infantry/srm_mecha_h.png differ
diff --git a/megamek/data/images/units/Infantry/srm_mecha_h_platoon.png b/megamek/data/images/units/Infantry/srm_mecha_h_platoon.png
index 30058b985f..5d947928b2 100644
Binary files a/megamek/data/images/units/Infantry/srm_mecha_h_platoon.png and b/megamek/data/images/units/Infantry/srm_mecha_h_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/srm_mecha_t.png b/megamek/data/images/units/Infantry/srm_mecha_t.png
index e38266e438..9414f24117 100644
Binary files a/megamek/data/images/units/Infantry/srm_mecha_t.png and b/megamek/data/images/units/Infantry/srm_mecha_t.png differ
diff --git a/megamek/data/images/units/Infantry/srm_mecha_t_platoon.png b/megamek/data/images/units/Infantry/srm_mecha_t_platoon.png
index 322da8c80a..3579873440 100644
Binary files a/megamek/data/images/units/Infantry/srm_mecha_t_platoon.png and b/megamek/data/images/units/Infantry/srm_mecha_t_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/srm_mecha_w.png b/megamek/data/images/units/Infantry/srm_mecha_w.png
index d1507147a7..46e1f0ea2d 100644
Binary files a/megamek/data/images/units/Infantry/srm_mecha_w.png and b/megamek/data/images/units/Infantry/srm_mecha_w.png differ
diff --git a/megamek/data/images/units/Infantry/srm_mecha_w_platoon.png b/megamek/data/images/units/Infantry/srm_mecha_w_platoon.png
index 72a0b393b3..21596f5a9d 100644
Binary files a/megamek/data/images/units/Infantry/srm_mecha_w_platoon.png and b/megamek/data/images/units/Infantry/srm_mecha_w_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/srm_motorized_infantry.png b/megamek/data/images/units/Infantry/srm_motorized_infantry.png
index 6cbd67bfc4..37b06e0edb 100644
Binary files a/megamek/data/images/units/Infantry/srm_motorized_infantry.png and b/megamek/data/images/units/Infantry/srm_motorized_infantry.png differ
diff --git a/megamek/data/images/units/Infantry/srm_motorized_infantry_platoon.png b/megamek/data/images/units/Infantry/srm_motorized_infantry_platoon.png
index ac0f46a09c..f9f754b0c4 100644
Binary files a/megamek/data/images/units/Infantry/srm_motorized_infantry_platoon.png and b/megamek/data/images/units/Infantry/srm_motorized_infantry_platoon.png differ
diff --git a/megamek/data/images/units/Infantry/star_corps_jump_assault_infantry.png b/megamek/data/images/units/Infantry/star_corps_jump_assault_infantry.png
index f7ae71f1e8..567ac03b79 100644
Binary files a/megamek/data/images/units/Infantry/star_corps_jump_assault_infantry.png and b/megamek/data/images/units/Infantry/star_corps_jump_assault_infantry.png differ
diff --git a/megamek/data/images/units/Infantry/thumper_fieldgun.png b/megamek/data/images/units/Infantry/thumper_fieldgun.png
new file mode 100644
index 0000000000..f2e530db3a
Binary files /dev/null and b/megamek/data/images/units/Infantry/thumper_fieldgun.png differ
diff --git a/megamek/data/images/units/battle armor/Elementals.png b/megamek/data/images/units/battle armor/Elementals.png
index 00f6b21319..8107b810ce 100644
Binary files a/megamek/data/images/units/battle armor/Elementals.png and b/megamek/data/images/units/battle armor/Elementals.png differ
diff --git a/megamek/data/images/units/battle armor/ElementalsHH.png b/megamek/data/images/units/battle armor/ElementalsHH.png
index a39d8d49e9..c455e6f330 100644
Binary files a/megamek/data/images/units/battle armor/ElementalsHH.png and b/megamek/data/images/units/battle armor/ElementalsHH.png differ
diff --git a/megamek/data/images/units/battle armor/ElementalsII.png b/megamek/data/images/units/battle armor/ElementalsII.png
index be57cf8154..ccaf7c62e3 100644
Binary files a/megamek/data/images/units/battle armor/ElementalsII.png and b/megamek/data/images/units/battle armor/ElementalsII.png differ
diff --git a/megamek/data/images/units/battle armor/ElementalsII_flamer.png b/megamek/data/images/units/battle armor/ElementalsII_flamer.png
index 89f15dd774..f8c743ba93 100644
Binary files a/megamek/data/images/units/battle armor/ElementalsII_flamer.png and b/megamek/data/images/units/battle armor/ElementalsII_flamer.png differ
diff --git a/megamek/data/images/units/battle armor/ElementalsII_mg.png b/megamek/data/images/units/battle armor/ElementalsII_mg.png
index 0dbf16e2f3..d9b83affbd 100644
Binary files a/megamek/data/images/units/battle armor/ElementalsII_mg.png and b/megamek/data/images/units/battle armor/ElementalsII_mg.png differ
diff --git a/megamek/data/images/units/battle armor/Elementals_flamer.png b/megamek/data/images/units/battle armor/Elementals_flamer.png
index e8679b3053..4f094c7dd7 100644
Binary files a/megamek/data/images/units/battle armor/Elementals_flamer.png and b/megamek/data/images/units/battle armor/Elementals_flamer.png differ
diff --git a/megamek/data/images/units/battle armor/Elementals_mg.png b/megamek/data/images/units/battle armor/Elementals_mg.png
index 3f3a1b2196..688207437a 100644
Binary files a/megamek/data/images/units/battle armor/Elementals_mg.png and b/megamek/data/images/units/battle armor/Elementals_mg.png differ
diff --git a/megamek/data/images/units/battle armor/Elementals_space.png b/megamek/data/images/units/battle armor/Elementals_space.png
index 9bda66a45d..7ef3c19622 100644
Binary files a/megamek/data/images/units/battle armor/Elementals_space.png and b/megamek/data/images/units/battle armor/Elementals_space.png differ
diff --git a/megamek/data/images/units/battle armor/Elementals_space_flamer.png b/megamek/data/images/units/battle armor/Elementals_space_flamer.png
index 1863b5f8c5..0eaf3a0d54 100644
Binary files a/megamek/data/images/units/battle armor/Elementals_space_flamer.png and b/megamek/data/images/units/battle armor/Elementals_space_flamer.png differ
diff --git a/megamek/data/images/units/battle armor/Elementals_space_mg.png b/megamek/data/images/units/battle armor/Elementals_space_mg.png
index fb56941868..9a9efc12ca 100644
Binary files a/megamek/data/images/units/battle armor/Elementals_space_mg.png and b/megamek/data/images/units/battle armor/Elementals_space_mg.png differ
diff --git a/megamek/data/images/units/defaults/default_ba.png b/megamek/data/images/units/defaults/default_ba.png
index fb58ca16b3..803817defc 100644
Binary files a/megamek/data/images/units/defaults/default_ba.png and b/megamek/data/images/units/defaults/default_ba.png differ
diff --git a/megamek/data/images/units/defaults/default_infantry.png b/megamek/data/images/units/defaults/default_infantry.png
index c0bdf37dd6..ca33cbc097 100644
Binary files a/megamek/data/images/units/defaults/default_infantry.png and b/megamek/data/images/units/defaults/default_infantry.png differ
diff --git a/megamek/data/images/units/defaults/default_infantry_platoon.png b/megamek/data/images/units/defaults/default_infantry_platoon.png
index 0d050a209c..f7bf86041c 100644
Binary files a/megamek/data/images/units/defaults/default_infantry_platoon.png and b/megamek/data/images/units/defaults/default_infantry_platoon.png differ
diff --git a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (Flamer).blk b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (Flamer).blk
index 0a67f86edb..4d6ac8f991 100644
--- a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (Flamer).blk	
+++ b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (Flamer).blk	
@@ -13,7 +13,7 @@ Infantry
 </UnitType>
 
 <Name>
-Clan Foot Point (Anti-’Mech)
+Clan Foot Point (Anti-'Mech)
 </Name>
 
 <Model>
diff --git a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (LRM).blk b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (LRM).blk
index ac88202d56..d929238e77 100644
--- a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (LRM).blk	
+++ b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (LRM).blk	
@@ -13,7 +13,7 @@ Infantry
 </UnitType>
 
 <Name>
-Clan Foot Point (Anti-’Mech)
+Clan Foot Point (Anti-'Mech)
 </Name>
 
 <Model>
diff --git a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (Laser).blk b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (Laser).blk
index 8d40caf686..b078b11e15 100644
--- a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (Laser).blk	
+++ b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (Laser).blk	
@@ -13,7 +13,7 @@ Infantry
 </UnitType>
 
 <Name>
-Clan Foot Point (Anti-’Mech)
+Clan Foot Point (Anti-'Mech)
 </Name>
 
 <Model>
diff --git a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (MG).blk b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (MG).blk
index 6a067d3a9c..0e89871845 100644
--- a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (MG).blk	
+++ b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (MG).blk	
@@ -13,7 +13,7 @@ Infantry
 </UnitType>
 
 <Name>
-Clan Foot Point (Anti-’Mech)
+Clan Foot Point (Anti-'Mech)
 </Name>
 
 <Model>
diff --git a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (Rifle).blk b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (Rifle).blk
index 17ea6e16bb..f7363ac507 100644
--- a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (Rifle).blk	
+++ b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (Rifle).blk	
@@ -13,7 +13,7 @@ Infantry
 </UnitType>
 
 <Name>
-Clan Foot Point (Anti-’Mech)
+Clan Foot Point (Anti-'Mech)
 </Name>
 
 <Model>
diff --git a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (SRM).blk b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (SRM).blk
index 634194f4fb..9b2c6e7bde 100644
--- a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (SRM).blk	
+++ b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Clan Foot Point AMT (SRM).blk	
@@ -13,7 +13,7 @@ Infantry
 </UnitType>
 
 <Name>
-Clan Foot Point (Anti-’Mech)
+Clan Foot Point (Anti-'Mech)
 </Name>
 
 <Model>
diff --git a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (Flamer).blk b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (Flamer).blk
index 916546dade..d5a93f6244 100644
--- a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (Flamer).blk	
+++ b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (Flamer).blk	
@@ -13,7 +13,7 @@ Infantry
 </UnitType>
 
 <Name>
-Foot Platoon (Anti-’Mech)
+Foot Platoon (Anti-'Mech)
 </Name>
 
 <Model>
diff --git a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (LRM).blk b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (LRM).blk
index 91a1141111..460d64b7da 100644
--- a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (LRM).blk	
+++ b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (LRM).blk	
@@ -13,7 +13,7 @@ Infantry
 </UnitType>
 
 <Name>
-Foot Platoon (Anti-’Mech)
+Foot Platoon (Anti-'Mech)
 </Name>
 
 <Model>
diff --git a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (Laser).blk b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (Laser).blk
index 12f8baabe6..0b99942ce8 100644
--- a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (Laser).blk	
+++ b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (Laser).blk	
@@ -13,7 +13,7 @@ Infantry
 </UnitType>
 
 <Name>
-Foot Platoon (Anti-’Mech)
+Foot Platoon (Anti-'Mech)
 </Name>
 
 <Model>
diff --git a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (MG).blk b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (MG).blk
index a40963e8b0..e32e4e107a 100644
--- a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (MG).blk	
+++ b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (MG).blk	
@@ -13,7 +13,7 @@ Infantry
 </UnitType>
 
 <Name>
-Foot Platoon (Anti-’Mech)
+Foot Platoon (Anti-'Mech)
 </Name>
 
 <Model>
diff --git a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (Rifle).blk b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (Rifle).blk
index 844a9b1ab9..dd86da8234 100644
--- a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (Rifle).blk	
+++ b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (Rifle).blk	
@@ -13,7 +13,7 @@ Infantry
 </UnitType>
 
 <Name>
-Foot Platoon (Anti-’Mech)
+Foot Platoon (Anti-'Mech)
 </Name>
 
 <Model>
diff --git a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (SRM).blk b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (SRM).blk
index ffd66d5f4d..f38266446e 100644
--- a/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (SRM).blk	
+++ b/megamek/data/mechfiles/infantry/TW/AntiMek Trained/Foot Platoon AMT (SRM).blk	
@@ -13,7 +13,7 @@ Infantry
 </UnitType>
 
 <Name>
-Foot Platoon (Anti-’Mech)
+Foot Platoon (Anti-'Mech)
 </Name>
 
 <Model>