Merge branch 'master' into feature/beautify-timecodes-2023

# Conflicts:
#	src/ui/Forms/Options/Settings.Designer.cs
#	src/ui/Forms/Options/Settings.cs

Dictionaries/hrv_OCRFixReplaceList.xml

@@ -24,6 +24,7 @@
     <Word from="akvarijumu" to="akvariju" />
     <Word from="amin" to="amen" />
     <Word from="Amin" to="Amen" />
+    <Word from="amle" to="male" />
     <Word from="ans" to="nas" />
     <Word from="apsorbovanje" to="apsorbiranje" />
     <Word from="apsorbuje" to="apsorbira" />
@@ -83,6 +84,10 @@
     <Word from="bioskop" to="kino" />
     <Word from="bioskopi" to="kina" />
     <Word from="bitci" to="bitki" />
+    <Word from="bjesno" to="bijesno" />
+    <Word from="bjeda" to="bijeda" />
+    <Word from="bjede" to="bijede" />
+    <Word from="bjedu" to="bijedu" />
     <Word from="bled" to="blijed" />
     <Word from="blede" to="blijede" />
     <Word from="blizankinja" to="blizanka" />
@@ -102,6 +107,7 @@
     <Word from="bregu" to="brijegu" />
     <Word from="bti" to="biti" />
     <Word from="budr" to="bude" />
+    <Word from="budep" to="budeš" />
     <Word from="buđav" to="pljesniv" />
     <Word from="cedila" to="cijedila" />
     <Word from="cedilu" to="cjedilu" />
@@ -142,6 +148,7 @@
     <Word from="cvetalo" to="cvjetalo" />
     <Word from="cvjetom" to="cvijetom" />
     <Word from="Čakom" to="Chuckom" />
+    <Word from="čakšir" to="hlače" />
     <Word from="čaršav" to="plahta" />
     <Word from="čaršave" to="plahte" />
     <Word from="čaršavi" to="plahte" />
@@ -203,8 +210,10 @@
     <Word from="ćute" to="šute" />
     <Word from="Ćute" to="Šute" />
     <Word from="cvetova" to="cvjetova" />
+    <Word from="dp" to="do" />
     <Word from="daga" to="da ga" />
     <Word from="damas" to="danas" />
+    <Word from="dase" to="da se" />
     <Word from="date" to="dane" />
     <Word from="dcije" to="dvije" />
     <Word from="deca" to="djeca" />
@@ -252,6 +261,8 @@
     <Word from="deleći" to="dijeleći" />
     <Word from="deo" to="dio" />
     <Word from="Deo" to="Dio" />
+    <Word from="delo" to="djelo" />
+    <Word from="demp" to="demo" />
     <Word from="dešava" to="događa" />
     <Word from="dešifrujemo" to="dešifriramo" />
     <Word from="dete" to="dijete" />
@@ -297,6 +308,8 @@
     <Word from="drugde" to="drugdje" />
     <Word from="ds" to="da" />
     <Word from="dti" to="dati" />
+    <Word from="dui" to="idu" />
+    <Word from="diu" to="idu" />
     <Word from="duuga" to="dúga" />
     <Word from="duvan" to="duhan" />
     <Word from="duvana" to="duhana" />
@@ -358,6 +371,8 @@
     <Word from="g-đici" to="gđici" />
     <Word from="g-đicu" to="gđicu" />
     <Word from="gluhonem" to="gluhonijem" />
+    <Word from="gorele" to="gorjele" />
+    <Word from="gorela" to="gorjela" />
     <Word from="greše" to="griješe" />
     <Word from="grješe" to="griješe" />
     <Word from="greši" to="griješi" />
@@ -530,6 +545,9 @@
     <Word from="jedbo" to="jedno" />
     <Word from="jel" to="je l'" />
     <Word from="jelda" to="jel' da" />
+    <Word from="jenako" to="jednako" />
+    <Word from="jenake" to="jednake" />    
+    <Word from="jenaki" to="jednaki" />
     <Word from="Ješćemo" to="Jest ćemo" />
     <Word from="Ješćeš" to="Jest ćeš" />
     <Word from="ješće" to="jest će" />
@@ -941,6 +959,7 @@
     <Word from="nemora" to="ne mora" />
     <Word from="Nemora" to="Ne mora" />
     <Word from="nene" to="njene" />
+    <Word from="neog" to="nego" />
     <Word from="nepto" to="nešto" />
     <Word from="nešo" to="nešto" />
     <Word from="neutešan" to="neutješan" />
@@ -989,6 +1008,10 @@
     <Word from="oar" to="par" />
     <Word from="obe" to="obje" />
     <Word from="Obe" to="Obje" />
+    <Word from="obeležavao" to="obilježavao" />
+    <Word from="obeležavala" to="obilježavala" />
+    <Word from="obeležavati" to="obilježavati" />
+    <Word from="obeležavali" to="obilježavali" />
     <Word from="obema" to="objema" />
     <Word from="obezbede" to="osiguraju" />
     <Word from="obezbediću" to="osigurat ću" />
@@ -1025,6 +1048,9 @@
     <Word from="odma" to="odmah" />
     <Word from="odna" to="onda" />
     <Word from="onfa" to="onda" />
+    <Word from="odeća" to="odjeća" />
+    <Word from="odeću" to="odjeću" />
+    <Word from="odjećom" to="odećom" />
     <Word from="Odneću" to="Odnijet ću" />
     <Word from="odneću" to="odnijet ću" />
     <Word from="odneće" to="odnijet će" />
@@ -1278,6 +1304,7 @@
     <Word from="predelu" to="predjelu" />
     <Word from="Preći" to="Prijeći" />
     <Word from="preći" to="prijeći" />
+    <Word from="prećutati" to="prešutjeti" />
     <Word from="prećutkuje" to="prešućuje" />
     <Word from="predame" to="preda me" />
     <Word from="predamnom" to="preda mnom" />
@@ -1605,6 +1632,7 @@
     <Word from="smesta" to="smjesta" />
     <Word from="Smesta" to="Smjesta" />
     <Word from="smeste" to="smjeste" />
+    <Word from="smeš" to="smiješ" />
     <Word from="smešak" to="smješak" />
     <Word from="smeši" to="smiješi" />
     <Word from="Smeši" to="Smiješi" />
@@ -1769,6 +1797,8 @@
     <Word from="Suvu" to="Suhu" />
     <Word from="Svestan" to="Svjestan" />
     <Word from="svestan" to="svjestan" />
+    <Word from="sveže" to="svježe" />
+    <Word from="svežu" to="svježu" />
     <Word from="svida" to="sviđa" />
     <Word from="svidja" to="sviđa" />
     <Word from="svjest" to="svijest" />
@@ -1821,6 +1851,7 @@
     <Word from="tešile" to="tješile" />
     <Word from="tiće" to="tiče" />
     <Word from="tki" to="tko" />
+    <Word from="tofa" to="toga" />
     <Word from="toag" to="toga" />
     <Word from="točak" to="kotač" />
     <Word from="Točak" to="Kotač" />
@@ -1886,7 +1917,9 @@
     <Word from="uleću" to="ulijeću" />
     <Word from="ulevo" to="ulijevo" />
     <Word from="ume" to="zna" />
+    <Word from="umetnik" to="umjetnik" />
     <Word from="umetnine" to="umjetnine" />
+    <Word from="umetninama" to="umjetninama" />
     <Word from="umem" to="umijem" />
     <Word from="umeš" to="umiješ" />
     <Word from="umesto" to="umjesto" />
@@ -1894,7 +1927,6 @@
     <Word from="umete" to="znate" />
     <Word from="umijesto" to="umjesto" />
     <Word from="Umijesto" to="Umjesto" />
-    <Word from="umetninama" to="umjetninama" />
     <Word from="umreti" to="umrijeti" />
     <Word from="Umret" to="Umrijet" />
     <Word from="umrijećeš" to="umrijet ćeš" />
@@ -2054,6 +2086,7 @@
     <Word from="Vodiće" to="Vodit će" />
     <Word from="Vodiću" to="Vodit ću" />
     <Word from="voleh" to="voljeh" />
+    <Word from="volela" to="voljela" />
     <Word from="voliti" to="voljeti" />
     <Word from="voza" to="vlaka" />
     <Word from="vozu" to="vlaku" />
@@ -2155,6 +2188,7 @@
     <Word from="zlodela" to="zlodjela" />
     <Word from="znaći" to="znači" />
     <Word from="zs" to="za" />
+    <Word from="znsm" to="znam" />
     <Word from="zvaničan" to="služben" />
     <Word from="zvezda" to="zvijezda" />
     <Word from="Zvezda" to="Zvijezda" />
@@ -3631,6 +3665,8 @@
     <RegEx find="(?&lt;![Ss]p)avać" replaceWith="avat ć" />
     <RegEx find="(?&lt;!e)bde" replaceWith="bdje" />
     <RegEx find="be[čć]aje" replaceWith="bećava" />
+    <RegEx find="beap" replaceWith="besp" />
+    <RegEx find="beop" replaceWith="besp" />
     <RegEx find="begl" replaceWith="bjegl" />
     <RegEx find="bmi" replaceWith="bni" />
     <RegEx find="bpl" replaceWith="bol" />
@@ -3745,6 +3781,7 @@
     <RegEx find="kpr" replaceWith="kor" />
     <RegEx find="ktovanj" replaceWith="ktiranj" />
     <RegEx find="ktuj" replaceWith="ktiraj" />
+    <RegEx find="kzp" replaceWith="kup" />
     <RegEx find="(?&lt;![Oo]b)([nl])izuj[eu]" replaceWith="$1izira" />
     <RegEx find="\bl([čćžzvsmrtpdbgkn])" replaceWith="i$1" />
     <RegEx find="\bL([čćžzvsmrtpdbgkn])" replaceWith="I$1" />
@@ -3765,6 +3802,7 @@
     <RegEx find="l([ou])žić" replaceWith="l$1žit ć" />
     <RegEx find="luparenj" replaceWith="lupiranj" />
     <RegEx find="lwn" replaceWith="lan" />
+    <RegEx find="mwn" replaceWith="men" />
     <RegEx find="mbog" replaceWith="mnog" />
     <RegEx find="(?&lt;![Mm])ekd" replaceWith="egd" />
     <RegEx find="([mv])ešten" replaceWith="$1ješten" />
@@ -3853,6 +3891,7 @@
     <RegEx find="pendov" replaceWith="pendir" />
     <RegEx find="pisho" replaceWith="psiho" />
     <RegEx find="pord" replaceWith="prod" />
+    <RegEx find="ptv" replaceWith="otv" />
     <RegEx find="ralijs" replaceWith="rals" />
     <RegEx find="kratij" replaceWith="kracij" />
     <RegEx find="(?&lt;![is]|S)redić" replaceWith="rjedit ć" />
@@ -3905,6 +3944,7 @@
     <RegEx find="stać(?!i)" replaceWith="stat ć" />
     <RegEx find="\bstaral" replaceWith="brinul" />
     <RegEx find="\bStaral" replaceWith="Brinul" />
+    <RegEx find="stba" replaceWith="stva" />
     <RegEx find="stkl" replaceWith="stakl" />
     <RegEx find="struis" replaceWith="struir" />
     <RegEx find="struiše" replaceWith="struira" />
@@ -4012,6 +4052,7 @@
     <RegEx find="zsn" replaceWith="zan" />
     <RegEx find="zqp" replaceWith="zap" />
     <RegEx find="zuslov" replaceWith="zuvjet" />
+    <RegEx find="zvesn" replaceWith="zvjesn" />
     <RegEx find="zvešć" replaceWith="zvest ć" />
     <RegEx find="zvolić" replaceWith="zvolit ć" />
     <RegEx find="zwm" replaceWith="zem" />

build.bat

@@ -188,6 +188,9 @@ IF NOT EXIST "temp_zip\Dictionaries" MD "temp_zip\Dictionaries"
 IF NOT EXIST "temp_zip\Ocr"          MD "temp_zip\Ocr"
 IF NOT EXIST "temp_zip\Tesseract302" MD "temp_zip\Tesseract302"
 IF NOT EXIST "temp_zip\Icons"        MD "temp_zip\Icons"
+IF NOT EXIST "temp_zip\Icons\DefaultTheme"        MD "temp_zip\Icons\DefaultTheme"
+IF NOT EXIST "temp_zip\Icons\DarkTheme"        MD "temp_zip\Icons\DarkTheme"
+IF NOT EXIST "temp_zip\Icons\Legacy"        MD "temp_zip\Icons\Legacy"
 
 ECHO.
 COPY /Y /V "..\..\..\..\LICENSE.txt"               "temp_zip\"
