diff --git a/bin/assets/icon/ee.x64.res b/bin/assets/icon/ee.x64.res
new file mode 100644
index 000000000..ccfe723cf
Binary files /dev/null and b/bin/assets/icon/ee.x64.res differ
diff --git a/premake5.lua b/premake5.lua
index 486d26d7d..6724b4716 100644
--- a/premake5.lua
+++ b/premake5.lua
@@ -249,11 +249,16 @@ function build_link_configuration( package_name, use_ee_icon )
 	set_xcode_config()
 	build_arch_configuration()
 
-	filter { "system:windows", "action:not vs*" }
+	filter { "system:windows", "action:not vs*", "architecture:x86" }
 		if ( true == use_ee_icon ) then
 			linkoptions { "../../bin/assets/icon/ee.res" }
 		end
 
+	filter { "system:windows", "action:not vs*", "architecture:x86_64" }
+		if ( true == use_ee_icon ) then
+			linkoptions { "../../bin/assets/icon/ee.x64.res" }
+		end
+
 	filter { "system:windows", "action:vs*" }
 		files { "bin/assets/icon/ee.rc", "bin/assets/icon/ee.ico" }
 		vpaths { ['Resources/*'] = { "ee.rc", "ee.ico" } }
@@ -294,10 +299,10 @@ function build_link_configuration( package_name, use_ee_icon )
 		syslibdirs { "src/thirdparty/" .. remote_sdl2_version .."/lib/x64" }
 
 	filter { "options:windows-mingw-build", "architecture:x86", "options:cc=mingw" }
-		syslibdirs { "src/thirdparty/" .. remote_sdl2_version .."/i686-w64-mingw32/lib/" }
+		syslibdirs { "src/thirdparty/" .. remote_sdl2_version .."/i686-w64-mingw32/lib/", "/usr/i686-w64-mingw32/sys-root/mingw/lib/" }
 
 	filter { "options:windows-mingw-build", "architecture:x86_64", "options:cc=mingw" }
-		syslibdirs { "src/thirdparty/" .. remote_sdl2_version .."/x86_64-w64-mingw32/lib/" }
+		syslibdirs { "src/thirdparty/" .. remote_sdl2_version .."/x86_64-w64-mingw32/lib/", "/usr/x86_64-w64-mingw32/sys-root/mingw/lib/" }
 
 	filter "system:emscripten"
 		targetname ( package_name .. extension )
diff --git a/projects/mingw32/ecode/build.app.sh b/projects/mingw32/ecode/build.app.sh
index 31f0a5893..61a791341 100755
--- a/projects/mingw32/ecode/build.app.sh
+++ b/projects/mingw32/ecode/build.app.sh
@@ -3,12 +3,17 @@ CANONPATH=$(readlink -f "$0")
 DIRPATH="$(dirname "$CANONPATH")"
 cd "$DIRPATH" || exit
 
-ARCH=x86
-ARCHI=i686
+ARCH=x86_64
+ARCHI=$ARCH
+BUILDTYPE=release
 for i in "$@"; do
   case $i in
-    config=*)
-      ARCH="${i#*=}"
+    arch=*)
+      ARCH_CONFIG="${i#*=}"
+      shift
+      ;;
+    buildtype=*)
+      BUILDTYPE_CONFIG="${i#*=}"
       shift
       ;;
     *)
@@ -16,12 +21,16 @@ for i in "$@"; do
   esac
 done
 
-if [[ "$ARCH" == *"x86_64"* ]]; then
-  ARCH=x86_64
-  ARCHI=$ARCH
+if [[ "$BUILDTYPE_CONFIG" == "debug" ]]; then
+  BUILDTYPE=debug
 fi
 
-../make.sh -e config=release_"$ARCH" -j"$(nproc)" ecode
+if [[ "$ARCH_CONFIG" == "x86" ]]; then
+  ARCH=x86
+  ARCHI=i686
+fi
+
+../make.sh -e config="$BUILDTYPE"_"$ARCH" -j"$(nproc)" ecode
 
 SDLVER=$(grep "remote_sdl2_version =" ../../../premake5.lua | awk '{print $3}' | tr -d '"')
 rm -rf ./ecode
@@ -41,6 +50,8 @@ cp -r ../../../bin/assets/fonts/NotoColorEmoji.ttf ecode/assets/fonts/
 cp -r ../../../bin/assets/plugins ecode/assets/
 mkdir ecode/assets/ui
 cp ../../../bin/assets/ui/breeze.css ecode/assets/ui/
+mkdir -p ecode/assets/icon
+cp ../../../bin/assets/icon/ee.png ecode/assets/icon/
 
 VERSIONPATH=../../../src/tools/ecode/version.hpp
 ECODE_MAJOR_VERSION=$(grep "define ECODE_MAJOR_VERSION" $VERSIONPATH | awk '{print $3}')