diff --git a/Build/Notepad3.ini b/Build/Notepad3.ini
index 8a339cff8..4755f9a27 100644
--- a/Build/Notepad3.ini
+++ b/Build/Notepad3.ini
@@ -5,16 +5,16 @@
 SettingsVersion=5
 [Settings2]
 ;IMEInteraction=0
-;DateTimeFormat=          (-> <Locale dependent short format>)
-;DateTimeLongFormat=      (-> <Locale dependent long format>)
-;TimeStampRegEx=          (-> \$Date:[^\$]+\$ ) (Find-Pattern to Update Stamps)
-;TimeStampFormat=         (-> $Date: %s $) {Print format should fit to TimeStampRegEx}
+;DateTimeFormat=         ;(-> <Locale dependent short format>)
+;DateTimeLongFormat=     ;(-> <Locale dependent long format>)
+;TimeStampRegEx=         ;(-> \$Date:[^\$]+\$ ) (Find-Pattern to Update Stamps)
+;TimeStampFormat=        ;(-> $Date: %s $) {Print format should fit to TimeStampRegEx}
 ;DefaultDirectory=
 ;DefaultExtension=txt
 ;DenyVirtualSpaceAccess=0
 ;filebrowser.exe=minipath.exe
 ;grepWin.exe=grepWinNP3.exe
-;FileCheckInterval=2000
+;FileCheckInterval=2000  ;(min: 500[msec] - if equal or less, notify immediately)
 ;FileChangedIndicator=[@]
 ;FileDeletedIndicator=[X]
 ;FileDlgFilters=
@@ -51,23 +51,23 @@ SettingsVersion=5
 ;UpdateDelayMarkAllOccurrences=50
 ;CurrentLineHorizontalSlop=40
 ;CurrentLineVerticalSlop=5
-;UndoTransactionTimeout=0  ;in [ms]
+;UndoTransactionTimeout=0  ;in [msec]
 ;AdministrationTool.exe=
 ;DevDebugMode=0
 ;AnalyzeReliableConfidenceLevel=90
 ;LocaleAnsiCodePageAnalysisBonus=33
 ;LexerSQLNumberSignAsComment=1
 ;ExitOnESCSkipLevel=2
-;ZoomTooltipTimeout=3200  ;in [ms]
-;WrapAroundTooltipTimeout=2000  ;in [ms]
+;ZoomTooltipTimeout=3200  ;in [msec]
+;WrapAroundTooltipTimeout=2000  ;in [msec]
 ;LargeIconScalePrecent=150
 ;DarkModeBkgColor=0x1F1F1F
 ;DarkModeBtnFaceColor=0x333333
 ;DarkModeTxtColor=0xEFEFEF
 ;DarkModeHiglightContrast=75
 ;HyperlinkShellExURLWithApp=""