@@ -214,6 +217,9 @@ COPY /Y /V "..\..\..\..\Dictionaries\*.*"          "temp_zip\Dictionaries\"
 COPY /Y /V "..\..\..\..\Ocr\*.*"                   "temp_zip\Ocr\"
 XCOPY /Y /V "..\..\..\..\Tesseract302\*.*"         "temp_zip\Tesseract302\" /S
 COPY /Y /V "..\..\..\..\Icons\*.ico"               "temp_zip\Icons\"
+COPY /Y /V "..\..\..\..\Icons\DefaultTheme\*.png"               "temp_zip\Icons\DefaultTheme"
+COPY /Y /V "..\..\..\..\Icons\DarkTheme\*.png"               "temp_zip\Icons\DarkTheme"
+COPY /Y /V "..\..\..\..\Icons\Legacy\*.png"               "temp_zip\Icons\Legacy"
 
 PUSHD "temp_zip"
 START "" /B /WAIT "%SEVENZIP%" a -tzip -mx=9 "SubtitleEdit-%VERSION%.zip" * >NUL

build_beta.bat

@@ -162,6 +162,9 @@ IF NOT EXIST "temp_zip\Dictionaries" MD "temp_zip\Dictionaries"
 IF NOT EXIST "temp_zip\Ocr"          MD "temp_zip\Ocr"
 IF NOT EXIST "temp_zip\Tesseract302" MD "temp_zip\Tesseract302"
 IF NOT EXIST "temp_zip\Icons"        MD "temp_zip\Icons"
+IF NOT EXIST "temp_zip\Icons\DefaultTheme"        MD "temp_zip\Icons\DefaultTheme"
+IF NOT EXIST "temp_zip\Icons\DarkTheme"        MD "temp_zip\Icons\DarkTheme"
+IF NOT EXIST "temp_zip\Icons\Legacy"        MD "temp_zip\Icons\Legacy"
 
 ECHO.
 COPY /Y /V "..\..\..\..\LICENSE.txt"               "temp_zip\"
@@ -188,6 +191,9 @@ COPY /Y /V "..\..\..\..\Dictionaries\*.*"          "temp_zip\Dictionaries\"
 COPY /Y /V "..\..\..\..\Ocr\*.*"                   "temp_zip\Ocr\"
 XCOPY /Y /V "..\..\..\..\Tesseract302\*.*"         "temp_zip\Tesseract302\" /S
 COPY /Y /V "..\..\..\..\Icons\*.ico"               "temp_zip\Icons\"
+COPY /Y /V "..\..\..\..\Icons\DefaultTheme\*.png"               "temp_zip\Icons\DefaultTheme"
+COPY /Y /V "..\..\..\..\Icons\DarkTheme\*.png"               "temp_zip\Icons\DarkTheme"
+COPY /Y /V "..\..\..\..\Icons\Legacy\*.png"               "temp_zip\Icons\Legacy"
 
 PUSHD "temp_zip"
 START "" /B /WAIT "%SEVENZIP%" a -tzip -mx=9 "SubtitleEditBeta.zip" * >NUL

installer/Subtitle_Edit_Installer.iss

@@ -120,7 +120,6 @@ CloseApplications=true
 SetupMutex='subtitle_edit_setup_mutex'
 ArchitecturesInstallIn64BitMode=x64
 
-
 [Languages]
 Name: "en";   MessagesFile: "compiler:Default.isl"
 #ifdef localize
@@ -264,7 +263,10 @@ Source: ..\Icons\sup.ico;                          DestDir: {app}\Icons;
 Source: ..\Icons\vtt.ico;                          DestDir: {app}\Icons;                              Flags: ignoreversion onlyifdoesntexist; Components: main
 Source: ..\Icons\smi.ico;                          DestDir: {app}\Icons;                              Flags: ignoreversion onlyifdoesntexist; Components: main
 Source: ..\Icons\itt.ico;                          DestDir: {app}\Icons;                              Flags: ignoreversion onlyifdoesntexist; Components: main
-  
+
+Source: ..\Icons\DarkTheme\*.png;                  DestDir: {userappdata}\Subtitle Edit\Icons\DarkTheme;     Flags: ignoreversion onlyifdoesntexist; Components: main
+Source: ..\Icons\DefaultTheme\*.png;               DestDir: {userappdata}\Subtitle Edit\Icons\DefaultTheme;  Flags: ignoreversion onlyifdoesntexist; Components: main
+
 #ifdef localize
 Source: {#bindir}\Languages\ar-EG.xml;             DestDir: {app}\Languages;                          Flags: ignoreversion; Components: translations
 Source: {#bindir}\Languages\bg-BG.xml;             DestDir: {app}\Languages;                          Flags: ignoreversion; Components: translations
@@ -725,6 +727,7 @@ begin
   RemoveDir(ExpandConstant('{userappdata}\Subtitle Edit\Ocr'));
   DelTree(ExpandConstant('{userappdata}\Subtitle Edit\Plugins\*.*'), False, True, False);
   RemoveDir(ExpandConstant('{userappdata}\Subtitle Edit\Plugins'));
+  DelTree(ExpandConstant('{userappdata}\Subtitle Edit\Icons\*.*'), False, True, False);
 end;
 
 

src/Test/FixCommonErrors/FixCommonErrorsTest.cs

@@ -3459,5 +3459,17 @@ namespace Test.FixCommonErrors
                 Assert.AreEqual("They wanted to test!" + Environment.NewLine + "But not Kal-El.", _subtitle.Paragraphs[0].Text);
             }
         }
+
+        [TestMethod]
+        public void UnbreakLinesExceptDialogWithUnicode()
+        {
+            using (var target = GetFixCommonErrorsLib())
+            {
+                InitializeFixCommonErrorsLine(target, "‏- fasdfsdf.\r\n‏-adfasf.");
+                Configuration.Settings.General.ContinuationStyle = ContinuationStyle.LeadingTrailingDots;
+                new FixShortLinesAll().Fix(_subtitle, new EmptyFixCallback());
+                Assert.AreEqual("‏- fasdfsdf.\r\n‏-adfasf.", _subtitle.Paragraphs[0].Text);
+            }
+        }
     }
 }

src/libse/AudioToText/WhisperHelper.cs

@@ -146,6 +146,17 @@ namespace Nikse.SubtitleEdit.Core.AudioToText
                     }
                 }
 
+                if (Configuration.Settings.Tools.WhisperChoice == WhisperChoice.WhisperX)
+                {
+                    var path = Path.Combine(
+                        Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
+                        "anaconda3", "envs", "whisperx", "Scripts", "whisperx.exe");
+                    if (File.Exists(path))
+                    {
+                        return path;
+                    }
+                }
+
                 if (Configuration.Settings.Tools.WhisperChoice == WhisperChoice.StableTs && !string.IsNullOrEmpty(Configuration.Settings.Tools.WhisperStableTsLocation))
                 {
                     if (Configuration.Settings.Tools.WhisperStableTsLocation.EndsWith("stable-ts.exe", StringComparison.InvariantCultureIgnoreCase) && File.Exists(Configuration.Settings.Tools.WhisperStableTsLocation))

src/libse/Common/Settings.cs

@@ -1472,6 +1472,7 @@ $HorzAlign          =   Center
         public Color LastColorPickerColor6 { get; set; }
         public Color LastColorPickerColor7 { get; set; }
         public Color LastColorPickerDropper { get; set; }
+        public string ToolbarIconTheme { get; set; }
         public bool UseDarkTheme { get; set; }
         public bool DarkThemeShowListViewGridLines { get; set; }
         public bool ShowBetaStuff { get; set; }
@@ -1637,6 +1638,7 @@ $HorzAlign          =   Center
             LastColorPickerColor6 = Color.Cyan;
             LastColorPickerColor7 = Color.DarkOrange;
             LastColorPickerDropper = Color.Transparent;
+            ToolbarIconTheme = "Auto";
             UseDarkTheme = false;
             DarkThemeShowListViewGridLines = false;
             AutoSetVideoSmpteForTtml = true;
@@ -4684,6 +4686,12 @@ $HorzAlign          =   Center
                 settings.General.UseDarkTheme = Convert.ToBoolean(subNode.InnerText.Trim(), CultureInfo.InvariantCulture);
             }
 
