diff --git a/bin/imageformats/qicns.dll b/bin/imageformats/qicns.dll
deleted file mode 100644
index 9896eb5814..0000000000
Binary files a/bin/imageformats/qicns.dll and /dev/null differ
diff --git a/bin/imageformats/qico.dll b/bin/imageformats/qico.dll
deleted file mode 100644
index d8c9982f5b..0000000000
Binary files a/bin/imageformats/qico.dll and /dev/null differ
diff --git a/bin/platforms/qwindows.dll b/bin/platforms/qwindows.dll
deleted file mode 100644
index 62afc772d7..0000000000
Binary files a/bin/platforms/qwindows.dll and /dev/null differ
diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index 3274377fe0..446ab2f58c 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -413,27 +413,17 @@ set_target_properties(rpcs3 PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "${RPCS3_SR
 
 if (MSVC)
   # Under Windows, some QT DLLs need to be in the same directory of the compiled
-  # RPCS3 binary, so copy them from the local QT installation at the end of the
-  # build
+  # RPCS3 binary, so call the windeployqt tool that will take care of copying
+  # them from the local QT installation at the end of the build.
   if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-    # debug build uses different DDLs files
-    set (RUNTIME_DLLS
-      $ENV{QTDIR}/bin/Qt5Cored.dll
-      $ENV{QTDIR}/bin/Qt5Guid.dll
-      $ENV{QTDIR}/bin/Qt5Widgetsd.dll
-      $ENV{QTDIR}/bin/Qt5WinExtrasd.dll
+    add_custom_command(TARGET rpcs3 POST_BUILD
+      COMMAND $ENV{QTDIR}/bin/windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --debug ${CMAKE_BINARY_DIR}/bin
       )
   else()
-    set (RUNTIME_DLLS
-      $ENV{QTDIR}/bin/Qt5Core.dll
-      $ENV{QTDIR}/bin/Qt5Gui.dll
-      $ENV{QTDIR}/bin/Qt5Widgets.dll
-      $ENV{QTDIR}/bin/Qt5WinExtras.dll
+    add_custom_command(TARGET rpcs3 POST_BUILD
+      COMMAND $ENV{QTDIR}/bin/windeployqt --no-angle --no-opengl-sw --no-svg --no-translations ${CMAKE_BINARY_DIR}/bin
       )
   endif()
-  add_custom_command(TARGET rpcs3 POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${RUNTIME_DLLS} ${CMAKE_BINARY_DIR}/bin
-    )
 endif()
 
 cotire(rpcs3)
diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj
index 65976fdde4..6107d003f8 100644
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@@ -166,10 +166,7 @@
     </ResourceCompile>
     <PostBuildEvent>
       <Command>
-        xcopy "$(QTDIR)\bin\Qt5Core.dll" "$(OutDir)" /d
-        xcopy "$(QTDIR)\bin\Qt5Gui.dll" "$(OutDir)" /d
-        xcopy "$(QTDIR)\bin\Qt5Widgets.dll" "$(OutDir)" /d
-        xcopy "$(QTDIR)\bin\Qt5WinExtras.dll" "$(OutDir)" /d
+        $(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations $(OutDir)
       </Command>
     </PostBuildEvent>
     <PostBuildEvent>
@@ -221,10 +218,7 @@
     </ResourceCompile>
     <PostBuildEvent>
       <Command>
-        xcopy "$(QTDIR)\bin\Qt5Core.dll" "$(OutDir)" /d
-        xcopy "$(QTDIR)\bin\Qt5Gui.dll" "$(OutDir)" /d
-        xcopy "$(QTDIR)\bin\Qt5Widgets.dll" "$(OutDir)" /d
-        xcopy "$(QTDIR)\bin\Qt5WinExtras.dll" "$(OutDir)" /d
+        $(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations $(OutDir)
       </Command>
     </PostBuildEvent>
     <PostBuildEvent>
@@ -277,10 +271,7 @@
     </ResourceCompile>
     <PostBuildEvent>
       <Command>
-        xcopy "$(QTDIR)\bin\Qt5Cored.dll" "$(OutDir)" /d
-        xcopy "$(QTDIR)\bin\Qt5Guid.dll" "$(OutDir)" /d
-        xcopy "$(QTDIR)\bin\Qt5Widgetsd.dll" "$(OutDir)" /d
-        xcopy "$(QTDIR)\bin\Qt5WinExtrasd.dll" "$(OutDir)" /d
+        $(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --debug $(OutDir)
       </Command>
     </PostBuildEvent>
     <PostBuildEvent>
@@ -333,10 +324,7 @@
     </ResourceCompile>
     <PostBuildEvent>
       <Command>
-        xcopy "$(QTDIR)\bin\Qt5Cored.dll" "$(OutDir)" /d
-        xcopy "$(QTDIR)\bin\Qt5Guid.dll" "$(OutDir)" /d
-        xcopy "$(QTDIR)\bin\Qt5Widgetsd.dll" "$(OutDir)" /d
-        xcopy "$(QTDIR)\bin\Qt5WinExtrasd.dll" "$(OutDir)" /d
+        $(QTDIR)\bin\windeployqt --no-angle --no-opengl-sw --no-svg --no-translations --debug $(OutDir)
       </Command>
     </PostBuildEvent>
     <PostBuildEvent>