-;HyperlinkShellExURLCmdLnArgs="${URL}"   (use ${URL} as place holder for clicked Hyperlink URL string)
-;HyperlinkFileProtocolVerb=""            (ShellExecuteEx()::lpVerb (""=default, "edit", "explore", "find", "open", "print", "properties", "runas")
+;HyperlinkShellExURLCmdLnArgs="${URL}"  ;(use ${URL} as place holder for clicked Hyperlink URL string)
+;HyperlinkFileProtocolVerb=""           ;(ShellExecuteEx()::lpVerb (""=default, "edit", "explore", "find", "open", "print", "properties", "runas")
 ;CodeFontPrefPrioList="Cascadia Code,Cascadia Mono,Cousine,Fira Code,Source Code Pro,Roboto Mono,DejaVu Sans Mono,Inconsolata,Consolas,Lucida Console"
 ;TextFontPrefPrioList="Cascadia Mono,Cousine,Roboto Mono,DejaVu Sans Mono,Inconsolata,Consolas,Lucida Console"
 [Statusbar Settings]
diff --git a/Readme.md b/Readme.md
index 813ff9731..0ddfb1668 100644
--- a/Readme.md
+++ b/Readme.md
@@ -210,10 +210,11 @@ This allows you to perform much more powerful search and replace operations in f
 - or from "Edit --> Search --> Search in Files"
 - or simply with "`Ctrl+Shift+F`"
 
-#### `FileCheckInterval=0`
+#### `FileCheckInterval=2000`
 
 The interval (in milliseconds) to check for external modification of the currently opened file. 
-- Defaults is 0 ms.
+- Defaults is 2000 msec.
+- Min: 500[msec] - if equal or less, notify immediately.
 
 #### `FileChangedIndicator=[@]`
 
@@ -390,9 +391,11 @@ If the string contains spaces, you have to double-quote it,
 
 #### `CurrentLineVerticalSlop=5`
 
-#### `UndoTransactionTimeout=0`  ;in [ms]
+#### `UndoTransactionTimeout=0`
 
-UndoTransactionTimeout=1 (will be clamped to 10ms min.) will separate nearly every keystroke as single undo action.
+- in [msec]
+
+UndoTransactionTimeout=1 (will be clamped to 10msec min.) will separate nearly every keystroke as single undo action.
 (UndoTransactionTimeout=0 will switch this timer OFF)
 
 #### `AdministrationTool.exe=`  
@@ -430,13 +433,15 @@ New parameter "[Settings2] ExitOnESCSkipLevel = 2"
 - Level 1 : ESC cancels message-box and ignores Selection.
 - Level 0 : ESC cancels all states and proceeds to Exit (if configured).
 
-#### `ZoomTooltipTimeout=3200`  ;in [ms]
+#### `ZoomTooltipTimeout=3200`
 
-- A value of zero (0) (or less than 100 ms) will disable the tooltip display.
+- in [msec]
+- A value of zero (0) (or less than 100 msec) will disable the tooltip display.
 
-#### `WrapAroundTooltipTimeout=2000`  ;in [ms]
+#### `WrapAroundTooltipTimeout=2000`
 
-- A value of zero (0) (or less than 100 ms) will disable the tooltip display.
+- in [msec]
+- A value of zero (0) (or less than 100 msec) will disable the tooltip display.
 
 #### `LargeIconScalePrecent=150`
 
diff --git a/grepWinNP3/src/Resources/grepWin.rc b/grepWinNP3/src/Resources/grepWin.rc
index db2b35c0e..236b3d32e 100644
Binary files a/grepWinNP3/src/Resources/grepWin.rc and b/grepWinNP3/src/Resources/grepWin.rc differ
diff --git a/grepWinNP3/src/Resources/grepWinNP3.rc b/grepWinNP3/src/Resources/grepWinNP3.rc
index 65dd5e289..971be7db5 100644
--- a/grepWinNP3/src/Resources/grepWinNP3.rc
+++ b/grepWinNP3/src/Resources/grepWinNP3.rc
@@ -54,6 +54,7 @@ CAPTION "grepWinNP3"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Press F1 for help...",IDC_HELPLABEL,395,51,100,8
+    CONTROL         "",IDC_UPDATELINK,"SysLink",LWS_RIGHT | NOT WS_VISIBLE | WS_TABSTOP | WS_DISABLED,252,110,190,11
     CONTROL         "<a>about grepWinNP3...</a>",IDC_ABOUTLINK,"SysLink",LWS_RIGHT | WS_TABSTOP,486,2,87,8
     PUSHBUTTON      "\\",IDC_PATHMRU,14,20,11,12
     EDITTEXT        IDC_SEARCHPATH,31,20,495,12,ES_AUTOHSCROLL,WS_EX_ACCEPTFILES
@@ -75,12 +76,11 @@ BEGIN
     CONTROL         "Dot matches newline",IDC_DOTMATCHNEWLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,123,97,110,10
     CONTROL         "Create backup files",IDC_CREATEBACKUP,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,236,97,104,10
     CONTROL         "Treat files as UTF-8",IDC_UTF8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,342,97,107,10
-    CONTROL         "Treat files as binary",IDC_BINARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,450,97,125,10
-    CONTROL         "Keep file date when replacing",IDC_KEEPFILEDATECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,450,109,125,10
     PUSHBUTTON      "Test regex...",IDC_TESTREGEX,14,109,60,14
     PUSHBUTTON      "Add to Presets...",IDC_ADDTOBOOKMARKS,89,109,90,14
     PUSHBUTTON      "Presets...",IDC_BOOKMARKS,183,109,60,14
-    CONTROL         "",IDC_UPDATELINK,"SysLink",LWS_RIGHT | NOT WS_VISIBLE | WS_TABSTOP | WS_DISABLED,252,110,190,11
+    CONTROL         "Treat files as binary",IDC_BINARY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,450,97,125,10
+    CONTROL         "Keep file date when replacing",IDC_KEEPFILEDATECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,450,109,125,10
     GROUPBOX        "Search",IDC_GROUPSEARCHFOR,7,41,587,86
     CONTROL         "All sizes",IDC_ALLSIZERADIO,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,14,139,98,10
     CONTROL         "Size is",IDC_SIZERADIO,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,14,152,48,10
@@ -107,16 +107,16 @@ BEGIN
     CONTROL         "Regex match",IDC_FILEPATTERNREGEX,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,458,174,61,10
     CONTROL         "Text match",IDC_FILEPATTERNTEXT,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,522,174,61,10
     PUSHBUTTON      "Settings...",IDC_SETTINGSBUTTON,14,210,103,14
-    CONTROL         "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | PBS_SMOOTHREVERSE | PBS_MARQUEE | NOT WS_VISIBLE,130,210,310,14
     PUSHBUTTON      "&Replace",IDC_REPLACE,457,210,62,14
     CONTROL         "Search",IDOK,"Button",BS_DEFSPLITBUTTON | WS_TABSTOP,523,210,62,14
     GROUPBOX        "Limit search",IDC_GROUPLIMITSEARCH,7,128,587,77
     CONTROL         "",IDC_RESULTLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP,14,248,571,82
+    LTEXT           "",IDC_SEARCHINFOLABEL,14,332,560,8
     GROUPBOX        "Search results",IDC_GROUPSEARCHRESULTS,7,230,587,114
     CONTROL         "Files",IDC_RESULTFILES,"Button",BS_AUTORADIOBUTTON | WS_GROUP,84,236,89,10
     CONTROL         "Content",IDC_RESULTCONTENT,"Button",BS_AUTORADIOBUTTON,200,236,104,10
+    CONTROL         "",IDC_PROGRESS,"msctls_progress32",PBS_SMOOTH | PBS_SMOOTHREVERSE | PBS_MARQUEE | NOT WS_VISIBLE,130,210,310,14
     PUSHBUTTON      ">>>",IDC_EXPORT,316,236,28,10,NOT WS_VISIBLE
-    LTEXT           "",IDC_SEARCHINFOLABEL,14,332,560,8
 END
 
 IDD_REGEXTEST DIALOGEX 0, 0, 401, 316
@@ -238,6 +238,7 @@ BEGIN
         VERTGUIDE, 344
         VERTGUIDE, 348
         VERTGUIDE, 458
+        VERTGUIDE, 528
         VERTGUIDE, 548
         VERTGUIDE, 594
         TOPMARGIN, 7
@@ -434,7 +435,8 @@ END
 STRINGTABLE
 BEGIN
     IDS_OPEN_MRU            "Open list with recent entries"
-    IDS_COPY_COLUMN         "Copy whole column"
+    IDS_COPY_COLUMN         "Copy column for all items"
+    IDS_COPY_COLUMN_SEL     "Copy column for selected items"
 END
 
 #endif    // Neutral resources
diff --git a/grepWinNP3/src/Resources/grepWin_orig.rc b/grepWinNP3/src/Resources/grepWin_orig.rc
deleted file mode 100644
index 29d64c69d..000000000
Binary files a/grepWinNP3/src/Resources/grepWin_orig.rc and /dev/null differ
diff --git a/grepWinNP3/src/SearchDlg.cpp b/grepWinNP3/src/SearchDlg.cpp
index 9f019f49e..7826a59c5 100644
--- a/grepWinNP3/src/SearchDlg.cpp
+++ b/grepWinNP3/src/SearchDlg.cpp
@@ -2132,15 +2132,18 @@ void CSearchDlg::ShowContextMenu(HWND hWnd, int x, int y)
             {
                 OnOutOfScope(DestroyMenu(hMenu));
                 auto sCopyColumn = TranslatedString(hResource, IDS_COPY_COLUMN);
+                auto sCopyColumnSel = TranslatedString(hResource, IDS_COPY_COLUMN_SEL);
                 AppendMenu(hMenu, MF_STRING, 1, sCopyColumn.c_str());
+                if (ListView_GetSelectedCount(hListControl) > 0)
+                    AppendMenu(hMenu, MF_STRING, 2, sCopyColumnSel.c_str());
                 // Display the menu.
                 auto cmdId = TrackPopupMenu(hMenu, TPM_RETURNCMD, pt.x, pt.y, 0, *this, nullptr);
-                if (cmdId == 1)
+                if (cmdId == 1 || cmdId == 2)
                 {
                     int          iItem = -1;
                     std::wstring copyText;
                     auto         sReadError = TranslatedString(hResource, IDS_READERROR);
-                    while ((iItem = ListView_GetNextItem(hListControl, iItem, LVNI_ALL)) != (-1))
+                    while ((iItem = ListView_GetNextItem(hListControl, iItem, cmdId == 1 ? LVNI_ALL : LVNI_SELECTED)) != (-1))
                     {
                         int selIndex = GetSelectedListIndex(fileList, iItem);
                         if ((selIndex < 0) || (selIndex >= static_cast<int>(m_items.size())))
@@ -2250,6 +2253,7 @@ void CSearchDlg::ShowContextMenu(HWND hWnd, int x, int y)
                     WriteAsciiStringToClipboard(copyText.c_str(), *this);
                 }
             }
+            return;
         }
     }
 
@@ -3889,7 +3893,7 @@ bool CSearchDlg::MatchPath(LPCTSTR pathBuf) const
 
 
 int CSearchDlg::SearchFile(std::shared_ptr<CSearchInfo> sinfoPtr, const std::wstring& searchRoot, const SearchFlags_t searchFlags,
-                           const std::wstring& searchString, const std::wstring& searchStringUtf16le, const std::wstring& replaceString)
+                           const std::wstring& searchString, const std::wstring& searchStringUtf16Le, const std::wstring& replaceString)
 {
     if (IsCancelled())
         return -1; // don't start this search thread
@@ -4007,7 +4011,7 @@ int CSearchDlg::SearchFile(std::shared_ptr<CSearchInfo> sinfoPtr, const std::wst
             }
             if (type == CTextFile::Binary)
             {
-                boost::wregex expressionUtf16 = boost::wregex(searchStringUtf16le, ft);
+                boost::wregex expressionUtf16 = boost::wregex(searchStringUtf16Le, ft);
                 start                         = textFile.GetFileString().begin();
                 end                           = textFile.GetFileString().end();
 
diff --git a/grepWinNP3/src/SearchDlg.h b/grepWinNP3/src/SearchDlg.h
index 444e3313a..d7ed41236 100644
--- a/grepWinNP3/src/SearchDlg.h
+++ b/grepWinNP3/src/SearchDlg.h
@@ -147,7 +147,7 @@ protected:
     bool                    PreTranslateMessage(MSG* pMsg) override;
 
     static int              SearchFile(std::shared_ptr<CSearchInfo> sinfoPtr, const std::wstring& searchRoot, const SearchFlags_t searchFlags,
-                                       const std::wstring& searchString, const std::wstring& searchStringUtf16le, const std::wstring& replaceString);
+                                       const std::wstring& searchString, const std::wstring& searchStringUtf16Le, const std::wstring& replaceString);
 
     bool             InitResultList();
     void             FillResultList();
diff --git a/grepWinNP3/src/last/version.h b/grepWinNP3/src/last/version.h
index 45c7977fb..7fa41cd6a 100644
--- a/grepWinNP3/src/last/version.h
+++ b/grepWinNP3/src/last/version.h
@@ -6,13 +6,13 @@
 
 //#pragma message(__LOC__"Run the NAnt script to get proper version info")
 
-#define FILEVER         2, 1, 13, 45
-#define PRODUCTVER      2, 1, 13, 45
-#define STRFILEVER      "2.1.13.45\0"
-#define STRPRODUCTVER   "2.1.13.45\0"
+#define FILEVER         2, 1, 13, 46
+#define PRODUCTVER      2, 1, 13, 46
+#define STRFILEVER      "2.1.13.46\0"
+#define STRPRODUCTVER   "2.1.13.46\0"
 
 #define GREPWIN_VERMAJOR     2
 #define GREPWIN_VERMINOR     1
 #define GREPWIN_VERMICRO     13
-#define GREPWIN_VERBUILD     45
-#define GREPWIN_VERDATE      "2023-02-27"
+#define GREPWIN_VERBUILD     46
+#define GREPWIN_VERDATE      "2023-03-16"
diff --git a/grepWinNP3/src/resource.h b/grepWinNP3/src/resource.h
index 5fcc91379..cd9300ed9 100644
--- a/grepWinNP3/src/resource.h
+++ b/grepWinNP3/src/resource.h
@@ -89,6 +89,7 @@
 #define IDS_INFOLABELSELEMPTY           175
 #define IDS_OPEN_MRU                    176
 #define IDS_COPY_COLUMN                 177
+#define IDS_COPY_COLUMN_SEL             178
 #define IDC_SEARCHTEXT                  1000
 #define IDC_REGEXRADIO                  1001
 #define IDC_TEXTRADIO                   1002
diff --git a/grepWinNP3/translationsNP3/Afrikaans (Suid-Afrika) [af-ZA].lang b/grepWinNP3/translationsNP3/Afrikaans (Suid-Afrika) [af-ZA].lang
index cefec5bac..fdb423fbe 100644
--- a/grepWinNP3/translationsNP3/Afrikaans (Suid-Afrika) [af-ZA].lang	
+++ b/grepWinNP3/translationsNP3/Afrikaans (Suid-Afrika) [af-ZA].lang	
@@ -156,7 +156,11 @@ msgid "Copy text results to clipboard"
 msgstr "Kopieer teksresultaat na klembord"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
 msgstr ""
 
 #. Resource IDs: (1029)
diff --git a/grepWinNP3/translationsNP3/Bahasa Indonesia (Indonesia) [id-ID].lang b/grepWinNP3/translationsNP3/Bahasa Indonesia (Indonesia) [id-ID].lang
index 0d0b61fcd..839515c37 100644
--- a/grepWinNP3/translationsNP3/Bahasa Indonesia (Indonesia) [id-ID].lang	
+++ b/grepWinNP3/translationsNP3/Bahasa Indonesia (Indonesia) [id-ID].lang	
@@ -156,8 +156,12 @@ msgid "Copy text results to clipboard"
 msgstr "Salin hasil teks ke papan klip"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
-msgstr "Salin seluruh kolom"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
+msgstr ""
 
 #. Resource IDs: (1029)
 msgid "Create backup files"
diff --git a/grepWinNP3/translationsNP3/Deutsch (Deutschland) [de-DE].lang b/grepWinNP3/translationsNP3/Deutsch (Deutschland) [de-DE].lang
index 1bfc47ebe..04be02294 100644
--- a/grepWinNP3/translationsNP3/Deutsch (Deutschland) [de-DE].lang	
+++ b/grepWinNP3/translationsNP3/Deutsch (Deutschland) [de-DE].lang	
@@ -156,8 +156,12 @@ msgid "Copy text results to clipboard"
 msgstr "Textresultate in Zwischenablage kopieren"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
-msgstr "Ganze Spalte kopieren"
+msgid "Copy column for all items"
+msgstr "Spaltentext für alle Einträge kopieren"
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
+msgstr "Spaltentext für selektierte Einträge kopieren"
 
 #. Resource IDs: (1029)
 msgid "Create backup files"
diff --git a/grepWinNP3/translationsNP3/English (United Kingdom) [en-GB].lang b/grepWinNP3/translationsNP3/English (United Kingdom) [en-GB].lang
index 2a76c488e..251c9163e 100644
--- a/grepWinNP3/translationsNP3/English (United Kingdom) [en-GB].lang	
+++ b/grepWinNP3/translationsNP3/English (United Kingdom) [en-GB].lang	
@@ -156,7 +156,11 @@ msgid "Copy text results to clipboard"
 msgstr ""
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
 msgstr ""
 
 #. Resource IDs: (1029)
diff --git a/grepWinNP3/translationsNP3/English (United States) [en-US].lang b/grepWinNP3/translationsNP3/English (United States) [en-US].lang
index eb2236a6b..71b51197e 100644
--- a/grepWinNP3/translationsNP3/English (United States) [en-US].lang	
+++ b/grepWinNP3/translationsNP3/English (United States) [en-US].lang	
@@ -156,7 +156,11 @@ msgid "Copy text results to clipboard"
 msgstr ""
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
 msgstr ""
 
 #. Resource IDs: (1029)
diff --git a/grepWinNP3/translationsNP3/Español (España) [es-ES].lang b/grepWinNP3/translationsNP3/Español (España) [es-ES].lang
index c3e0dd5d3..d55ce6ee3 100644
--- a/grepWinNP3/translationsNP3/Español (España) [es-ES].lang	
+++ b/grepWinNP3/translationsNP3/Español (España) [es-ES].lang	
@@ -156,8 +156,12 @@ msgid "Copy text results to clipboard"
 msgstr "Copiar los textos resultantes al portapapeles"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
-msgstr "Copiar toda la columna"
+msgid "Copy column for all items"
+msgstr "Copiar todos los elementos de la columna"
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
+msgstr "Copiar elementos seleccionados de la columna"
 
 #. Resource IDs: (1029)
 msgid "Create backup files"
diff --git a/grepWinNP3/translationsNP3/Español Mexicano (Mexico) [es-MX].lang b/grepWinNP3/translationsNP3/Español Mexicano (Mexico) [es-MX].lang
index 7fb168945..299374cd5 100644
--- a/grepWinNP3/translationsNP3/Español Mexicano (Mexico) [es-MX].lang	
+++ b/grepWinNP3/translationsNP3/Español Mexicano (Mexico) [es-MX].lang	
@@ -156,8 +156,12 @@ msgid "Copy text results to clipboard"
 msgstr "Copiar los textos resultantes al portapapeles"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
-msgstr "Copiar toda la columna"
+msgid "Copy column for all items"
+msgstr "Copiar todos los elementos de la columna"
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
+msgstr "Copiar elementos seleccionados de la columna"
 
 #. Resource IDs: (1029)
 msgid "Create backup files"
diff --git a/grepWinNP3/translationsNP3/Français (France) [fr-FR].lang b/grepWinNP3/translationsNP3/Français (France) [fr-FR].lang
index 08a90e7f3..ed2f5daea 100644
--- a/grepWinNP3/translationsNP3/Français (France) [fr-FR].lang	
+++ b/grepWinNP3/translationsNP3/Français (France) [fr-FR].lang	
@@ -156,8 +156,12 @@ msgid "Copy text results to clipboard"
 msgstr "Copier les résultats du texte dans le presse-papiers"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
-msgstr "Copier toute la colonne"
+msgid "Copy column for all items"
+msgstr "Copier tous les éléments de la colonne"
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
+msgstr "Copier les éléments sélectionnés de la colonne"
 
 #. Resource IDs: (1029)
 msgid "Create backup files"
diff --git a/grepWinNP3/translationsNP3/Italiano (Italia) [it-IT].lang b/grepWinNP3/translationsNP3/Italiano (Italia) [it-IT].lang
index fcaa9899b..8df2d7207 100644
--- a/grepWinNP3/translationsNP3/Italiano (Italia) [it-IT].lang	
+++ b/grepWinNP3/translationsNP3/Italiano (Italia) [it-IT].lang	
@@ -156,7 +156,11 @@ msgid "Copy text results to clipboard"
 msgstr "Copia i testi risultanti negli appunti"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
 msgstr ""
 
 #. Resource IDs: (1029)
diff --git a/grepWinNP3/translationsNP3/Magyar (Magyarország) [hu-HU].lang b/grepWinNP3/translationsNP3/Magyar (Magyarország) [hu-HU].lang
index be9221b3e..70c55f6e8 100644
--- a/grepWinNP3/translationsNP3/Magyar (Magyarország) [hu-HU].lang	
+++ b/grepWinNP3/translationsNP3/Magyar (Magyarország) [hu-HU].lang	
@@ -156,8 +156,12 @@ msgid "Copy text results to clipboard"
 msgstr "Eredmények vágólapra másolása"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
-msgstr "Egész oszlop másolása"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
+msgstr ""
 
 #. Resource IDs: (1029)
 msgid "Create backup files"
diff --git a/grepWinNP3/translationsNP3/Nederlands (Nederland) [nl-NL].lang b/grepWinNP3/translationsNP3/Nederlands (Nederland) [nl-NL].lang
index 8be9c2f9d..da24de1ef 100644
--- a/grepWinNP3/translationsNP3/Nederlands (Nederland) [nl-NL].lang	
+++ b/grepWinNP3/translationsNP3/Nederlands (Nederland) [nl-NL].lang	
@@ -156,8 +156,12 @@ msgid "Copy text results to clipboard"
 msgstr "Tekstresultaten naar klembord kopiëren"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
-msgstr "Hele kolom kopiëren"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
+msgstr ""
 
 #. Resource IDs: (1029)
 msgid "Create backup files"
diff --git a/grepWinNP3/translationsNP3/Polski (Polska) [pl-PL].lang b/grepWinNP3/translationsNP3/Polski (Polska) [pl-PL].lang
index f33655f63..12a805ea7 100644
--- a/grepWinNP3/translationsNP3/Polski (Polska) [pl-PL].lang	
+++ b/grepWinNP3/translationsNP3/Polski (Polska) [pl-PL].lang	
@@ -156,8 +156,12 @@ msgid "Copy text results to clipboard"
 msgstr "Kopiuj wyniki tekstowe do schowka"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
-msgstr "Kopiuj całą kolumnę"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
+msgstr ""
 
 #. Resource IDs: (1029)
 msgid "Create backup files"
diff --git a/grepWinNP3/translationsNP3/Português (Portugal) [pt-PT].lang b/grepWinNP3/translationsNP3/Português (Portugal) [pt-PT].lang
index b061b5682..0c8e77b8f 100644
--- a/grepWinNP3/translationsNP3/Português (Portugal) [pt-PT].lang	
+++ b/grepWinNP3/translationsNP3/Português (Portugal) [pt-PT].lang	
@@ -156,8 +156,12 @@ msgid "Copy text results to clipboard"
 msgstr "Copiar resultados dos textos para a área de transferência"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
-msgstr "Copiar toda a coluna"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
+msgstr ""
 
 #. Resource IDs: (1029)
 msgid "Create backup files"
diff --git a/grepWinNP3/translationsNP3/Português Brasileiro (Brasil) [pt-BR].lang b/grepWinNP3/translationsNP3/Português Brasileiro (Brasil) [pt-BR].lang
index 03275e738..e6b04a057 100644
--- a/grepWinNP3/translationsNP3/Português Brasileiro (Brasil) [pt-BR].lang	
+++ b/grepWinNP3/translationsNP3/Português Brasileiro (Brasil) [pt-BR].lang	
@@ -156,8 +156,12 @@ msgid "Copy text results to clipboard"
 msgstr "Copiar resultados do texto para área de transferência"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
-msgstr "Copiar toda a coluna"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
+msgstr ""
 
 #. Resource IDs: (1029)
 msgid "Create backup files"
diff --git a/grepWinNP3/translationsNP3/Slovenčina (Slovensko) [sk-SK].lang b/grepWinNP3/translationsNP3/Slovenčina (Slovensko) [sk-SK].lang
index f4d0a4220..05efcd321 100644
--- a/grepWinNP3/translationsNP3/Slovenčina (Slovensko) [sk-SK].lang	
+++ b/grepWinNP3/translationsNP3/Slovenčina (Slovensko) [sk-SK].lang	
@@ -156,8 +156,12 @@ msgid "Copy text results to clipboard"
 msgstr "Kopírovať výsledky do schránky"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
-msgstr "Kopírovať celý stĺpec"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
+msgstr ""
 
 #. Resource IDs: (1029)
 msgid "Create backup files"
diff --git a/grepWinNP3/translationsNP3/Svenska (Sverige) [sv-SE].lang b/grepWinNP3/translationsNP3/Svenska (Sverige) [sv-SE].lang
index a2c69e2cd..5af2753cc 100644
--- a/grepWinNP3/translationsNP3/Svenska (Sverige) [sv-SE].lang	
+++ b/grepWinNP3/translationsNP3/Svenska (Sverige) [sv-SE].lang	
@@ -156,7 +156,11 @@ msgid "Copy text results to clipboard"
 msgstr "Kopiera textresultat till urklipp"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
 msgstr ""
 
 #. Resource IDs: (1029)
diff --git a/grepWinNP3/translationsNP3/Tiếng Việt (Việt Nam) [vi-VN].lang b/grepWinNP3/translationsNP3/Tiếng Việt (Việt Nam) [vi-VN].lang
index 1a5bd3a82..813a3b0e4 100644
--- a/grepWinNP3/translationsNP3/Tiếng Việt (Việt Nam) [vi-VN].lang	
+++ b/grepWinNP3/translationsNP3/Tiếng Việt (Việt Nam) [vi-VN].lang	
@@ -156,7 +156,11 @@ msgid "Copy text results to clipboard"
 msgstr ""
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
 msgstr ""
 
 #. Resource IDs: (1029)
diff --git a/grepWinNP3/translationsNP3/Türkçe (Türkiye) [tr-TR].lang b/grepWinNP3/translationsNP3/Türkçe (Türkiye) [tr-TR].lang
index 26551a3b0..8a27a48eb 100644
--- a/grepWinNP3/translationsNP3/Türkçe (Türkiye) [tr-TR].lang	
+++ b/grepWinNP3/translationsNP3/Türkçe (Türkiye) [tr-TR].lang	
@@ -156,7 +156,11 @@ msgid "Copy text results to clipboard"
 msgstr "Metin sonuçlarını panoya kopyala"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
 msgstr ""
 
 #. Resource IDs: (1029)
diff --git a/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang b/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang
index 586fb7454..4afc6462a 100644
--- a/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang	
+++ b/grepWinNP3/translationsNP3/Ελληνικά (Ελλάδα) [el-GR].lang	
@@ -156,7 +156,11 @@ msgid "Copy text results to clipboard"
 msgstr "Αντιγραφή κειμένων αποτελεσμάτων στο πρόχειρο"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
 msgstr ""
 
 #. Resource IDs: (1029)
diff --git a/grepWinNP3/translationsNP3/Беларуская (Беларусь) [be-BY].lang b/grepWinNP3/translationsNP3/Беларуская (Беларусь) [be-BY].lang
index 301b8132a..1c500d054 100644
--- a/grepWinNP3/translationsNP3/Беларуская (Беларусь) [be-BY].lang	
+++ b/grepWinNP3/translationsNP3/Беларуская (Беларусь) [be-BY].lang	
@@ -156,7 +156,11 @@ msgid "Copy text results to clipboard"
 msgstr "Капіяваць тэкст вынікаў"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
 msgstr ""
 
 #. Resource IDs: (1029)
diff --git a/grepWinNP3/translationsNP3/Русский (Pоссия) [ru-RU].lang b/grepWinNP3/translationsNP3/Русский (Pоссия) [ru-RU].lang
index fb24a2788..8273ff66d 100644
--- a/grepWinNP3/translationsNP3/Русский (Pоссия) [ru-RU].lang	
+++ b/grepWinNP3/translationsNP3/Русский (Pоссия) [ru-RU].lang	
@@ -156,7 +156,11 @@ msgid "Copy text results to clipboard"
 msgstr "Копировать текст результатов"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
 msgstr ""
 
 #. Resource IDs: (1029)
diff --git a/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang b/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang
index f2255cec3..492ca04d8 100644
--- a/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang	
+++ b/grepWinNP3/translationsNP3/हिन्दी (भारत) [hi-IN].lang	
@@ -156,7 +156,11 @@ msgid "Copy text results to clipboard"
 msgstr "कई टेक्स्ट नतीजे क्लिपबोर्ड में कॉपी करें"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
 msgstr ""
 
 #. Resource IDs: (1029)
diff --git a/grepWinNP3/translationsNP3/日本語 (日本) [ja-JP].lang b/grepWinNP3/translationsNP3/日本語 (日本) [ja-JP].lang
index 96ad3574c..5ffd90d5d 100644
--- a/grepWinNP3/translationsNP3/日本語 (日本) [ja-JP].lang	
+++ b/grepWinNP3/translationsNP3/日本語 (日本) [ja-JP].lang	
@@ -156,7 +156,11 @@ msgid "Copy text results to clipboard"
 msgstr "結果のテキストをクリップボードにコピー"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
 msgstr ""
 
 #. Resource IDs: (1029)
diff --git a/grepWinNP3/translationsNP3/正體中文 (中國台灣) [zh-TW].lang b/grepWinNP3/translationsNP3/正體中文 (中國台灣) [zh-TW].lang
index 67d332ef6..ffffe7c3f 100644
--- a/grepWinNP3/translationsNP3/正體中文 (中國台灣) [zh-TW].lang	
+++ b/grepWinNP3/translationsNP3/正體中文 (中國台灣) [zh-TW].lang	
@@ -156,8 +156,12 @@ msgid "Copy text results to clipboard"
 msgstr "複製文字結果到剪貼簿"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
-msgstr "複製整列"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
+msgstr ""
 
 #. Resource IDs: (1029)
 msgid "Create backup files"
diff --git a/grepWinNP3/translationsNP3/简体中文 (中国大陆) [zh-CN].lang b/grepWinNP3/translationsNP3/简体中文 (中国大陆) [zh-CN].lang
index 432b4b194..3dcf4069b 100644
--- a/grepWinNP3/translationsNP3/简体中文 (中国大陆) [zh-CN].lang	
+++ b/grepWinNP3/translationsNP3/简体中文 (中国大陆) [zh-CN].lang	
@@ -156,8 +156,12 @@ msgid "Copy text results to clipboard"
 msgstr "复制文本结果到剪贴板"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
-msgstr "复制整列"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
+msgstr ""
 
 #. Resource IDs: (1029)
 msgid "Create backup files"
diff --git a/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang b/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang
index dccd5403e..59bc26903 100644
--- a/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang	
+++ b/grepWinNP3/translationsNP3/한국어 (대한민국) [ko-KR].lang	
@@ -156,8 +156,12 @@ msgid "Copy text results to clipboard"
 msgstr "클립보드에 텍스트 결과 복사"
 
 #. Resource IDs: (177)
-msgid "Copy whole column"
-msgstr "전체 열 복사"
+msgid "Copy column for all items"
+msgstr ""
+
+#. Resource IDs: (178)
+msgid "Copy column for selected items"
+msgstr ""
 
 #. Resource IDs: (1029)
 msgid "Create backup files"
diff --git a/language/Line numbers to translate.txt b/language/Line numbers to translate.txt
index 12696fcd2..cf77ad796 100644
--- a/language/Line numbers to translate.txt	
+++ b/language/Line numbers to translate.txt	
@@ -3,7 +3,7 @@
 ==  This file is intended for "Translators" to communicate to them the "Line Numbers" of the        ==
 ==  "Added or Modified" lines in the "Resource" files ("filename_xx_yy.rc" and "grepWinNP3.lang").  ==
 ==                                                                                                  ==
-==                                                                       Last update:  2023-03-15   ==
+==                                                                       Last update:  2023-03-16   ==
 ======================================================================================================
 
 January 2022:   Line numbers to translate_22-01 - https://workupload.com/file/3kmZN49gB9w (2022-01-29)
@@ -21,7 +21,7 @@ December 2022:  Line numbers to translate_22-12 - https://workupload.com/file/Jq
 
 January 2023:   Line numbers to translate_23-01 - No "Added or Modified" items in January 2023
 February 2023:  Line numbers to translate_23-02 - https://workupload.com/file/4uWRc8ufYUU (2023-02-26)
-March 2023:     Line numbers to translate_23-03 - https://workupload.com/file/xpqgYS8TswM (2023-03-15)
+March 2023:     Line numbers to translate_23-03 - https://workupload.com/file/gCPAT5YrUen (2023-03-16)
 April 2023:     Line numbers to translate_23-04 -  (2023-04-xx)
 May 2023:       Line numbers to translate_23-05 -  (2023-05-xx)
 June 2023:      Line numbers to translate_23-06 -  (2023-06-xx)
diff --git a/language/np3_af_za/dialogs_af_za.rc b/language/np3_af_za/dialogs_af_za.rc
index e9965fba7..f5e50d32d 100644
--- a/language/np3_af_za/dialogs_af_za.rc
+++ b/language/np3_af_za/dialogs_af_za.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 283, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Vind Teks"
+CAPTION "  ☰   Vind Teks"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Soe&kstring:",IDC_STATIC,7,7,46,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 283, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Vervang Teks"
+CAPTION "  ☰   Vervang Teks"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Soe&kstring:",IDC_STATIC,7,7,46,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Skema"
+CAPTION "  ☰   Skema"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_be_by/dialogs_be_by.rc b/language/np3_be_by/dialogs_be_by.rc
index b1b60ee6b..ecd743e7e 100644
--- a/language/np3_be_by/dialogs_be_by.rc
+++ b/language/np3_be_by/dialogs_be_by.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 313, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Знайсці тэкст"
+CAPTION "  ☰   Знайсці тэкст"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "&Шукаць:",IDC_STATIC,7,7,47,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 313, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Замяніць тэкст"
+CAPTION "  ☰   Замяніць тэкст"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "&Шукаць:",IDC_STATIC,7,7,47,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Схема"
+CAPTION "  ☰   Схема"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_de_de/dialogs_de_de.rc b/language/np3_de_de/dialogs_de_de.rc
index 57bcabf07..8ebea69f7 100644
--- a/language/np3_de_de/dialogs_de_de.rc
+++ b/language/np3_de_de/dialogs_de_de.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Suche Text"
+CAPTION "  ☰   Suche Text"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "&Suche nach:",IDC_STATIC,7,7,46,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Ersetze Text"
+CAPTION "  ☰   Ersetze Text"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "&Suche nach:",IDC_STATIC,7,7,46,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Schema"
+CAPTION "  ☰   Schema"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,240
diff --git a/language/np3_el_gr/dialogs_el_gr.rc b/language/np3_el_gr/dialogs_el_gr.rc
index 06c6a1557..41ba4c7fb 100644
--- a/language/np3_el_gr/dialogs_el_gr.rc
+++ b/language/np3_el_gr/dialogs_el_gr.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 283, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Εύρεση κειμένου"
+CAPTION "  ☰   Εύρεση κειμένου"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "&Συμβ/σειρά αναζήτησης:",IDC_STATIC,7,7,85,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 283, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Αντικατάσταση κειμένου"
+CAPTION "  ☰   Αντικατάσταση κειμένου"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "&Συμβ/σειρά αναζήτησης:",IDC_STATIC,7,7,85,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Συνδυασμός"
+CAPTION "  ☰   Συνδυασμός"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_en_gb/dialogs_en_gb.rc b/language/np3_en_gb/dialogs_en_gb.rc
index b0aa18203..fd9537c6f 100644
--- a/language/np3_en_gb/dialogs_en_gb.rc
+++ b/language/np3_en_gb/dialogs_en_gb.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Find Text"
+CAPTION "  ☰   Find Text"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Search Strin&g:",IDC_STATIC,7,7,46,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Replace Text"
+CAPTION "  ☰   Replace Text"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Search Strin&g:",IDC_STATIC,7,7,46,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Scheme"
+CAPTION "  ☰   Scheme"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_en_us/dialogs_en_us.rc b/language/np3_en_us/dialogs_en_us.rc
index b9880af2a..db5911015 100644
--- a/language/np3_en_us/dialogs_en_us.rc
+++ b/language/np3_en_us/dialogs_en_us.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Find Text"
+CAPTION "  ☰   Find Text"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Search Strin&g:",IDC_STATIC,7,7,46,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Replace Text"
+CAPTION "  ☰   Replace Text"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Search Strin&g:",IDC_STATIC,7,7,46,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Scheme"
+CAPTION "  ☰   Scheme"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_es_es/dialogs_es_es.rc b/language/np3_es_es/dialogs_es_es.rc
index 813cb6535..0cf33048a 100644
--- a/language/np3_es_es/dialogs_es_es.rc
+++ b/language/np3_es_es/dialogs_es_es.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Buscar texto"
+CAPTION "  ☰   Buscar texto"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "&Buscar:",IDC_STATIC,7,7,46,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Reemplazar texto"
+CAPTION "  ☰   Reemplazar texto"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "&Buscar:",IDC_STATIC,7,7,46,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Esquema"
+CAPTION "  ☰   Esquema"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_es_mx/dialogs_es_mx.rc b/language/np3_es_mx/dialogs_es_mx.rc
index a6d6b487f..7a7495f9b 100644
--- a/language/np3_es_mx/dialogs_es_mx.rc
+++ b/language/np3_es_mx/dialogs_es_mx.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Buscar texto"
+CAPTION "  ☰   Buscar texto"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "&Buscar:",IDC_STATIC,7,7,46,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Reemplazar texto"
+CAPTION "  ☰   Reemplazar texto"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "&Buscar:",IDC_STATIC,7,7,46,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Esquema"
+CAPTION "  ☰   Esquema"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_fr_fr/dialogs_fr_fr.rc b/language/np3_fr_fr/dialogs_fr_fr.rc
index 6de07bf80..73ddc34fd 100644
--- a/language/np3_fr_fr/dialogs_fr_fr.rc
+++ b/language/np3_fr_fr/dialogs_fr_fr.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 278, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Chercher du texte"
+CAPTION "  ☰   Chercher du texte"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Chercher la chaîne :",IDC_STATIC,7,7,65,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 278, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Remplacer du texte"
+CAPTION "  ☰   Remplacer du texte"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Chercher la chaîne :",IDC_STATIC,7,7,65,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Thème"
+CAPTION "  ☰   Thème"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_hi_in/dialogs_hi_in.rc b/language/np3_hi_in/dialogs_hi_in.rc
index 081010d12..8cd4efffe 100644
--- a/language/np3_hi_in/dialogs_hi_in.rc
+++ b/language/np3_hi_in/dialogs_hi_in.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "टेक्स्ट ढूँढें"
+CAPTION "  ☰   टेक्स्ट ढूँढें"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "स्ट्रिंग ढूँढें: (&G)",IDC_STATIC,7,7,46,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "टेक्स्ट बदलें"
+CAPTION "  ☰   टेक्स्ट बदलें"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "स्ट्रिंग खोजें: (&G)",IDC_STATIC,7,7,46,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "प्रणाली"
+CAPTION "  ☰   प्रणाली"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_hu_hu/dialogs_hu_hu.rc b/language/np3_hu_hu/dialogs_hu_hu.rc
index 2d4a3f526..3d1e48d8a 100644
--- a/language/np3_hu_hu/dialogs_hu_hu.rc
+++ b/language/np3_hu_hu/dialogs_hu_hu.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Szöveg keresése"
+CAPTION "  ☰   Szöveg keresése"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Keresési szöve&g:",IDC_STATIC,7,7,55,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Szöveg cseréje"
+CAPTION "  ☰   Szöveg cseréje"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Keresési szöve&g:",IDC_STATIC,7,7,55,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Séma"
+CAPTION "  ☰   Séma"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_id_id/dialogs_id_id.rc b/language/np3_id_id/dialogs_id_id.rc
index 0ff6f29c1..d4e6d6c61 100644
--- a/language/np3_id_id/dialogs_id_id.rc
+++ b/language/np3_id_id/dialogs_id_id.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Cari Teks"
+CAPTION "  ☰   Cari Teks"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Search Strin&g:",IDC_STATIC,7,7,46,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Ganti Teks"
+CAPTION "  ☰   Ganti Teks"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Cari Strin&g:",IDC_STATIC,7,7,46,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Skema"
+CAPTION "  ☰   Skema"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_it_it/dialogs_it_it.rc b/language/np3_it_it/dialogs_it_it.rc
index 11e97d9b6..9bf0c5608 100644
--- a/language/np3_it_it/dialogs_it_it.rc
+++ b/language/np3_it_it/dialogs_it_it.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 290, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Trova testo"
+CAPTION "  ☰   Trova testo"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Stringa di ri&cerca:",IDC_STATIC,7,7,60,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 290, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Sostituisci Testo"
+CAPTION "  ☰   Sostituisci Testo"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Stringa da &cercare:",IDC_STATIC,7,7,62,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Schema"
+CAPTION "  ☰   Schema"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_ja_jp/dialogs_ja_jp.rc b/language/np3_ja_jp/dialogs_ja_jp.rc
index 7511a2487..c421983bc 100644
--- a/language/np3_ja_jp/dialogs_ja_jp.rc
+++ b/language/np3_ja_jp/dialogs_ja_jp.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "検索"
+CAPTION "  ☰   検索"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "検索文字列(&G):",IDC_STATIC,7,7,50,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "置換"
+CAPTION "  ☰   置換"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "検索文字列(&G):",IDC_STATIC,7,7,50,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "配色"
+CAPTION "  ☰   配色"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_ko_kr/dialogs_ko_kr.rc b/language/np3_ko_kr/dialogs_ko_kr.rc
index 67870c0db..6fcfafcfd 100644
--- a/language/np3_ko_kr/dialogs_ko_kr.rc
+++ b/language/np3_ko_kr/dialogs_ko_kr.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 278, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "문자열 찾기"
+CAPTION "  ☰   문자열 찾기"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "찾을 문자열(&G):",IDC_STATIC,7,7,56,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 278, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "텍스트 바꾸기"
+CAPTION "  ☰   텍스트 바꾸기"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "검색 문자열(&G):",IDC_STATIC,7,7,56,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "구성표"
+CAPTION "  ☰   구성표"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_nl_nl/dialogs_nl_nl.rc b/language/np3_nl_nl/dialogs_nl_nl.rc
index 729af218a..c41a8ebc7 100644
--- a/language/np3_nl_nl/dialogs_nl_nl.rc
+++ b/language/np3_nl_nl/dialogs_nl_nl.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Tekst zoeken"
+CAPTION "  ☰   Tekst zoeken"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Zoek naar:",IDC_STATIC,7,7,46,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Tekst vervangen"
+CAPTION "  ☰   Tekst vervangen"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Zoeken naar:",IDC_STATIC,7,7,46,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Schema"
+CAPTION "  ☰   Schema"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_pl_pl/dialogs_pl_pl.rc b/language/np3_pl_pl/dialogs_pl_pl.rc
index f349123e8..0cb149a91 100644
--- a/language/np3_pl_pl/dialogs_pl_pl.rc
+++ b/language/np3_pl_pl/dialogs_pl_pl.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Znajdź tekst"
+CAPTION "  ☰   Znajdź tekst"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Wyszukaj ciąg:",IDC_STATIC,7,7,50,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Zamień tekst"
+CAPTION "  ☰   Zamień tekst"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Wyszukaj ciąg:",IDC_STATIC,7,7,50,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Schemat"
+CAPTION "  ☰   Schemat"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_pt_br/dialogs_pt_br.rc b/language/np3_pt_br/dialogs_pt_br.rc
index 6f3d2fbd3..36ab19f4b 100644
--- a/language/np3_pt_br/dialogs_pt_br.rc
+++ b/language/np3_pt_br/dialogs_pt_br.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Encontrar texto"
+CAPTION "  ☰   Encontrar texto"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Procurar Strin&g:",IDC_STATIC,7,7,55,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Trocar texto"
+CAPTION "  ☰   Trocar texto"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Procurar Strin&g:",IDC_STATIC,7,7,55,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Esquema"
+CAPTION "  ☰   Esquema"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_pt_pt/dialogs_pt_pt.rc b/language/np3_pt_pt/dialogs_pt_pt.rc
index 78ebc5f12..5a173d23f 100644
--- a/language/np3_pt_pt/dialogs_pt_pt.rc
+++ b/language/np3_pt_pt/dialogs_pt_pt.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Localizar Texto"
+CAPTION "  ☰   Localizar Texto"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Texto a procurar:",IDC_STATIC,7,7,72,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Substituir Texto"
+CAPTION "  ☰   Substituir Texto"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Texto a procurar:",IDC_STATIC,7,7,57,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Esquema"
+CAPTION "  ☰   Esquema"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_ru_ru/dialogs_ru_ru.rc b/language/np3_ru_ru/dialogs_ru_ru.rc
index ea5c26e60..6e6869c21 100644
--- a/language/np3_ru_ru/dialogs_ru_ru.rc
+++ b/language/np3_ru_ru/dialogs_ru_ru.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 313, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Найти текст"
+CAPTION "  ☰   Найти текст"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "На&йти:",IDC_STATIC,7,7,46,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 313, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Заменить тест"
+CAPTION "  ☰   Заменить тест"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "На&йти:",IDC_STATIC,7,7,46,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Схема"
+CAPTION "  ☰   Схема"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_sk_sk/dialogs_sk_sk.rc b/language/np3_sk_sk/dialogs_sk_sk.rc
index 7bfd69486..98691eaae 100644
--- a/language/np3_sk_sk/dialogs_sk_sk.rc
+++ b/language/np3_sk_sk/dialogs_sk_sk.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Hľadať text"
+CAPTION "  ☰   Hľadať text"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Hľ&adaný reťazec:",IDC_STATIC,7,7,60,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Zameniť text"
+CAPTION "  ☰   Zameniť text"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Hľ&adaný reťazec:",IDC_STATIC,7,7,60,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Schémy"
+CAPTION "  ☰   Schémy"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_sv_se/dialogs_sv_se.rc b/language/np3_sv_se/dialogs_sv_se.rc
index bf532e0bb..678816f36 100644
--- a/language/np3_sv_se/dialogs_sv_se.rc
+++ b/language/np3_sv_se/dialogs_sv_se.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Hitta text"
+CAPTION "  ☰   Hitta text"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Söksträng:",IDC_STATIC,7,7,46,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Ersätt text"
+CAPTION "  ☰   Ersätt text"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Söksträng:",IDC_STATIC,7,7,46,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Schema"
+CAPTION "  ☰   Schema"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_tr_tr/dialogs_tr_tr.rc b/language/np3_tr_tr/dialogs_tr_tr.rc
index 55436aece..61c66805e 100644
--- a/language/np3_tr_tr/dialogs_tr_tr.rc
+++ b/language/np3_tr_tr/dialogs_tr_tr.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 285, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Metin bul"
+CAPTION "  ☰   Metin bul"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Aranacak diz&ge:",IDC_STATIC,7,7,55,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 285, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Metin değiştir"
+CAPTION "  ☰   Metin değiştir"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Aranacak diz&ge:",IDC_STATIC,7,7,55,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Şema"
+CAPTION "  ☰   Şema"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,240
diff --git a/language/np3_vi_vn/dialogs_vi_vn.rc b/language/np3_vi_vn/dialogs_vi_vn.rc
index 8ea94a639..33082dabb 100644
--- a/language/np3_vi_vn/dialogs_vi_vn.rc
+++ b/language/np3_vi_vn/dialogs_vi_vn.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Find Text"
+CAPTION "  ☰   Find Text"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Search Strin&g:",IDC_STATIC,7,7,46,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Replace Text"
+CAPTION "  ☰   Replace Text"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "Search Strin&g:",IDC_STATIC,7,7,46,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Scheme"
+CAPTION "  ☰   Scheme"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_zh_cn/dialogs_zh_cn.rc b/language/np3_zh_cn/dialogs_zh_cn.rc
index df7d7bb54..0d76f3892 100644
--- a/language/np3_zh_cn/dialogs_zh_cn.rc
+++ b/language/np3_zh_cn/dialogs_zh_cn.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "查找"
+CAPTION "  ☰   查找"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "查找内容(&G)：",IDC_STATIC,7,7,46,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "替换"
+CAPTION "  ☰   替换"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "查找内容(&G)：",IDC_STATIC,7,7,46,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "方案"
+CAPTION "  ☰   方案"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/language/np3_zh_tw/dialogs_zh_tw.rc b/language/np3_zh_tw/dialogs_zh_tw.rc
index c4e18d41e..9a43db94e 100644
--- a/language/np3_zh_tw/dialogs_zh_tw.rc
+++ b/language/np3_zh_tw/dialogs_zh_tw.rc
@@ -85,7 +85,7 @@ END
 
 IDD_MUI_FIND DIALOGEX 0, 0, 273, 142
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "搜尋"
+CAPTION "  ☰   搜尋"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "搜尋內容(&G)：",IDC_STATIC,7,7,46,8
@@ -116,7 +116,7 @@ END
 
 IDD_MUI_REPLACE DIALOGEX 0, 0, 273, 168
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_NOFAILCREATE | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "替換"
+CAPTION "  ☰   替換"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     LTEXT           "搜尋內容(&G)：",IDC_STATIC,7,7,46,8
@@ -302,7 +302,7 @@ END
 
 IDD_MUI_STYLECONFIG DIALOGEX 0, 0, 467, 254
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "配置"
+CAPTION "  ☰   配置"
 FONT 9, "Segoe UI", 400, 0, 0x1
 BEGIN
     CONTROL         "",IDC_STYLELIST,"SysTreeView32",TVS_SHOWSELALWAYS | TVS_SINGLEEXPAND | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,164,239
diff --git a/src/Config/Config.cpp b/src/Config/Config.cpp
index 14e9a303b..b34ff9591 100644
--- a/src/Config/Config.cpp
+++ b/src/Config/Config.cpp
@@ -1257,7 +1257,7 @@ void LoadSettings()
         }
         bDirtyFlag = true;
     }
