Add "toolbar icon theme"

Working on https://github.com/SubtitleEdit/subtitleedit/discussions/6921

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/libse/Common/Settings.cs

@@ -1467,6 +1467,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; }
@@ -1631,6 +1632,7 @@ $HorzAlign          =   Center
             LastColorPickerColor6 = Color.Cyan;
             LastColorPickerColor7 = Color.DarkOrange;
             LastColorPickerDropper = Color.Transparent;
+            ToolbarIconTheme = "Auto";
             UseDarkTheme = false;
             DarkThemeShowListViewGridLines = false;
             AutoSetVideoSmpteForTtml = true;
@@ -4470,6 +4472,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)
             {
@@ -10468,6 +10476,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/ui/Forms/Main.cs

@@ -5920,13 +5920,19 @@ namespace Nikse.SubtitleEdit.Forms
         private static void TryLoadIcon(ToolStripButton button, string iconName)
         {
             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 = Configuration.IconsDirectory + iconName + ".png";
+            var fullPath = Path.Combine(Configuration.IconsDirectory, "DefaultTheme", iconName + ".png");
             if (File.Exists(fullPath))
             {
                 button.Image = new Bitmap(fullPath);

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

@@ -319,20 +319,22 @@
             this.groupBox2 = new System.Windows.Forms.GroupBox();
             this.checkBoxShowFrameRate = new System.Windows.Forms.CheckBox();
             this.groupBoxShowToolBarButtons = new System.Windows.Forms.GroupBox();
+            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.labelTBNetflixQualityCheck = new System.Windows.Forms.Label();
             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();
@@ -359,10 +361,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();
@@ -429,6 +431,15 @@
             this.labelUpdateFileTypeAssociationsStatus = new System.Windows.Forms.Label();
             this.imageListFileTypeAssociations = new System.Windows.Forms.ImageList(this.components);
             this.toolTipDialogStylePreview = new System.Windows.Forms.ToolTip(this.components);
+            this.pictureBoxAssStyleManager = new System.Windows.Forms.PictureBox();
+            this.pictureBoxAssProperties = new System.Windows.Forms.PictureBox();
+            this.pictureBoxAssAttachments = new System.Windows.Forms.PictureBox();
+            this.pictureBoxAssaDraw = new System.Windows.Forms.PictureBox();
+            this.pictureBoxToggleWaveform = new System.Windows.Forms.PictureBox();
+            this.pictureBoxToggleVideo = new System.Windows.Forms.PictureBox();
+            this.pictureBoxIttProperties = new System.Windows.Forms.PictureBox();
+            this.pictureBoxWebVttProperties = new System.Windows.Forms.PictureBox();
+            this.pictureBoxEbuProperties = new System.Windows.Forms.PictureBox();
             this.panelGeneral.SuspendLayout();
             this.groupBoxMiscellaneous.SuspendLayout();
             this.groupBoxGeneralRules.SuspendLayout();
@@ -474,11 +485,11 @@
             this.panelToolBar.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.groupBoxShowToolBarButtons.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxToggleSourceView)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTBBurnIn)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSourceView)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBurnIn)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxNetflixQualityCheck)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTBRemoveTextForHi)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTBFixCommonErrors)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxRemoveTextForHi)).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();
@@ -487,8 +498,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.pictureBoxNew)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxFileOpen)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxFileNew)).BeginInit();
             this.panelFont.SuspendLayout();
             this.groupBoxAppearance.SuspendLayout();
             this.groupBoxFontInUI.SuspendLayout();
@@ -501,6 +512,15 @@
             this.groupBoxProxySettings.SuspendLayout();
             this.groupBoxProxyAuthentication.SuspendLayout();
             this.panelFileTypeAssociations.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAssStyleManager)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAssProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAssAttachments)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAssaDraw)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxToggleWaveform)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxToggleVideo)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxIttProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWebVttProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxEbuProperties)).BeginInit();
             this.SuspendLayout();
             // 
             // buttonOK
@@ -3988,9 +4008,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;
             // 
@@ -4008,20 +4028,31 @@
             // 
             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.labelTBNetflixQualityCheck);
             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);
@@ -4048,18 +4079,37 @@
             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";
             // 
+            // 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;
@@ -4069,13 +4119,13 @@
             this.labelToggleSourceView.TabIndex = 48;
             this.labelToggleSourceView.Text = "Toggle source view";
             // 
-            // pictureBoxToggleSourceView
+            // pictureBoxSourceView
             // 