+            subNode = node.SelectSingleNode("ToolbarIconTheme");
+            if (subNode != null)
+            {
+                settings.General.ToolbarIconTheme = subNode.InnerText;
+            }
+
             subNode = node.SelectSingleNode("DarkThemeShowListViewGridLines");
             if (subNode != null)
             {
@@ -10920,6 +10928,7 @@ $HorzAlign          =   Center
                 textWriter.WriteElementString("LastColorPickerColor7", ToHtml(settings.General.LastColorPickerColor7));
                 textWriter.WriteElementString("DarkThemeBackColor", settings.General.DarkThemeBackColor.ToArgb().ToString(CultureInfo.InvariantCulture));
                 textWriter.WriteElementString("DarkThemeForeColor", settings.General.DarkThemeForeColor.ToArgb().ToString(CultureInfo.InvariantCulture));
+                textWriter.WriteElementString("ToolbarIconTheme", settings.General.ToolbarIconTheme);
                 textWriter.WriteElementString("UseDarkTheme", settings.General.UseDarkTheme.ToString(CultureInfo.InvariantCulture));
                 textWriter.WriteElementString("DarkThemeShowListViewGridLines", settings.General.DarkThemeShowListViewGridLines.ToString(CultureInfo.InvariantCulture));
                 textWriter.WriteElementString("ShowBetaStuff", settings.General.ShowBetaStuff.ToString(CultureInfo.InvariantCulture));

src/libse/Common/Utilities.cs

@@ -480,13 +480,13 @@ namespace Nikse.SubtitleEdit.Core.Common
             // do not auto break dialogs or music symbol
             if (text.Contains(Environment.NewLine) && (text.IndexOf('-') >= 0 || text.IndexOf('♪') >= 0))
             {
-                var noTagLines = HtmlUtil.RemoveHtmlTags(text, true).SplitToLines();
+                var sanitizedLines = RemoveUnicodeControlChars(HtmlUtil.RemoveHtmlTags(text, true)).SplitToLines();
-                if (noTagLines.Count == 2)
+                if (sanitizedLines.Count == 2)
                 {
-                    var arr0 = noTagLines[0].Trim().TrimEnd('"', '\'').TrimEnd();
+                    var arr0 = sanitizedLines[0].Trim().TrimEnd('"', '\'').TrimEnd();
                     if (language == "ar")
                     {
-                        if (arr0.EndsWith('-') && noTagLines[1].TrimStart().EndsWith('-') && arr0.Length > 1 && (".?!)]♪؟".Contains(arr0[0]) || arr0.StartsWith("--", StringComparison.Ordinal) || arr0.StartsWith('–')))
+                        if (arr0.EndsWith('-') && sanitizedLines[1].TrimStart().EndsWith('-') && arr0.Length > 1 && (".?!)]♪؟".Contains(arr0[0]) || arr0.StartsWith("--", StringComparison.Ordinal) || arr0.StartsWith('–')))
                         {
                             if (Configuration.Settings.Tools.AutoBreakDashEarly)
                             {
@@ -496,7 +496,7 @@ namespace Nikse.SubtitleEdit.Core.Common
                     }
                     else
                     {
-                        if (arr0.StartsWith('-') && noTagLines[1].TrimStart().StartsWith('-') && arr0.Length > 1 && (".?!)]♪؟".Contains(arr0[arr0.Length - 1]) || arr0.EndsWith("--", StringComparison.Ordinal) || arr0.EndsWith('–') || arr0 == "- _" || arr0 == "-_"))
+                        if (arr0.StartsWith('-') && sanitizedLines[1].TrimStart().StartsWith('-') && arr0.Length > 1 && (".?!)]♪؟".Contains(arr0[arr0.Length - 1]) || arr0.EndsWith("--", StringComparison.Ordinal) || arr0.EndsWith('–') || arr0 == "- _" || arr0 == "-_"))
                         {
                             if (Configuration.Settings.Tools.AutoBreakDashEarly)
                             {
@@ -504,15 +504,15 @@ namespace Nikse.SubtitleEdit.Core.Common
                             }
                         }
                     }
-                    if (noTagLines[0].StartsWith('♪') && noTagLines[0].EndsWith('♪') || noTagLines[1].StartsWith('♪') && noTagLines[0].EndsWith('♪'))
+                    if (sanitizedLines[0].StartsWith('♪') && sanitizedLines[0].EndsWith('♪') || sanitizedLines[1].StartsWith('♪') && sanitizedLines[0].EndsWith('♪'))
                     {
                         return input;
                     }
-                    if (noTagLines[0].StartsWith('[') && noTagLines[0].Length > 1 && (".?!)]♪؟".Contains(arr0[arr0.Length - 1]) && (noTagLines[1].StartsWith('-') || noTagLines[1].StartsWith('['))))
+                    if (sanitizedLines[0].StartsWith('[') && sanitizedLines[0].Length > 1 && (".?!)]♪؟".Contains(arr0[arr0.Length - 1]) && (sanitizedLines[1].StartsWith('-') || sanitizedLines[1].StartsWith('['))))
                     {
                         return input;
                     }
-                    if (noTagLines[0].StartsWith('-') && noTagLines[0].Length > 1 && (".?!)]♪؟".Contains(arr0[arr0.Length - 1]) && (noTagLines[1].StartsWith('-') || noTagLines[1].StartsWith('['))))
+                    if (sanitizedLines[0].StartsWith('-') && sanitizedLines[0].Length > 1 && (".?!)]♪؟".Contains(arr0[arr0.Length - 1]) && (sanitizedLines[1].StartsWith('-') || sanitizedLines[1].StartsWith('['))))
                     {
                         if (Configuration.Settings.Tools.AutoBreakDashEarly)
                         {
@@ -523,7 +523,7 @@ namespace Nikse.SubtitleEdit.Core.Common
 
                 var dialogHelper = new DialogSplitMerge { DialogStyle = Configuration.Settings.General.DialogStyle, TwoLetterLanguageCode = language };
                 if (Configuration.Settings.Tools.AutoBreakDashEarly &&
-                    dialogHelper.IsDialog(noTagLines) && noTagLines.Count <= Configuration.Settings.General.MaxNumberOfLines)
+                    dialogHelper.IsDialog(sanitizedLines) && sanitizedLines.Count <= Configuration.Settings.General.MaxNumberOfLines)
                 {
                     return input;
                 }

src/libse/ContainerFormats/TransportStream/TransportStreamParser.cs

@@ -220,6 +220,12 @@ namespace Nikse.SubtitleEdit.Core.ContainerFormats.TransportStream
                             bdMs = new MemoryStream();
                             currentList.Clear();
                         }
+                        else if (bdMs.Length > 2_000_000_000) // Avoid crashing on very large files
+                        {
+                            bdMs.Dispose();
+                            bdMs = new MemoryStream();
+                            currentList.Clear();
+                        }
                     }
 
                     if (subList.Count > 0)

src/libse/Forms/FixCommonErrors/FixShortLinesAll.cs

@@ -14,25 +14,29 @@ namespace Nikse.SubtitleEdit.Core.Forms.FixCommonErrors
 
         public void Fix(Subtitle subtitle, IFixCallbacks callbacks)
         {
-            string fixAction = Language.MergeShortLineAll;
+            var fixAction = Language.MergeShortLineAll;
-            int noOfShortLines = 0;
+            var noOfShortLines = 0;
-            for (int i = 0; i < subtitle.Paragraphs.Count; i++)
+            for (var i = 0; i < subtitle.Paragraphs.Count; i++)
             {
-                Paragraph p = subtitle.Paragraphs[i];
+                var p = subtitle.Paragraphs[i];
-                if (callbacks.AllowFix(p, fixAction))
+                if (!callbacks.AllowFix(p, fixAction))
                 {
-                    string s = HtmlUtil.RemoveHtmlTags(p.Text, true);
+                    continue;
-                    if (s.Contains(Environment.NewLine) && s.Replace(Environment.NewLine, " ").Replace("  ", " ").CountCharacters(false) < Configuration.Settings.General.MergeLinesShorterThan)
+                }
-                    {
+
-                        s = Utilities.AutoBreakLine(p.Text, callbacks.Language);
+                var s = HtmlUtil.RemoveHtmlTags(p.Text, true);
-                        if (s != p.Text)
+                if (!s.Contains(Environment.NewLine) || s.Replace(Environment.NewLine, " ").Replace("  ", " ").CountCharacters(false) >= Configuration.Settings.General.MergeLinesShorterThan)
-                        {
+                {
-                            string oldCurrent = p.Text;
+                    continue;
-                            p.Text = s;
+                }
-                            noOfShortLines++;
+
-                            callbacks.AddFixToListView(p, fixAction, oldCurrent, p.Text);
+                s = Utilities.AutoBreakLine(p.Text, callbacks.Language);
-                        }
+                if (s != p.Text)
-                    }
+                {
+                    var oldCurrent = p.Text;
+                    p.Text = s;
+                    noOfShortLines++;
+                    callbacks.AddFixToListView(p, fixAction, oldCurrent, p.Text);
                 }
             }
             callbacks.UpdateFixStatus(noOfShortLines, Language.RemoveLineBreaks);

src/ui/Forms/Main.cs

@@ -5789,6 +5789,7 @@ namespace Nikse.SubtitleEdit.Forms
                     DarkTheme.UndoDarkTheme(this, 1500);
 
                     OnLoad(null);
+                    InitializeToolbar();
                 }
             }
 
@@ -5921,7 +5922,20 @@ namespace Nikse.SubtitleEdit.Forms
 
         private static void TryLoadIcon(ToolStripButton button, string iconName)
         {
-            string fullPath = Configuration.IconsDirectory + iconName + ".png";
+            var theme = Configuration.Settings.General.UseDarkTheme ? "DarkTheme" : "DefaultTheme";
+            if (!string.IsNullOrEmpty(Configuration.Settings.General.ToolbarIconTheme) && !Configuration.Settings.General.ToolbarIconTheme.Equals("Auto", StringComparison.OrdinalIgnoreCase))
+            {
+                theme = Configuration.Settings.General.ToolbarIconTheme;
+            }
+
+            var themeFullPath = Path.Combine(Configuration.IconsDirectory, theme, iconName + ".png");
+            if (File.Exists(themeFullPath))
+            {
+                button.Image = new Bitmap(themeFullPath);
+                return;
+            }
+
+            var fullPath = Path.Combine(Configuration.IconsDirectory, "DefaultTheme", iconName + ".png");
             if (File.Exists(fullPath))
             {
                 button.Image = new Bitmap(fullPath);
@@ -5955,6 +5969,8 @@ namespace Nikse.SubtitleEdit.Forms
                 TryLoadIcon(toolStripButtonHelp, "Help");
                 TryLoadIcon(toolStripButtonToggleWaveform, "WaveformToggle");
                 TryLoadIcon(toolStripButtonToggleVideo, "VideoToggle");
+                TryLoadIcon(toolStripButtonSourceView, "SourceView");
+                //  IttProperties, WebVttProperties, EbuProperties
             }
 
             toolStripButtonFileNew.Visible = gs.ShowToolbarNew;
@@ -6354,7 +6370,7 @@ namespace Nikse.SubtitleEdit.Forms
                     }
                     else
                     {
-                        if (!(_subtitleListViewIndex == 0 && _findHelper.SelectedPosition <= 0)) 
+                        if (!(_subtitleListViewIndex == 0 && _findHelper.SelectedPosition <= 0))
                         {
                             if (MessageBox.Show(_language.FindContinue, _language.FindContinueTitle, MessageBoxButtons.YesNoCancel) == DialogResult.Yes)
                             {
@@ -6545,7 +6561,7 @@ namespace Nikse.SubtitleEdit.Forms
                 bool found = _findHelper.Find(_subtitle, _subtitleOriginal, _subtitleListViewIndex, startPos);
                 tb = GetFindReplaceTextBox();
                 // if we fail to find the text, we might want to start searching from the top of the file.
-                if (!found && !(_subtitleListViewIndex == 0 && _findHelper.SelectedPosition <= 0)) 
+                if (!found && !(_subtitleListViewIndex == 0 && _findHelper.SelectedPosition <= 0))
                 {
                     if (MessageBox.Show(_language.FindContinue, _language.FindContinueTitle, MessageBoxButtons.YesNoCancel) == DialogResult.Yes)
                     {
@@ -6673,7 +6689,7 @@ namespace Nikse.SubtitleEdit.Forms
                 ShowStatus(msg + string.Format(_language.XNotFound, _findHelper.FindText));
 
                 // Prompt for start over
-                if (!(_subtitleListViewIndex == 0 && _findHelper.SelectedPosition <= 0)) 
+                if (!(_subtitleListViewIndex == 0 && _findHelper.SelectedPosition <= 0))
                 {
                     _replaceStartLineIndex = 0;
                     if (MessageBox.Show(_language.FindContinue, _language.FindContinueTitle, MessageBoxButtons.YesNoCancel) == DialogResult.Yes)
@@ -10057,7 +10073,7 @@ namespace Nikse.SubtitleEdit.Forms
 
             var prev = _subtitle.GetParagraphOrDefault(firstSelectedIndex - 1);
             var next = _subtitle.GetParagraphOrDefault(firstSelectedIndex);
-            
+
             var addMilliseconds = MinGapBetweenLines;
             if (addMilliseconds < 1)
             {
@@ -32795,6 +32811,7 @@ namespace Nikse.SubtitleEdit.Forms
             {
                 toolStripButtonXProperties.ToolTipText = string.Format(_language.Menu.File.FormatXProperties, _currentSubtitleFormat?.Name);
                 toolStripButtonXProperties.Image = Properties.Resources.itt;
+                TryLoadIcon(toolStripButtonXProperties, "IttProperties");
             }
 
             if (formatType == typeof(WebVTT) || formatType == typeof(WebVTTFileWithLineNumber))
@@ -32802,6 +32819,7 @@ namespace Nikse.SubtitleEdit.Forms
                 toolStripButtonXProperties.Visible = true;
                 toolStripButtonXProperties.ToolTipText = string.Format(_language.Menu.File.FormatXProperties, new WebVTT().Name);
                 toolStripButtonXProperties.Image = Properties.Resources.webvtt;
+                TryLoadIcon(toolStripButtonXProperties, "WebVttProperties");
             }
 
             if (formatType == typeof(Ebu))
@@ -32809,6 +32827,7 @@ namespace Nikse.SubtitleEdit.Forms
                 toolStripButtonXProperties.Visible = true;
                 toolStripButtonXProperties.ToolTipText = string.Format(_language.Menu.File.FormatXProperties, new Ebu().Name);
                 toolStripButtonXProperties.Image = Properties.Resources.ebu;
+                TryLoadIcon(toolStripButtonXProperties, "EbuProperties");
             }
         }
 

src/ui/Forms/Options/Settings.Designer.cs

@@ -320,11 +320,22 @@
             this.groupBox2 = new System.Windows.Forms.GroupBox();
             this.checkBoxShowFrameRate = new System.Windows.Forms.CheckBox();
             this.groupBoxShowToolBarButtons = new System.Windows.Forms.GroupBox();
+            this.pictureBoxEbuProperties = new System.Windows.Forms.PictureBox();
+            this.pictureBoxWebVttProperties = new System.Windows.Forms.PictureBox();
+            this.pictureBoxIttProperties = new System.Windows.Forms.PictureBox();
+            this.pictureBoxToggleVideo = new System.Windows.Forms.PictureBox();
+            this.pictureBoxToggleWaveform = new System.Windows.Forms.PictureBox();
+            this.pictureBoxAssaDraw = new System.Windows.Forms.PictureBox();
+            this.pictureBoxAssAttachments = new System.Windows.Forms.PictureBox();
+            this.pictureBoxAssProperties = new System.Windows.Forms.PictureBox();
+            this.pictureBoxAssStyleManager = new System.Windows.Forms.PictureBox();
+            this.labelToolbarIconTheme = new System.Windows.Forms.Label();
+            this.comboBoxToolbarIconTheme = new System.Windows.Forms.ComboBox();
             this.labelToggleSourceView = new System.Windows.Forms.Label();
-            this.pictureBoxToggleSourceView = new System.Windows.Forms.PictureBox();
+            this.pictureBoxSourceView = new System.Windows.Forms.PictureBox();
             this.checkBoxTBToggleSourceView = new System.Windows.Forms.CheckBox();
             this.labelTBBurnIn = new System.Windows.Forms.Label();
-            this.pictureBoxTBBurnIn = new System.Windows.Forms.PictureBox();
+            this.pictureBoxBurnIn = new System.Windows.Forms.PictureBox();
             this.checkBoxTBBurnIn = new System.Windows.Forms.CheckBox();
             this.labelTBBeautifyTimeCodes = new System.Windows.Forms.Label();
             this.pictureBoxBeautifyTimeCodes = new System.Windows.Forms.PictureBox();
@@ -333,10 +344,10 @@
             this.pictureBoxNetflixQualityCheck = new System.Windows.Forms.PictureBox();
             this.checkBoxNetflixQualityCheck = new System.Windows.Forms.CheckBox();
             this.labelTBRemoveTextForHi = new System.Windows.Forms.Label();
-            this.pictureBoxTBRemoveTextForHi = new System.Windows.Forms.PictureBox();
+            this.pictureBoxRemoveTextForHi = new System.Windows.Forms.PictureBox();
             this.checkBoxTBRemoveTextForHi = new System.Windows.Forms.CheckBox();
             this.labelTBFixCommonErrors = new System.Windows.Forms.Label();
-            this.pictureBoxTBFixCommonErrors = new System.Windows.Forms.PictureBox();
+            this.pictureBoxFixCommonErrors = new System.Windows.Forms.PictureBox();
             this.checkBoxTBFixCommonErrors = new System.Windows.Forms.CheckBox();
             this.labelTBHelp = new System.Windows.Forms.Label();
             this.pictureBoxHelp = new System.Windows.Forms.PictureBox();
@@ -363,10 +374,10 @@
             this.pictureBoxSave = new System.Windows.Forms.PictureBox();
             this.checkBoxToolbarSave = new System.Windows.Forms.CheckBox();
             this.labelTBOpen = new System.Windows.Forms.Label();
-            this.pictureBoxOpen = new System.Windows.Forms.PictureBox();
+            this.pictureBoxFileOpen = new System.Windows.Forms.PictureBox();
             this.checkBoxToolbarOpen = new System.Windows.Forms.CheckBox();
             this.labelTBNew = new System.Windows.Forms.Label();
-            this.pictureBoxNew = new System.Windows.Forms.PictureBox();
+            this.pictureBoxFileNew = new System.Windows.Forms.PictureBox();
             this.checkBoxToolbarNew = new System.Windows.Forms.CheckBox();
             this.panelFont = new System.Windows.Forms.Panel();
             this.groupBoxAppearance = new System.Windows.Forms.GroupBox();
@@ -478,12 +489,21 @@
             this.panelToolBar.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBoxShowToolBarButtons.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxToggleSourceView)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxEbuProperties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTBBurnIn)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWebVttProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxIttProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxToggleVideo)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxToggleWaveform)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAssaDraw)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAssAttachments)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAssProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAssStyleManager)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSourceView)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBurnIn)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBeautifyTimeCodes)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxNetflixQualityCheck)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTBRemoveTextForHi)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxRemoveTextForHi)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTBFixCommonErrors)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxFixCommonErrors)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxHelp)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSettings)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSpellCheck)).BeginInit();
