diff --git a/installer/windows/product.wxs b/installer/windows/product.wxs
index ae346da7..64c326e9 100644
--- a/installer/windows/product.wxs
+++ b/installer/windows/product.wxs
@@ -49,24 +49,12 @@
             <Merge Id="VCRedist" SourceFile="$(var.VCRedistPath)\$(var.VCRedistFile)" DiskId="1" Language="0" />
             <Directory Id="$(var.ProgramFilesFolder)">
                 <Directory Id="INSTALLDIR" Name="$(var.Name)">
-                    <!--
-                    This DLL is required when using Qt 5.10 and higher to show Windows Vista style GUI. The check for
-                    64-bit is required here since we are using Qt 5.7 for the 32-bit build. This file does not exist
-                    on earlier version of Qt. If Qt 5.10 is used for both 32-bit and 64-bit then this check can be removed.
-
-                    See https://bugreports.qt.io/browse/QTBUG-65177
-                    -->
-                    <?if $(sys.BUILDARCH)="x64"?>
                     <Directory Id="styles" Name="styles">
                         <Component><File Source="$(var.QtPath)\plugins\styles\qwindowsvistastyle.dll" /></Component>
                     </Directory>
-                    <?endif?>
-                    <!-- This plugin is not needed for the 32-bit version which is built with Qt 5.7. -->
-                    <?if $(sys.BUILDARCH)="x64"?>
                     <Directory Id="bearer" Name="bearer">
                         <Component><File Source="$(var.QtPath)\plugins\bearer\qgenericbearer.dll" /></Component>
                     </Directory>
-                    <?endif?>
                     <Directory Id="extensions" Name="extensions">
                         <Component><File Source="$(var.SQLitePath)\math.dll" /></Component>
                         <Component><File Source="$(var.SQLitePath)\formats.dll" /></Component>
@@ -164,9 +152,7 @@
             <ComponentGroupRef Id="TranslationsGroup" />
 
             <!-- Bearer -->
-            <?if $(sys.BUILDARCH)="x64"?>
             <ComponentRef Id="qgenericbearer.dll" />
-            <?endif?>
             <!-- Plugins -->
             <ComponentRef Id="qgif.dll" />
             <ComponentRef Id="qicns.dll" />
@@ -180,9 +166,7 @@
             <!-- Platforms -->
             <ComponentRef Id="qwindows.dll" />
             <!-- Windows Vista Style -->
-            <?if $(sys.BUILDARCH)="x64"?>
                 <ComponentRef Id="qwindowsvistastyle.dll" />
-            <?endif?>
             <!-- Printer -->
             <ComponentRef Id="windowsprintersupport.dll" />
             <!-- Licenses -->
diff --git a/installer/windows/translations.wxs b/installer/windows/translations.wxs
index 3787593b..c3fb6598 100644
--- a/installer/windows/translations.wxs
+++ b/installer/windows/translations.wxs
@@ -14,12 +14,11 @@
                 - qt_<language_code>.qm
                 - qtbase_<language_code>.qm
                 - qtmultimedia_<language_code>.qm
-                - qtquick1_<language_code>.qm
                 - qtscript_<language_code>.qm
                 - qtxmlpatterns_<language_code>.qm
 
             Notes:
-                - Arabic is missing "qtquick1_ar.qm" and "qtxmlpatterns_ar.qm" but seems to work without a problem.
+                - Arabic is missing "qtxmlpatterns_ar.qm" but seems to work without a problem.
 
                 - Chinese (China), Chinese (Taiwan), and Portuguese have only one file (qt_<language_code>.qm), so
                   the default buttons are not translated for these languages.
@@ -29,27 +28,11 @@
 
             <Directory Id="translations" Name="translations">
 
-                <!-- These files are not present in Qt 5.12, used by our 64-bit nightly builds. -->
-                <?if $(sys.BUILDARCH)!="x64"?>
-                    <Component><File Source="$(var.QtPath)\translations\qtquick1_cs.qm" /></Component>
-                    <Component><File Source="$(var.QtPath)\translations\qtquick1_en.qm" /></Component>
-                    <Component><File Source="$(var.QtPath)\translations\qtquick1_fr.qm" /></Component>
-                    <Component><File Source="$(var.QtPath)\translations\qtquick1_de.qm" /></Component>
-                    <Component><File Source="$(var.QtPath)\translations\qtquick1_it.qm" /></Component>
-                    <Component><File Source="$(var.QtPath)\translations\qtquick1_ko.qm" /></Component>
-                    <Component><File Source="$(var.QtPath)\translations\qtquick1_pl.qm" /></Component>
-                    <Component><File Source="$(var.QtPath)\translations\qtquick1_ru.qm" /></Component>
-                    <Component><File Source="$(var.QtPath)\translations\qtquick1_uk.qm" /></Component>
-                <?endif?>
-
                 <!-- Arabic -->
                 <Component><File Source="$(var.QtPath)\translations\qt_ar.qm" /></Component>
-                <!-- These files are not present in Qt 5.7, used by our 32-bit nightly builds. -->
-                <?if $(sys.BUILDARCH)="x64"?>
-                    <Component><File Source="$(var.QtPath)\translations\qtbase_ar.qm" /></Component>
-                    <Component><File Source="$(var.QtPath)\translations\qtmultimedia_ar.qm" /></Component>
-                    <Component><File Source="$(var.QtPath)\translations\qtscript_ar.qm" /></Component>
-                <?endif?>
+                <Component><File Source="$(var.QtPath)\translations\qtbase_ar.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtmultimedia_ar.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtscript_ar.qm" /></Component>
 
                 <!-- Chinese (China) -->
                 <Component><File Source="$(var.QtPath)\translations\qt_zh_CN.qm" /></Component>