-    Settings2.FileCheckInterval = clampul(Settings2.FileCheckInterval, 120UL, (24UL*60*60*1000) << 1); // min: 120msec  max: 48h
+    Settings2.FileCheckInterval = clampul(Settings2.FileCheckInterval, MIN_FC_POLL_INTERVAL, (24UL * 60 * 60 * 1000) << 1); // min: 500msec  max: 48h
     FileWatching.FileCheckInterval = Settings2.FileCheckInterval;
 
     IniSectionGetString(IniSecSettings2, L"FileChangedIndicator", L"[@]", Settings2.FileChangedIndicator, COUNTOF(Settings2.FileChangedIndicator));
diff --git a/src/Helpers.h b/src/Helpers.h
index 80ef4a5e2..9fe86b38a 100644
--- a/src/Helpers.h
+++ b/src/Helpers.h
@@ -420,11 +420,13 @@ bool IsRunAsAdmin();
 
 void        BackgroundWorker_Init(BackgroundWorker* worker, HWND hwnd, const HPATHL hFilePath);
 void        BackgroundWorker_Start(BackgroundWorker* worker, _beginthreadex_proc_type routine, LPVOID property);
-void        BackgroundWorker_Cancel(BackgroundWorker *worker);
-void        BackgroundWorker_Destroy(BackgroundWorker *worker);
+void        BackgroundWorker_Cancel(BackgroundWorker* worker);
+void        BackgroundWorker_Destroy(BackgroundWorker* worker);
 