@@ -492,8 +512,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxFind)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSaveAs)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSave)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxOpen)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxFileOpen)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxNew)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxFileNew)).BeginInit();
             this.panelFont.SuspendLayout();
             this.groupBoxAppearance.SuspendLayout();
             this.groupBoxFontInUI.SuspendLayout();
@@ -4004,9 +4024,9 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.groupBox2.Controls.Add(this.checkBoxShowFrameRate);
-            this.groupBox2.Location = new System.Drawing.Point(0, 340);
+            this.groupBox2.Location = new System.Drawing.Point(0, 449);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Size = new System.Drawing.Size(850, 179);
+            this.groupBox2.Size = new System.Drawing.Size(850, 70);
             this.groupBox2.TabIndex = 35;
             this.groupBox2.TabStop = false;
             // 
@@ -4024,11 +4044,22 @@
             // 
             this.groupBoxShowToolBarButtons.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxEbuProperties);
+            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxWebVttProperties);
+            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxIttProperties);
+            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxToggleVideo);
+            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxToggleWaveform);
+            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxAssaDraw);
+            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxAssAttachments);
+            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxAssProperties);
+            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxAssStyleManager);
+            this.groupBoxShowToolBarButtons.Controls.Add(this.labelToolbarIconTheme);
+            this.groupBoxShowToolBarButtons.Controls.Add(this.comboBoxToolbarIconTheme);
             this.groupBoxShowToolBarButtons.Controls.Add(this.labelToggleSourceView);
-            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxToggleSourceView);
+            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxSourceView);
             this.groupBoxShowToolBarButtons.Controls.Add(this.checkBoxTBToggleSourceView);
             this.groupBoxShowToolBarButtons.Controls.Add(this.labelTBBurnIn);
-            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxTBBurnIn);
+            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxBurnIn);
             this.groupBoxShowToolBarButtons.Controls.Add(this.checkBoxTBBurnIn);
             this.groupBoxShowToolBarButtons.Controls.Add(this.labelTBBeautifyTimeCodes);
             this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxBeautifyTimeCodes);
@@ -4037,10 +4068,10 @@
             this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxNetflixQualityCheck);
             this.groupBoxShowToolBarButtons.Controls.Add(this.checkBoxNetflixQualityCheck);
             this.groupBoxShowToolBarButtons.Controls.Add(this.labelTBRemoveTextForHi);
-            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxTBRemoveTextForHi);
+            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxRemoveTextForHi);
             this.groupBoxShowToolBarButtons.Controls.Add(this.checkBoxTBRemoveTextForHi);
             this.groupBoxShowToolBarButtons.Controls.Add(this.labelTBFixCommonErrors);
-            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxTBFixCommonErrors);
+            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxFixCommonErrors);
             this.groupBoxShowToolBarButtons.Controls.Add(this.checkBoxTBFixCommonErrors);
             this.groupBoxShowToolBarButtons.Controls.Add(this.labelTBHelp);
             this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxHelp);
@@ -4067,39 +4098,130 @@
             this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxSave);
             this.groupBoxShowToolBarButtons.Controls.Add(this.checkBoxToolbarSave);
             this.groupBoxShowToolBarButtons.Controls.Add(this.labelTBOpen);
-            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxOpen);
+            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxFileOpen);
             this.groupBoxShowToolBarButtons.Controls.Add(this.checkBoxToolbarOpen);
             this.groupBoxShowToolBarButtons.Controls.Add(this.labelTBNew);
-            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxNew);
+            this.groupBoxShowToolBarButtons.Controls.Add(this.pictureBoxFileNew);
             this.groupBoxShowToolBarButtons.Controls.Add(this.checkBoxToolbarNew);
             this.groupBoxShowToolBarButtons.Location = new System.Drawing.Point(0, 0);
             this.groupBoxShowToolBarButtons.Name = "groupBoxShowToolBarButtons";
-            this.groupBoxShowToolBarButtons.Size = new System.Drawing.Size(851, 341);
+            this.groupBoxShowToolBarButtons.Size = new System.Drawing.Size(851, 448);
             this.groupBoxShowToolBarButtons.TabIndex = 0;
             this.groupBoxShowToolBarButtons.TabStop = false;
             this.groupBoxShowToolBarButtons.Text = "Show toolbar buttons";
             // 
+            // pictureBoxEbuProperties
+            // 
+            this.pictureBoxEbuProperties.Location = new System.Drawing.Point(323, 398);
+            this.pictureBoxEbuProperties.Name = "pictureBoxEbuProperties";
+            this.pictureBoxEbuProperties.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxEbuProperties.TabIndex = 59;
+            this.pictureBoxEbuProperties.TabStop = false;
+            // 
+            // pictureBoxWebVttProperties
+            // 
+            this.pictureBoxWebVttProperties.Location = new System.Drawing.Point(285, 398);
+            this.pictureBoxWebVttProperties.Name = "pictureBoxWebVttProperties";
+            this.pictureBoxWebVttProperties.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxWebVttProperties.TabIndex = 58;
+            this.pictureBoxWebVttProperties.TabStop = false;
+            // 
+            // pictureBoxIttProperties
+            // 
+            this.pictureBoxIttProperties.Location = new System.Drawing.Point(247, 398);
+            this.pictureBoxIttProperties.Name = "pictureBoxIttProperties";
+            this.pictureBoxIttProperties.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxIttProperties.TabIndex = 57;
+            this.pictureBoxIttProperties.TabStop = false;
+            // 
+            // pictureBoxToggleVideo
+            // 
+            this.pictureBoxToggleVideo.Location = new System.Drawing.Point(209, 398);
+            this.pictureBoxToggleVideo.Name = "pictureBoxToggleVideo";
+            this.pictureBoxToggleVideo.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxToggleVideo.TabIndex = 56;
+            this.pictureBoxToggleVideo.TabStop = false;
+            // 
+            // pictureBoxToggleWaveform
+            // 
+            this.pictureBoxToggleWaveform.Location = new System.Drawing.Point(171, 398);
+            this.pictureBoxToggleWaveform.Name = "pictureBoxToggleWaveform";
+            this.pictureBoxToggleWaveform.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxToggleWaveform.TabIndex = 55;
+            this.pictureBoxToggleWaveform.TabStop = false;
+            // 
+            // pictureBoxAssaDraw
+            // 
+            this.pictureBoxAssaDraw.Location = new System.Drawing.Point(133, 399);
+            this.pictureBoxAssaDraw.Name = "pictureBoxAssaDraw";
+            this.pictureBoxAssaDraw.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxAssaDraw.TabIndex = 54;
+            this.pictureBoxAssaDraw.TabStop = false;
+            // 
+            // pictureBoxAssAttachments
+            // 
+            this.pictureBoxAssAttachments.Location = new System.Drawing.Point(95, 399);
+            this.pictureBoxAssAttachments.Name = "pictureBoxAssAttachments";
+            this.pictureBoxAssAttachments.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxAssAttachments.TabIndex = 53;
+            this.pictureBoxAssAttachments.TabStop = false;
+            // 
+            // pictureBoxAssProperties
+            // 
+            this.pictureBoxAssProperties.Location = new System.Drawing.Point(57, 399);
+            this.pictureBoxAssProperties.Name = "pictureBoxAssProperties";
+            this.pictureBoxAssProperties.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxAssProperties.TabIndex = 52;
+            this.pictureBoxAssProperties.TabStop = false;
+            // 
+            // pictureBoxAssStyleManager
+            // 
+            this.pictureBoxAssStyleManager.Location = new System.Drawing.Point(19, 399);
+            this.pictureBoxAssStyleManager.Name = "pictureBoxAssStyleManager";
+            this.pictureBoxAssStyleManager.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxAssStyleManager.TabIndex = 51;
+            this.pictureBoxAssStyleManager.TabStop = false;
+            // 
+            // labelToolbarIconTheme
+            // 
+            this.labelToolbarIconTheme.AutoSize = true;
+            this.labelToolbarIconTheme.Location = new System.Drawing.Point(487, 276);
+            this.labelToolbarIconTheme.Name = "labelToolbarIconTheme";
+            this.labelToolbarIconTheme.Size = new System.Drawing.Size(39, 13);
+            this.labelToolbarIconTheme.TabIndex = 50;
+            this.labelToolbarIconTheme.Text = "Theme";
+            // 
+            // comboBoxToolbarIconTheme
+            // 
+            this.comboBoxToolbarIconTheme.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxToolbarIconTheme.FormattingEnabled = true;
+            this.comboBoxToolbarIconTheme.Location = new System.Drawing.Point(487, 291);
+            this.comboBoxToolbarIconTheme.Name = "comboBoxToolbarIconTheme";
+            this.comboBoxToolbarIconTheme.Size = new System.Drawing.Size(202, 21);
+            this.comboBoxToolbarIconTheme.TabIndex = 49;
+            this.comboBoxToolbarIconTheme.SelectedIndexChanged += new System.EventHandler(this.comboBoxToolbarIconTheme_SelectedIndexChanged);
+            // 
             // labelToggleSourceView
             // 
             this.labelToggleSourceView.AutoSize = true;
-            this.labelToggleSourceView.Location = new System.Drawing.Point(11, 253);
+            this.labelToggleSourceView.Location = new System.Drawing.Point(132, 256);
             this.labelToggleSourceView.Name = "labelToggleSourceView";
             this.labelToggleSourceView.Size = new System.Drawing.Size(99, 13);
             this.labelToggleSourceView.TabIndex = 48;
             this.labelToggleSourceView.Text = "Toggle source view";
             // 
-            // pictureBoxToggleSourceView
+            // pictureBoxSourceView
             // 
-            this.pictureBoxToggleSourceView.Location = new System.Drawing.Point(24, 272);
+            this.pictureBoxSourceView.Location = new System.Drawing.Point(145, 275);
-            this.pictureBoxToggleSourceView.Name = "pictureBoxToggleSourceView";
+            this.pictureBoxSourceView.Name = "pictureBoxSourceView";
-            this.pictureBoxToggleSourceView.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxSourceView.Size = new System.Drawing.Size(32, 32);
-            this.pictureBoxToggleSourceView.TabIndex = 47;
+            this.pictureBoxSourceView.TabIndex = 47;
-            this.pictureBoxToggleSourceView.TabStop = false;
+            this.pictureBoxSourceView.TabStop = false;
             // 
             // checkBoxTBToggleSourceView
             // 
             this.checkBoxTBToggleSourceView.AutoSize = true;
