diff --git a/openpype/hooks/pre_foundry_apps.py b/openpype/hooks/pre_foundry_apps.py
index 7df1a6a833..85f68c6b60 100644
--- a/openpype/hooks/pre_foundry_apps.py
+++ b/openpype/hooks/pre_foundry_apps.py
@@ -13,7 +13,7 @@ class LaunchFoundryAppsWindows(PreLaunchHook):
 
     # Should be as last hook because must change launch arguments to string
     order = 1000
-    app_groups = ["nuke", "nukex", "hiero", "nukestudio", "photoshop"]
+    app_groups = ["nuke", "nukex", "hiero", "nukestudio"]
     platforms = ["windows"]
 
     def execute(self):
diff --git a/openpype/tools/launcher/window.py b/openpype/tools/launcher/window.py
index c8acbe77c2..a8f65894f2 100644
--- a/openpype/tools/launcher/window.py
+++ b/openpype/tools/launcher/window.py
@@ -243,7 +243,11 @@ class LauncherWindow(QtWidgets.QDialog):
 
         # Allow minimize
         self.setWindowFlags(
-            self.windowFlags() | QtCore.Qt.WindowMinimizeButtonHint
+            QtCore.Qt.Window
+            | QtCore.Qt.CustomizeWindowHint
+            | QtCore.Qt.WindowTitleHint
+            | QtCore.Qt.WindowMinimizeButtonHint
+            | QtCore.Qt.WindowCloseButtonHint
         )
 
         project_model = ProjectModel(self.dbcon)
diff --git a/openpype/tools/standalonepublish/widgets/widget_family.py b/openpype/tools/standalonepublish/widgets/widget_family.py
index 682a6fc974..1e20028392 100644
--- a/openpype/tools/standalonepublish/widgets/widget_family.py
+++ b/openpype/tools/standalonepublish/widgets/widget_family.py
@@ -10,7 +10,7 @@ from openpype.api import (
     Creator
 )
 from openpype.lib import TaskNotSetError
-from avalon.tools.creator.app import SubsetAllowedSymbols
+from openpype.pipeline.create import SUBSET_NAME_ALLOWED_SYMBOLS
 
 
 class FamilyWidget(QtWidgets.QWidget):
@@ -223,7 +223,7 @@ class FamilyWidget(QtWidgets.QWidget):
                 # QUESTION should Creator care about this and here should be
                 #   only validated with schema regex?
                 subset_name = re.sub(
-                    "[^{}]+".format(SubsetAllowedSymbols),
+                    "[^{}]+".format(SUBSET_NAME_ALLOWED_SYMBOLS),
                     "",
                     subset_name
                 )
diff --git a/repos/avalon-core b/repos/avalon-core
index 7e5efd6885..9499f6517a 160000
--- a/repos/avalon-core
+++ b/repos/avalon-core
@@ -1 +1 @@
-Subproject commit 7e5efd6885330d84bb8495975bcab84df49bfa3d
+Subproject commit 9499f6517a1ff2d3bf94c5d34c0aece146734760