+inline bool BackgroundWorker_Continue(BackgroundWorker* worker) { 
+    return (worker) ? (WaitForSingleObject(worker->eventCancel, 0) != WAIT_OBJECT_0) : false;
+}
 inline void BackgroundWorker_End(BackgroundWorker* worker, unsigned int retcode) { if (worker) { _endthreadex(retcode); }}
-inline bool BackgroundWorker_Continue(BackgroundWorker* worker) { return (worker) ? (WaitForSingleObject(worker->eventCancel, 0) != WAIT_OBJECT_0) : false; }
 
 
 bool BitmapMergeAlpha(HBITMAP hbmp,COLORREF crDest);
diff --git a/src/Notepad3.c b/src/Notepad3.c
index de844553f..079345619 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -2893,7 +2893,9 @@ static HBITMAP LoadBitmapFile(const HPATHL hpath)
         }
     }
     else {
-        InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_ERR_LOADFILE, Path_Get(hpath));
+        WCHAR displayName[80];
+        Path_GetDisplayName(displayName, 80, hpath, L"<unknown>", false);
+        InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_ERR_LOADFILE, displayName);
     }
 
     return hbmp;
@@ -11328,6 +11330,7 @@ bool FileLoad(const HPATHL hfile_pth, const FileLoadFlags fLoadFlags)
     Path_NormalizeEx(hopen_file, Paths.WorkingDirectory, true, Flags.bSearchPathIfRelative);
 
     if (!bReloadFile && Path_StrgComparePathNormalized(hopen_file, Paths.CurrentFile) == 0) {
+        Path_Release(hopen_file);
         return false;
     }
     if (!bReloadFile && Flags.bSingleFileInstance) {
@@ -11338,6 +11341,7 @@ bool FileLoad(const HPATHL hfile_pth, const FileLoadFlags fLoadFlags)
             if (IsYesOkay(InfoBoxLng(MB_YESNO | MB_ICONQUESTION, L"InfoInstanceExist", IDS_MUI_ASK_INSTANCE_EXISTS))) {
                 SetForegroundWindow(hwnd);
             }
+            Path_Release(hopen_file);
             return false;
         }
     }