-            this.checkBoxTBToggleSourceView.Location = new System.Drawing.Point(27, 311);
+            this.checkBoxTBToggleSourceView.Location = new System.Drawing.Point(148, 314);
             this.checkBoxTBToggleSourceView.Name = "checkBoxTBToggleSourceView";
             this.checkBoxTBToggleSourceView.Size = new System.Drawing.Size(55, 17);
             this.checkBoxTBToggleSourceView.TabIndex = 46;
@@ -4115,13 +4237,13 @@
             this.labelTBBurnIn.TabIndex = 45;
             this.labelTBBurnIn.Text = "Burn in";
             // 
-            // pictureBoxTBBurnIn
+            // pictureBoxBurnIn
             // 
-            this.pictureBoxTBBurnIn.Location = new System.Drawing.Point(256, 159);
+            this.pictureBoxBurnIn.Location = new System.Drawing.Point(256, 159);
-            this.pictureBoxTBBurnIn.Name = "pictureBoxTBBurnIn";
+            this.pictureBoxBurnIn.Name = "pictureBoxBurnIn";
-            this.pictureBoxTBBurnIn.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxBurnIn.Size = new System.Drawing.Size(32, 32);
-            this.pictureBoxTBBurnIn.TabIndex = 44;
+            this.pictureBoxBurnIn.TabIndex = 44;
-            this.pictureBoxTBBurnIn.TabStop = false;
+            this.pictureBoxBurnIn.TabStop = false;
             // 
             // checkBoxTBBurnIn
             // 
@@ -4136,7 +4258,7 @@
             // labelTBBeautifyTimeCodes
             // 
             this.labelTBBeautifyTimeCodes.AutoSize = true;
-            this.labelTBBeautifyTimeCodes.Location = new System.Drawing.Point(742, 136);
+            this.labelTBBeautifyTimeCodes.Location = new System.Drawing.Point(13, 256);
             this.labelTBBeautifyTimeCodes.Name = "labelTBBeautifyTimeCodes";
             this.labelTBBeautifyTimeCodes.Size = new System.Drawing.Size(101, 13);
             this.labelTBBeautifyTimeCodes.TabIndex = 45;
@@ -4144,7 +4266,7 @@
             // 
             // pictureBoxBeautifyTimeCodes
             // 
-            this.pictureBoxBeautifyTimeCodes.Location = new System.Drawing.Point(751, 155);
+            this.pictureBoxBeautifyTimeCodes.Location = new System.Drawing.Point(22, 275);
             this.pictureBoxBeautifyTimeCodes.Name = "pictureBoxBeautifyTimeCodes";
             this.pictureBoxBeautifyTimeCodes.Size = new System.Drawing.Size(32, 32);
             this.pictureBoxBeautifyTimeCodes.TabIndex = 44;
@@ -4153,7 +4275,7 @@
             // checkBoxBeautifyTimeCodes
             // 
             this.checkBoxBeautifyTimeCodes.AutoSize = true;
-            this.checkBoxBeautifyTimeCodes.Location = new System.Drawing.Point(754, 195);
+            this.checkBoxBeautifyTimeCodes.Location = new System.Drawing.Point(25, 314);
             this.checkBoxBeautifyTimeCodes.Name = "checkBoxBeautifyTimeCodes";
             this.checkBoxBeautifyTimeCodes.Size = new System.Drawing.Size(55, 17);
             this.checkBoxBeautifyTimeCodes.TabIndex = 43;
@@ -4196,13 +4318,13 @@
             this.labelTBRemoveTextForHi.TabIndex = 39;
             this.labelTBRemoveTextForHi.Text = "Remove text for HI";
             // 
-            // pictureBoxTBRemoveTextForHi
+            // pictureBoxRemoveTextForHi
             // 
-            this.pictureBoxTBRemoveTextForHi.Location = new System.Drawing.Point(22, 161);
+            this.pictureBoxRemoveTextForHi.Location = new System.Drawing.Point(22, 161);
-            this.pictureBoxTBRemoveTextForHi.Name = "pictureBoxTBRemoveTextForHi";
+            this.pictureBoxRemoveTextForHi.Name = "pictureBoxRemoveTextForHi";
-            this.pictureBoxTBRemoveTextForHi.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxRemoveTextForHi.Size = new System.Drawing.Size(32, 32);
-            this.pictureBoxTBRemoveTextForHi.TabIndex = 38;
+            this.pictureBoxRemoveTextForHi.TabIndex = 38;
-            this.pictureBoxTBRemoveTextForHi.TabStop = false;
+            this.pictureBoxRemoveTextForHi.TabStop = false;
             // 
             // checkBoxTBRemoveTextForHi
             // 
@@ -4223,13 +4345,13 @@
             this.labelTBFixCommonErrors.TabIndex = 36;
             this.labelTBFixCommonErrors.Text = "Fix common errors";
             // 
-            // pictureBoxTBFixCommonErrors
+            // pictureBoxFixCommonErrors
             // 
-            this.pictureBoxTBFixCommonErrors.Location = new System.Drawing.Point(610, 41);
+            this.pictureBoxFixCommonErrors.Location = new System.Drawing.Point(610, 41);
-            this.pictureBoxTBFixCommonErrors.Name = "pictureBoxTBFixCommonErrors";
+            this.pictureBoxFixCommonErrors.Name = "pictureBoxFixCommonErrors";
-            this.pictureBoxTBFixCommonErrors.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxFixCommonErrors.Size = new System.Drawing.Size(32, 32);
-            this.pictureBoxTBFixCommonErrors.TabIndex = 35;
+            this.pictureBoxFixCommonErrors.TabIndex = 35;
-            this.pictureBoxTBFixCommonErrors.TabStop = false;
+            this.pictureBoxFixCommonErrors.TabStop = false;
             // 
             // checkBoxTBFixCommonErrors
             // 
@@ -4466,13 +4588,13 @@
             this.labelTBOpen.TabIndex = 6;
             this.labelTBOpen.Text = "Open";
             // 
-            // pictureBoxOpen
+            // pictureBoxFileOpen
             // 
-            this.pictureBoxOpen.Location = new System.Drawing.Point(123, 41);
+            this.pictureBoxFileOpen.Location = new System.Drawing.Point(123, 41);
-            this.pictureBoxOpen.Name = "pictureBoxOpen";
+            this.pictureBoxFileOpen.Name = "pictureBoxFileOpen";
-            this.pictureBoxOpen.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxFileOpen.Size = new System.Drawing.Size(32, 32);
-            this.pictureBoxOpen.TabIndex = 5;
+            this.pictureBoxFileOpen.TabIndex = 5;
-            this.pictureBoxOpen.TabStop = false;
+            this.pictureBoxFileOpen.TabStop = false;
             // 
             // checkBoxToolbarOpen
             // 
@@ -4493,13 +4615,13 @@
             this.labelTBNew.TabIndex = 3;
             this.labelTBNew.Text = "New";
             // 
-            // pictureBoxNew
+            // pictureBoxFileNew
             // 
-            this.pictureBoxNew.Location = new System.Drawing.Point(22, 41);
+            this.pictureBoxFileNew.Location = new System.Drawing.Point(22, 41);
-            this.pictureBoxNew.Name = "pictureBoxNew";
+            this.pictureBoxFileNew.Name = "pictureBoxFileNew";
-            this.pictureBoxNew.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxFileNew.Size = new System.Drawing.Size(32, 32);
-            this.pictureBoxNew.TabIndex = 2;
+            this.pictureBoxFileNew.TabIndex = 2;
-            this.pictureBoxNew.TabStop = false;
+            this.pictureBoxFileNew.TabStop = false;
             // 
             // checkBoxToolbarNew
             // 
@@ -5211,8 +5333,8 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1092, 574);
             this.Controls.Add(this.labelUpdateFileTypeAssociationsStatus);
-            this.Controls.Add(this.panelVideoPlayer);
             this.Controls.Add(this.panelToolBar);
+            this.Controls.Add(this.panelVideoPlayer);
             this.Controls.Add(this.panelTools);
             this.Controls.Add(this.panelWaveform);
             this.Controls.Add(this.panelGeneral);
@@ -5305,12 +5427,21 @@
             this.groupBox2.PerformLayout();
             this.groupBoxShowToolBarButtons.ResumeLayout(false);
             this.groupBoxShowToolBarButtons.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxToggleSourceView)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxEbuProperties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTBBurnIn)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWebVttProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxIttProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxToggleVideo)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxToggleWaveform)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAssaDraw)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAssAttachments)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAssProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAssStyleManager)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSourceView)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBurnIn)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBeautifyTimeCodes)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxNetflixQualityCheck)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTBRemoveTextForHi)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxRemoveTextForHi)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTBFixCommonErrors)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxFixCommonErrors)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxHelp)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSettings)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSpellCheck)).EndInit();
@@ -5319,8 +5450,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxFind)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSaveAs)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSave)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxOpen)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxFileOpen)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxNew)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxFileNew)).EndInit();
             this.panelFont.ResumeLayout(false);
             this.groupBoxAppearance.ResumeLayout(false);
             this.groupBoxAppearance.PerformLayout();
@@ -5354,7 +5485,7 @@
         private System.Windows.Forms.Panel panelGeneral;
         private System.Windows.Forms.GroupBox groupBoxMiscellaneous;
         private System.Windows.Forms.GroupBox groupBoxShowToolBarButtons;
-        private System.Windows.Forms.PictureBox pictureBoxNew;
+        private System.Windows.Forms.PictureBox pictureBoxFileNew;
         private System.Windows.Forms.CheckBox checkBoxToolbarNew;
         private System.Windows.Forms.Label labelTBSpellCheck;
         private System.Windows.Forms.PictureBox pictureBoxSpellCheck;
@@ -5375,7 +5506,7 @@
         private System.Windows.Forms.PictureBox pictureBoxSave;
         private System.Windows.Forms.CheckBox checkBoxToolbarSave;
         private System.Windows.Forms.Label labelTBOpen;
-        private System.Windows.Forms.PictureBox pictureBoxOpen;
+        private System.Windows.Forms.PictureBox pictureBoxFileOpen;
         private System.Windows.Forms.CheckBox checkBoxToolbarOpen;
         private System.Windows.Forms.Label labelTBNew;
         private System.Windows.Forms.Label labelTBHelp;
@@ -5542,7 +5673,7 @@
         private System.Windows.Forms.NumericUpDown numericUpDownMinGapMs;
         private System.Windows.Forms.Label labelMinGapMs;
         private System.Windows.Forms.Label labelTBFixCommonErrors;
-        private System.Windows.Forms.PictureBox pictureBoxTBFixCommonErrors;
+        private System.Windows.Forms.PictureBox pictureBoxFixCommonErrors;
         private System.Windows.Forms.CheckBox checkBoxTBFixCommonErrors;
         private System.Windows.Forms.CheckBox checkBoxFixShortDisplayTimesAllowMoveStartTime;
         private System.Windows.Forms.Button buttonVlcPathBrowse;
@@ -5573,7 +5704,7 @@
         private System.Windows.Forms.ComboBox comboBoxAutoBackupDeleteAfter;
         private System.Windows.Forms.Label labelAutoBackupDeleteAfter;
         private System.Windows.Forms.Label labelTBRemoveTextForHi;
-        private System.Windows.Forms.PictureBox pictureBoxTBRemoveTextForHi;
+        private System.Windows.Forms.PictureBox pictureBoxRemoveTextForHi;
         private System.Windows.Forms.CheckBox checkBoxTBRemoveTextForHi;
         private System.Windows.Forms.NumericUpDown numericUpDownMaxNumberOfLines;
         private System.Windows.Forms.Label labelMaxLines;
@@ -5716,7 +5847,7 @@
         private System.Windows.Forms.Label labelUpdateFileTypeAssociationsStatus;
         private System.Windows.Forms.ColumnHeader columnHeader2;
         private System.Windows.Forms.Label labelTBBurnIn;
-        private System.Windows.Forms.PictureBox pictureBoxTBBurnIn;
+        private System.Windows.Forms.PictureBox pictureBoxBurnIn;
         private System.Windows.Forms.CheckBox checkBoxTBBurnIn;
         private System.Windows.Forms.ComboBox comboBoxCpsLineLenCalc;
         private System.Windows.Forms.Label labelCpsLineLenCalc;
@@ -5728,7 +5859,7 @@
         private System.Windows.Forms.ComboBox comboBoxProxyAuthType;
         private System.Windows.Forms.CheckBox checkBoxFfmpegUseCenterChannel;
         private System.Windows.Forms.Label labelToggleSourceView;
