diff --git a/addons/disarming/CfgVehicles.hpp b/addons/disarming/CfgVehicles.hpp
index 5a85dc1287..381aaed93e 100644
--- a/addons/disarming/CfgVehicles.hpp
+++ b/addons/disarming/CfgVehicles.hpp
@@ -8,7 +8,7 @@ class CfgVehicles {
                     distance = 3.5;
                     condition = QUOTE([ARR_2(_player,_target)] call FUNC(canPlayerDisarmUnit));
                     statement = QUOTE([ARR_2(_player,_target)] call FUNC(openDisarmDialog));
-                    icon = "\a3\Modules_F_Curator\Data\portraitRespawnInventory_ca.paa";
+                    icon = PATHTOF(UI\disarm.paa);
                     exceptions[] = {};
                 };
             };
diff --git a/addons/disarming/UI/disarm.paa b/addons/disarming/UI/disarm.paa
new file mode 100644
index 0000000000..d13f38daee
Binary files /dev/null and b/addons/disarming/UI/disarm.paa differ
diff --git a/extras/assets/icons/Icons_Actions.psd b/extras/assets/icons/Icons_Actions.psd
new file mode 100644
index 0000000000..616ab7a7fa
Binary files /dev/null and b/extras/assets/icons/Icons_Actions.psd differ
diff --git a/extras/assets/icons/png/Icon_Actions/disarm.png b/extras/assets/icons/png/Icon_Actions/disarm.png
new file mode 100644
index 0000000000..1bf8de1548
Binary files /dev/null and b/extras/assets/icons/png/Icon_Actions/disarm.png differ
diff --git a/extras/assets/icons/png/Icon_Module_Ambient_Sounds_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_Ambient_Sounds_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_Ambient_Sounds_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_Ambient_Sounds_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_BFTracking_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_BFTracking_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_BFTracking_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_BFTracking_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_CheckPBO_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_CheckPBO_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_CheckPBO_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_CheckPBO_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_Explosives_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_Explosives_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_Explosives_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_Explosives_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_FriendlyFire_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_FriendlyFire_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_FriendlyFire_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_FriendlyFire_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_Hearing_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_Hearing_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_Hearing_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_Hearing_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_Interaction_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_Interaction_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_Interaction_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_Interaction_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_LSD_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_LSD_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_LSD_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_LSD_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_Make_Unit_Surrender_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_Make_Unit_Surrender_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_Make_Unit_Surrender_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_Make_Unit_Surrender_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_Map_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_Map_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_Map_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_Map_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_Medical_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_Medical_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_Medical_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_Medical_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_NameTags_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_NameTags_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_NameTags_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_NameTags_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_Rallypoint_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_Rallypoint_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_Rallypoint_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_Rallypoint_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_Respawn_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_Respawn_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_Respawn_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_Respawn_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_SwitchUnits_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_SwitchUnits_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_SwitchUnits_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_SwitchUnits_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_VehicleKey_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_VehicleKey_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_VehicleKey_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_VehicleKey_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_VehicleLock_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_VehicleLock_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_VehicleLock_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_VehicleLock_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_Wind_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_Wind_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_Wind_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_Wind_ca.png
diff --git a/extras/assets/icons/png/Icon_Module_microDAGR_ca.png b/extras/assets/icons/png/Icon_Module/Icon_Module_microDAGR_ca.png
similarity index 100%
rename from extras/assets/icons/png/Icon_Module_microDAGR_ca.png
rename to extras/assets/icons/png/Icon_Module/Icon_Module_microDAGR_ca.png