diff --git a/openpype/modules/ftrack/event_handlers_user/action_batch_task_creation.py b/openpype/modules/ftrack/event_handlers_user/action_batch_task_creation.py
index 9146dc1f81..08b845d490 100644
--- a/openpype/modules/ftrack/event_handlers_user/action_batch_task_creation.py
+++ b/openpype/modules/ftrack/event_handlers_user/action_batch_task_creation.py
@@ -2,7 +2,7 @@
Taken from https://github.com/tokejepsen/ftrack-hooks/tree/master/batch_tasks
"""
-from openpype.modules.ftrack.lib import BaseAction
+from openpype.modules.ftrack.lib import BaseAction, statics_icon
class BatchTasksAction(BaseAction):
@@ -13,10 +13,11 @@ class BatchTasksAction(BaseAction):
`identifier` a unique identifier for your action.
`description` a verbose descriptive text for you action
'''
- label = "Batch Tasks"
+ label = "Batch Task Create"
variant = None
identifier = "batch-tasks"
description = None
+ icon = statics_icon("ftrack", "action_icons", "BatchTasks.svg")
def discover(self, session, entities, event):
'''Return true if we can handle the selected entities.
@@ -29,11 +30,13 @@ class BatchTasksAction(BaseAction):
or Asset Build.
*event* the unmodified original event
'''
- # Only discover the action if any selection is made.
- if entities:
- return True
- return False
+ not_allowed = ["assetversion", "project", "ReviewSession"
+ if entities[0].entity_type.lower() in not_allowed:
+ return False
+
+ return True
+
def get_task_form_items(self, session, number_of_tasks):
items = []
diff --git a/openpype/modules/ftrack/event_handlers_user/action_client_review_sort.py b/openpype/modules/ftrack/event_handlers_user/action_client_review_sort.py
index fc611c1d2b..7c9a2881d6 100644
--- a/openpype/modules/ftrack/event_handlers_user/action_client_review_sort.py
+++ b/openpype/modules/ftrack/event_handlers_user/action_client_review_sort.py
@@ -1,4 +1,4 @@
-from openpype.modules.ftrack.lib import BaseAction
+from openpype.modules.ftrack.lib import BaseAction, statics_icon
try:
from functools import cmp_to_key
except Exception:
@@ -50,6 +50,8 @@ class ClientReviewSort(BaseAction):
#: Action label.
label = 'Sort Review'
+ icon = statics_icon("ftrack", "action_icons", "SortReview.svg")
+
def discover(self, session, entities, event):
''' Validation '''
diff --git a/openpype/resources/ftrack/action_icons/BatchTasks.svg b/openpype/resources/ftrack/action_icons/BatchTasks.svg
new file mode 100644
index 0000000000..5cf5d423dd
--- /dev/null
+++ b/openpype/resources/ftrack/action_icons/BatchTasks.svg
@@ -0,0 +1,32 @@
+
+
+
diff --git a/openpype/resources/ftrack/action_icons/CreateFolders.svg b/openpype/resources/ftrack/action_icons/CreateFolders.svg
index c07e474e5c..18efc273aa 100644
--- a/openpype/resources/ftrack/action_icons/CreateFolders.svg
+++ b/openpype/resources/ftrack/action_icons/CreateFolders.svg
@@ -1,51 +1,29 @@
-
-
-
-
-
diff --git a/openpype/resources/ftrack/action_icons/CreateProjectFolders.svg b/openpype/resources/ftrack/action_icons/CreateProjectFolders.svg
index 5fa653361e..0e5821b0be 100644
--- a/openpype/resources/ftrack/action_icons/CreateProjectFolders.svg
+++ b/openpype/resources/ftrack/action_icons/CreateProjectFolders.svg
@@ -1,51 +1,29 @@
-
-
-
-
-
diff --git a/openpype/resources/ftrack/action_icons/DeleteAsset.svg b/openpype/resources/ftrack/action_icons/DeleteAsset.svg
index a41ae31d12..855bdae7c5 100644
--- a/openpype/resources/ftrack/action_icons/DeleteAsset.svg
+++ b/openpype/resources/ftrack/action_icons/DeleteAsset.svg
@@ -1 +1,32 @@
-
\ No newline at end of file
+
+
+
diff --git a/openpype/resources/ftrack/action_icons/Delivery.svg b/openpype/resources/ftrack/action_icons/Delivery.svg
index 3380487c31..a6333333ae 100644
--- a/openpype/resources/ftrack/action_icons/Delivery.svg
+++ b/openpype/resources/ftrack/action_icons/Delivery.svg
@@ -1,34 +1,27 @@
-
-