-        private System.Windows.Forms.PictureBox pictureBoxToggleSourceView;
+        private System.Windows.Forms.PictureBox pictureBoxSourceView;
         private System.Windows.Forms.CheckBox checkBoxTBToggleSourceView;
         private System.Windows.Forms.Button buttonTranslationAutoSuffix;
         private System.Windows.Forms.ComboBox comboBoxTranslationAutoSuffix;
@@ -5752,5 +5883,16 @@
         private System.Windows.Forms.Panel panelMpvPrimaryColor;
         private System.Windows.Forms.Button buttonMpvPrimaryColor;
         private System.Windows.Forms.Button buttonEditShotChangesProfile;
+        private System.Windows.Forms.Label labelToolbarIconTheme;
+        private System.Windows.Forms.ComboBox comboBoxToolbarIconTheme;
+        private System.Windows.Forms.PictureBox pictureBoxAssStyleManager;
+        private System.Windows.Forms.PictureBox pictureBoxAssAttachments;
+        private System.Windows.Forms.PictureBox pictureBoxAssProperties;
+        private System.Windows.Forms.PictureBox pictureBoxAssaDraw;
+        private System.Windows.Forms.PictureBox pictureBoxToggleVideo;
+        private System.Windows.Forms.PictureBox pictureBoxToggleWaveform;
+        private System.Windows.Forms.PictureBox pictureBoxEbuProperties;
+        private System.Windows.Forms.PictureBox pictureBoxWebVttProperties;
+        private System.Windows.Forms.PictureBox pictureBoxIttProperties;
     }
 }

src/ui/Forms/Options/Settings.cs

@@ -4,6 +4,7 @@ using Nikse.SubtitleEdit.Core.SubtitleFormats;
 using Nikse.SubtitleEdit.Core.Translate.Service;
 using Nikse.SubtitleEdit.Logic;
 using Nikse.SubtitleEdit.Logic.VideoPlayers;
+using Nikse.SubtitleEdit.Forms.BeautifyTimeCodes;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -14,7 +15,6 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using System.Windows.Forms;
-using Nikse.SubtitleEdit.Forms.BeautifyTimeCodes;
 
 namespace Nikse.SubtitleEdit.Forms.Options
 {
@@ -412,7 +412,7 @@ namespace Nikse.SubtitleEdit.Forms.Options
 
             // Toolbar icons first row
             labelTBOpen.Left = Math.Max(labelTBNew.Right, checkBoxToolbarNew.Right) + 18;
-            pictureBoxOpen.Left = labelTBOpen.Left;
+            pictureBoxFileOpen.Left = labelTBOpen.Left;
             checkBoxToolbarOpen.Left = labelTBOpen.Left;
 
             labelTBSave.Left = Math.Max(labelTBOpen.Right, checkBoxToolbarOpen.Right) + 18;
@@ -432,7 +432,7 @@ namespace Nikse.SubtitleEdit.Forms.Options
             checkBoxReplace.Left = labelTBReplace.Left;
 
             labelTBFixCommonErrors.Left = Math.Max(labelTBReplace.Right, checkBoxReplace.Right) + 18;
-            pictureBoxTBFixCommonErrors.Left = labelTBFixCommonErrors.Left;
+            pictureBoxFixCommonErrors.Left = labelTBFixCommonErrors.Left;
             checkBoxTBFixCommonErrors.Left = labelTBFixCommonErrors.Left;
 
             // Toolbar icons second row
@@ -441,7 +441,7 @@ namespace Nikse.SubtitleEdit.Forms.Options
             checkBoxVisualSync.Left = labelTBVisualSync.Left;
 
             labelTBBurnIn.Left = Math.Max(labelTBVisualSync.Right, checkBoxVisualSync.Right) + 18;
-            pictureBoxTBBurnIn.Left = labelTBBurnIn.Left;
+            pictureBoxBurnIn.Left = labelTBBurnIn.Left;
             checkBoxTBBurnIn.Left = labelTBBurnIn.Left;
 
             labelTBSpellCheck.Left = Math.Max(labelTBBurnIn.Right, checkBoxTBBurnIn.Right) + 18;
@@ -460,11 +460,6 @@ namespace Nikse.SubtitleEdit.Forms.Options
             pictureBoxNetflixQualityCheck.Left = labelTBNetflixQualityCheck.Left;
             checkBoxNetflixQualityCheck.Left = labelTBNetflixQualityCheck.Left;
 
-            labelTBBeautifyTimeCodes.Left = Math.Max(labelTBNetflixQualityCheck.Right, checkBoxNetflixQualityCheck.Right) + 18;
-            pictureBoxBeautifyTimeCodes.Left = labelTBBeautifyTimeCodes.Left;
-            checkBoxBeautifyTimeCodes.Left = labelTBBeautifyTimeCodes.Left;
-
-
             groupBoxMiscellaneous.Text = language.General;
             groupBoxToolsMisc.Text = language.Miscellaneous;
             groupBoxGeneralRules.Text = language.Rules;
@@ -1204,6 +1199,39 @@ namespace Nikse.SubtitleEdit.Forms.Options
             labelUpdateFileTypeAssociationsStatus.Text = string.Empty;
 
             checkBoxDarkThemeEnabled_CheckedChanged(null, null);
+
+            ToolbarIconThemeInit();
+        }
+
+        private void ToolbarIconThemeInit()
+        {
+            if (!Directory.Exists(Configuration.IconsDirectory))
+            {
+                comboBoxToolbarIconTheme.Visible = false;
+                labelToolbarIconTheme.Visible = false;
+            }
+
+            comboBoxToolbarIconTheme.SelectedIndexChanged -= comboBoxToolbarIconTheme_SelectedIndexChanged;
+            var directories = Directory.GetDirectories(Configuration.IconsDirectory);
+            comboBoxToolbarIconTheme.Items.Clear();
+            comboBoxToolbarIconTheme.Items.Add("Auto");
+            comboBoxToolbarIconTheme.SelectedIndex = 0;
+            foreach (var dir in directories)
+            {
+                if (File.Exists(Path.Combine(dir, "new.png")))
+                {
+                    var d = Path.GetFileName(dir);
+                    comboBoxToolbarIconTheme.Items.Add(d);
+                    if (Configuration.Settings.General.ToolbarIconTheme != null &&
+                        Configuration.Settings.General.ToolbarIconTheme.Equals(d, StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        comboBoxToolbarIconTheme.SelectedIndex = comboBoxToolbarIconTheme.Items.Count - 1;
+                    }
+                }
+            }
+
+            comboBoxToolbarIconTheme.SelectedIndexChanged += comboBoxToolbarIconTheme_SelectedIndexChanged;
+
         }
 
         private void ShowMpvVideoOutput()
@@ -1846,17 +1874,17 @@ namespace Nikse.SubtitleEdit.Forms.Options
                                Image visualSync, Image burnIn, Image spellCheck, Image netflixGlyphCheck, Image beautifyTimeCodes, Image settings, Image help, Image toggleSourceView)
         {
             Icon = (Icon)icon.Clone();
-            pictureBoxNew.Image = (Image)newFile.Clone();
+            pictureBoxFileNew.Image = (Image)newFile.Clone();
-            pictureBoxOpen.Image = (Image)openFile.Clone();
+            pictureBoxFileOpen.Image = (Image)openFile.Clone();
             pictureBoxSave.Image = (Image)saveFile.Clone();
             pictureBoxSaveAs.Image = (Image)saveFileAs.Clone();
             pictureBoxFind.Image = (Image)find.Clone();
             pictureBoxReplace.Image = (Image)replace.Clone();
-            pictureBoxTBFixCommonErrors.Image = (Image)fixCommonErrors.Clone();
+            pictureBoxFixCommonErrors.Image = (Image)fixCommonErrors.Clone();
-            pictureBoxTBRemoveTextForHi.Image = (Image)removeTextForHi.Clone();
+            pictureBoxRemoveTextForHi.Image = (Image)removeTextForHi.Clone();
-            pictureBoxToggleSourceView.Image = (Image)toggleSourceView.Clone();
+            pictureBoxSourceView.Image = (Image)toggleSourceView.Clone();
             pictureBoxVisualSync.Image = (Image)visualSync.Clone();
-            pictureBoxTBBurnIn.Image = (Image)burnIn.Clone();
+            pictureBoxBurnIn.Image = (Image)burnIn.Clone();
             pictureBoxSpellCheck.Image = (Image)spellCheck.Clone();
             pictureBoxNetflixQualityCheck.Image = (Image)netflixGlyphCheck.Clone();
             pictureBoxBeautifyTimeCodes.Image = (Image)beautifyTimeCodes.Clone();
@@ -2185,6 +2213,8 @@ namespace Nikse.SubtitleEdit.Forms.Options
             gs.FFmpegUseCenterChannelOnly = checkBoxFfmpegUseCenterChannel.Checked;
             gs.FFmpegLocation = textBoxFFmpegPath.Text;
 
+            gs.ToolbarIconTheme = comboBoxToolbarIconTheme.SelectedIndex > 0 ? comboBoxToolbarIconTheme.Text : "Auto";
+
             // save shortcuts
             Configuration.Settings.Shortcuts.PluginShortcuts = _pluginShortcuts;
             foreach (var kvp in _newShortcuts)
@@ -3626,5 +3656,54 @@ namespace Nikse.SubtitleEdit.Forms.Options
                 form.ShowDialog(this);
             }
         }
+        
+        private void comboBoxToolbarIconTheme_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            TryLoadIcon(pictureBoxFileNew, "New");
+            TryLoadIcon(pictureBoxFileOpen, "Open");
+            TryLoadIcon(pictureBoxSave, "Save");
+            TryLoadIcon(pictureBoxSaveAs, "SaveAs");
+            TryLoadIcon(pictureBoxFind, "Find");
+            TryLoadIcon(pictureBoxReplace, "Replace");
+            TryLoadIcon(pictureBoxFixCommonErrors, "FixCommonErrors");
+            TryLoadIcon(pictureBoxRemoveTextForHi, "RemoveTextForHi");
+            TryLoadIcon(pictureBoxVisualSync, "VisualSync");
+            TryLoadIcon(pictureBoxBurnIn, "BurnIn");
+            TryLoadIcon(pictureBoxSpellCheck, "SpellCheck");
+            TryLoadIcon(pictureBoxNetflixQualityCheck, "Netflix");
+            TryLoadIcon(pictureBoxBeautifyTimeCodes, "BeautifyTimeCodes");
+            TryLoadIcon(pictureBoxAssStyleManager, "AssaStyle");
+            TryLoadIcon(pictureBoxAssProperties, "AssaProperties");
+            TryLoadIcon(pictureBoxAssAttachments, "AssaAttachments");
+            TryLoadIcon(pictureBoxAssaDraw, "AssaDraw");
+            TryLoadIcon(pictureBoxSettings, "Settings");
+            TryLoadIcon(pictureBoxHelp, "Help");
+            TryLoadIcon(pictureBoxToggleWaveform, "WaveformToggle");
+            TryLoadIcon(pictureBoxToggleVideo, "VideoToggle");
+            TryLoadIcon(pictureBoxSourceView, "SourceView");
+            TryLoadIcon(pictureBoxIttProperties, "IttProperties");
+            TryLoadIcon(pictureBoxWebVttProperties, "WebVttProperties");
+            TryLoadIcon(pictureBoxEbuProperties, "EbuProperties");
+        }
+
+        private void TryLoadIcon(PictureBox button, string iconName)
+        {
+            pictureBoxEbuProperties.Image?.Dispose();
+            pictureBoxEbuProperties.Image = null;
+
+            var theme = comboBoxToolbarIconTheme.Text;
+            var themeFullPath = Path.Combine(Configuration.IconsDirectory, theme, iconName + ".png");
+            if (comboBoxToolbarIconTheme.SelectedIndex > 0 && File.Exists(themeFullPath))
+            {
+                button.Image = new Bitmap(themeFullPath);
+                return;
+            }
+
+            var fullPath = Path.Combine(Configuration.IconsDirectory, "DefaultTheme", iconName + ".png");
+            if (File.Exists(fullPath))
+            {
+                button.Image = new Bitmap(fullPath);
+            }
+        }
     }
 }

src/ui/Languages/de-DE.xml

@@ -11,8 +11,7 @@
     <Yes>Ja</Yes>
     <No>Nein</No>
     <Apply>Auswahl</Apply>
-    <ApplyTo>Anwenden auf
+    <ApplyTo>Anwenden auf</ApplyTo>
-</ApplyTo>
     <None>Aus</None>
     <All>Alle</All>
     <Preview>Vorschau</Preview>
