diff --git a/build.xml b/build.xml
index 01dd163d..742fd30a 100644
--- a/build.xml
+++ b/build.xml
@@ -253,7 +253,7 @@
 		<property name="dir.staging" location="${dir.dist}/appx" />
 
 		<copy todir="${dir.staging}">
-			<fileset dir="${dir.installer}/appx" includes="*.exe, **/*.png" />
+			<fileset dir="${dir.installer}/msi" includes="filebot.exe, filebot.launcher.exe" />
 		</copy>
 		<copy todir="${dir.staging}/lib">
 			<fileset dir="${dir.lib}/native/win32-x64" />
@@ -261,6 +261,9 @@
 		<copy todir="${dir.staging}/jar">
 			<fileset dir="${dir.dist}/lib" includes="*.jar" />
 		</copy>
+		<copy todir="${dir.staging}">
+			<fileset dir="${dir.installer}/appx" includes="**/*.png" />
+		</copy>
 
 		<!-- copy files and resolve ant variables -->
 		<copy-replace todir="${dir.staging}">
diff --git a/installer/appx/filebot.exe b/installer/appx/filebot.exe
deleted file mode 100644
index 4db0a823..00000000
Binary files a/installer/appx/filebot.exe and /dev/null differ
diff --git a/installer/appx/filebot.l4j.xml b/installer/appx/filebot.l4j.xml
deleted file mode 100644
index 95ea3a41..00000000
--- a/installer/appx/filebot.l4j.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launch4jConfig>
-  <dontWrapJar>true</dontWrapJar>
-  <headerType>console</headerType>
-  <jar></jar>
-  <outfile>filebot.exe</outfile>
-  <errTitle></errTitle>
-  <cmdLine></cmdLine>
-  <chdir></chdir>
-  <priority>normal</priority>
-  <downloadUrl></downloadUrl>
-  <supportUrl></supportUrl>
-  <stayAlive>false</stayAlive>
-  <restartOnCrash>false</restartOnCrash>
-  <manifest></manifest>
-  <icon>icon.ico</icon>
-  <classPath>
-    <mainClass>net.filebot.Main</mainClass>
-    <cp>%EXEDIR%\jar\*.jar</cp>
-  </classPath>
-  <jre>
-    <path>jre</path>
-    <bundledJre64Bit>true</bundledJre64Bit>
-    <bundledJreAsFallback>false</bundledJreAsFallback>
-    <minVersion></minVersion>
-    <maxVersion></maxVersion>
-    <jdkPreference>jreOnly</jdkPreference>
-    <runtimeBits>64</runtimeBits>
-  </jre>
-</launch4jConfig>
\ No newline at end of file
diff --git a/installer/appx/filebot.launcher.exe b/installer/appx/filebot.launcher.exe
deleted file mode 100644
index 8374e121..00000000
Binary files a/installer/appx/filebot.launcher.exe and /dev/null differ
diff --git a/installer/msi/filebot-launch4j.xml b/installer/msi/filebot-launch4j.xml
deleted file mode 100644
index fc53baec..00000000
--- a/installer/msi/filebot-launch4j.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launch4jConfig>
-  <dontWrapJar>true</dontWrapJar>
-  <headerType>gui</headerType>
-  <jar></jar>
-  <outfile>filebot.launcher.exe</outfile>
-  <errTitle></errTitle>
-  <cmdLine></cmdLine>
-  <chdir></chdir>
-  <priority>normal</priority>
-  <downloadUrl></downloadUrl>
-  <supportUrl></supportUrl>
-  <stayAlive>true</stayAlive>
-  <restartOnCrash>false</restartOnCrash>
-  <manifest></manifest>
-  <icon>icon.ico</icon>
-  <classPath>
-    <mainClass>net.filebot.Main</mainClass>
-    <cp>%EXEDIR%\jar\*.jar</cp>
-  </classPath>
-  <jre>
-    <path>jre</path>
-    <bundledJre64Bit>true</bundledJre64Bit>
-    <bundledJreAsFallback>false</bundledJreAsFallback>
-    <minVersion></minVersion>
-    <maxVersion></maxVersion>
-    <jdkPreference>jreOnly</jdkPreference>
-    <runtimeBits>64</runtimeBits>
-  </jre>
-</launch4jConfig>
\ No newline at end of file