diff --git a/.gitignore b/.gitignore
index f05646fb8a..f312ddb55e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ texHeaders.bin
 *.swp
 *.swo
 *.biprivatekey
+Thumbs.db
diff --git a/extras/assets/icons/png/Icon_Actions/disarm.png b/extras/assets/icons/Icon_Actions_png/disarm.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Actions/disarm.png
rename to extras/assets/icons/Icon_Actions_png/disarm.png
diff --git a/extras/assets/icons/icon_microDAGR.png b/extras/assets/icons/Icon_Actions_png/icon_microDAGR.png
similarity index 100%
rename from extras/assets/icons/icon_microDAGR.png
rename to extras/assets/icons/Icon_Actions_png/icon_microDAGR.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_Ambient_Sounds_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_Ambient_Sounds_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_Ambient_Sounds_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_Ambient_Sounds_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_BFTracking_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_BFTracking_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_BFTracking_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_BFTracking_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_CheckPBO_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_CheckPBO_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_CheckPBO_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_CheckPBO_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_Explosives_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_Explosives_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_Explosives_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_Explosives_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_FriendlyFire_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_FriendlyFire_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_FriendlyFire_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_FriendlyFire_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_Hearing_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_Hearing_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_Hearing_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_Hearing_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_Interaction_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_Interaction_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_Interaction_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_Interaction_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_LSD_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_LSD_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_LSD_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_LSD_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_Make_Unit_Surrender_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_Make_Unit_Surrender_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_Make_Unit_Surrender_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_Make_Unit_Surrender_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_Map_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_Map_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_Map_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_Map_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_Medical_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_Medical_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_Medical_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_Medical_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_NameTags_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_NameTags_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_NameTags_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_NameTags_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_Rallypoint_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_Rallypoint_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_Rallypoint_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_Rallypoint_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_Repair_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_Repair_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_Repair_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_Repair_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_Respawn_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_Respawn_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_Respawn_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_Respawn_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icons_Module_Sitting_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_Sitting_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icons_Module_Sitting_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_Sitting_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_SwitchUnits_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_SwitchUnits_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_SwitchUnits_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_SwitchUnits_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_VehicleKey_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_VehicleKey_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_VehicleKey_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_VehicleKey_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_VehicleLock_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_VehicleLock_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_VehicleLock_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_VehicleLock_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_Wind_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_Wind_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_Wind_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_Wind_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_Zeus_Captive_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_Zeus_Captive_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_Zeus_Captive_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_Zeus_Captive_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_Zeus_Settings_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_Zeus_Settings_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_Zeus_Settings_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_Zeus_Settings_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_Zeus_Surrender_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_Zeus_Surrender_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_Zeus_Surrender_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_Zeus_Surrender_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_Zeus_Unconscious_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_Zeus_Unconscious_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_Zeus_Unconscious_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_Zeus_Unconscious_ca.png
diff --git a/extras/assets/icons/png/Icon_Module/Icon_Module_microDAGR_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_microDAGR_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module/Icon_Module_microDAGR_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_microDAGR_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_mk6_ca.png b/extras/assets/icons/Icon_Module_png/Icon_Module_mk6_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_mk6_ca.png
rename to extras/assets/icons/Icon_Module_png/Icon_Module_mk6_ca.png