@@ -125,13 +108,10 @@
 
                 <!-- Spanish -->
                 <Component><File Source="$(var.QtPath)\translations\qt_es.qm" /></Component>
-                <!-- These files are not present in Qt 5.7, used by our 32-bit nightly builds. -->
-                <?if $(sys.BUILDARCH)="x64"?>
-                    <Component><File Source="$(var.QtPath)\translations\qtbase_es.qm" /></Component>
-                    <Component><File Source="$(var.QtPath)\translations\qtmultimedia_es.qm" /></Component>
-                    <Component><File Source="$(var.QtPath)\translations\qtscript_es.qm" /></Component>
-                    <Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_es.qm" /></Component>
-                <?endif?>
+                <Component><File Source="$(var.QtPath)\translations\qtbase_es.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtmultimedia_es.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtscript_es.qm" /></Component>
+                <Component><File Source="$(var.QtPath)\translations\qtxmlpatterns_es.qm" /></Component>
 
                 <!-- Turkish -->
 
@@ -148,27 +128,11 @@
 
         <ComponentGroup Id="TranslationsGroup">
 
-            <!-- These files are not present in Qt 5.12, used by our 64-bit nightly builds. -->
-            <?if $(sys.BUILDARCH)!="x64"?>
-                <ComponentRef Id="qtquick1_cs.qm" />
-                <ComponentRef Id="qtquick1_en.qm" />
-                <ComponentRef Id="qtquick1_fr.qm" />
-                <ComponentRef Id="qtquick1_de.qm" />
-                <ComponentRef Id="qtquick1_it.qm" />
-                <ComponentRef Id="qtquick1_ko.qm" />
-                <ComponentRef Id="qtquick1_pl.qm" />
-                <ComponentRef Id="qtquick1_ru.qm" />
-                <ComponentRef Id="qtquick1_uk.qm" />
-            <?endif?>
-
             <!-- Arabic -->
             <ComponentRef Id="qt_ar.qm" />
-            <!-- These files are not present in Qt 5.7, used by our 32-bit nightly builds. -->
-            <?if $(sys.BUILDARCH)="x64"?>
-                <ComponentRef Id="qtbase_ar.qm" />
-                <ComponentRef Id="qtmultimedia_ar.qm" />
-                <ComponentRef Id="qtscript_ar.qm" />
-            <?endif?>
+            <ComponentRef Id="qtbase_ar.qm" />
+            <ComponentRef Id="qtmultimedia_ar.qm" />
+            <ComponentRef Id="qtscript_ar.qm" />
 
             <!-- Chinese (China) -->
             <ComponentRef Id="qt_zh_CN.qm" />
@@ -244,13 +208,10 @@
 
             <!-- Spanish -->
             <ComponentRef Id="qt_es.qm" />
-            <!-- These files are not present in Qt 5.7, used by our 32-bit nightly builds. -->
-            <?if $(sys.BUILDARCH)="x64"?>
-                <ComponentRef Id="qtbase_es.qm" />
-                <ComponentRef Id="qtmultimedia_es.qm" />
-                <ComponentRef Id="qtscript_es.qm" />
-                <ComponentRef Id="qtxmlpatterns_es.qm" />
-            <?endif?>
+            <ComponentRef Id="qtbase_es.qm" />
+            <ComponentRef Id="qtmultimedia_es.qm" />
+            <ComponentRef Id="qtscript_es.qm" />
+            <ComponentRef Id="qtxmlpatterns_es.qm" />
 
             <!-- Turkish -->
 
diff --git a/installer/windows/variables.wxi b/installer/windows/variables.wxi
index 49e2a4eb..fc073fbc 100644
--- a/installer/windows/variables.wxi
+++ b/installer/windows/variables.wxi
@@ -36,17 +36,12 @@
         The Visual C++ runtime merge modules are installed with Visual Studio and are located in this directory.
     VCRedistFile
         The Visual C++ runtime file. This file is usually named "Microsoft_[VERSION]_CRT_[ARCH].msm". "VERSION" is the
-        Visual Studio version the application is built with. Use VC140 (version 14.0) if the application is built with
-        Visual Studio 2015. The build "ARCH" will be set automatically.
+        Visual Studio version the application is built with. Use VC141 (version 14.1) if the application is built with
+        Visual Studio 2017. The build "ARCH" will be set automatically.
     -->
 
-    <?if $(sys.BUILDARCH)="x64"?>
-        <?define VCRedistPath="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\MergeModules" ?>
-        <?define VCRedistFile="Microsoft_VC141_CRT_$(sys.BUILDARCH).msm" ?>
-    <?elseif $(sys.BUILDARCH)="x86"?>
-        <?define VCRedistPath="C:\Program Files (x86)\Common Files\Merge Modules" ?>
-        <?define VCRedistFile="Microsoft_VC140_CRT_$(sys.BUILDARCH).msm" ?>
-    <?endif?>
+    <?define VCRedistPath="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\14.16.27012\MergeModules" ?>
+    <?define VCRedistFile="Microsoft_VC141_CRT_$(sys.BUILDARCH).msm" ?>
 
     <!--
     =================================================== Build System ===================================================