diff --git a/client/ayon_core/hosts/houdini/api/usd.py b/client/ayon_core/hosts/houdini/api/usd.py
index 443a52bc37..ed33fbf590 100644
--- a/client/ayon_core/hosts/houdini/api/usd.py
+++ b/client/ayon_core/hosts/houdini/api/usd.py
@@ -8,8 +8,11 @@ from qtpy import QtWidgets, QtCore, QtGui
 
 from ayon_core import style
 from ayon_core.pipeline import get_current_project_name
-from ayon_core.tools.utils import PlaceholderLineEdit, RefreshButton
-from ayon_core.tools.ayon_utils.widgets import SimpleFoldersWidget
+from ayon_core.tools.utils import (
+    PlaceholderLineEdit,
+    RefreshButton,
+    SimpleFoldersWidget,
+)
 
 from pxr import Sdf
 
diff --git a/client/ayon_core/tools/context_dialog/window.py b/client/ayon_core/tools/context_dialog/window.py
index b145e77515..df5dd868e8 100644
--- a/client/ayon_core/tools/context_dialog/window.py
+++ b/client/ayon_core/tools/context_dialog/window.py
@@ -10,15 +10,13 @@ from ayon_core.tools.ayon_utils.models import (
     ProjectsModel,
     HierarchyModel,
 )