-            this.pictureBoxToggleSourceView.Location = new System.Drawing.Point(24, 272);
-            this.pictureBoxToggleSourceView.Name = "pictureBoxToggleSourceView";
-            this.pictureBoxToggleSourceView.Size = new System.Drawing.Size(32, 32);
-            this.pictureBoxToggleSourceView.TabIndex = 47;
-            this.pictureBoxToggleSourceView.TabStop = false;
+            this.pictureBoxSourceView.Location = new System.Drawing.Point(24, 272);
+            this.pictureBoxSourceView.Name = "pictureBoxSourceView";
+            this.pictureBoxSourceView.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxSourceView.TabIndex = 47;
+            this.pictureBoxSourceView.TabStop = false;
             // 
             // checkBoxTBToggleSourceView
             // 
@@ -4096,13 +4146,13 @@
             this.labelTBBurnIn.TabIndex = 45;
             this.labelTBBurnIn.Text = "Burn in";
             // 
-            // pictureBoxTBBurnIn
+            // pictureBoxBurnIn
             // 
-            this.pictureBoxTBBurnIn.Location = new System.Drawing.Point(256, 159);
-            this.pictureBoxTBBurnIn.Name = "pictureBoxTBBurnIn";
-            this.pictureBoxTBBurnIn.Size = new System.Drawing.Size(32, 32);
-            this.pictureBoxTBBurnIn.TabIndex = 44;
-            this.pictureBoxTBBurnIn.TabStop = false;
+            this.pictureBoxBurnIn.Location = new System.Drawing.Point(256, 159);
+            this.pictureBoxBurnIn.Name = "pictureBoxBurnIn";
+            this.pictureBoxBurnIn.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxBurnIn.TabIndex = 44;
+            this.pictureBoxBurnIn.TabStop = false;
             // 
             // checkBoxTBBurnIn
             // 
@@ -4150,13 +4200,13 @@
             this.labelTBRemoveTextForHi.TabIndex = 39;
             this.labelTBRemoveTextForHi.Text = "Remove text for HI";
             // 
-            // pictureBoxTBRemoveTextForHi
+            // pictureBoxRemoveTextForHi
             // 
-            this.pictureBoxTBRemoveTextForHi.Location = new System.Drawing.Point(22, 161);
-            this.pictureBoxTBRemoveTextForHi.Name = "pictureBoxTBRemoveTextForHi";
-            this.pictureBoxTBRemoveTextForHi.Size = new System.Drawing.Size(32, 32);
-            this.pictureBoxTBRemoveTextForHi.TabIndex = 38;
-            this.pictureBoxTBRemoveTextForHi.TabStop = false;
+            this.pictureBoxRemoveTextForHi.Location = new System.Drawing.Point(22, 161);
+            this.pictureBoxRemoveTextForHi.Name = "pictureBoxRemoveTextForHi";
+            this.pictureBoxRemoveTextForHi.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxRemoveTextForHi.TabIndex = 38;
+            this.pictureBoxRemoveTextForHi.TabStop = false;
             // 
             // checkBoxTBRemoveTextForHi
             // 
@@ -4177,13 +4227,13 @@
             this.labelTBFixCommonErrors.TabIndex = 36;
             this.labelTBFixCommonErrors.Text = "Fix common errors";
             // 
-            // pictureBoxTBFixCommonErrors
+            // pictureBoxFixCommonErrors
             // 
-            this.pictureBoxTBFixCommonErrors.Location = new System.Drawing.Point(610, 41);
-            this.pictureBoxTBFixCommonErrors.Name = "pictureBoxTBFixCommonErrors";
-            this.pictureBoxTBFixCommonErrors.Size = new System.Drawing.Size(32, 32);
-            this.pictureBoxTBFixCommonErrors.TabIndex = 35;
-            this.pictureBoxTBFixCommonErrors.TabStop = false;
+            this.pictureBoxFixCommonErrors.Location = new System.Drawing.Point(610, 41);
+            this.pictureBoxFixCommonErrors.Name = "pictureBoxFixCommonErrors";
+            this.pictureBoxFixCommonErrors.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxFixCommonErrors.TabIndex = 35;
+            this.pictureBoxFixCommonErrors.TabStop = false;
             // 
             // checkBoxTBFixCommonErrors
             // 
@@ -4420,13 +4470,13 @@
             this.labelTBOpen.TabIndex = 6;
             this.labelTBOpen.Text = "Open";
             // 
-            // pictureBoxOpen
+            // pictureBoxFileOpen
             // 
-            this.pictureBoxOpen.Location = new System.Drawing.Point(123, 41);
-            this.pictureBoxOpen.Name = "pictureBoxOpen";
-            this.pictureBoxOpen.Size = new System.Drawing.Size(32, 32);
-            this.pictureBoxOpen.TabIndex = 5;
-            this.pictureBoxOpen.TabStop = false;
+            this.pictureBoxFileOpen.Location = new System.Drawing.Point(123, 41);
+            this.pictureBoxFileOpen.Name = "pictureBoxFileOpen";
+            this.pictureBoxFileOpen.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxFileOpen.TabIndex = 5;
+            this.pictureBoxFileOpen.TabStop = false;
             // 
             // checkBoxToolbarOpen
             // 