@@ -11421,8 +11425,8 @@ bool FileLoad(const HPATHL hfile_pth, const FileLoadFlags fLoadFlags)
             Flags.bPreserveFileModTime = DefaultFlags.bPreserveFileModTime;
         }
 
-        Path_Swap(Paths.CurrentFile, hopen_file);
-        Path_Release(hopen_file);
+        //~Path_Swap(Paths.CurrentFile, hopen_file); ~ hopen_file needed later
+        Path_Reset(Paths.CurrentFile, Path_Get(hopen_file)); // dup
 
         SetDlgItemText(Globals.hwndMain, IDC_FILENAME, Path_Get(Paths.CurrentFile));
         SetDlgItemInt(Globals.hwndMain, IDC_REUSELOCK, GetTickCount(), false);
@@ -11540,7 +11544,9 @@ bool FileLoad(const HPATHL hfile_pth, const FileLoadFlags fLoadFlags)
 
     }
     else if (!(Flags.bHugeFileLoadState || fioStatus.bUnknownExt)) {
-        InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_ERR_LOADFILE, Path_FindFileName(Paths.CurrentFile));
+        WCHAR displayName[80];
+        Path_GetDisplayName(displayName, 80, hopen_file, L"<unknown>", false);
+        InfoBoxLng(MB_ICONWARNING, NULL, IDS_MUI_ERR_LOADFILE, displayName);
         Flags.bHugeFileLoadState = false; // reset
     }
 