-from ayon_core.tools.ayon_utils.widgets import (
+from ayon_core.tools.utils import (
     ProjectsCombobox,
     FoldersWidget,
     TasksWidget,
-)
-from ayon_core.tools.utils.lib import (
-    center_window,
     get_ayon_qt_app,
 )
+from ayon_core.tools.utils.lib import center_window
 
 
 class SelectionModel(object):
diff --git a/client/ayon_core/tools/launcher/ui/actions_widget.py b/client/ayon_core/tools/launcher/ui/actions_widget.py
index 617f3b0c91..a225827418 100644
--- a/client/ayon_core/tools/launcher/ui/actions_widget.py
+++ b/client/ayon_core/tools/launcher/ui/actions_widget.py
@@ -4,7 +4,7 @@ import collections
 from qtpy import QtWidgets, QtCore, QtGui
 
 from ayon_core.tools.flickcharm import FlickCharm
-from ayon_core.tools.ayon_utils.widgets import get_qt_icon
+from ayon_core.tools.utils import get_qt_icon
 
 from .resources import get_options_image_path
 
diff --git a/client/ayon_core/tools/launcher/ui/hierarchy_page.py b/client/ayon_core/tools/launcher/ui/hierarchy_page.py
index 5b5f88a802..226a57930b 100644
--- a/client/ayon_core/tools/launcher/ui/hierarchy_page.py
+++ b/client/ayon_core/tools/launcher/ui/hierarchy_page.py
@@ -6,7 +6,7 @@ from ayon_core.tools.utils import (
     SquareButton,
     RefreshButton,
 )
-from ayon_core.tools.ayon_utils.widgets import (
+from ayon_core.tools.utils import (
     ProjectsCombobox,
     FoldersWidget,
     TasksWidget,
diff --git a/client/ayon_core/tools/launcher/ui/projects_widget.py b/client/ayon_core/tools/launcher/ui/projects_widget.py
index 729caf3232..39fc67fc0f 100644
--- a/client/ayon_core/tools/launcher/ui/projects_widget.py
+++ b/client/ayon_core/tools/launcher/ui/projects_widget.py
@@ -1,8 +1,9 @@
 from qtpy import QtWidgets, QtCore
 
 from ayon_core.tools.flickcharm import FlickCharm
-from ayon_core.tools.utils import PlaceholderLineEdit, RefreshButton
-from ayon_core.tools.ayon_utils.widgets import (
+from ayon_core.tools.utils import (
+    PlaceholderLineEdit,
+    RefreshButton,
     ProjectsQtModel,
     ProjectSortFilterProxy,
 )
diff --git a/client/ayon_core/tools/loader/ui/actions_utils.py b/client/ayon_core/tools/loader/ui/actions_utils.py
index bf6ab6eeb5..5a988ef4c2 100644
--- a/client/ayon_core/tools/loader/ui/actions_utils.py
+++ b/client/ayon_core/tools/loader/ui/actions_utils.py
@@ -10,7 +10,7 @@ from ayon_core.tools.utils.widgets import (
     OptionalAction,
     OptionDialog,
 )
-from ayon_core.tools.ayon_utils.widgets import get_qt_icon
+from ayon_core.tools.utils import get_qt_icon
 
 
 def show_actions_menu(action_items, global_point, one_item_selected, parent):
diff --git a/client/ayon_core/tools/loader/ui/folders_widget.py b/client/ayon_core/tools/loader/ui/folders_widget.py
index 34881ab49d..7b146456da 100644
--- a/client/ayon_core/tools/loader/ui/folders_widget.py
+++ b/client/ayon_core/tools/loader/ui/folders_widget.py
@@ -7,11 +7,11 @@ from ayon_core.tools.utils import (
 )
 from ayon_core.style import get_objected_colors
 
-from ayon_core.tools.ayon_utils.widgets import (
+from ayon_core.tools.utils import (
     FoldersQtModel,
     FOLDERS_MODEL_SENDER_NAME,
 )
-from ayon_core.tools.ayon_utils.widgets.folders_widget import FOLDER_ID_ROLE
+from ayon_core.tools.utils.folders_widget import FOLDER_ID_ROLE
 
 if qtpy.API == "pyside":
     from PySide.QtGui import QStyleOptionViewItemV4
diff --git a/client/ayon_core/tools/loader/ui/product_types_widget.py b/client/ayon_core/tools/loader/ui/product_types_widget.py
index 26244517ec..180994fd7f 100644
--- a/client/ayon_core/tools/loader/ui/product_types_widget.py
+++ b/client/ayon_core/tools/loader/ui/product_types_widget.py
@@ -1,6 +1,6 @@
 from qtpy import QtWidgets, QtGui, QtCore
 
-from ayon_core.tools.ayon_utils.widgets import get_qt_icon
+from ayon_core.tools.utils import get_qt_icon
 
 PRODUCT_TYPE_ROLE = QtCore.Qt.UserRole + 1
 
diff --git a/client/ayon_core/tools/loader/ui/products_model.py b/client/ayon_core/tools/loader/ui/products_model.py
index 331efad68a..c51172849a 100644
--- a/client/ayon_core/tools/loader/ui/products_model.py
+++ b/client/ayon_core/tools/loader/ui/products_model.py
@@ -4,7 +4,7 @@ import qtawesome
 from qtpy import QtGui, QtCore
 
 from ayon_core.style import get_default_entity_icon_color
-from ayon_core.tools.ayon_utils.widgets import get_qt_icon
+from ayon_core.tools.utils import get_qt_icon
 
 PRODUCTS_MODEL_SENDER_NAME = "qt_products_model"
 
diff --git a/client/ayon_core/tools/loader/ui/repres_widget.py b/client/ayon_core/tools/loader/ui/repres_widget.py
index 27db8dda40..3b6b8f94bf 100644
--- a/client/ayon_core/tools/loader/ui/repres_widget.py
+++ b/client/ayon_core/tools/loader/ui/repres_widget.py
@@ -4,7 +4,7 @@ from qtpy import QtWidgets, QtGui, QtCore
 import qtawesome
 
 from ayon_core.style import get_default_entity_icon_color
-from ayon_core.tools.ayon_utils.widgets import get_qt_icon
+from ayon_core.tools.utils import get_qt_icon
 from ayon_core.tools.utils import DeselectableTreeView
 
 from .actions_utils import show_actions_menu
diff --git a/client/ayon_core/tools/loader/ui/window.py b/client/ayon_core/tools/loader/ui/window.py
index 104b64d81c..3a6f4679fa 100644
--- a/client/ayon_core/tools/loader/ui/window.py
+++ b/client/ayon_core/tools/loader/ui/window.py
@@ -10,7 +10,7 @@ from ayon_core.tools.utils import (
     GoToCurrentButton,
 )
 from ayon_core.tools.utils.lib import center_window
-from ayon_core.tools.ayon_utils.widgets import ProjectsCombobox
+from ayon_core.tools.utils import ProjectsCombobox
 from ayon_core.tools.loader.control import LoaderController
 
 from .folders_widget import LoaderFoldersWidget
diff --git a/client/ayon_core/tools/publisher/widgets/create_context_widgets.py b/client/ayon_core/tools/publisher/widgets/create_context_widgets.py
index d65a2ace8d..3ec1c491e8 100644
--- a/client/ayon_core/tools/publisher/widgets/create_context_widgets.py
+++ b/client/ayon_core/tools/publisher/widgets/create_context_widgets.py
@@ -4,7 +4,7 @@ from ayon_core.lib.events import QueuedEventSystem
 from ayon_core.tools.utils import PlaceholderLineEdit, GoToCurrentButton
 
 from ayon_core.tools.ayon_utils.models import HierarchyExpectedSelection
-from ayon_core.tools.ayon_utils.widgets import FoldersWidget, TasksWidget
+from ayon_core.tools.utils import FoldersWidget, TasksWidget
 
 
 class CreateSelectionModel(object):
diff --git a/client/ayon_core/tools/publisher/widgets/folders_dialog.py b/client/ayon_core/tools/publisher/widgets/folders_dialog.py
index 8f93264b2e..03336e10a6 100644
--- a/client/ayon_core/tools/publisher/widgets/folders_dialog.py
+++ b/client/ayon_core/tools/publisher/widgets/folders_dialog.py
@@ -1,8 +1,7 @@
 from qtpy import QtWidgets, QtCore, QtGui
 
 from ayon_core.lib.events import QueuedEventSystem
-from ayon_core.tools.ayon_utils.widgets import FoldersWidget
-from ayon_core.tools.utils import PlaceholderLineEdit
+from ayon_core.tools.utils import PlaceholderLineEdit, FoldersWidget
 
 
 class FoldersDialogController:
diff --git a/client/ayon_core/tools/publisher/widgets/tasks_model.py b/client/ayon_core/tools/publisher/widgets/tasks_model.py
index 8f00dc37a2..e36de80fcf 100644
--- a/client/ayon_core/tools/publisher/widgets/tasks_model.py
+++ b/client/ayon_core/tools/publisher/widgets/tasks_model.py
@@ -1,6 +1,7 @@
 from qtpy import QtWidgets, QtCore, QtGui
 
-from ayon_core.tools.utils.lib import get_default_task_icon
+from ayon_core.style import get_default_entity_icon_color
+from ayon_core.tools.utils import get_qt_icon
 
 TASK_NAME_ROLE = QtCore.Qt.UserRole + 1
 TASK_TYPE_ROLE = QtCore.Qt.UserRole + 2
@@ -121,6 +122,11 @@ class TasksModel(QtGui.QStandardItemModel):
                 item = self._items_by_name.pop(task_name)
                 root_item.removeRow(item.row())
 
+        icon = get_qt_icon({
+            "type": "awesome-font",
+            "name": "fa.male",
+            "color": get_default_entity_icon_color(),
+        })
         new_items = []
         for task_name in new_task_names:
             if task_name in self._items_by_name:
@@ -129,7 +135,7 @@ class TasksModel(QtGui.QStandardItemModel):
             item = QtGui.QStandardItem(task_name)
             item.setData(task_name, TASK_NAME_ROLE)
             if task_name:
-                item.setData(get_default_task_icon(), QtCore.Qt.DecorationRole)
+                item.setData(icon, QtCore.Qt.DecorationRole)
             self._items_by_name[task_name] = item
             new_items.append(item)
 
diff --git a/client/ayon_core/tools/push_to_project/ui/window.py b/client/ayon_core/tools/push_to_project/ui/window.py
index bc2fc6bf96..4d64509afd 100644
--- a/client/ayon_core/tools/push_to_project/ui/window.py
+++ b/client/ayon_core/tools/push_to_project/ui/window.py
@@ -5,8 +5,6 @@ from ayon_core.tools.utils import (
     PlaceholderLineEdit,
     SeparatorWidget,
     set_style_property,
-)
-from ayon_core.tools.ayon_utils.widgets import (
     ProjectsCombobox,
     FoldersWidget,
     TasksWidget,
diff --git a/client/ayon_core/tools/sceneinventory/model.py b/client/ayon_core/tools/sceneinventory/model.py
index e53b6aa4c3..df0dea7a3d 100644
--- a/client/ayon_core/tools/sceneinventory/model.py
+++ b/client/ayon_core/tools/sceneinventory/model.py
@@ -13,8 +13,8 @@ from ayon_core.pipeline import (
     HeroVersionType,
 )
 from ayon_core.style import get_default_entity_icon_color
+from ayon_core.tools.utils import get_qt_icon
 from ayon_core.tools.utils.models import TreeModel, Item
-from ayon_core.tools.ayon_utils.widgets import get_qt_icon
 
 
 def walk_hierarchy(node):
diff --git a/client/ayon_core/tools/sceneinventory/switch_dialog/folders_input.py b/client/ayon_core/tools/sceneinventory/switch_dialog/folders_input.py
index e46c28474f..3137e70214 100644
--- a/client/ayon_core/tools/sceneinventory/switch_dialog/folders_input.py
+++ b/client/ayon_core/tools/sceneinventory/switch_dialog/folders_input.py
@@ -5,8 +5,8 @@ from ayon_core.tools.utils import (
     PlaceholderLineEdit,
     BaseClickableFrame,
     set_style_property,
+    FoldersWidget,
 )
-from ayon_core.tools.ayon_utils.widgets import FoldersWidget
 
 NOT_SET = object()
 
diff --git a/client/ayon_core/tools/traypublisher/window.py b/client/ayon_core/tools/traypublisher/window.py
index 988c22819a..ffa5d5b606 100644
--- a/client/ayon_core/tools/traypublisher/window.py
+++ b/client/ayon_core/tools/traypublisher/window.py
@@ -16,9 +16,10 @@ from ayon_core.pipeline import install_host
 from ayon_core.hosts.traypublisher.api import TrayPublisherHost
 from ayon_core.tools.publisher.control_qt import QtPublisherController
 from ayon_core.tools.publisher.window import PublisherWindow
-from ayon_core.tools.utils import PlaceholderLineEdit, get_ayon_qt_app
 from ayon_core.tools.ayon_utils.models import ProjectsModel
-from ayon_core.tools.ayon_utils.widgets import (
+from ayon_core.tools.utils import (
+    PlaceholderLineEdit,
+    get_ayon_qt_app,
     ProjectsQtModel,
     ProjectSortFilterProxy,
     PROJECT_NAME_ROLE,
diff --git a/client/ayon_core/tools/workfiles/widgets/window.py b/client/ayon_core/tools/workfiles/widgets/window.py
index 86a84b6195..8a2617d270 100644
--- a/client/ayon_core/tools/workfiles/widgets/window.py
+++ b/client/ayon_core/tools/workfiles/widgets/window.py
@@ -6,9 +6,13 @@ from ayon_core.tools.utils import (
     MessageOverlayObject,
 )
 
-from ayon_core.tools.ayon_utils.widgets import FoldersWidget, TasksWidget
 from ayon_core.tools.workfiles.control import BaseWorkfileController
-from ayon_core.tools.utils import GoToCurrentButton, RefreshButton
+from ayon_core.tools.utils import (
+    GoToCurrentButton,
+    RefreshButton,
+    FoldersWidget,
+    TasksWidget,
+)
 
 from .side_panel import SidePanelWidget
 from .files_widget import FilesWidget