From 8f2f10bce1efca04f6f0a22f663d98a99cce95c6 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Fri, 12 Sep 2025 18:20:43 +0200
Subject: [PATCH 1/6] added 'get_project_entity' to controller

---
 client/ayon_core/tools/loader/abstract.py | 6 ++++++
 client/ayon_core/tools/loader/control.py  | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/client/ayon_core/tools/loader/abstract.py b/client/ayon_core/tools/loader/abstract.py
index 5ab7e78212..42e88c15d7 100644
--- a/client/ayon_core/tools/loader/abstract.py
+++ b/client/ayon_core/tools/loader/abstract.py
@@ -513,6 +513,12 @@ class BackendLoaderController(_BaseLoaderController):
 
         pass
 
+    @abstractmethod
+    def get_project_entity(
+        self, project_name: Optional[str]
+    ) -> Optional[dict[str, Any]]:
+        pass
+
 
 class FrontendLoaderController(_BaseLoaderController):
     @abstractmethod
diff --git a/client/ayon_core/tools/loader/control.py b/client/ayon_core/tools/loader/control.py
index 7ba42a0981..492a05e82f 100644
--- a/client/ayon_core/tools/loader/control.py
+++ b/client/ayon_core/tools/loader/control.py
@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import logging
 import uuid
+from typing import Optional, Any
 
 import ayon_api
 
@@ -188,6 +189,11 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
     def get_project_items(self, sender=None):
         return self._projects_model.get_project_items(sender)
 
