diff --git a/Build/Changes.txt b/Build/Changes.txt
index 80b10381c..70a4546c0 100644
--- a/Build/Changes.txt
+++ b/Build/Changes.txt
@@ -32,13 +32,14 @@ GRE - (GRE)pWinNP3 Search in Files Tool
 
 
 =====================================================
-Current BETA Version 5.20.609.(build_#) (2020-06-09)
+Current BETA Version 5.20.610.(build_#) (2020-06-10)
 =====================================================
 
 -----------------------------------------------------
 NEW:
 -----------------------------------------------------
 - 
+- Add a grepWinNP3 toolbar icon.
 - Configurable Zoom-Tooltip clear delay ([Settings2] ZoomTooltipimeout=3200.
 - Add Install/Remove "Open with Notepad3" to Notepad3 Install version. 
 - Add another Dark Theme "Sombra".
diff --git a/Versions/build.txt b/Versions/build.txt
index 0cfbf0888..d00491fd7 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-2
+1
diff --git a/Versions/day.txt b/Versions/day.txt
index cb3e25bbc..502380c6c 100644
--- a/Versions/day.txt
+++ b/Versions/day.txt
@@ -1 +1 @@
-609
+610
diff --git a/grepWinNP3/grepWinNP3.vcxproj b/grepWinNP3/grepWinNP3.vcxproj
index f758f4335..edec49f33 100644
--- a/grepWinNP3/grepWinNP3.vcxproj
+++ b/grepWinNP3/grepWinNP3.vcxproj
@@ -306,7 +306,7 @@
     <None Include="translationsNP3\Italiano (Italia) [it-IT].lang" />
     <None Include="translationsNP3\Magyar (Magyarország) [hu-HU].lang" />
     <None Include="translationsNP3\Nederlands (Nederland) [nl-NL].lang" />
-    <None Include="translationsNP3\Polski (Polska)Polski [pl-PL].lang" />
+    <None Include="translationsNP3\Polski (Polska) [pl-PL].lang" />
     <None Include="translationsNP3\Português (Portugal) [pt-PT].lang" />
     <None Include="translationsNP3\Português Brasileiro (Brasil) [pt-BR].lang" />
     <None Include="translationsNP3\Slovenčina (Slovensko) [sk-SK].lang" />
diff --git a/grepWinNP3/grepWinNP3.vcxproj.filters b/grepWinNP3/grepWinNP3.vcxproj.filters
index bb95fe652..2158e1482 100644
--- a/grepWinNP3/grepWinNP3.vcxproj.filters
+++ b/grepWinNP3/grepWinNP3.vcxproj.filters
@@ -338,7 +338,7 @@
     <None Include="translationsNP3\Nederlands (Nederland) [nl-NL].lang">
       <Filter>translationsNP3</Filter>
     </None>
-    <None Include="translationsNP3\Polski (Polska)Polski [pl-PL].lang">
+    <None Include="translationsNP3\Polski (Polska) [pl-PL].lang">
       <Filter>translationsNP3</Filter>
     </None>
     <None Include="translationsNP3\Português (Portugal) [pt-PT].lang">
diff --git a/grepWinNP3/translationsNP3/Polski (Polska)Polski [pl-PL].lang b/grepWinNP3/translationsNP3/Polski (Polska) [pl-PL].lang
similarity index 100%
rename from grepWinNP3/translationsNP3/Polski (Polska)Polski [pl-PL].lang
rename to grepWinNP3/translationsNP3/Polski (Polska) [pl-PL].lang
diff --git a/language/np3_af_za/strings_af_za.rc b/language/np3_af_za/strings_af_za.rc
index fab77b92a..ad0347a34 100644
--- a/language/np3_af_za/strings_af_za.rc
+++ b/language/np3_af_za/strings_af_za.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Gefokusde Aansig"
     IDT_VIEW_CHASING_DOCTAIL "Moniteringslogboek"
     IDT_VIEW_PIN_ON_TOP      "Altyd Bo-op"
+    IDT_GREP_WIN_TOOL        "Search in Files"
 END
 
 STRINGTABLE
diff --git a/language/np3_be_by/strings_be_by.rc b/language/np3_be_by/strings_be_by.rc
index 8cd593a66..6b40c42fb 100644
--- a/language/np3_be_by/strings_be_by.rc
+++ b/language/np3_be_by/strings_be_by.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Факусаваны прагляд"
     IDT_VIEW_CHASING_DOCTAIL "Назіранне за файлам"
     IDT_VIEW_PIN_ON_TOP      "Зверху іншых вокнаў"
+    IDT_GREP_WIN_TOOL        "Шукаць у файлах"
 END
 
 STRINGTABLE
diff --git a/language/np3_de_de/strings_de_de.rc b/language/np3_de_de/strings_de_de.rc
index 040647349..a169197bf 100644
--- a/language/np3_de_de/strings_de_de.rc
+++ b/language/np3_de_de/strings_de_de.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Fokussierte Ansicht"
     IDT_VIEW_CHASING_DOCTAIL "Logfile Monitoring"
     IDT_VIEW_PIN_ON_TOP      "Immer im Vordergrung"
+    IDT_GREP_WIN_TOOL        "Suche in &Dateien"
 END
 
 STRINGTABLE
diff --git a/language/np3_en_gb/strings_en_gb.rc b/language/np3_en_gb/strings_en_gb.rc
index cd85efda8..2ee4c31c6 100644
--- a/language/np3_en_gb/strings_en_gb.rc
+++ b/language/np3_en_gb/strings_en_gb.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Focused View"
     IDT_VIEW_CHASING_DOCTAIL "Monitoring Log"
     IDT_VIEW_PIN_ON_TOP      "Always On Top"
+    IDT_GREP_WIN_TOOL        "Search in Files"
 END
 
 STRINGTABLE
diff --git a/language/np3_es_es/strings_es_es.rc b/language/np3_es_es/strings_es_es.rc
index a0e6370c6..bc35b9915 100644
--- a/language/np3_es_es/strings_es_es.rc
+++ b/language/np3_es_es/strings_es_es.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Vista enfocada"
     IDT_VIEW_CHASING_DOCTAIL "Monitoreo de Log"
     IDT_VIEW_PIN_ON_TOP      "Siempre visible"
+    IDT_GREP_WIN_TOOL        "Buscar en archivos"
 END
 
 STRINGTABLE
diff --git a/language/np3_fr_fr/strings_fr_fr.rc b/language/np3_fr_fr/strings_fr_fr.rc
index c6c494764..d560abd82 100644
--- a/language/np3_fr_fr/strings_fr_fr.rc
+++ b/language/np3_fr_fr/strings_fr_fr.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Vue Focalisée"
     IDT_VIEW_CHASING_DOCTAIL "Surveillance de Log"
     IDT_VIEW_PIN_ON_TOP      "Toujours visible"
+    IDT_GREP_WIN_TOOL        "Rechercher dans fichiers"
 END
 
 STRINGTABLE
diff --git a/language/np3_hi_in/strings_hi_in.rc b/language/np3_hi_in/strings_hi_in.rc
index 5de35ec00..09a2251a2 100644
--- a/language/np3_hi_in/strings_hi_in.rc
+++ b/language/np3_hi_in/strings_hi_in.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Focused View"
     IDT_VIEW_CHASING_DOCTAIL "Monitoring Log"
     IDT_VIEW_PIN_ON_TOP      "Always On Top"
+    IDT_GREP_WIN_TOOL        "Search in Files"
 END
 
 STRINGTABLE
diff --git a/language/np3_hu_hu/strings_hu_hu.rc b/language/np3_hu_hu/strings_hu_hu.rc
index 5a23538e3..fe04becb7 100644
--- a/language/np3_hu_hu/strings_hu_hu.rc
+++ b/language/np3_hu_hu/strings_hu_hu.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Fókuszált nézet"
     IDT_VIEW_CHASING_DOCTAIL "Naplófájl követése"
     IDT_VIEW_PIN_ON_TOP      "Mindig felül"
+    IDT_GREP_WIN_TOOL        "Keresés fájlokban"
 END
 
 STRINGTABLE
diff --git a/language/np3_id_id/strings_id_id.rc b/language/np3_id_id/strings_id_id.rc
index b086b1977..00a3f543e 100644
--- a/language/np3_id_id/strings_id_id.rc
+++ b/language/np3_id_id/strings_id_id.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Focused View"
     IDT_VIEW_CHASING_DOCTAIL "Monitoring Log"
     IDT_VIEW_PIN_ON_TOP      "Always On Top"
+    IDT_GREP_WIN_TOOL        "Search in Files"
 END
 
 STRINGTABLE
diff --git a/language/np3_it_it/strings_it_it.rc b/language/np3_it_it/strings_it_it.rc
index 4b33ba8c9..1f8a55871 100644
--- a/language/np3_it_it/strings_it_it.rc
+++ b/language/np3_it_it/strings_it_it.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Vista focalizzata"
     IDT_VIEW_CHASING_DOCTAIL "Monitoraggio log"
     IDT_VIEW_PIN_ON_TOP      "Sempre in primo piano"
+    IDT_GREP_WIN_TOOL        "Cerca nei file"
 END
 
 STRINGTABLE
diff --git a/language/np3_ja_jp/strings_ja_jp.rc b/language/np3_ja_jp/strings_ja_jp.rc
index 39ec091ba..17e40adac 100644
--- a/language/np3_ja_jp/strings_ja_jp.rc
+++ b/language/np3_ja_jp/strings_ja_jp.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "単語一望モード"
     IDT_VIEW_CHASING_DOCTAIL "編集制限モード"
     IDT_VIEW_PIN_ON_TOP      "常に手前に表示"
+    IDT_GREP_WIN_TOOL        "ファイル群から検索"
 END
 
 STRINGTABLE
diff --git a/language/np3_ko_kr/strings_ko_kr.rc b/language/np3_ko_kr/strings_ko_kr.rc
index 67dcf4ea4..d9ddcdded 100644
--- a/language/np3_ko_kr/strings_ko_kr.rc
+++ b/language/np3_ko_kr/strings_ko_kr.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "집중"
     IDT_VIEW_CHASING_DOCTAIL "열람(&M)"
     IDT_VIEW_PIN_ON_TOP      "항상 위에"
+    IDT_GREP_WIN_TOOL        "Search in Files"
 END
 
 STRINGTABLE
diff --git a/language/np3_nl_nl/strings_nl_nl.rc b/language/np3_nl_nl/strings_nl_nl.rc
index dd2c71a33..97acb8abf 100644
--- a/language/np3_nl_nl/strings_nl_nl.rc
+++ b/language/np3_nl_nl/strings_nl_nl.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Gefocust zicht"
     IDT_VIEW_CHASING_DOCTAIL "Log Monitoren"
     IDT_VIEW_PIN_ON_TOP      "Altijd bovenop"
+    IDT_GREP_WIN_TOOL        "Zoek in bestanden"
 END
 
 STRINGTABLE
diff --git a/language/np3_pl_pl/strings_pl_pl.rc b/language/np3_pl_pl/strings_pl_pl.rc
index ffad05769..a8d315f7d 100644
--- a/language/np3_pl_pl/strings_pl_pl.rc
+++ b/language/np3_pl_pl/strings_pl_pl.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Widok skupiony"
     IDT_VIEW_CHASING_DOCTAIL "Dziennik monitorowania"
     IDT_VIEW_PIN_ON_TOP      "Zawsze na wierzchu"
+    IDT_GREP_WIN_TOOL        "Szukaj w plikach"
 END
 
 STRINGTABLE
diff --git a/language/np3_pt_br/strings_pt_br.rc b/language/np3_pt_br/strings_pt_br.rc
index 043be8c02..3f80ab7a2 100644
--- a/language/np3_pt_br/strings_pt_br.rc
+++ b/language/np3_pt_br/strings_pt_br.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Focused View"
     IDT_VIEW_CHASING_DOCTAIL "Monitoring Log"
     IDT_VIEW_PIN_ON_TOP      "Always On Top"
+    IDT_GREP_WIN_TOOL        "Search in Files"
 END
 
 STRINGTABLE
diff --git a/language/np3_pt_pt/strings_pt_pt.rc b/language/np3_pt_pt/strings_pt_pt.rc
index c47b14b6e..22669fc41 100644
--- a/language/np3_pt_pt/strings_pt_pt.rc
+++ b/language/np3_pt_pt/strings_pt_pt.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Vista focada"
     IDT_VIEW_CHASING_DOCTAIL "Registo de monitorização"
     IDT_VIEW_PIN_ON_TOP      "Sempre visível"
+    IDT_GREP_WIN_TOOL        "Procurar em ficheiro"
 END
 
 STRINGTABLE
diff --git a/language/np3_ru_ru/strings_ru_ru.rc b/language/np3_ru_ru/strings_ru_ru.rc
index 6aaca5aee..35040e8fd 100644
--- a/language/np3_ru_ru/strings_ru_ru.rc
+++ b/language/np3_ru_ru/strings_ru_ru.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Фокусировка просмотра"
     IDT_VIEW_CHASING_DOCTAIL "Слежение за файлом"
     IDT_VIEW_PIN_ON_TOP      "Поверх других окон"
+    IDT_GREP_WIN_TOOL        "Искать в файлах"
 END
 
 STRINGTABLE
diff --git a/language/np3_sk_sk/strings_sk_sk.rc b/language/np3_sk_sk/strings_sk_sk.rc
index 1a3755b73..edd465d09 100644
--- a/language/np3_sk_sk/strings_sk_sk.rc
+++ b/language/np3_sk_sk/strings_sk_sk.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Zamerať zobrazenie"
     IDT_VIEW_CHASING_DOCTAIL "Monitorovať logovanie"
     IDT_VIEW_PIN_ON_TOP      "Vždy na vrchu"
+    IDT_GREP_WIN_TOOL        "Vyhľadávať v súboroch"
 END
 
 STRINGTABLE
diff --git a/language/np3_sv_se/strings_sv_se.rc b/language/np3_sv_se/strings_sv_se.rc
index 6689f9145..98577ce72 100644
--- a/language/np3_sv_se/strings_sv_se.rc
+++ b/language/np3_sv_se/strings_sv_se.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Växla vy"
     IDT_VIEW_CHASING_DOCTAIL "Övervaknigslogg"
     IDT_VIEW_PIN_ON_TOP      "Alltid överst"
+    IDT_GREP_WIN_TOOL        "Sök i filer"
 END
 
 STRINGTABLE
diff --git a/language/np3_tr_tr/strings_tr_tr.rc b/language/np3_tr_tr/strings_tr_tr.rc
index 35853f0b8..3ae747869 100644
--- a/language/np3_tr_tr/strings_tr_tr.rc
+++ b/language/np3_tr_tr/strings_tr_tr.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Focused View"
     IDT_VIEW_CHASING_DOCTAIL "Monitoring Log"
     IDT_VIEW_PIN_ON_TOP      "Always On Top"
+    IDT_GREP_WIN_TOOL        "Search in Files"
 END
 
 STRINGTABLE
diff --git a/language/np3_vi_vn/strings_vi_vn.rc b/language/np3_vi_vn/strings_vi_vn.rc
index 696c22a02..7478c36f5 100644
--- a/language/np3_vi_vn/strings_vi_vn.rc
+++ b/language/np3_vi_vn/strings_vi_vn.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "Focused View"
     IDT_VIEW_CHASING_DOCTAIL "Monitoring Log"
     IDT_VIEW_PIN_ON_TOP      "Always On Top"
+    IDT_GREP_WIN_TOOL        "Search in Files"
 END
 
 STRINGTABLE
diff --git a/language/np3_zh_cn/strings_zh_cn.rc b/language/np3_zh_cn/strings_zh_cn.rc
index 895d846e6..b81a4e7d0 100644
--- a/language/np3_zh_cn/strings_zh_cn.rc
+++ b/language/np3_zh_cn/strings_zh_cn.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "仅显示匹配行"
     IDT_VIEW_CHASING_DOCTAIL "日志监控"
     IDT_VIEW_PIN_ON_TOP      "总是置顶"
+    IDT_GREP_WIN_TOOL        "在文件中查找"
 END
 
 STRINGTABLE
diff --git a/language/np3_zh_tw/strings_zh_tw.rc b/language/np3_zh_tw/strings_zh_tw.rc
index d0393bd35..9bed339d8 100644
--- a/language/np3_zh_tw/strings_zh_tw.rc
+++ b/language/np3_zh_tw/strings_zh_tw.rc
@@ -92,6 +92,7 @@ BEGIN
     IDT_VIEW_TOGGLE_VIEW     "僅顯示符合行"
     IDT_VIEW_CHASING_DOCTAIL "日誌監控"
     IDT_VIEW_PIN_ON_TOP      "總是置頂"
+    IDT_GREP_WIN_TOOL        "在檔案中查詢"
 END
 
 STRINGTABLE
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 4eaf2dcd1..8003f5efe 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.20.609.2"
+    version="5.20.610.1"
     type="win32"
   />
   <description>Notepad3 BETA</description>
diff --git a/src/MuiLanguage.c b/src/MuiLanguage.c
index 525b22aea..d9d1504df 100644
--- a/src/MuiLanguage.c
+++ b/src/MuiLanguage.c
@@ -82,7 +82,7 @@ grepWinLng_t grepWinLangResName[] =
   { MAKELANGID(LANG_JAPANESE, SUBLANG_JAPANESE_JAPAN),                    L".\\lng\\gwLng\\日本語 （日本）[ja-JP].lang"},
   { MAKELANGID(LANG_KOREAN, SUBLANG_KOREAN),                              L".\\lng\\gwLng\\한국어 (대한민국) [ko-KR].lang"},
   { MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH),                                L".\\lng\\gwLng\\Nederlands (Nederland) [nl-NL].lang"},
-  { MAKELANGID(LANG_POLISH, SUBLANG_POLISH_POLAND),                       L".\\lng\\gwLng\\Polski (Polska)Polski [pl-PL].lang"},
+  { MAKELANGID(LANG_POLISH, SUBLANG_POLISH_POLAND),                       L".\\lng\\gwLng\\Polski (Polska) [pl-PL].lang"},
   { MAKELANGID(LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN),            L".\\lng\\gwLng\\Português Brasileiro (Brasil) [pt-BR].lang"},
   { MAKELANGID(LANG_PORTUGUESE, SUBLANG_PORTUGUESE),                      L".\\lng\\gwLng\\Português (Portugal) [pt-PT].lang"},
   { MAKELANGID(LANG_RUSSIAN, SUBLANG_RUSSIAN_RUSSIA),                     L".\\lng\\gwLng\\Русский (Pоссия) [ru-RU].lang"},
diff --git a/src/VersionEx.h b/src/VersionEx.h
index c67562db8..89c7587c9 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,8 +8,8 @@
 #define SAPPNAME "Notepad3"
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 20
-#define VERSION_REV 609
-#define VERSION_BUILD 2
+#define VERSION_REV 610
+#define VERSION_BUILD 1
 #define SCINTILLA_VER 433
 #define ONIGURUMA_REGEX_VER 6.9.5
 #define UCHARDET_VER 2018.09.27