@@ -11548,7 +11554,7 @@ bool FileLoad(const HPATHL hfile_pth, const FileLoadFlags fLoadFlags)
     UpdateMargins(true);
     UpdateStatusbar(true);
 
-    //~Path_Release(hopen_file) ~ already released
+    Path_Release(hopen_file);
     return fSuccess;
 }
 
@@ -12575,17 +12581,27 @@ unsigned int WINAPI FileChangeObserver(LPVOID lpParam)
 
         BackgroundWorker* const worker = &(pFCOBSVData->worker);
 
+        assert(!IS_VALID_HANDLE(pFCOBSVData->hFileChanged) && "ChangeHandle not properly closed!");
+
+        pFCOBSVData->hFileChanged = FindFirstChangeNotificationW(Path_Get(pFCOBSVData->worker.hFilePath), false,
+            FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_DIR_NAME |
+            FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_SIZE |
+            FILE_NOTIFY_CHANGE_LAST_WRITE);
+
         while (BackgroundWorker_Continue(worker)) {
 
-            switch (WaitForSingleObject(pFCOBSVData->hFileChanged, (FileWatching.FileCheckInterval >> 1))) {
+            switch (WaitForSingleObject(pFCOBSVData->hFileChanged, 100)) {
 
             case WAIT_TIMEOUT:
-                // okay, wait again until done
+                // okay, check BGWorker cancellation or wait again until done
                 break;
 
             case WAIT_OBJECT_0:
-                //~NotifyIfFileHasChanged(false); // immediate notification
-                WatchTimerProc(NULL, 0, 0ULL, 0); // rely on FileCheckInterval
+                if (pFCOBSVData->bNotifyImmediate) {
+                    NotifyIfFileHasChanged(/*(!)*/false); // immediate notification
+                } else {
+                    WatchTimerProc(NULL, 0, 0ULL, 0); // rely on FileCheckInterval
+                }
                 FindNextChangeNotification(pFCOBSVData->hFileChanged);
                 break;
 
@@ -12598,7 +12614,7 @@ unsigned int WINAPI FileChangeObserver(LPVOID lpParam)
             }
         }
 
-        FindCloseChangeNotification(pFCOBSVData->hFileChanged);
+        FindCloseChangeNotification(pFCOBSVData->hFileChanged); // stop monitoring
         pFCOBSVData->hFileChanged = INVALID_HANDLE_VALUE;
 
         BackgroundWorker_End(worker, retcode);
@@ -12624,6 +12640,8 @@ void InstallFileWatching(const bool bInstall) {
     bool const bExclusiveLock = (FileWatching.FileWatchingMode == FWM_EXCLUSIVELOCK);
     bool const bWatchFile = (FileWatching.FileWatchingMode != FWM_DONT_CARE) && !bExclusiveLock;
 
+    s_FileChgObsvrData.bNotifyImmediate = (FileWatching.FileCheckInterval <= MIN_FC_POLL_INTERVAL);
+
     // always release exclusive file lock in any case
     if (IS_VALID_HANDLE(_hCurrFileHandle)) {
         CloseHandle(_hCurrFileHandle);
@@ -12652,12 +12670,7 @@ void InstallFileWatching(const bool bInstall) {
                 // Save data of current file
                 ResetFileObservationData(false); // (!) false
 
-                assert(!IS_VALID_HANDLE(s_FileChgObsvrData.hFileChanged) && "ChangeHandle not properly closed!");
-
-                s_FileChgObsvrData.hFileChanged = FindFirstChangeNotificationW(Path_Get(hdir_pth), false,
-                    FILE_NOTIFY_CHANGE_FILE_NAME | FILE_NOTIFY_CHANGE_DIR_NAME |
-                    FILE_NOTIFY_CHANGE_ATTRIBUTES | FILE_NOTIFY_CHANGE_SIZE |
-                    FILE_NOTIFY_CHANGE_LAST_WRITE);
+                Path_Reset(s_FileChgObsvrData.worker.hFilePath, Path_Get(hdir_pth)); // directory monitoring
 
                 BackgroundWorker_Start(&(s_FileChgObsvrData.worker), FileChangeObserver, &s_FileChgObsvrData);
             }
diff --git a/src/TypeDefs.h b/src/TypeDefs.h
index 9eb7ab1b5..06b22cba8 100644
--- a/src/TypeDefs.h
+++ b/src/TypeDefs.h
@@ -852,11 +852,14 @@ typedef struct FCOBSRVDATA_T {
     HANDLE            hEventFileDeleted;
 
     HANDLE            hFileChanged;  // FindFirstChangeNotification()
+    bool              bNotifyImmediate;
     BackgroundWorker  worker;
 
 } FCOBSRVDATA_T, *PFCOBSRVDATA_T;
 
-#define INIT_FCOBSRV_T { 0UL, { 0 }, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, { NULL, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, NULL } }
+#define INIT_FCOBSRV_T { 0UL, { 0 }, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, false, { NULL, INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE, NULL } }
+
+#define MIN_FC_POLL_INTERVAL (500UL)
 
 //=============================================================================
 
diff --git a/test/test_files/StyleLexers/styleLexCPP/Config.cpp b/test/test_files/StyleLexers/styleLexCPP/Config.cpp
index 50780f74f..0fd4bd233 100644
--- a/test/test_files/StyleLexers/styleLexCPP/Config.cpp
+++ b/test/test_files/StyleLexers/styleLexCPP/Config.cpp
@@ -11,7 +11,7 @@
 *                                                    https://rizonesoft.com   *
 *                                                                             *
 *                                                                             *
-*******************************************************************************/
+  *******************************************************************************/
 
 
 file:///D:/DEV/GitHub/Notepad3/language/np3_af_za/menu_af_za.rc:472