+    def get_project_entity(
+        self, project_name: Optional[str]
+    ) -> Optional[dict[str, Any]]:
+        return self._projects_model.get_project_entity(project_name)
+
     def get_folder_type_items(self, project_name, sender=None):
         return self._projects_model.get_folder_type_items(
             project_name, sender

From 7f8e62e8efc2efa016fe66cabc305d1a215fd5bf Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Fri, 12 Sep 2025 18:29:55 +0200
Subject: [PATCH 2/6] add icons mapping to products

---
 client/ayon_core/tools/loader/abstract.py     |   7 -
 .../ayon_core/tools/loader/models/products.py | 205 +++++++++---------
 .../tools/loader/ui/products_model.py         |   8 +-
 3 files changed, 103 insertions(+), 117 deletions(-)

diff --git a/client/ayon_core/tools/loader/abstract.py b/client/ayon_core/tools/loader/abstract.py
index 42e88c15d7..87cfb1f3f2 100644
--- a/client/ayon_core/tools/loader/abstract.py
+++ b/client/ayon_core/tools/loader/abstract.py
@@ -78,7 +78,6 @@ class ProductItem:
         product_type (str): Product type.
         product_name (str): Product name.
         product_icon (dict[str, Any]): Product icon definition.
-        product_type_icon (dict[str, Any]): Product type icon definition.
         product_in_scene (bool): Is product in scene (only when used in DCC).
         group_name (str): Group name.
         folder_id (str): Folder id.
@@ -93,8 +92,6 @@ class ProductItem:
         product_base_type: str,
         product_name: str,
         product_icon: dict[str, Any],
-        product_type_icon: dict[str, Any],
-        product_base_type_icon: dict[str, Any],
         group_name: str,
         folder_id: str,
         folder_label: str,
@@ -106,8 +103,6 @@ class ProductItem:
         self.product_base_type = product_base_type
         self.product_name = product_name
         self.product_icon = product_icon
-        self.product_type_icon = product_type_icon
-        self.product_base_type_icon = product_base_type_icon
         self.product_in_scene = product_in_scene
         self.group_name = group_name
         self.folder_id = folder_id
@@ -121,8 +116,6 @@ class ProductItem:
             "product_base_type": self.product_base_type,
             "product_name": self.product_name,
             "product_icon": self.product_icon,
-            "product_type_icon": self.product_type_icon,
-            "product_base_type_icon": self.product_base_type_icon,
             "product_in_scene": self.product_in_scene,
             "group_name": self.group_name,
             "folder_id": self.folder_id,
diff --git a/client/ayon_core/tools/loader/models/products.py b/client/ayon_core/tools/loader/models/products.py
index 87e2406c81..f5e0b2fa80 100644
--- a/client/ayon_core/tools/loader/models/products.py
+++ b/client/ayon_core/tools/loader/models/products.py
@@ -9,7 +9,6 @@ import arrow
 import ayon_api
 from ayon_api.operations import OperationsSession
 
-
 from ayon_core.lib import NestedCacheItem
 from ayon_core.style import get_default_entity_icon_color
 from ayon_core.tools.loader.abstract import (
@@ -21,12 +20,63 @@ from ayon_core.tools.loader.abstract import (
 )
 
 if TYPE_CHECKING:
-    from ayon_api.typing import ProductBaseTypeDict, ProductDict, VersionDict
-
+    from ayon_api.typing import (
+        ProductBaseTypeDict,
+        ProductDict,
+        VersionDict,
+    )
 
 PRODUCTS_MODEL_SENDER = "products.model"
 
 
+class ProductBaseTypeIconMapping:
+    def __init__(
+        self,
+        default: Optional[dict[str, str]] = None,
+        definitions: Optional[list[dict[str, str]]] = None,
+    ):
+        self._default = default or {}
+        self._definitions = definitions or []
+
+        self._default_def = None
+        self._definitions_by_name = None
+
+    def get_icon(
+        self,
+        product_base_type: Optional[str] = None,
+        product_type: Optional[str] = None,
+    ) -> dict[str, str]:
+        defs = self._get_defs_by_name()
+        icon = defs.get(product_type)
+        if icon is None:
+            icon = defs.get(product_base_type)
+            if icon is None:
+                icon = self._get_default_def()
+        return icon.copy()
+
+    def _get_default_def(self) -> dict[str, str]:
+        if self._default_def is None:
+            self._default_def = {
+                "type": "material-symbols",
+                "name": self._default.get("icon", "inventory_2"),
+                "color": self._default.get("color", "#cccccc"),
+            }
+
+        return self._default_def
+
+    def _get_defs_by_name(self) -> dict[str, dict[str, str]]:
+        if self._definitions_by_name is None:
+            self._definitions_by_name = {
+                product_base_type_def["name"]: {
+                    "type": "material-symbols",
+                    "name": product_base_type_def.get("icon", "inventory_2"),
+                    "color": product_base_type_def.get("color", "#cccccc"),
+                }
+                for product_base_type_def in self._definitions
+            }
+        return self._definitions_by_name
+
+
 def version_item_from_entity(version):
     version_attribs = version["attrib"]
     tags = version["tags"]
@@ -84,42 +134,18 @@ def version_item_from_entity(version):
 def product_item_from_entity(
     product_entity: ProductDict,
     version_entities,
-    product_type_items_by_name: dict[str, ProductTypeItem],
-    product_base_type_items_by_name: dict[str, ProductBaseTypeItem],
     folder_label,
+    icons_mapping,
     product_in_scene,
 ):
     product_attribs = product_entity["attrib"]
     group = product_attribs.get("productGroup")
     product_type = product_entity["productType"]
-    product_type_item = product_type_items_by_name.get(product_type)
-    # NOTE This is needed for cases when products were not created on server
-    #   using api functions. In that case product type item may not be
-    #   available and we need to create a default.
-    if product_type_item is None:
-        product_type_item = create_default_product_type_item(product_type)
-        # Cache the item for future use
-        product_type_items_by_name[product_type] = product_type_item
-
     product_base_type = product_entity.get("productBaseType")
-    product_base_type_item = product_base_type_items_by_name.get(
-        product_base_type)
-    # Same as for product type item above. Not sure if this is still needed
-    # though.
-    if product_base_type_item is None:
-        product_base_type_item = create_default_product_base_type_item(
-            product_base_type)
-        # Cache the item for future use
-        product_base_type_items_by_name[product_base_type] = (
-            product_base_type_item)
 
-    product_type_icon = product_type_item.icon
-    product_base_type_icon = product_base_type_item.icon
-    product_icon = {
-        "type": "awesome-font",
-        "name": "fa.file-o",
-        "color": get_default_entity_icon_color(),
-    }
+    product_icon = icons_mapping.get_icon(
+        product_base_type, product_type
+    )
     version_items = {
         version_entity["id"]: version_item_from_entity(version_entity)
         for version_entity in version_entities
@@ -131,8 +157,6 @@ def product_item_from_entity(
         product_base_type=product_base_type,
         product_name=product_entity["name"],
         product_icon=product_icon,
-        product_type_icon=product_type_icon,
-        product_base_type_icon=product_base_type_icon,
         product_in_scene=product_in_scene,
         group_name=group,
         folder_id=product_entity["folderId"],
@@ -141,22 +165,8 @@ def product_item_from_entity(
     )
 
 
-def product_type_item_from_data(
-        product_type_data: ProductDict) -> ProductTypeItem:
-    # TODO implement icon implementation
-    # icon = product_type_data["icon"]
-    # color = product_type_data["color"]
-    icon = {
-        "type": "awesome-font",
-        "name": "fa.folder",
-        "color": "#0091B2",
-    }
-    # TODO implement checked logic
-    return ProductTypeItem(product_type_data["name"], icon)
-
-
 def product_base_type_item_from_data(
-        product_base_type_data: ProductBaseTypeDict
+    product_base_type_data: ProductBaseTypeDict
 ) -> ProductBaseTypeItem:
     """Create product base type item from data.
 
@@ -174,34 +184,8 @@ def product_base_type_item_from_data(
     }
     return ProductBaseTypeItem(
         name=product_base_type_data["name"],
-        icon=icon)
-
-
-def create_default_product_type_item(product_type: str) -> ProductTypeItem:
-    icon = {
-        "type": "awesome-font",
-        "name": "fa.folder",
-        "color": "#0091B2",
-    }
-    return ProductTypeItem(product_type, icon)
-
-
-def create_default_product_base_type_item(
-        product_base_type: str) -> ProductBaseTypeItem:
-    """Create default product base type item.
-
-    Args:
-        product_base_type (str): Product base type name.
-
-    Returns:
-        ProductBaseTypeItem: Default product base type item.
-    """
-    icon = {
-        "type": "awesome-font",
-        "name": "fa.folder",
-        "color": "#0091B2",
-    }
-    return ProductBaseTypeItem(product_base_type, icon)
+        icon=icon
+    )
 
 
 class ProductsModel:
@@ -227,6 +211,8 @@ class ProductsModel:
         self._product_folder_ids_mapping = collections.defaultdict(dict)
 
         # Cache helpers
+        self._product_type_icons_mapping = NestedCacheItem(
+            levels=1, default_factory=list, lifetime=self.lifetime)
         self._product_type_items_cache = NestedCacheItem(
             levels=1, default_factory=list, lifetime=self.lifetime)
         self._product_base_type_items_cache = NestedCacheItem(
@@ -243,11 +229,14 @@ class ProductsModel:
         self._version_item_by_id.clear()
         self._product_folder_ids_mapping.clear()
 
+        self._product_type_icons_mapping.reset()
         self._product_type_items_cache.reset()
         self._product_items_cache.reset()
         self._repre_items_cache.reset()
 
-    def get_product_type_items(self, project_name):
+    def get_product_type_items(
+        self, project_name: Optional[str]
+    ) -> list[ProductTypeItem]:
         """Product type items for project.
 
         Args:
@@ -255,23 +244,27 @@ class ProductsModel:
 
         Returns:
             list[ProductTypeItem]: Product type items.
-        """
 
+        """
         if not project_name:
             return []
 
         cache = self._product_type_items_cache[project_name]
         if not cache.is_valid:
+            icons_mapping = self._get_product_type_icons(project_name)
             product_types = ayon_api.get_project_product_types(project_name)
             cache.update_data([
-                product_type_item_from_data(product_type)
+                ProductTypeItem(
+                    product_type["name"],
+                    icons_mapping.get_icon(product_type=product_type["name"]),
+                )
                 for product_type in product_types
             ])
         return cache.get_data()
 
     def get_product_base_type_items(
-            self,
-            project_name: Optional[str]) -> list[ProductBaseTypeItem]:
+        self, project_name: Optional[str]
+    ) -> list[ProductBaseTypeItem]:
         """Product base type items for the project.
 
         Args:
@@ -286,6 +279,7 @@ class ProductsModel:
 
         cache = self._product_base_type_items_cache[project_name]
         if not cache.is_valid:
+            icons_mapping = self._get_product_type_icons(project_name)
             product_base_types = []
             # TODO add temp implementation here when it is actually
             #   implemented and available on server.
@@ -294,7 +288,10 @@ class ProductsModel:
                     project_name
                 )
             cache.update_data([
-                product_base_type_item_from_data(product_base_type)
+                ProductBaseTypeItem(
+                    product_base_type["name"],
+                    icons_mapping.get_icon(product_base_type["name"]),
+                )
                 for product_base_type in product_base_types
             ])
         return cache.get_data()
@@ -511,6 +508,27 @@ class ProductsModel:
             PRODUCTS_MODEL_SENDER
         )
 
+    def _get_product_type_icons(
+        self, project_name: Optional[str]
+    ) -> ProductBaseTypeIconMapping:
+        cache = self._product_type_icons_mapping[project_name]
+        if cache.is_valid:
+            return cache.get_data()
+
+        project_entity = self._controller.get_project_entity(project_name)
+        icons_mapping = ProductBaseTypeIconMapping()
+        if project_entity:
+            product_base_types = (
+                project_entity["config"].get("productBaseTypes", {})
+            )
+            icons_mapping = ProductBaseTypeIconMapping(
+                product_base_types.get("default"),
+                product_base_types.get("definitions")
+            )
+
+        cache.update_data(icons_mapping)
+        return icons_mapping
+
     def _get_product_items_by_id(self, project_name, product_ids):
         product_item_by_id = self._product_item_by_id[project_name]
         missing_product_ids = set()
@@ -553,36 +571,18 @@ class ProductsModel:
         products: Iterable[ProductDict],
         versions: Iterable[VersionDict],
         folder_items=None,
-        product_type_items=None,
-        product_base_type_items: Optional[Iterable[ProductBaseTypeItem]] = None
     ):
         if folder_items is None:
             folder_items = self._controller.get_folder_items(project_name)
 
-        if product_type_items is None:
-            product_type_items = self.get_product_type_items(project_name)
-
-        if product_base_type_items is None:
-            product_base_type_items = self.get_product_base_type_items(
-                project_name
-            )
-
         loaded_product_ids = self._controller.get_loaded_product_ids()
 
         versions_by_product_id = collections.defaultdict(list)
         for version in versions:
             versions_by_product_id[version["productId"]].append(version)
-        product_type_items_by_name = {
-            product_type_item.name: product_type_item
-            for product_type_item in product_type_items
-        }
-
-        product_base_type_items_by_name: dict[str, ProductBaseTypeItem] = {
-            product_base_type_item.name: product_base_type_item
-            for product_base_type_item in product_base_type_items
-        }
 
         output: dict[str, ProductItem] = {}
+        icons_mapping = self._get_product_type_icons(project_name)
         for product in products:
             product_id = product["id"]
             folder_id = product["folderId"]
@@ -595,9 +595,8 @@ class ProductsModel:
             product_item = product_item_from_entity(
                 product,
                 versions,
-                product_type_items_by_name,
-                product_base_type_items_by_name,
                 folder_item.label,
+                icons_mapping,
                 product_id in loaded_product_ids,
             )
             output[product_id] = product_item
diff --git a/client/ayon_core/tools/loader/ui/products_model.py b/client/ayon_core/tools/loader/ui/products_model.py
index f3e5271f51..79ed197d83 100644
--- a/client/ayon_core/tools/loader/ui/products_model.py
+++ b/client/ayon_core/tools/loader/ui/products_model.py
@@ -17,7 +17,6 @@ PRODUCT_ID_ROLE = QtCore.Qt.UserRole + 6
 PRODUCT_NAME_ROLE = QtCore.Qt.UserRole + 7
 PRODUCT_TYPE_ROLE = QtCore.Qt.UserRole + 8
 PRODUCT_BASE_TYPE_ROLE = QtCore.Qt.UserRole + 9
-PRODUCT_TYPE_ICON_ROLE = QtCore.Qt.UserRole + 10
 PRODUCT_IN_SCENE_ROLE = QtCore.Qt.UserRole + 11
 VERSION_ID_ROLE = QtCore.Qt.UserRole + 12
 VERSION_HERO_ROLE = QtCore.Qt.UserRole + 13
@@ -228,10 +227,7 @@ class ProductsModel(QtGui.QStandardItemModel):
             return super().data(index, role)
 
         if role == QtCore.Qt.DecorationRole:
-            if col == 1:
-                role = PRODUCT_TYPE_ICON_ROLE
-            else:
-                return None
+            return None
 
         if (
             role == VERSION_NAME_EDIT_ROLE
@@ -455,7 +451,6 @@ class ProductsModel(QtGui.QStandardItemModel):
             model_item = QtGui.QStandardItem(product_item.product_name)
             model_item.setEditable(False)
             icon = get_qt_icon(product_item.product_icon)
-            product_type_icon = get_qt_icon(product_item.product_type_icon)
             model_item.setColumnCount(self.columnCount())
             model_item.setData(icon, QtCore.Qt.DecorationRole)
             model_item.setData(product_id, PRODUCT_ID_ROLE)
@@ -464,7 +459,6 @@ class ProductsModel(QtGui.QStandardItemModel):
                 product_item.product_base_type, PRODUCT_BASE_TYPE_ROLE
             )
             model_item.setData(product_item.product_type, PRODUCT_TYPE_ROLE)
-            model_item.setData(product_type_icon, PRODUCT_TYPE_ICON_ROLE)
             model_item.setData(product_item.folder_id, FOLDER_ID_ROLE)
 
             self._product_items_by_id[product_id] = product_item

From d8045df9a7f6d82941f280d4ae9783b58557a7f7 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Fri, 12 Sep 2025 18:33:03 +0200
Subject: [PATCH 3/6] use same deafult as backend has

---
 client/ayon_core/tools/loader/models/products.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/ayon_core/tools/loader/models/products.py b/client/ayon_core/tools/loader/models/products.py
index f5e0b2fa80..11468e4db0 100644
--- a/client/ayon_core/tools/loader/models/products.py
+++ b/client/ayon_core/tools/loader/models/products.py
@@ -58,7 +58,7 @@ class ProductBaseTypeIconMapping:
         if self._default_def is None:
             self._default_def = {
                 "type": "material-symbols",
-                "name": self._default.get("icon", "inventory_2"),
+                "name": self._default.get("icon", "deployed_code"),
                 "color": self._default.get("color", "#cccccc"),
             }
 
@@ -69,7 +69,7 @@ class ProductBaseTypeIconMapping:
             self._definitions_by_name = {
                 product_base_type_def["name"]: {
                     "type": "material-symbols",
-                    "name": product_base_type_def.get("icon", "inventory_2"),
+                    "name": product_base_type_def.get("icon", "deployed_code"),
                     "color": product_base_type_def.get("color", "#cccccc"),
                 }
                 for product_base_type_def in self._definitions

From 7b92047a6bea0e10e3e3e8cb34d97129a75d72c7 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 15 Sep 2025 11:38:58 +0200
Subject: [PATCH 4/6] move 'ProductTypeIconMapping' to common project model

---
 .../ayon_core/tools/common_models/__init__.py |  2 +
 .../ayon_core/tools/common_models/projects.py | 77 +++++++++++++++++-
 client/ayon_core/tools/loader/abstract.py     | 20 +++--
 client/ayon_core/tools/loader/control.py      | 13 ++--
 .../ayon_core/tools/loader/models/products.py | 78 ++-----------------
 5 files changed, 108 insertions(+), 82 deletions(-)

diff --git a/client/ayon_core/tools/common_models/__init__.py b/client/ayon_core/tools/common_models/__init__.py
index ec69e20b64..77cc2dfb0f 100644
--- a/client/ayon_core/tools/common_models/__init__.py
+++ b/client/ayon_core/tools/common_models/__init__.py
@@ -10,6 +10,7 @@ from .projects import (
     PROJECTS_MODEL_SENDER,
     FolderTypeItem,
     TaskTypeItem,
+    ProductTypeIconMapping,
 )
 from .hierarchy import (
     FolderItem,
@@ -34,6 +35,7 @@ __all__ = (
     "PROJECTS_MODEL_SENDER",
     "FolderTypeItem",
     "TaskTypeItem",
+    "ProductTypeIconMapping",
 
     "FolderItem",
     "TaskItem",
diff --git a/client/ayon_core/tools/common_models/projects.py b/client/ayon_core/tools/common_models/projects.py
index 034947de3a..710482a871 100644
--- a/client/ayon_core/tools/common_models/projects.py
+++ b/client/ayon_core/tools/common_models/projects.py
@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import contextlib
 from abc import ABC, abstractmethod
-from typing import Dict, Any
+from typing import Any, Optional
 from dataclasses import dataclass
 
 import ayon_api
@@ -51,7 +51,7 @@ class StatusItem:
         self.icon: str = icon
         self.state: str = state
 
-    def to_data(self) -> Dict[str, Any]:
+    def to_data(self) -> dict[str, Any]:
         return {
             "name": self.name,
             "color": self.color,
@@ -218,6 +218,54 @@ class ProjectItem:
         return cls(**data)
 
 
+class ProductTypeIconMapping:
+    def __init__(
+        self,
+        default: Optional[dict[str, str]] = None,
+        definitions: Optional[list[dict[str, str]]] = None,
+    ):
+        self._default = default or {}
+        self._definitions = definitions or []
+
+        self._default_def = None
+        self._definitions_by_name = None
+
+    def get_icon(
+        self,
+        product_base_type: Optional[str] = None,
+        product_type: Optional[str] = None,
+    ) -> dict[str, str]:
+        defs = self._get_defs_by_name()
+        icon = defs.get(product_type)
+        if icon is None:
+            icon = defs.get(product_base_type)
+            if icon is None:
+                icon = self._get_default_def()
+        return icon.copy()
+
+    def _get_default_def(self) -> dict[str, str]:
+        if self._default_def is None:
+            self._default_def = {
+                "type": "material-symbols",
+                "name": self._default.get("icon", "deployed_code"),
+                "color": self._default.get("color", "#cccccc"),
+            }
+
+        return self._default_def
+
+    def _get_defs_by_name(self) -> dict[str, dict[str, str]]:
+        if self._definitions_by_name is None:
+            self._definitions_by_name = {
+                product_base_type_def["name"]: {
+                    "type": "material-symbols",
+                    "name": product_base_type_def.get("icon", "deployed_code"),
+                    "color": product_base_type_def.get("color", "#cccccc"),
+                }
+                for product_base_type_def in self._definitions
+            }
+        return self._definitions_by_name
+
+
 def _get_project_items_from_entitiy(
     projects: list[dict[str, Any]]
 ) -> list[ProjectItem]:
@@ -242,6 +290,9 @@ class ProjectsModel(object):
         self._projects_by_name = NestedCacheItem(
             levels=1, default_factory=list
         )
+        self._product_type_icons_mapping = NestedCacheItem(
+            levels=1, default_factory=ProductTypeIconMapping
+        )
         self._project_statuses_cache = {}
         self._folder_types_cache = {}
         self._task_types_cache = {}
@@ -255,6 +306,7 @@ class ProjectsModel(object):
         self._task_types_cache = {}
         self._projects_cache.reset()
         self._projects_by_name.reset()
+        self._product_type_icons_mapping.reset()
 
     def refresh(self):
         """Refresh project items.
@@ -390,6 +442,27 @@ class ProjectsModel(object):
             self._task_type_items_getter,
         )
 
+    def get_product_type_icons_mapping(
+        self, project_name: Optional[str]
+    ) -> ProductTypeIconMapping:
+        cache = self._product_type_icons_mapping[project_name]
+        if cache.is_valid:
+            return cache.get_data()
+
+        project_entity = self.get_project_entity(project_name)
+        icons_mapping = ProductTypeIconMapping()
+        if project_entity:
+            product_base_types = (
+                project_entity["config"].get("productBaseTypes", {})
+            )
+            icons_mapping = ProductTypeIconMapping(
+                product_base_types.get("default"),
+                product_base_types.get("definitions")
+            )
+
+        cache.update_data(icons_mapping)
+        return icons_mapping
+
     def _get_project_items(
         self, project_name, sender, item_type, cache_obj, getter
     ):
diff --git a/client/ayon_core/tools/loader/abstract.py b/client/ayon_core/tools/loader/abstract.py
index 87cfb1f3f2..9c7934d2db 100644
--- a/client/ayon_core/tools/loader/abstract.py
+++ b/client/ayon_core/tools/loader/abstract.py
@@ -9,7 +9,11 @@ from ayon_core.lib.attribute_definitions import (
     deserialize_attr_defs,
     serialize_attr_defs,
 )
-from ayon_core.tools.common_models import TaskItem, TagItem
+from ayon_core.tools.common_models import (
+    TaskItem,
+    TagItem,
+    ProductTypeIconMapping,
+)
 
 
 class ProductTypeItem:
@@ -492,8 +496,8 @@ class BackendLoaderController(_BaseLoaderController):
             topic (str): Event topic name.
             data (Optional[dict[str, Any]]): Event data.
             source (Optional[str]): Event source.
-        """
 
+        """
         pass
 
     @abstractmethod
@@ -502,14 +506,20 @@ class BackendLoaderController(_BaseLoaderController):
 
         Returns:
             set[str]: Set of loaded product ids.
-        """
 
+        """
         pass
 
     @abstractmethod
-    def get_project_entity(
+    def get_product_type_icons_mapping(
         self, project_name: Optional[str]
-    ) -> Optional[dict[str, Any]]:
+    ) -> ProductTypeIconMapping:
+        """Product type icons mapping.
+
+        Returns:
+            ProductTypeIconMapping: Product type icons mapping.
+
+        """
         pass
 
 
diff --git a/client/ayon_core/tools/loader/control.py b/client/ayon_core/tools/loader/control.py
index 492a05e82f..c7c182b192 100644
--- a/client/ayon_core/tools/loader/control.py
+++ b/client/ayon_core/tools/loader/control.py
@@ -17,6 +17,7 @@ from ayon_core.tools.common_models import (
     HierarchyModel,
     ThumbnailsModel,
     TagItem,
+    ProductTypeIconMapping,
 )
 
 from .abstract import (
@@ -189,11 +190,6 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
     def get_project_items(self, sender=None):
         return self._projects_model.get_project_items(sender)
 
-    def get_project_entity(
-        self, project_name: Optional[str]
-    ) -> Optional[dict[str, Any]]:
-        return self._projects_model.get_project_entity(project_name)
-
     def get_folder_type_items(self, project_name, sender=None):
         return self._projects_model.get_folder_type_items(
             project_name, sender
@@ -204,6 +200,13 @@ class LoaderController(BackendLoaderController, FrontendLoaderController):
             project_name, sender
         )
 
+    def get_product_type_icons_mapping(
+        self, project_name: Optional[str]
+    ) -> ProductTypeIconMapping:
+        return self._projects_model.get_product_type_icons_mapping(
+            project_name
+        )
+
     def get_folder_items(self, project_name, sender=None):
         return self._hierarchy_model.get_folder_items(project_name, sender)
 
diff --git a/client/ayon_core/tools/loader/models/products.py b/client/ayon_core/tools/loader/models/products.py
index 11468e4db0..7915a75bcf 100644
--- a/client/ayon_core/tools/loader/models/products.py
+++ b/client/ayon_core/tools/loader/models/products.py
@@ -11,6 +11,7 @@ from ayon_api.operations import OperationsSession
 
 from ayon_core.lib import NestedCacheItem
 from ayon_core.style import get_default_entity_icon_color
+from ayon_core.tools.common_models import ProductTypeIconMapping
 from ayon_core.tools.loader.abstract import (
     ProductTypeItem,
     ProductBaseTypeItem,
@@ -29,54 +30,6 @@ if TYPE_CHECKING:
 PRODUCTS_MODEL_SENDER = "products.model"
 
 
-class ProductBaseTypeIconMapping:
-    def __init__(
-        self,
-        default: Optional[dict[str, str]] = None,
-        definitions: Optional[list[dict[str, str]]] = None,
-    ):
-        self._default = default or {}
-        self._definitions = definitions or []
-
-        self._default_def = None
-        self._definitions_by_name = None
-
-    def get_icon(
-        self,
-        product_base_type: Optional[str] = None,
-        product_type: Optional[str] = None,
-    ) -> dict[str, str]:
-        defs = self._get_defs_by_name()
-        icon = defs.get(product_type)
-        if icon is None:
-            icon = defs.get(product_base_type)
-            if icon is None:
-                icon = self._get_default_def()
-        return icon.copy()
-
-    def _get_default_def(self) -> dict[str, str]:
-        if self._default_def is None:
-            self._default_def = {
-                "type": "material-symbols",
-                "name": self._default.get("icon", "deployed_code"),
-                "color": self._default.get("color", "#cccccc"),
-            }
-
-        return self._default_def
-
-    def _get_defs_by_name(self) -> dict[str, dict[str, str]]:
-        if self._definitions_by_name is None:
-            self._definitions_by_name = {
-                product_base_type_def["name"]: {
-                    "type": "material-symbols",
-                    "name": product_base_type_def.get("icon", "deployed_code"),
-                    "color": product_base_type_def.get("color", "#cccccc"),
-                }
-                for product_base_type_def in self._definitions
-            }
-        return self._definitions_by_name
-
-
 def version_item_from_entity(version):
     version_attribs = version["attrib"]
     tags = version["tags"]
@@ -211,8 +164,6 @@ class ProductsModel:
         self._product_folder_ids_mapping = collections.defaultdict(dict)
 
         # Cache helpers
-        self._product_type_icons_mapping = NestedCacheItem(
-            levels=1, default_factory=list, lifetime=self.lifetime)
         self._product_type_items_cache = NestedCacheItem(
             levels=1, default_factory=list, lifetime=self.lifetime)
         self._product_base_type_items_cache = NestedCacheItem(
@@ -229,7 +180,6 @@ class ProductsModel:
         self._version_item_by_id.clear()
         self._product_folder_ids_mapping.clear()
 
-        self._product_type_icons_mapping.reset()
         self._product_type_items_cache.reset()
         self._product_items_cache.reset()
         self._repre_items_cache.reset()
@@ -267,6 +217,10 @@ class ProductsModel:
     ) -> list[ProductBaseTypeItem]:
         """Product base type items for the project.
 
+        Notes:
+            This will be used for filtering product types in UI when
+                product base types are fully implemented.
+
         Args:
             project_name (optional, str): Project name.
 
@@ -510,24 +464,8 @@ class ProductsModel:
 
     def _get_product_type_icons(
         self, project_name: Optional[str]
-    ) -> ProductBaseTypeIconMapping:
-        cache = self._product_type_icons_mapping[project_name]
-        if cache.is_valid:
-            return cache.get_data()
-
-        project_entity = self._controller.get_project_entity(project_name)
-        icons_mapping = ProductBaseTypeIconMapping()
-        if project_entity:
-            product_base_types = (
-                project_entity["config"].get("productBaseTypes", {})
-            )
-            icons_mapping = ProductBaseTypeIconMapping(
-                product_base_types.get("default"),
-                product_base_types.get("definitions")
-            )
-
-        cache.update_data(icons_mapping)
-        return icons_mapping
+    ) -> ProductTypeIconMapping:
+        return self._controller.get_product_type_icons_mapping(project_name)
 
     def _get_product_items_by_id(self, project_name, product_ids):
         product_item_by_id = self._product_item_by_id[project_name]
@@ -542,7 +480,7 @@ class ProductsModel:
 
         output.update(
             self._query_product_items_by_ids(
-                project_name, missing_product_ids
+                project_name, product_ids=missing_product_ids
             )
         )
         return output

From cf874e8f0a274b8a38ff8221d7f3d1a567095286 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 15 Sep 2025 11:46:28 +0200
Subject: [PATCH 5/6] use product type icon in scene inventory

---
 .../ayon_core/tools/sceneinventory/control.py | 15 ++++++++++-
 .../ayon_core/tools/sceneinventory/model.py   |  5 +---
 .../tools/sceneinventory/models/containers.py | 25 ++++++++++++++++++-
 3 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/client/ayon_core/tools/sceneinventory/control.py b/client/ayon_core/tools/sceneinventory/control.py
index 45f76a54ac..606c9e7298 100644
--- a/client/ayon_core/tools/sceneinventory/control.py
+++ b/client/ayon_core/tools/sceneinventory/control.py
@@ -1,3 +1,5 @@
+from typing import Optional
+
 import ayon_api
 
 from ayon_core.lib.events import QueuedEventSystem
@@ -6,7 +8,11 @@ from ayon_core.pipeline import (
     registered_host,
     get_current_context,
 )
-from ayon_core.tools.common_models import HierarchyModel, ProjectsModel
+from ayon_core.tools.common_models import (
+    HierarchyModel,
+    ProjectsModel,
+    ProductTypeIconMapping,
+)
 
 from .models import SiteSyncModel, ContainersModel
 
@@ -93,6 +99,13 @@ class SceneInventoryController:
             project_name, None
         )
 
+    def get_product_type_icons_mapping(
+        self, project_name: Optional[str]
+    ) -> ProductTypeIconMapping:
+        return self._projects_model.get_product_type_icons_mapping(
+            project_name
+        )
+
     # Containers methods
     def get_containers(self):
         return self._containers_model.get_containers()
diff --git a/client/ayon_core/tools/sceneinventory/model.py b/client/ayon_core/tools/sceneinventory/model.py
index 885553acaf..9977acea21 100644
--- a/client/ayon_core/tools/sceneinventory/model.py
+++ b/client/ayon_core/tools/sceneinventory/model.py
@@ -214,9 +214,6 @@ class InventoryModel(QtGui.QStandardItemModel):
         group_icon = qtawesome.icon(
             "fa.object-group", color=self._default_icon_color
         )
-        product_type_icon = qtawesome.icon(
-            "fa.folder", color="#0091B2"
-        )
         group_item_font = QtGui.QFont()
         group_item_font.setBold(True)
 
@@ -303,7 +300,7 @@ class InventoryModel(QtGui.QStandardItemModel):
                 remote_site_progress = "{}%".format(
                     max(progress["remote_site"], 0) * 100
                 )
-
+                product_type_icon = get_qt_icon(repre_info.product_type_icon)
                 group_item = QtGui.QStandardItem()
                 group_item.setColumnCount(root_item.columnCount())
                 group_item.setData(group_name, QtCore.Qt.DisplayRole)
diff --git a/client/ayon_core/tools/sceneinventory/models/containers.py b/client/ayon_core/tools/sceneinventory/models/containers.py
index f841f87c8e..47f74476de 100644
--- a/client/ayon_core/tools/sceneinventory/models/containers.py
+++ b/client/ayon_core/tools/sceneinventory/models/containers.py
@@ -126,6 +126,7 @@ class RepresentationInfo:
         product_id,
         product_name,
         product_type,
+        product_type_icon,
         product_group,
         version_id,
         representation_name,
@@ -135,6 +136,7 @@ class RepresentationInfo:
         self.product_id = product_id
         self.product_name = product_name
         self.product_type = product_type
+        self.product_type_icon = product_type_icon
         self.product_group = product_group
         self.version_id = version_id
         self.representation_name = representation_name
@@ -153,7 +155,17 @@ class RepresentationInfo:
 
     @classmethod
     def new_invalid(cls):
-        return cls(None, None, None, None, None, None, None, None)
+        return cls(
+            None,
+            None,
+            None,
+            None,
+            None,
+            None,
+            None,
+            None,
+            None,
+        )
 
 
 class VersionItem:
@@ -229,6 +241,9 @@ class ContainersModel:
     def get_representation_info_items(self, project_name, representation_ids):
         output = {}
         missing_repre_ids = set()
+        icons_mapping = self._controller.get_product_type_icons_mapping(
+            project_name
+        )
         for repre_id in representation_ids:
             try:
                 uuid.UUID(repre_id)
@@ -253,6 +268,7 @@ class ContainersModel:
                 "product_id": None,
                 "product_name": None,
                 "product_type": None,
+                "product_type_icon": None,
                 "product_group": None,
                 "version_id": None,
                 "representation_name": None,
@@ -265,10 +281,17 @@ class ContainersModel:
                 kwargs["folder_id"] = folder["id"]
                 kwargs["folder_path"] = folder["path"]
             if product:
+                product_type = product["productType"]
+                product_base_type = product.get("productBaseType")
+                icon = icons_mapping.get_icon(
+                    product_base_type=product_base_type,
+                    product_type=product_type,
+                )
                 group = product["attrib"]["productGroup"]
                 kwargs["product_id"] = product["id"]
                 kwargs["product_name"] = product["name"]
                 kwargs["product_type"] = product["productType"]
+                kwargs["product_type_icon"] = icon
                 kwargs["product_group"] = group
             if version:
                 kwargs["version_id"] = version["id"]

From 31469bfd9a0b7d29b88ce9162cfb297fc1c4aef5 Mon Sep 17 00:00:00 2001
From: Jakub Trllo <43494761+iLLiCiTiT@users.noreply.github.com>
Date: Mon, 15 Sep 2025 11:52:37 +0200
Subject: [PATCH 6/6] remove unused import

---
 client/ayon_core/tools/loader/control.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/ayon_core/tools/loader/control.py b/client/ayon_core/tools/loader/control.py
index c7c182b192..9f159bfb21 100644
--- a/client/ayon_core/tools/loader/control.py
+++ b/client/ayon_core/tools/loader/control.py
@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import logging
 import uuid
-from typing import Optional, Any
+from typing import Optional
 
 import ayon_api