diff --git a/.gitignore b/.gitignore
index 24209be6e..97e52a99b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,6 @@ debug.log
 Projects/Superalgos/Icons/Thumbs.db
 *.bat
 !launch-windows.bat
+!create-shortcut-windows.bat
 *.exe
 
diff --git a/Launch-Scripts/create-shortcut-windows.bat b/Launch-Scripts/create-shortcut-windows.bat
new file mode 100644
index 000000000..8074f5e72
--- /dev/null
+++ b/Launch-Scripts/create-shortcut-windows.bat
@@ -0,0 +1,9 @@
+set TARGET='%CD%\launch-windows.bat'
+set SHORTCUT='%USERPROFILE%\Desktop\Superalgos.lnk'
+set ICON='%CD%\superalgos.ico'
+set PWS=powershell.exe -ExecutionPolicy Bypass -NoLogo -NonInteractive -NoProfile
+
+%PWS% -Command "$ws = New-Object -ComObject WScript.Shell; $s = $ws.CreateShortcut(%SHORTCUT%); $S.TargetPath = %Target%; $S.IconLocation = %ICON%; $S.Save()"
+
+#Keep terminal open for debug
+#cmd /k echo "keep open"
\ No newline at end of file
diff --git a/Launch-Scripts/launch-linux.sh b/Launch-Scripts/launch-linux.sh
new file mode 100755
index 000000000..544a02045
--- /dev/null
+++ b/Launch-Scripts/launch-linux.sh
@@ -0,0 +1 @@
+x-terminal-emulator -e "bash -c 'cd .. && node run; $SHELL'"
diff --git a/launch-windows.bat b/Launch-Scripts/launch-windows.bat
similarity index 53%
rename from launch-windows.bat
rename to Launch-Scripts/launch-windows.bat
index 411b57fb0..f09ab7850 100644
--- a/launch-windows.bat
+++ b/Launch-Scripts/launch-windows.bat
@@ -1 +1,3 @@
+cd %~dp0
+cd ..
 cmd /k "node run"
\ No newline at end of file
diff --git a/Launch-Scripts/superalgos.ico b/Launch-Scripts/superalgos.ico
new file mode 100644
index 000000000..ad6b5d50b
Binary files /dev/null and b/Launch-Scripts/superalgos.ico differ
diff --git a/launch-linux.sh b/launch-linux.sh
deleted file mode 100755
index 5b56e4d0a..000000000
--- a/launch-linux.sh
+++ /dev/null
@@ -1 +0,0 @@
-x-terminal-emulator -e "bash -c 'node run; $SHELL'"