diff --git a/src/options.xul b/platform/firefox/options.xul
similarity index 100%
rename from src/options.xul
rename to platform/firefox/options.xul
diff --git a/tools/make-firefox.bat b/tools/make-firefox.bat
index 123540883..f9f25e745 100644
--- a/tools/make-firefox.bat
+++ b/tools/make-firefox.bat
@@ -15,13 +15,13 @@ xcopy /S /I src\js %DES%\js
xcopy /S /I src\lib %DES%\lib
xcopy /S /I src\_locales %DES%\_locales
xcopy src\*.html %DES%\
-xcopy src\*.xul %DES%\
move %DES%\img\icon_128.png %DES%\icon.png
xcopy platform\firefox\vapi-*.js %DES%\js\
xcopy platform\firefox\bootstrap.js %DES%\
xcopy platform\firefox\frame*.js %DES%\
xcopy platform\firefox\chrome.manifest %DES%\
xcopy platform\firefox\install.rdf %DES%\
+xcopy platform\firefox\*.xul %DES%\
xcopy LICENSE.txt %DES%\
echo "*** uBlock.firefox: Generating meta..."
diff --git a/tools/make-firefox.sh b/tools/make-firefox.sh
index d52a3a8bf..91f3e5fc3 100755
--- a/tools/make-firefox.sh
+++ b/tools/make-firefox.sh
@@ -22,6 +22,7 @@ cp platform/firefox/bootstrap.js $DES/
cp platform/firefox/frame*.js $DES/
cp platform/firefox/chrome.manifest $DES/
cp platform/firefox/install.rdf $DES/
+cp platform/firefox/*.xul $DES/
cp LICENSE.txt $DES/
echo "*** uBlock.firefox: Generating meta..."
diff --git a/uBlock.csproj b/uBlock.csproj
index da4c851fa..738daab2f 100644
--- a/uBlock.csproj
+++ b/uBlock.csproj
@@ -83,7 +83,7 @@
-
+
@@ -148,6 +148,7 @@
+