diff --git a/aur/panel_entry.py b/aur/panel_entry.py
index 56493aa7..8f427e73 100644
--- a/aur/panel_entry.py
+++ b/aur/panel_entry.py
@@ -14,7 +14,13 @@ Icon = {lib_path}/python{version}/site-packages/fpakman/resources/img/logo.svg
 
 py_version = "{}.{}".format(sys.version_info.major, sys.version_info.minor)
 
-with open('fpakman.desktop', 'w+') as f:
+fpakman_cmd = os.getenv('FPAKMAN_PATH', '/usr/bin/fpakman')
+
+with open('fpakman_desktop.desktop', 'w+') as f:
     f.write(desktop_file.format(lib_path=os.getenv('FPAKMAN_LIB_PATH', '/usr/lib'),
                                 version=py_version,
-                                path=os.getenv('FPAKMAN_PATH', '/usr/bin/fpakman')))
+                                path=fpakman_cmd))
+
+
+with open('fpakman', 'w') as f:
+    f.write(fpakman_cmd)
diff --git a/aur/tray_entry.py b/aur/tray_entry.py
index 2035b1d7..9b1b3d77 100644
--- a/aur/tray_entry.py
+++ b/aur/tray_entry.py
@@ -8,13 +8,19 @@ Type = Application
 Name = fpakman (tray)
 Categories = System;
 Comment = Manage your Flatpak / Snap applications
-Exec = {path} --tray=1
+Exec = {path}
 Icon = {lib_path}/python{version}/site-packages/fpakman/resources/img/logo.svg
 """
 
 py_version = "{}.{}".format(sys.version_info.major, sys.version_info.minor)
 
+fpakman_cmd = os.getenv('FPAKMAN_PATH', '/usr/bin/fpakman') + ' --tray=1'
+
 with open('fpakman_tray.desktop', 'w+') as f:
     f.write(desktop_file.format(lib_path=os.getenv('FPAKMAN_LIB_PATH', '/usr/lib'),
                                 version=py_version,
-                                path=os.getenv('FPAKMAN_PATH', '/usr/bin/fpakman')))
+                                path=fpakman_cmd))
+
+
+with open('fpakman-tray', 'w') as f:
+    f.write(fpakman_cmd)