diff --git a/addons/flags/CfgVehicles.hpp b/addons/flags/CfgVehicles.hpp
index d04eae2265..bf04c570aa 100644
--- a/addons/flags/CfgVehicles.hpp
+++ b/addons/flags/CfgVehicles.hpp
@@ -7,11 +7,13 @@ class CfgVehicles {
                     displayName = CSTRING(action);
                     condition = QUOTE(_player call FUNC(hasFlag));
                     insertChildren = QUOTE(_this call FUNC(addActions));
+                    icon = QPATHTOF(data\icons\place\white_place_icon.paa);
 
                     class GVAR(furlFlag) {
                         displayName = CSTRING(furlFlag);
                         condition = QUOTE(_player call FUNC(carriesFlag));
                         statement = QUOTE(_player call FUNC(furlFlag));
+                        icon = QPATHTOF(data\icons\carry\white_furl_icon.paa);
                     };
                 };
             };
diff --git a/addons/flags/CfgWeapons.hpp b/addons/flags/CfgWeapons.hpp
index 8e73c1cd87..fe495336aa 100644
--- a/addons/flags/CfgWeapons.hpp
+++ b/addons/flags/CfgWeapons.hpp
@@ -7,12 +7,13 @@ class CfgWeapons {
         author = ECSTRING(common,ACETeam);
         descriptionShort = CSTRING(description);
         descriptionUse = CSTRING(description);
+
         displayName = CSTRING(white);
-        picture = QPATHTOF(data\ui\flags\red_item_icon.paa);
+        picture = QPATHTOF(data\pictures\white_item.paa);
 
         GVAR(texture) = "\a3\data_f\flags\flag_white_co.paa";
-        GVAR(actionIconPlace) = QPATHTOF(data\ui\flags\white_icon.paa);
-        GVAR(actionIconCarry) = QPATHTOF(data\ui\flags\white_carry_icon.paa);
+        GVAR(actionIconPlace) = QPATHTOF(data\icons\place\white_place_icon.paa);
+        GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\white_carry_icon.paa);
 
         class ItemInfo: CBA_MiscItem_ItemInfo {
             mass = 3;
@@ -20,34 +21,34 @@ class CfgWeapons {
     };
     class GVAR(red): GVAR(white) {
         displayName = CSTRING(red);
-        picture = QPATHTOF(data\ui\flags\red_item_icon.paa);
+        picture = QPATHTOF(data\pictures\red_item.paa);
 
         GVAR(texture) = "\a3\data_f\flags\flag_red_co.paa";
-        GVAR(actionIconPlace) = QPATHTOF(data\ui\flags\red_place_icon.paa);
-        GVAR(actionIconCarry) = QPATHTOF(data\ui\flags\red_carry_icon.paa);
+        GVAR(actionIconPlace) = QPATHTOF(data\icons\place\red_place_icon.paa);
+        GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\red_carry_icon.paa);
     };
     class GVAR(blue): GVAR(white) {
         displayName = CSTRING(blue);
-        picture = QPATHTOF(data\ui\flags\blue_item_icon.paa);
+        picture = QPATHTOF(data\pictures\blue_item.paa);
 
         GVAR(texture) = "\a3\data_f\flags\Flag_blue_co.paa";
-        GVAR(actionIconPlace) = QPATHTOF(data\ui\flags\blue_place_icon.paa);
-        GVAR(actionIconCarry) = QPATHTOF(data\ui\flags\blue_carry_icon.paa);
+        GVAR(actionIconPlace) = QPATHTOF(data\icons\place\blue_place_icon.paa);
+        GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\blue_carry_icon.paa);
     };
     class GVAR(green): GVAR(white) {
         displayName = CSTRING(green);
-        picture = QPATHTOF(data\ui\flags\green_item_icon.paa);
+        picture = QPATHTOF(data\pictures\green_item.paa);
 
         GVAR(texture) = "\a3\data_f\flags\flag_green_co.paa";
-        GVAR(actionIconPlace) = QPATHTOF(data\ui\flags\green_place_icon.paa);
-        GVAR(actionIconCarry) = QPATHTOF(data\ui\flags\green_carry_icon.paa);
+        GVAR(actionIconPlace) = QPATHTOF(data\icons\place\green_place_icon.paa);
+        GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\green_carry_icon.paa);
     };
     class GVAR(yellow): GVAR(white) {
         displayName = CSTRING(yellow);
-        picture = QPATHTOF(data\ui\flags\yellow_item_icon.paa);
+        picture = QPATHTOF(data\pictures\yellow_item.paa);
 
         GVAR(texture) = QPATHTOF(data\Flag_yellow_co.paa);
-        GVAR(actionIconPlace) = QPATHTOF(data\ui\flags\yellow_place_icon.paa);
-        GVAR(actionIconCarry) = QPATHTOF(data\ui\flags\yellow_carry_icon.paa);
+        GVAR(actionIconPlace) = QPATHTOF(data\icons\place\yellow_place_icon.paa);
+        GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\yellow_carry_icon.paa);
     };
 };
diff --git a/addons/flags/XEH_postInit.sqf b/addons/flags/XEH_postInit.sqf
index 64978b95e6..a735b04ada 100644
--- a/addons/flags/XEH_postInit.sqf
+++ b/addons/flags/XEH_postInit.sqf
@@ -13,7 +13,7 @@ GVAR(isPlacing) = PLACE_CANCEL;
     private _pickupFlag = [
         QGVAR(pickup),
         format [LLSTRING(pickup), _displayName],
-        QPATHTOF(data\ui\flags\pickup_icon.paa),
+        QPATHTOF(data\icons\place\white_pickup_icon.paa),
         {
             params ["_flag", "_unit", "_args"];
             _args params ["_item"];
diff --git a/addons/flags/data/icons/carry/furl_icon.paa b/addons/flags/data/icons/carry/white_furl_icon.paa
similarity index 100%
rename from addons/flags/data/icons/carry/furl_icon.paa
rename to addons/flags/data/icons/carry/white_furl_icon.paa
diff --git a/addons/flags/data/icons/place/pickup_icon.paa b/addons/flags/data/icons/place/white_pickup_icon.paa
similarity index 100%
rename from addons/flags/data/icons/place/pickup_icon.paa
rename to addons/flags/data/icons/place/white_pickup_icon.paa
diff --git a/addons/flags/data/icons/place/white_icon.paa b/addons/flags/data/icons/place/white_place_icon.paa
similarity index 100%
rename from addons/flags/data/icons/place/white_icon.paa
rename to addons/flags/data/icons/place/white_place_icon.paa