diff --git a/pype/nukestudio/tags.py b/pype/nukestudio/tags.py
index 8d1ec9e43a..e6c29a4f4e 100644
--- a/pype/nukestudio/tags.py
+++ b/pype/nukestudio/tags.py
@@ -37,11 +37,11 @@ def update_tag(tag, value):
     """
 
     tag.setNote(value['note'])
-    tag.setIcon(value['icon']['path'])
+    tag.setIcon(str(value['icon']['path']))
     mtd = tag.metadata()
     pres_mtd = value.get('metadata', None)
     if pres_mtd:
-        [mtd.setValue("tag.{}".format(k), v)
+        [mtd.setValue("tag.{}".format(str(k)), str(v))
          for k, v in pres_mtd.items()]
 
     return tag
diff --git a/pype/plugins/nukestudio/publish/collect_handles.py b/pype/plugins/nukestudio/publish/collect_handles.py
index cb20f97442..c148550a1a 100644
--- a/pype/plugins/nukestudio/publish/collect_handles.py
+++ b/pype/plugins/nukestudio/publish/collect_handles.py
@@ -35,18 +35,12 @@ class CollectClipHandles(api.InstancePlugin):
                     t_args = json.loads(t_args.replace("'", "\""))
                     # add in start
                     if 'start' in t_args['where']:
-                        hs = instance.data.get('handle_start')
-                        if not hs:
-                            instance.data['handle_start'] = 0
-                        instance.data['handle_start'] += t_value
+                        instance.data["handleStart"] += t_value
                         self.log.info("Collected Handle Start: `{}`".format(
-                            instance.data['handle_start']))
+                            instance.data["handleStart"]))
 
                     # add in end
                     if 'end' in t_args['where']:
-                        hs = instance.data.get('handle_end')
-                        if not hs:
-                            instance.data['handle_end'] = 0
-                        instance.data['handle_end'] += t_value
+                        instance.data["handleEnd"] += t_value
                         self.log.info("Collected Handle End: `{}`".format(
-                            instance.data['handle_end']))
+                            instance.data["handleEnd"]))
diff --git a/setup/nukestudio/hiero_plugin_path/Icons/1_add_handles_end.png b/setup/nukestudio/hiero_plugin_path/Icons/1_add_handles_end.png
new file mode 100644
index 0000000000..31c41d1ac6
Binary files /dev/null and b/setup/nukestudio/hiero_plugin_path/Icons/1_add_handles_end.png differ
diff --git a/setup/nukestudio/hiero_plugin_path/Icons/2D.png b/setup/nukestudio/hiero_plugin_path/Icons/2D.png
deleted file mode 100644
index 69a22ad815..0000000000
Binary files a/setup/nukestudio/hiero_plugin_path/Icons/2D.png and /dev/null differ
diff --git a/setup/nukestudio/hiero_plugin_path/Icons/2_add_handles.png b/setup/nukestudio/hiero_plugin_path/Icons/2_add_handles.png
new file mode 100644
index 0000000000..ab911c5ebc
Binary files /dev/null and b/setup/nukestudio/hiero_plugin_path/Icons/2_add_handles.png differ
diff --git a/setup/nukestudio/hiero_plugin_path/Icons/3D.png b/setup/nukestudio/hiero_plugin_path/Icons/3D.png
index b3a4af9e24..4ace8911df 100644
Binary files a/setup/nukestudio/hiero_plugin_path/Icons/3D.png and b/setup/nukestudio/hiero_plugin_path/Icons/3D.png differ
diff --git a/setup/nukestudio/hiero_plugin_path/Icons/3_add_handles_start.png b/setup/nukestudio/hiero_plugin_path/Icons/3_add_handles_start.png
new file mode 100644
index 0000000000..4cdc09b541
Binary files /dev/null and b/setup/nukestudio/hiero_plugin_path/Icons/3_add_handles_start.png differ
diff --git a/setup/nukestudio/hiero_plugin_path/Icons/4_2D.png b/setup/nukestudio/hiero_plugin_path/Icons/4_2D.png
new file mode 100644
index 0000000000..418272517f
Binary files /dev/null and b/setup/nukestudio/hiero_plugin_path/Icons/4_2D.png differ
diff --git a/setup/nukestudio/hiero_plugin_path/Icons/add_handles.png b/setup/nukestudio/hiero_plugin_path/Icons/add_handles.png
deleted file mode 100644
index 9c8be0d207..0000000000
Binary files a/setup/nukestudio/hiero_plugin_path/Icons/add_handles.png and /dev/null differ
diff --git a/setup/nukestudio/hiero_plugin_path/Icons/add_handles_end.png b/setup/nukestudio/hiero_plugin_path/Icons/add_handles_end.png
deleted file mode 100644
index 3885925f99..0000000000
Binary files a/setup/nukestudio/hiero_plugin_path/Icons/add_handles_end.png and /dev/null differ
diff --git a/setup/nukestudio/hiero_plugin_path/Icons/add_handles_start.png b/setup/nukestudio/hiero_plugin_path/Icons/add_handles_start.png
deleted file mode 100644
index ecfd2c2621..0000000000
Binary files a/setup/nukestudio/hiero_plugin_path/Icons/add_handles_start.png and /dev/null differ
diff --git a/setup/nukestudio/hiero_plugin_path/Icons/edit.png b/setup/nukestudio/hiero_plugin_path/Icons/edit.png
index b0f4c436ec..e0ba3c102f 100644
Binary files a/setup/nukestudio/hiero_plugin_path/Icons/edit.png and b/setup/nukestudio/hiero_plugin_path/Icons/edit.png differ
diff --git a/setup/nukestudio/hiero_plugin_path/Icons/hierarchy.png b/setup/nukestudio/hiero_plugin_path/Icons/hierarchy.png
index 55b4f9843b..68ea352885 100644
Binary files a/setup/nukestudio/hiero_plugin_path/Icons/hierarchy.png and b/setup/nukestudio/hiero_plugin_path/Icons/hierarchy.png differ
diff --git a/setup/nukestudio/hiero_plugin_path/Icons/lense.png b/setup/nukestudio/hiero_plugin_path/Icons/lense.png
new file mode 100644
index 0000000000..2eb2da982f
Binary files /dev/null and b/setup/nukestudio/hiero_plugin_path/Icons/lense.png differ
diff --git a/setup/nukestudio/hiero_plugin_path/Icons/lense1.png b/setup/nukestudio/hiero_plugin_path/Icons/lense1.png
new file mode 100644
index 0000000000..f76354f48c
Binary files /dev/null and b/setup/nukestudio/hiero_plugin_path/Icons/lense1.png differ
diff --git a/setup/nukestudio/hiero_plugin_path/Icons/z_layer_bg.png b/setup/nukestudio/hiero_plugin_path/Icons/z_layer_bg.png
new file mode 100644
index 0000000000..d01fe683e5
Binary files /dev/null and b/setup/nukestudio/hiero_plugin_path/Icons/z_layer_bg.png differ
diff --git a/setup/nukestudio/hiero_plugin_path/Icons/z_layer_fg.png b/setup/nukestudio/hiero_plugin_path/Icons/z_layer_fg.png
new file mode 100644
index 0000000000..3d7011b933
Binary files /dev/null and b/setup/nukestudio/hiero_plugin_path/Icons/z_layer_fg.png differ
diff --git a/setup/nukestudio/hiero_plugin_path/Icons/z_layer_main.png b/setup/nukestudio/hiero_plugin_path/Icons/z_layer_main.png
new file mode 100644
index 0000000000..0fe806d86e
Binary files /dev/null and b/setup/nukestudio/hiero_plugin_path/Icons/z_layer_main.png differ
diff --git a/setup/nukestudio/hiero_plugin_path/Icons/z_layers.png b/setup/nukestudio/hiero_plugin_path/Icons/z_layers.png
new file mode 100644
index 0000000000..cbe864b67a
Binary files /dev/null and b/setup/nukestudio/hiero_plugin_path/Icons/z_layers.png differ