diff --git a/addons/flags/data/ui/flags/blue_carry_icon.paa b/addons/flags/data/icons/carry/blue_carry_icon.paa
similarity index 100%
rename from addons/flags/data/ui/flags/blue_carry_icon.paa
rename to addons/flags/data/icons/carry/blue_carry_icon.paa
diff --git a/addons/flags/data/ui/flags/furl_icon.paa b/addons/flags/data/icons/carry/furl_icon.paa
similarity index 100%
rename from addons/flags/data/ui/flags/furl_icon.paa
rename to addons/flags/data/icons/carry/furl_icon.paa
diff --git a/addons/flags/data/ui/flags/green_carry_icon.paa b/addons/flags/data/icons/carry/green_carry_icon.paa
similarity index 100%
rename from addons/flags/data/ui/flags/green_carry_icon.paa
rename to addons/flags/data/icons/carry/green_carry_icon.paa
diff --git a/addons/flags/data/ui/flags/red_carry_icon.paa b/addons/flags/data/icons/carry/red_carry_icon.paa
similarity index 100%
rename from addons/flags/data/ui/flags/red_carry_icon.paa
rename to addons/flags/data/icons/carry/red_carry_icon.paa
diff --git a/addons/flags/data/icons/carry/white_carry_icon.paa b/addons/flags/data/icons/carry/white_carry_icon.paa
new file mode 100644
index 0000000000..9949907e4e
Binary files /dev/null and b/addons/flags/data/icons/carry/white_carry_icon.paa differ
diff --git a/addons/flags/data/ui/flags/yellow_carry_icon.paa b/addons/flags/data/icons/carry/yellow_carry_icon.paa
similarity index 100%
rename from addons/flags/data/ui/flags/yellow_carry_icon.paa
rename to addons/flags/data/icons/carry/yellow_carry_icon.paa
diff --git a/addons/flags/data/ui/flags/blue_place_icon.paa b/addons/flags/data/icons/place/blue_place_icon.paa
similarity index 100%
rename from addons/flags/data/ui/flags/blue_place_icon.paa
rename to addons/flags/data/icons/place/blue_place_icon.paa
diff --git a/addons/flags/data/ui/flags/green_place_icon.paa b/addons/flags/data/icons/place/green_place_icon.paa
similarity index 100%
rename from addons/flags/data/ui/flags/green_place_icon.paa
rename to addons/flags/data/icons/place/green_place_icon.paa
diff --git a/addons/flags/data/ui/flags/pickup_icon.paa b/addons/flags/data/icons/place/pickup_icon.paa
similarity index 100%
rename from addons/flags/data/ui/flags/pickup_icon.paa
rename to addons/flags/data/icons/place/pickup_icon.paa
diff --git a/addons/flags/data/ui/flags/red_place_icon.paa b/addons/flags/data/icons/place/red_place_icon.paa
similarity index 100%
rename from addons/flags/data/ui/flags/red_place_icon.paa
rename to addons/flags/data/icons/place/red_place_icon.paa
diff --git a/addons/flags/data/ui/flags/white_icon.paa b/addons/flags/data/icons/place/white_icon.paa
similarity index 100%
rename from addons/flags/data/ui/flags/white_icon.paa
rename to addons/flags/data/icons/place/white_icon.paa
diff --git a/addons/flags/data/ui/flags/yellow_place_icon.paa b/addons/flags/data/icons/place/yellow_place_icon.paa
similarity index 100%
rename from addons/flags/data/ui/flags/yellow_place_icon.paa
rename to addons/flags/data/icons/place/yellow_place_icon.paa
diff --git a/addons/flags/data/ui/flags/blue_item_icon.paa b/addons/flags/data/pictures/blue_item.paa
similarity index 100%
rename from addons/flags/data/ui/flags/blue_item_icon.paa
rename to addons/flags/data/pictures/blue_item.paa
diff --git a/addons/flags/data/ui/flags/green_item_icon.paa b/addons/flags/data/pictures/green_item.paa
similarity index 100%
rename from addons/flags/data/ui/flags/green_item_icon.paa
rename to addons/flags/data/pictures/green_item.paa
diff --git a/addons/flags/data/ui/flags/red_item_icon.paa b/addons/flags/data/pictures/red_item.paa
similarity index 100%
rename from addons/flags/data/ui/flags/red_item_icon.paa
rename to addons/flags/data/pictures/red_item.paa
diff --git a/addons/flags/data/pictures/white_item.paa b/addons/flags/data/pictures/white_item.paa
new file mode 100644
index 0000000000..e0353f2466
Binary files /dev/null and b/addons/flags/data/pictures/white_item.paa differ
diff --git a/addons/flags/data/ui/flags/yellow_item_icon.paa b/addons/flags/data/pictures/yellow_item.paa
similarity index 100%
rename from addons/flags/data/ui/flags/yellow_item_icon.paa
rename to addons/flags/data/pictures/yellow_item.paa