diff --git a/Tesseract4/gif.dll b/Tesseract4/gif.dll
deleted file mode 100644
index cab04f798..000000000
Binary files a/Tesseract4/gif.dll and /dev/null differ
diff --git a/Tesseract4/jpeg62.dll b/Tesseract4/jpeg62.dll
deleted file mode 100644
index 288d10fb3..000000000
Binary files a/Tesseract4/jpeg62.dll and /dev/null differ
diff --git a/Tesseract4/leptonica-1.74.4.dll b/Tesseract4/leptonica-1.74.4.dll
deleted file mode 100644
index d0c4b37df..000000000
Binary files a/Tesseract4/leptonica-1.74.4.dll and /dev/null differ
diff --git a/Tesseract4/libpng16.dll b/Tesseract4/libpng16.dll
deleted file mode 100644
index 30d0e5c33..000000000
Binary files a/Tesseract4/libpng16.dll and /dev/null differ
diff --git a/Tesseract4/lzma.dll b/Tesseract4/lzma.dll
deleted file mode 100644
index 6106229de..000000000
Binary files a/Tesseract4/lzma.dll and /dev/null differ
diff --git a/Tesseract4/tessdata/configs/hocr b/Tesseract4/tessdata/configs/hocr
deleted file mode 100644
index 9f63e41eb..000000000
--- a/Tesseract4/tessdata/configs/hocr
+++ /dev/null
@@ -1,3 +0,0 @@
-tessedit_create_hocr 1
-tessedit_pageseg_mode 1
-hocr_font_info 0
diff --git a/Tesseract4/tessdata/osd.traineddata b/Tesseract4/tessdata/osd.traineddata
deleted file mode 100644
index 183644aa5..000000000
Binary files a/Tesseract4/tessdata/osd.traineddata and /dev/null differ
diff --git a/Tesseract4/tesseract.exe b/Tesseract4/tesseract.exe
deleted file mode 100644
index 0529798a6..000000000
Binary files a/Tesseract4/tesseract.exe and /dev/null differ
diff --git a/Tesseract4/tiff.dll b/Tesseract4/tiff.dll
deleted file mode 100644
index fbd09dc02..000000000
Binary files a/Tesseract4/tiff.dll and /dev/null differ
diff --git a/Tesseract4/zlib1.dll b/Tesseract4/zlib1.dll
deleted file mode 100644
index d2515ebec..000000000
Binary files a/Tesseract4/zlib1.dll and /dev/null differ
diff --git a/build.bat b/build.bat
index ca27616f7..e56ea73d7 100644
--- a/build.bat
+++ b/build.bat
@@ -91,9 +91,8 @@ PUSHD "src\bin\Release"
 IF EXIST "temp_zip"                                RD /S /Q "temp_zip"
 IF NOT EXIST "temp_zip"                            MD "temp_zip"
 IF NOT EXIST "temp_zip\Languages"                  MD "temp_zip\Languages"
-IF NOT EXIST "temp_zip\Tesseract4"                  MD "temp_zip\Tesseract4"
-IF NOT EXIST "temp_zip\Tesseract4\tessdata"         MD "temp_zip\Tesseract4\tessdata"
-IF NOT EXIST "temp_zip\Tesseract4\tessdata\configs" MD "temp_zip\Tesseract4\tessdata\configs"
+IF NOT EXIST "temp_zip\Dictionaries"                  MD "temp_zip\Dictionaries"
+IF NOT EXIST "temp_zip\Ocr"                  MD "temp_zip\Ocr"
 
 COPY /Y /V "..\..\..\LICENSE.txt"                        "temp_zip\"
 COPY /Y /V "..\..\..\Changelog.txt"                      "temp_zip\"
@@ -101,10 +100,8 @@ COPY /Y /V "Hunspellx86.dll"                             "temp_zip\"
 COPY /Y /V "Hunspellx64.dll"                             "temp_zip\"
 COPY /Y /V "SubtitleEdit.exe"                            "temp_zip\"
 COPY /Y /V "Languages\*.xml"                             "temp_zip\Languages\"
-COPY /Y /V "..\..\..\Tesseract4\tesseract.exe"            "temp_zip\Tesseract4\"
-COPY /Y /V "..\..\..\Tesseract4\*.dll"            "temp_zip\Tesseract4\"
-COPY /Y /V "..\..\..\Tesseract4\tessdata\configs\hocr"    "temp_zip\Tesseract4\tessdata\configs\"
-COPY /Y /V "..\..\..\Tesseract4\tessdata\*.traineddata"   "temp_zip\Tesseract4\tessdata\"
+COPY /Y /V "..\..\..\Dictionaries\*.*"            "temp_zip\Dictionaries\"
+COPY /Y /V "..\..\..\Ocr\*.*"            "temp_zip\Ocr\"
 
 PUSHD "temp_zip"
 START "" /B /WAIT "%SEVENZIP%" a -tzip -mx=9 "SE%VERSION%.zip" * >NUL
diff --git a/src/Forms/Ocr/DownloadTesseract4.cs b/src/Forms/Ocr/DownloadTesseract4.cs
index 4a437931d..e8035d218 100644
--- a/src/Forms/Ocr/DownloadTesseract4.cs
+++ b/src/Forms/Ocr/DownloadTesseract4.cs
@@ -25,7 +25,9 @@ namespace Nikse.SubtitleEdit.Forms.Ocr
         {
             if (e.Error != null)
             {
-                MessageBox.Show(Configuration.Settings.Language.GetTesseractDictionaries.DownloadFailed);
+                MessageBox.Show(Configuration.Settings.Language.GetTesseractDictionaries.DownloadFailed + Environment.NewLine +
+                                Environment.NewLine +
+                                e.Error.Message + ": " + e.Error.StackTrace);
                 DialogResult = DialogResult.Cancel;
                 return;
             }
diff --git a/src/Forms/Ocr/VobSubOcr.cs b/src/Forms/Ocr/VobSubOcr.cs
index e88343c18..6e2d26b77 100644
--- a/src/Forms/Ocr/VobSubOcr.cs
+++ b/src/Forms/Ocr/VobSubOcr.cs
@@ -5199,6 +5199,7 @@ namespace Nikse.SubtitleEdit.Forms.Ocr
 
             if (_ocrMethodIndex == _ocrMethodTesseract302 || _ocrMethodIndex == _ocrMethodTesseract4)
             {
+                labelStatus.Text = Configuration.Settings.Language.General.PleaseWait;
                 _tesseractThreadRunner?.Cancel();
                 _tesseractThreadRunner = new TesseractThreadRunner(OcrDone);
                 _tesseractRunner = new TesseractRunner();