@@ -65,6 +64,7 @@
     <OverlapPreviousLineX>Vorherige Überlappung ({0:#,##0.###})</OverlapPreviousLineX>
     <OverlapX>Überlappung ({0:#,##0.###})</OverlapX>
     <OverlapNextX>Nächste Überlappung ({0:#,##0.###})</OverlapNextX>
+    <OverlapStartAndEnd>STart und Ende überlappen</OverlapStartAndEnd>
     <Negative>Negativ</Negative>
     <RegularExpressionIsNotValid>Regulärer Ausdruck ist ungültig!</RegularExpressionIsNotValid>
     <CurrentSubtitle>Aktueller Untertitel</CurrentSubtitle>
@@ -103,16 +103,18 @@
   </General>
   <About>
     <Title>Über Subtitle Edit</Title>
-    <AboutText1>Subtitle Edit ist Freie Software unter der GNU Public License.
+    <AboutText1>
-Sie dürfen sie frei verbreiten, verändern und verwenden.
+			Subtitle Edit ist Freie Software unter der GNU Public License.
+			Sie dürfen sie frei verbreiten, verändern und verwenden.
 
-Der C# Quelltext ist erhältlich unter https://github.com/SubtitleEdit/subtitleedit
+			Der C# Quelltext ist erhältlich unter https://github.com/SubtitleEdit/subtitleedit
 
-Besuchen Sie www.nikse.dk für die neueste Version.
+			Besuchen Sie www.nikse.dk für die neueste Version.
 
-Vorschläge sind willkommen.
+			Vorschläge sind willkommen.
 
-E-Mail: mailto:nikse.dk@gmail.com</AboutText1>
+			E-Mail: mailto:nikse.dk@gmail.com
+		</AboutText1>
   </About>
   <AddToNames>
     <Title>Zur Namensliste hinzufügen</Title>
@@ -136,15 +138,19 @@ E-Mail: mailto:nikse.dk@gmail.com</AboutText1>
     <GeneratingSpectrogram>Erzeuge Spektogramm...</GeneratingSpectrogram>
     <ExtractingSeconds>Extrahiere Audio: {0:0.0} Sekunden</ExtractingSeconds>
     <ExtractingMinutes>Extrahiere Audio: {0}.{1:00} Minuten</ExtractingMinutes>
-    <WaveFileNotFound>Wellenformdatei nicht gefunden!
+    <WaveFileNotFound>
-Diese Funktion erfordert VLC media player 1.1.x oder höher ({0}-bit).
+			Wellenformdatei nicht gefunden!
+			Diese Funktion erfordert VLC media player 1.1.x oder höher ({0}-bit).
 
-Befehlszeile: {1} {2}</WaveFileNotFound>
+			Befehlszeile: {1} {2}
-    <WaveFileMalformed>{0} konnte die Wellenformdatei nicht erzeugen!
+		</WaveFileNotFound>
+    <WaveFileMalformed>
+			{0} konnte die Wellenformdatei nicht erzeugen!
 
-Befehlszeile: {1} {2}
+			Befehlszeile: {1} {2}
 
-Ist genügend Plattenspeicherplatz verfügbar?</WaveFileMalformed>
+			Ist genügend Plattenspeicherplatz verfügbar?
+		</WaveFileMalformed>
     <LowDiskSpace>GERINGER PLATTENSPEICHERPLATZ</LowDiskSpace>
     <FreeDiskSpace>{0} freier Plattenspeicherplatz</FreeDiskSpace>
     <NoAudioTracksFoundGenerateEmptyWaveform>Keine Tonspuren gefunden. Soll eine leere Wellenform erzeugt werden?</NoAudioTracksFoundGenerateEmptyWaveform>
@@ -199,6 +205,7 @@ Ist genügend Plattenspeicherplatz verfügbar?</WaveFileMalformed>
     <MaxCharsPerSubtitle>Max. Anzahl Zeichen pru Untertitelzeile</MaxCharsPerSubtitle>
     <RemoveTemporaryFiles>Temp-Dateien entfernen</RemoveTemporaryFiles>
     <SetCppConstMeFolder>CPP/Const-me Modellordner festlegen...</SetCppConstMeFolder>
+    <OnlyRunPostProcessing>Nur Nachbearbeitung durchführen/Timings anpassen</OnlyRunPostProcessing>
   </AudioToText>
   <AssaAttachments>
     <Title>Erweiterte Sub Station Alpha Anhänge</Title>
@@ -262,7 +269,7 @@ Ist genügend Plattenspeicherplatz verfügbar?</WaveFileMalformed>
     <BoxColor>Boxfarbe</BoxColor>
     <Radius>Radius</Radius>
     <Step>Schritt</Step>
-    <Spikes>Spikes</Spikes>
+    <Spikes>Spitzen</Spikes>
     <Bubbles>Blasen</Bubbles>
     <Circle>Kreis</Circle>
     <MarginX>Rand X</MarginX>
@@ -354,6 +361,7 @@ Ist genügend Plattenspeicherplatz verfügbar?</WaveFileMalformed>
     <MkvLanguageStyleTwoLetter>Sprachcode aus zwei Buchstaben</MkvLanguageStyleTwoLetter>
     <MkvLanguageStyleThreeLetter>Sprachcode aus drei Buchstaben</MkvLanguageStyleThreeLetter>
     <MkvLanguageStyleEmpty>Kein Sprachcode</MkvLanguageStyleEmpty>
+    <SearchFolderScanVideo>Auch Videodateien im Suchordner prüfen (langsam)</SearchFolderScanVideo>
   </BatchConvert>
   <BinEdit>
     <ImportImage>Bild importieren...</ImportImage>
@@ -685,8 +693,10 @@ Ist genügend Plattenspeicherplatz verfügbar?</WaveFileMalformed>
     <SavePremiereEdlAs>Premiere EDL Dateiname wählen</SavePremiereEdlAs>
     <SaveFcpAs>Final Cut Pro XML Dateiname wählen</SaveFcpAs>
     <SaveDostAs>DoStudio dost Dateiname wählen</SaveDostAs>
-    <SomeLinesWereTooLongX>Einige Zeilen sind zu lang:
+    <SomeLinesWereTooLongX>
-{0}</SomeLinesWereTooLongX>
+			Einige Zeilen sind zu lang:
+			{0}
+		</SomeLinesWereTooLongX>
     <LineHeight>Zeilenhöhe</LineHeight>
     <BoxSingleLine>Box - Einzeilig</BoxSingleLine>
     <BoxMultiLine>Box - Mehrzeilig</BoxMultiLine>
@@ -816,7 +826,7 @@ Ist genügend Plattenspeicherplatz verfügbar?</WaveFileMalformed>
     <RemoveUnneededPeriodsExample>Hey du!. -&gt; Hey du!</RemoveUnneededPeriodsExample>
     <FixMissingSpacesExample>Hey.Du. -&gt; Hey. Du.</FixMissingSpacesExample>
     <FixUppercaseIInsideLowercaseWordsExample>Die Erde ist fIach. -&gt; Die Erde ist flach.</FixUppercaseIInsideLowercaseWordsExample>
-    <FixLowercaseIToUppercaseIExample>What do i care. -&gt; What do I care.</FixLowercaseIToUppercaseIExample>
+    <FixLowercaseIToUppercaseIExample>Der bauer mäht die wiese. -&gt; Der Bauer mäht die Wiese..</FixLowercaseIToUppercaseIExample>
     <StartTimeLaterThanEndTime>Textnummer {0}: Startzeit kommt nach Endzeit: {4}{1} -&gt; {2} {3}</StartTimeLaterThanEndTime>
     <UnableToFixStartTimeLaterThanEndTime>Konnte Textnummer {0} nicht korrigieren: Startzeit kommt nach Endzeit: {1}</UnableToFixStartTimeLaterThanEndTime>
     <XFixedToYZ>{0} korrigiert zu: {1}{2}</XFixedToYZ>
@@ -923,9 +933,11 @@ Ist genügend Plattenspeicherplatz verfügbar?</WaveFileMalformed>
     <PleaseWait>Bitte warten... das könnte einen Moment dauern</PleaseWait>
     <PoweredByGoogleTranslate>Powered by Google Übersetzer</PoweredByGoogleTranslate>
     <PoweredByMicrosoftTranslate>Powered by Microsoft Übersetzer</PoweredByMicrosoftTranslate>
-    <MsClientSecretNeeded>Zugriff auf Microsoft Translator erfordert einen Cognitive Services "Translator Text" Schlüssel von Microsoft.
+    <MsClientSecretNeeded>
+			Zugriff auf Microsoft Translator erfordert einen Cognitive Services "Translator Text" Schlüssel von Microsoft.
 
-"Optionen -&gt; Einstellungen -&gt; Werkzeuge" öffnen zur Eingabe des Schlüssels.</MsClientSecretNeeded>
+			"Optionen -&gt; Einstellungen -&gt; Werkzeuge" öffnen zur Eingabe des Schlüssels.
+		</MsClientSecretNeeded>
     <GoogleNoApiKeyWarning>Google Übersetzer ohne API Schlüssel... (begrenzt)</GoogleNoApiKeyWarning>
     <Service>Service:</Service>
     <LineMergeHandling>Zeilenzusammenführung:</LineMergeHandling>
@@ -1534,15 +1546,20 @@ Ist genügend Plattenspeicherplatz verfügbar?</WaveFileMalformed>
     <LoadedEmptyOrShort>Leere oder sehr kurze Untertitel {0} geladen</LoadedEmptyOrShort>
     <FileIsEmptyOrShort>Datei ist leer oder sehr kurz!</FileIsEmptyOrShort>
     <FileNotFound>Datei nicht gefunden: {0}</FileNotFound>
+    <FileLocked>Datei kann nicht geöffnet werden, da sie von einem anderen Programm verwendet wird: {0}</FileLocked>
     <SavedSubtitleX>Untertitel {0} gespeichert</SavedSubtitleX>
     <SavedOriginalSubtitleX>Original Untertitel {0} gespeichert</SavedOriginalSubtitleX>
     <FileOnDiskModified>Datei auf Disk wurde geändert</FileOnDiskModified>
     <OverwriteModifiedFile>Soll die Datei {0} bearbeitet am {1} {2}{3} überschrieben werden mit aktueller Datei, geladen am {4} {5}?</OverwriteModifiedFile>
-    <FileXIsReadOnly>Kann {0} nicht speichern
+    <FileXIsReadOnly>
+			Kann {0} nicht speichern
 
-Die Datei ist schreibgeschützt!</FileXIsReadOnly>
+			Die Datei ist schreibgeschützt!
-    <UnableToSaveSubtitleX>Konnte Untertiteldatei {0} nicht speichern
+		</FileXIsReadOnly>
-Untertitel scheint leer zu sein - erneutes Speichern versuchen!</UnableToSaveSubtitleX>
+    <UnableToSaveSubtitleX>
+			Konnte Untertiteldatei {0} nicht speichern
+			Untertitel scheint leer zu sein - erneutes Speichern versuchen!
+		</UnableToSaveSubtitleX>
     <FormatXShouldUseUft8>Beim Speichern von {0}-Dateien sollte die UTF-8-Codierung verwendet werden!</FormatXShouldUseUft8>
     <BeforeNew>Vor Neu</BeforeNew>
     <New>Neu</New>
@@ -1554,13 +1571,19 @@ Untertitel scheint leer zu sein - erneutes Speichern versuchen!</UnableToSaveSub
     <OpenVideoFile>Videodatei öffnen...</OpenVideoFile>
     <NewFrameRateUsedToCalculateTimeCodes>Neue Bildfrequenz ({0}) wurde verwendet um Start/Ende Zeitstempel zu berechnen</NewFrameRateUsedToCalculateTimeCodes>
     <NewFrameRateUsedToCalculateFrameNumbers>Neue Bildfrequenz ({0}) wurde verwendet um Start/Ende Bildnummer zu berechnen</NewFrameRateUsedToCalculateFrameNumbers>
-    <FindContinue>Der Suchbegriff wurde nicht gefunden.
+    <FindContinue>
-Am Anfang des Dokuments weitersuchen?</FindContinue>
+			Der Suchbegriff wurde nicht gefunden.
+			Am Anfang des Dokuments weitersuchen?
+		</FindContinue>
     <FindContinueTitle>Suche fortsetzen?</FindContinueTitle>
-    <ReplaceContinueNotFound>Der Suchbegriff wurde nicht gefunden.
+    <ReplaceContinueNotFound>
-Am Anfang des Dokuments weitersuchen?</ReplaceContinueNotFound>
+			Der Suchbegriff wurde nicht gefunden.
-    <ReplaceXContinue>Der Suchbegriff wurde {0} Mal ersetzt.
+			Am Anfang des Dokuments weitersuchen?
-Am Anfang des Dokuments weitersuchen?</ReplaceXContinue>
+		</ReplaceContinueNotFound>
+    <ReplaceXContinue>
+			Der Suchbegriff wurde {0} Mal ersetzt.
+			Am Anfang des Dokuments weitersuchen?
+		</ReplaceXContinue>
     <ReplaceContinueTitle>Ersetzen fortsetzen?</ReplaceContinueTitle>
     <SearchingForXFromLineY>Suche nach '{0}' ab Text {1}...</SearchingForXFromLineY>
     <XFoundAtLineNumberY>'{0}' gefunden in Text {1}</XFoundAtLineNumberY>
@@ -1590,10 +1613,12 @@ Am Anfang des Dokuments weitersuchen?</ReplaceXContinue>
     <TextingForHearingImpairedRemovedOneLine>Text für Hörgeschädigte entfernt: Ein Text</TextingForHearingImpairedRemovedOneLine>
     <TextingForHearingImpairedRemovedXLines>Text für Hörgeschädigte entfernt: {0} Texte</TextingForHearingImpairedRemovedXLines>
     <SubtitleSplitted>Untertitel wurde getrennt</SubtitleSplitted>
-    <SubtitleAppendPrompt>Es wird ein existierender Untertitel am aktuell geladenen Untertitel
+    <SubtitleAppendPrompt>
-angehängt, der schon an das Video angepasst sein sollte.
+			Es wird ein existierender Untertitel am aktuell geladenen Untertitel
+			angehängt, der schon an das Video angepasst sein sollte.
 
-Fortfahren?</SubtitleAppendPrompt>
+			Fortfahren?
+		</SubtitleAppendPrompt>
     <SubtitleAppendPromptTitle>Untertitel anhängen</SubtitleAppendPromptTitle>
     <OpenSubtitleToAppend>Öffne Untertitel zum Anhängen...</OpenSubtitleToAppend>
     <AppendViaVisualSyncTitle>Visuelle Anpassung - zweiten Teil des Untertitels anhängen</AppendViaVisualSyncTitle>
@@ -1763,15 +1788,19 @@ Fortfahren?</SubtitleAppendPrompt>
     <PluginXExecuted>Plugin '{0}' ausgeführt.</PluginXExecuted>
     <NotAValidXSubFile>Keine gültige XSub Datei!</NotAValidXSubFile>
     <BeforeMergeLinesWithSameText>Vor Zeilenverbinden mit gleichen Text</BeforeMergeLinesWithSameText>
-    <ImportTimeCodesDifferentNumberOfLinesWarning>Untertitel mit Zeitstempel hat eine andere Zeilenanzahl ({0}) als der aktuelle ({1}).
+    <ImportTimeCodesDifferentNumberOfLinesWarning>
+			Untertitel mit Zeitstempel hat eine andere Zeilenanzahl ({0}) als der aktuelle ({1}).
 
-Trotzdem fortfahren?</ImportTimeCodesDifferentNumberOfLinesWarning>
+			Trotzdem fortfahren?
+		</ImportTimeCodesDifferentNumberOfLinesWarning>
     <ParsingTransportStream>Untersuche Transport Stream - Bitte warten...</ParsingTransportStream>
     <XPercentCompleted>{0}% vollendet</XPercentCompleted>
     <NextX>Nächster: {0}</NextX>
-    <PromptInsertSubtitleOverlap>Einfügen des Untertitels an Wellenformposition führt zu Überlappung.
+    <PromptInsertSubtitleOverlap>
+			Einfügen des Untertitels an Wellenformposition führt zu Überlappung.
 
-Trotzdem fortfahren?</PromptInsertSubtitleOverlap>
+			Trotzdem fortfahren?
+		</PromptInsertSubtitleOverlap>
     <SubtitleContainsNegativeDurationsX>Untertitel enthält negative Dauer in Zeile(n): {0}</SubtitleContainsNegativeDurationsX>
     <SetPlayRateX>Wiedergabegeschwindigkeit auf {0}% festlegen</SetPlayRateX>
     <ErrorLoadIdx>Subtitle Edit kann keine .idx Dateien lesen. Sie sind Teile von idx/sub Dateipaaren (VobSub). Die .sub Dateien können geöffnet werden.</ErrorLoadIdx>
@@ -1782,9 +1811,11 @@ Trotzdem fortfahren?</PromptInsertSubtitleOverlap>
     <ErrorLoadJpg>Diese Datei ist ein JPEG-Bild. Subtitle Edit kann keine JPEG-Dateien öffnen.</ErrorLoadJpg>
     <ErrorLoadSrr>Diese Datei ist eine ReScene .srr Datei - keine Untertiteldatei.</ErrorLoadSrr>
     <ErrorLoadTorrent>Diese Datei ist eine BitTorrent Datei - keine Untertiteldatei.</ErrorLoadTorrent>
-    <ErrorLoadBinaryZeroes>Diese Datei enthällt nur Nullzeichen.
+    <ErrorLoadBinaryZeroes>
+			Diese Datei enthällt nur Nullzeichen.
 
-Falls Sie diese Datei mit Subtitle Edit bearbeitet haben, dürfte eine Sicherung vorliegen unter Menüpunkt "Datei -&gt; Automatische Sicherung wiederherstellen..."</ErrorLoadBinaryZeroes>
+			Falls Sie diese Datei mit Subtitle Edit bearbeitet haben, dürfte eine Sicherung vorliegen unter Menüpunkt "Datei -&gt; Automatische Sicherung wiederherstellen..."
+		</ErrorLoadBinaryZeroes>
     <ErrorDirectoryDropNotAllowed>Das Ziehen eines Ordners ist hier nicht erlaubt.</ErrorDirectoryDropNotAllowed>
     <NoSupportEncryptedVobSub>Verschlüsselte VobSub-Untertitel können nicht verarbeitet werden.</NoSupportEncryptedVobSub>
     <NoSupportHereBluRaySup>Blu-ray sup Dateien sind hier nicht erlaubt.</NoSupportHereBluRaySup>
@@ -2010,8 +2041,10 @@ Falls Sie diese Datei mit Subtitle Edit bearbeitet haben, dürfte eine Sicherung
   </NetworkChat>
   <NetworkJoin>
     <Title>Einer Sitzung beitreten</Title>
-    <Information>Einer Sitzung beitreten, in der mehrere Personen die
+    <Information>
-gleiche Untertiteldatei bearbeiten können (Zusammenarbeit)</Information>
+			Einer Sitzung beitreten, in der mehrere Personen die
+			gleiche Untertiteldatei bearbeiten können (Zusammenarbeit)
+		</Information>
     <Join>Beitreten</Join>
   </NetworkJoin>
   <NetworkLogAndInfo>
@@ -2021,8 +2054,10 @@ gleiche Untertiteldatei bearbeiten können (Zusammenarbeit)</Information>
   <NetworkStart>
     <Title>Neue Sitzung beginnen</Title>
     <ConnectionTo>Verbinde mit {0}...</ConnectionTo>
-    <Information>Beginne neue Sitzung, in der mehrere Personen die
+    <Information>
-gleiche Untertiteldatei bearbeiten können (Zusammenarbeit)</Information>
+			Beginne neue Sitzung, in der mehrere Personen die
+			gleiche Untertiteldatei bearbeiten können (Zusammenarbeit)
+		</Information>
     <Start>Start</Start>
   </NetworkStart>
   <OpenVideoDvd>
@@ -2634,8 +2669,10 @@ gleiche Untertiteldatei bearbeiten können (Zusammenarbeit)</Information>
     <HowToSignUp>Wie anmelden?</HowToSignUp>
     <MicrosoftTranslateApiKey>Schlüssel</MicrosoftTranslateApiKey>
     <MicrosoftTranslateTokenEndpoint>Token-Endpunkt</MicrosoftTranslateTokenEndpoint>
-    <FontNote>Hinweis: Diese Schrifteinstellungen Sind nur für die SubtitleEdit-GUI. Festlegen einer Schriftart für einen Untertitel erfolgt üblicherweise im Videoplayer, kann aber auch mittels einem Untertitelformat mit eingebetteten Schriftart-Information wie 
+    <FontNote>
-"Advanced Sub Station Alpha" oder über den Export in image-baseierte Formate.</FontNote>
+			Hinweis: Diese Schrifteinstellungen Sind nur für die SubtitleEdit-GUI. Festlegen einer Schriftart für einen Untertitel erfolgt üblicherweise im Videoplayer, kann aber auch mittels einem Untertitelformat mit eingebetteten Schriftart-Information wie
+			"Advanced Sub Station Alpha" oder über den Export in image-baseierte Formate.
+		</FontNote>
     <RestoreDefaultSettings>Standardeinstellungen wiederherstellen</RestoreDefaultSettings>
     <RestoreDefaultSettingsMsg>Alle Einstellungen werden auf Standard zurückgesetzt. Fortsetzen?</RestoreDefaultSettingsMsg>
     <RemoveTimeCodes>Zeitstempel entfernen</RemoveTimeCodes>
@@ -2675,9 +2712,11 @@ gleiche Untertiteldatei bearbeiten können (Zusammenarbeit)</Information>
   </Settings>
   <SettingsMpv>
     <DownloadMpv>Mpv-lib herunterladen</DownloadMpv>
-    <DownloadMpvFailed>Herunterladen der Mpv-Programmbibliothek ist fehlgeschlagen!
+    <DownloadMpvFailed>
+			Herunterladen der Mpv-Programmbibliothek ist fehlgeschlagen!
 
-Bitte versuchen Sie es später noch einmal.</DownloadMpvFailed>
+			Bitte versuchen Sie es später noch einmal.
+		</DownloadMpvFailed>
     <DownloadMpvOk>Nach erfolgreichem Herunterladen ist die Mpv-Programmbibliothek einsatzbereit.</DownloadMpvOk>
   </SettingsMpv>
   <SettingsFfmpeg>
@@ -2780,6 +2819,7 @@ Bitte versuchen Sie es später noch einmal.</DownloadMpvFailed>
     <NumberOfSplits>Trennungen: {0}</NumberOfSplits>
     <LongestSingleLineIsXAtY>Längste Einzelzeilenlänge ist {0} bei Text {1}</LongestSingleLineIsXAtY>
     <LongestLineIsXAtY>Längste Textlänge ist {0} bei Text {1}</LongestLineIsXAtY>
+    <SplitAtLineBreaks>Bei Zeilenumbrüchen trennen</SplitAtLineBreaks>
   </SplitLongLines>
   <SplitSubtitle>
     <Title>Untertitel teilen</Title>
@@ -2863,8 +2903,10 @@ Bitte versuchen Sie es später noch einmal.</DownloadMpvFailed>
     <ScaleBorderAndShadow>Ränder und Schatten skalieren</ScaleBorderAndShadow>
     <WrapStyle0>0: Smart Wrapping, obere Linie ist breiter</WrapStyle0>
     <WrapStyle1>1: Zeilenende-Wortumbruch, nur N bricht</WrapStyle1>
-    <WrapStyle2>2: Kein Zeilenumbruch, sowohl
+    <WrapStyle2>
-als auch N brechen</WrapStyle2>
+			2: Kein Zeilenumbruch, sowohl
+			als auch N brechen
+		</WrapStyle2>
     <WrapStyle3>3: Smart Wrapping, Endergebnis ist breiter</WrapStyle3>
   </SubStationAlphaProperties>
   <SubStationAlphaStyles>
@@ -2987,9 +3029,11 @@ als auch N brechen</WrapStyle2>
     <FindText>Suche Text</FindText>
     <GoToSubPosition>Zur Text Pos.</GoToSubPosition>
     <KeepChangesTitle>Änderungen speichern?</KeepChangesTitle>
-    <KeepChangesMessage>Es wurden Änderungen am Untertitel mit 'Visueller Anpassung' vorgenommen.
+    <KeepChangesMessage>
+			Es wurden Änderungen am Untertitel mit 'Visueller Anpassung' vorgenommen.
 
-Änderungen speichern?</KeepChangesMessage>
+			Änderungen speichern?
+		</KeepChangesMessage>
     <SynchronizationDone>Anpassung erfolgreich!</SynchronizationDone>
     <StartSceneMustComeBeforeEndScene>Anfangsszene muss vor Endszene liegen!</StartSceneMustComeBeforeEndScene>
     <Tip>Tip: Nutze &lt;Strg+Pfeil links/rechts&gt; für 100 ms vor/zurück</Tip>

src/ui/Logic/Language.cs

@@ -2620,6 +2620,7 @@ can edit in same subtitle file (collaboration)",
                 BurnIn = "Burn in",
                 SpellCheck = "Spell check",
                 NetflixQualityCheck = "Netflix quality check",
+                BeautifyTimeCodes = "Beautify time codes",
                 SettingsName = "Settings",
                 ToggleBookmarks = "Toggle bookmarks",
                 ToggleBookmarksWithComment = "Toggle bookmarks - add comment",