diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 79d6c244..1be5c106 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,7 +20,10 @@ add_subdirectory (xoj-preview-extractor)
 # Used for both util and xournalpp targets
 add_definitions (-g -Wreturn-type -Wuninitialized -Wunused-value -Wunused-variable)
 
-if (NOT WIN32)
+if (WIN32)
+  # optimize for size (the Windows .exe is really big)
+  set (xournalpp_LDFLAGS ${xournalpp_LDFLAGS} "-Os -s")
+else ()
   add_definitions (-rdynamic)
 endif ()
 
diff --git a/windows-setup/build-launcher.sh b/windows-setup/build-launcher.sh
index cb6944c7..bc8f0ca7 100755
--- a/windows-setup/build-launcher.sh
+++ b/windows-setup/build-launcher.sh
@@ -6,6 +6,6 @@ if [[ "$unamestr" == 'Linux' ]]; then
 	g++ xournalpp_launcher.cpp -o xournalpp_launcher
 else
 	windres xpp.rc -O coff -o xpp.res
-	g++ xournalpp_launcher.cpp xpp.res -o setup/bin/xournalpp.exe -mwindows
+	g++ xournalpp_launcher.cpp xpp.res -o setup/bin/xournalpp.exe -s -Os -mwindows
 fi
 
diff --git a/windows-setup/build-setup.sh b/windows-setup/build-setup.sh
index 2b40364a..9de926ae 100644
--- a/windows-setup/build-setup.sh
+++ b/windows-setup/build-setup.sh
@@ -33,8 +33,20 @@ ldd ../build/src/xournalpp.exe | grep '\/mingw.*\.dll' -o | xargs -I{} cp "{}" s
 echo "copy ui"
 
 cp -r ../ui setup/
-mkdir setup/share/po/
-cp -r ../po/*.mo setup/share/po/
+
+mkdir -p setup/share/po/cs/LC_MESSAGES
+mkdir -p setup/share/po/zh_HK/LC_MESSAGES
+mkdir -p setup/share/po/de/LC_MESSAGES
+mkdir -p setup/share/po/pl/LC_MESSAGES
+mkdir -p setup/share/po/zh_TW/LC_MESSAGES
+mkdir -p setup/share/po/zh/LC_MESSAGES
+
+cp -r ../po/cs.mo setup/share/po/cs/LC_MESSAGES/xournalpp.mo
+cp -r ../po/zh_HK.mo setup/share/po/zh_HK/LC_MESSAGES/xournalpp.mo
+cp -r ../po/de.mo setup/share/po/de/LC_MESSAGES/xournalpp.mo
+cp -r ../po/ps.mo setup/share/po/pl/LC_MESSAGES/xournalpp.mo
+cp -r ../po/zh_TW.mo setup/share/po/zh_TW/LC_MESSAGES/xournalpp.mo
+cp -r ../po/zh.mo setup/share/po/zh/LC_MESSAGES/xournalpp.mo
 
 echo "copy pixbuf libs"
 cp -r /mingw64/lib/gdk-pixbuf-2.0 setup/lib
@@ -45,6 +57,12 @@ ldd /mingw64/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll | grep '\/mingw.*\.dll' -o
 echo "copy icons"
 cp -r /mingw64/share/icons setup/share/
 
+echo "copy glib shared"
+cp -r /mingw64/share/glib-2.0 setup/share/
+
+C:\msys64\mingw64\share\glib-2.0
+
+
 echo "pack setup"
 "/c/Program Files (x86)/NSIS/Bin/makensis.exe" xournalpp.nsi
 
diff --git a/windows-setup/xournalpp.nsi b/windows-setup/xournalpp.nsi
index aa982005..53da8786 100644
--- a/windows-setup/xournalpp.nsi
+++ b/windows-setup/xournalpp.nsi
@@ -21,7 +21,7 @@ InstallDir $PROGRAMFILES\Xournal++
 InstallDirRegKey HKCU "Software\Xournalpp" ""
 
 ;Request application privileges for Windows Vista
-RequestExecutionLevel user
+RequestExecutionLevel admin
 
 ;--------------------------------
 ;Variables