diff --git a/scripts/deploy_desktop.py b/scripts/deploy_desktop.py
index 1f0a92b..3777021 100644
--- a/scripts/deploy_desktop.py
+++ b/scripts/deploy_desktop.py
@@ -102,11 +102,7 @@ def make():
 
     base.generate_doctrenderer_config(root_dir + "/converter/DoctRenderer.config", "../editors/", "desktop", "", "../dictionaries")
     base.copy_dir(git_dir + "/document-templates/new", root_dir + "/converter/empty")
-    if (0 == platform.find("mac")):
-      # TODO: check macOS app launch issue when localized file name templates inside
-      base.copy_dir(git_dir + "/desktop-apps/common/templates/EN", root_dir + "/converter/templates/EN")
-    else:
-      base.copy_dir(git_dir + "/desktop-apps/common/templates", root_dir + "/converter/templates")
+    base.copy_dir(git_dir + "/desktop-apps/common/templates", root_dir + "/converter/templates")
 
     # dictionaries
     base.copy_dictionaries(git_dir + "/dictionaries", root_dir + "/dictionaries")
diff --git a/tools/common/desktop_templates.py b/tools/common/desktop_templates.py
index 6891e1a..266a1f2 100644
--- a/tools/common/desktop_templates.py
+++ b/tools/common/desktop_templates.py
@@ -59,7 +59,9 @@ for file in src_files:
   elif ("xlsx" == name_ext) or ("xltx" == name_ext):
     dst_ext = "xltx"
 
-  dst_name = "[32]" + base64.b32encode(name_without_ext.encode("utf-8")).decode("utf-8")
+  dst_name = name_without_ext
+  if (len(dst_name) < 4) or (dst_name[0:4] != "[32]"):
+    dst_name = "[32]" + base64.b32encode(name_without_ext.encode("utf-8")).decode("utf-8")
 
   dst_file = directory_out_file + "/" + dst_name + "." + dst_ext