diff --git a/Code/Tools/AssetProcessor/native/ui/AssetTreeItem.cpp b/Code/Tools/AssetProcessor/native/ui/AssetTreeItem.cpp
index d8b69a80f5..75823374a0 100644
--- a/Code/Tools/AssetProcessor/native/ui/AssetTreeItem.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/AssetTreeItem.cpp
@@ -29,14 +29,16 @@ namespace AssetProcessor
     AssetTreeItem::AssetTreeItem(
         AZStd::shared_ptr<AssetTreeItemData> data,
         QIcon errorIcon,
+        QIcon folderIcon,
+        QIcon fileIcon,
         AssetTreeItem* parentItem) :
         m_data(data),
         m_parent(parentItem),
-        m_errorIcon(errorIcon), // QIcon is implicitily shared.
-        m_folderIcon(QIcon(QStringLiteral(":/Gallery/Asset_Folder.svg"))),
-        m_fileIcon(QIcon(QStringLiteral(":/Gallery/Asset_File.svg")))
+        m_errorIcon(errorIcon), // QIcon is implicitly shared.
+        m_folderIcon(folderIcon),
+        m_fileIcon(fileIcon)
     {
-        m_folderIcon.addFile(QStringLiteral(":/Gallery/Asset_Folder.svg"), QSize(), QIcon::Selected);
+
     }
 
     AssetTreeItem::~AssetTreeItem()
@@ -45,7 +47,7 @@ namespace AssetProcessor
 
     AssetTreeItem* AssetTreeItem::CreateChild(AZStd::shared_ptr<AssetTreeItemData> data)
     {
-        m_childItems.emplace_back(new AssetTreeItem(data, m_errorIcon, this));
+        m_childItems.emplace_back(new AssetTreeItem(data, m_errorIcon, m_folderIcon, m_fileIcon, this));
         return m_childItems.back().get();
     }
 
diff --git a/Code/Tools/AssetProcessor/native/ui/AssetTreeItem.h b/Code/Tools/AssetProcessor/native/ui/AssetTreeItem.h
index c9bc926c34..f36855adfe 100644
--- a/Code/Tools/AssetProcessor/native/ui/AssetTreeItem.h
+++ b/Code/Tools/AssetProcessor/native/ui/AssetTreeItem.h
@@ -50,6 +50,8 @@ namespace AssetProcessor
         explicit AssetTreeItem(
             AZStd::shared_ptr<AssetTreeItemData> data,
             QIcon errorIcon,
+            QIcon folderIcon,
+            QIcon fileIcon,
             AssetTreeItem* parentItem = nullptr);
         virtual ~AssetTreeItem();
 
diff --git a/Code/Tools/AssetProcessor/native/ui/AssetTreeModel.cpp b/Code/Tools/AssetProcessor/native/ui/AssetTreeModel.cpp
index 8d889343f9..e8540c3d8d 100644
--- a/Code/Tools/AssetProcessor/native/ui/AssetTreeModel.cpp
+++ b/Code/Tools/AssetProcessor/native/ui/AssetTreeModel.cpp
@@ -16,9 +16,12 @@ namespace AssetProcessor
 
     AssetTreeModel::AssetTreeModel(AZStd::shared_ptr<AzToolsFramework::AssetDatabase::AssetDatabaseConnection> sharedDbConnection, QObject *parent) :
         QAbstractItemModel(parent),
-        m_sharedDbConnection(sharedDbConnection),
-        m_errorIcon(QStringLiteral(":/stylesheet/img/logging/error.svg"))
+        m_sharedDbConnection(sharedDbConnection)
+        , m_errorIcon(QStringLiteral(":/stylesheet/img/logging/error.svg"))
+        , m_folderIcon(QIcon(QStringLiteral(":/Gallery/Asset_Folder.svg")))
+        , m_fileIcon(QIcon(QStringLiteral(":/Gallery/Asset_File.svg")))
     {
+        m_folderIcon.addFile(QStringLiteral(":/Gallery/Asset_Folder.svg"), QSize(), QIcon::Selected);
         ApplicationManagerNotifications::Bus::Handler::BusConnect();
         AzToolsFramework::AssetDatabase::AssetDatabaseNotificationBus::Handler::BusConnect();
     }
@@ -40,7 +43,7 @@ namespace AssetProcessor
     void AssetTreeModel::Reset()
     {
         beginResetModel();
-        m_root.reset(new AssetTreeItem(AZStd::make_shared<AssetTreeItemData>("", "", true, AZ::Uuid::CreateNull()), m_errorIcon));
+        m_root.reset(new AssetTreeItem(AZStd::make_shared<AssetTreeItemData>("", "", true, AZ::Uuid::CreateNull()), m_errorIcon, m_folderIcon, m_fileIcon));
 
         ResetModel();
 
diff --git a/Code/Tools/AssetProcessor/native/ui/AssetTreeModel.h b/Code/Tools/AssetProcessor/native/ui/AssetTreeModel.h
index d33bc0bc48..27201c55a3 100644
--- a/Code/Tools/AssetProcessor/native/ui/AssetTreeModel.h
+++ b/Code/Tools/AssetProcessor/native/ui/AssetTreeModel.h
@@ -54,5 +54,7 @@ namespace AssetProcessor
         AZStd::shared_ptr<AzToolsFramework::AssetDatabase::AssetDatabaseConnection> m_sharedDbConnection;
 
         QIcon m_errorIcon;
+        QIcon m_folderIcon;
+        QIcon m_fileIcon;
     };
 }