diff --git a/winbuild/builddist.bat b/winbuild/builddist.bat
index 2c97ffb..dc44870 100644
--- a/winbuild/builddist.bat
+++ b/winbuild/builddist.bat
@@ -6,11 +6,19 @@ call __env__\Scripts\activate.bat
 pip install .
 pip install nuitka
 
-python -m nuitka --follow-imports --standalone --windows-dependency-tool=pefile --windows-icon=winbuild\yoga-icon.ico winbuild\yogawin.py
+REM Hack to workaround an issue with the way Nuitka handles the icons...
+mkdir yogawin.build
+copy winbuild\yoga-icon.ico yogawin.build\yoga-icon.ico
+copy winbuild\yoga-icon.ico yoga-icon.ico
+
+python -m nuitka --follow-imports --standalone --windows-dependency-tool=pefile --windows-icon=yoga-icon.ico winbuild\yogawin.py
 move yogawin.dist\yogawin.exe yogawin.dist\yoga.exe
 copy winbuild\README-windows-dist.md yogawin.dist\README.txt
 copy LICENSE yogawin.dist\LICENSE.txt
 
+REM Remove the icon that was put here to workaround Nuika icon issue...
+del yoga-icon.ico
+
 call __env__\Scripts\deactivate.bat
 
 endlocal
diff --git a/winbuild/yoga-icon.ico b/winbuild/yoga-icon.ico
index e145203..7a0f9af 100644
Binary files a/winbuild/yoga-icon.ico and b/winbuild/yoga-icon.ico differ