@@ -4447,13 +4497,13 @@
             this.labelTBNew.TabIndex = 3;
             this.labelTBNew.Text = "New";
             // 
-            // pictureBoxNew
+            // pictureBoxFileNew
             // 
-            this.pictureBoxNew.Location = new System.Drawing.Point(22, 41);
-            this.pictureBoxNew.Name = "pictureBoxNew";
-            this.pictureBoxNew.Size = new System.Drawing.Size(32, 32);
-            this.pictureBoxNew.TabIndex = 2;
-            this.pictureBoxNew.TabStop = false;
+            this.pictureBoxFileNew.Location = new System.Drawing.Point(22, 41);
+            this.pictureBoxFileNew.Name = "pictureBoxFileNew";
+            this.pictureBoxFileNew.Size = new System.Drawing.Size(32, 32);
+            this.pictureBoxFileNew.TabIndex = 2;
+            this.pictureBoxFileNew.TabStop = false;
             // 
             // checkBoxToolbarNew
             // 
@@ -5159,14 +5209,86 @@
             this.toolTipDialogStylePreview.InitialDelay = 500;
             this.toolTipDialogStylePreview.ReshowDelay = 100;
             // 
+            // 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;
+            // 
+            // 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;
+            // 
+            // 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;
+            // 
+            // 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;
+            // 
+            // 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;
+            // 
+            // 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;
+            // 
+            // 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;
+            // 
+            // 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;
+            // 
+            // 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;
+            // 
             // Settings
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             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);
@@ -5259,11 +5381,11 @@
             this.groupBox2.PerformLayout();
             this.groupBoxShowToolBarButtons.ResumeLayout(false);
             this.groupBoxShowToolBarButtons.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxToggleSourceView)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTBBurnIn)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxSourceView)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBurnIn)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBoxNetflixQualityCheck)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTBRemoveTextForHi)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxTBFixCommonErrors)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxRemoveTextForHi)).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();
@@ -5272,8 +5394,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.pictureBoxNew)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxFileOpen)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxFileNew)).EndInit();
             this.panelFont.ResumeLayout(false);
             this.groupBoxAppearance.ResumeLayout(false);
             this.groupBoxAppearance.PerformLayout();
@@ -5294,6 +5416,15 @@
             this.groupBoxProxyAuthentication.ResumeLayout(false);
             this.groupBoxProxyAuthentication.PerformLayout();
             this.panelFileTypeAssociations.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAssStyleManager)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAssProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAssAttachments)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxAssaDraw)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxToggleWaveform)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxToggleVideo)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxIttProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxWebVttProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBoxEbuProperties)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -5307,7 +5438,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;
@@ -5328,7 +5459,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;
@@ -5495,7 +5626,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;
@@ -5526,7 +5657,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;
@@ -5666,7 +5797,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;
@@ -5678,7 +5809,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;
@@ -5701,5 +5832,16 @@
         private System.Windows.Forms.Button buttonMpvOutlineColor;
         private System.Windows.Forms.Panel panelMpvPrimaryColor;
         private System.Windows.Forms.Button buttonMpvPrimaryColor;
+        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

@@ -408,7 +408,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;
@@ -428,7 +428,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
@@ -437,7 +437,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;
@@ -1193,6 +1193,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()
@@ -1835,17 +1868,17 @@ namespace Nikse.SubtitleEdit.Forms.Options
                                Image visualSync, Image burnIn, Image spellCheck, Image netflixGlyphCheck, Image settings, Image help, Image toggleSourceView)
         {
             Icon = (Icon)icon.Clone();
-            pictureBoxNew.Image = (Image)newFile.Clone();
-            pictureBoxOpen.Image = (Image)openFile.Clone();
+            pictureBoxFileNew.Image = (Image)newFile.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();
-            pictureBoxTBRemoveTextForHi.Image = (Image)removeTextForHi.Clone();
-            pictureBoxToggleSourceView.Image = (Image)toggleSourceView.Clone();
+            pictureBoxFixCommonErrors.Image = (Image)fixCommonErrors.Clone();
+            pictureBoxRemoveTextForHi.Image = (Image)removeTextForHi.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();
             pictureBoxSettings.Image = (Image)settings.Clone();
@@ -2172,6 +2205,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)
@@ -3605,5 +3640,53 @@ namespace Nikse.SubtitleEdit.Forms.Options
                 panelMpvBackColor.BackColor = colorDialogSSAStyle.Color;
             }
         }
+
+        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(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);
+            }
+        }
     }
 }