diff --git a/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/TokenPropertiesDialog.form b/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/TokenPropertiesDialog.form
index 11a6ea16d2..57752636be 100644
--- a/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/TokenPropertiesDialog.form
+++ b/src/main/java/net/rptools/maptool/client/ui/token/dialog/edit/TokenPropertiesDialog.form
@@ -1102,7 +1102,7 @@
                         <properties>
                           <actionCommand value="Find"/>
                           <name value="xmlStatblockSearchButton"/>
-                          <text resource-bundle="net/rptools/maptool/language/i18n" key="EditTokenDialog.action.hero.statBlockRTextScroll"/>
+                          <text resource-bundle="net/rptools/maptool/language/i18n" key="EditTokenDialog.action.hero.statBlockSearch.label"/>
                           <toolTipText resource-bundle="net/rptools/maptool/language/i18n" key="EditTokenDialog.button.hero.statBlockSearch.tooltip"/>
                         </properties>
                       </component>
@@ -1154,7 +1154,7 @@
                         <properties>
                           <actionCommand value="Find"/>
                           <name value="textStatblockSearchButton"/>
-                          <text resource-bundle="net/rptools/maptool/language/i18n" key="EditTokenDialog.action.hero.statBlockRTextScroll"/>
+                          <text resource-bundle="net/rptools/maptool/language/i18n" key="EditTokenDialog.action.hero.statBlockSearch.label"/>
                           <toolTipText resource-bundle="net/rptools/maptool/language/i18n" key="EditTokenDialog.button.hero.statBlockSearch.tooltip"/>
                         </properties>
                       </component>
diff --git a/src/main/resources/net/rptools/maptool/client/ui/forms/tokenPropertiesDialog.xml b/src/main/resources/net/rptools/maptool/client/ui/forms/tokenPropertiesDialog.xml
index 0831544ed8..545a9cced8 100644
--- a/src/main/resources/net/rptools/maptool/client/ui/forms/tokenPropertiesDialog.xml
+++ b/src/main/resources/net/rptools/maptool/client/ui/forms/tokenPropertiesDialog.xml
@@ -6967,7 +6967,7 @@
                                                 <at name="actionCommand">Find</at>
                                                 <at name="name">xmlStatblockSearchButton</at>
                                                 <at name="width">334</at>
-                                                <at name="text">EditTokenDialog.action.hero.statBlockRTextScroll</at>
+                                                <at name="text">EditTokenDialog.action.hero.statBlockSearch.label</at>
                                                 <at name="toolTipText">EditTokenDialog.button.hero.statBlockSearch.tooltip</at>
                                                 <at name="height">25</at>
                                                </object>
@@ -7209,7 +7209,7 @@
                                                 <at name="actionCommand">Find</at>
                                                 <at name="name">textStatblockSearchButton</at>
                                                 <at name="width">334</at>
-                                                <at name="text">EditTokenDialog.action.hero.statBlockRTextScroll</at>
+                                                <at name="text">EditTokenDialog.action.hero.statBlockSearch.label</at>
                                                 <at name="toolTipText">EditTokenDialog.button.hero.statBlockSearch.tooltip</at>
                                                 <at name="height">25</at>
                                                </object>
diff --git a/src/main/resources/net/rptools/maptool/language/i18n.properties b/src/main/resources/net/rptools/maptool/language/i18n.properties
index d52fc35d3a..337bb4e318 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n.properties
@@ -337,7 +337,7 @@ EditTokenDialog.label.hero.isAlly = Ally?
 EditTokenDialog.label.hero.statBlockSearch = Expression: 
 EditTokenDialog.button.hero.statBlockSearch.tooltip = Search the statblock using the expression provided.
 EditTokenDialog.label.hero.statBlockSearch.tooltip = Enter raw text, a regular expression or an xPath expression to search the statblock for.
-EditTokenDialog.action.hero.statBlockRTextScroll = Find
+EditTokenDialog.action.hero.statBlockSearch.label = Find
 EditTokenDialog.tab.hero.images = Images
 EditTokenDialog.tab.hero.text = TEXT
 EditTokenDialog.tab.hero.xml = XML
diff --git a/src/main/resources/net/rptools/maptool/language/i18n_cs.properties b/src/main/resources/net/rptools/maptool/language/i18n_cs.properties
index 938ef1f608..f7e6a5f39f 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n_cs.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n_cs.properties
@@ -337,7 +337,7 @@ EditTokenDialog.label.hero.isAlly = Ally?
 EditTokenDialog.label.hero.statBlockSearch = Expression\: 
 EditTokenDialog.button.hero.statBlockSearch.tooltip = Search the statblock using the expression provided.
 EditTokenDialog.label.hero.statBlockSearch.tooltip = Enter raw text, a regular expression or an xPath expression to search the statblock for.
-EditTokenDialog.action.hero.statBlockRTextScroll = Find
+EditTokenDialog.action.hero.statBlockSearch.label = Find
 EditTokenDialog.tab.hero.images = Images
 EditTokenDialog.tab.hero.text = TEXT
 EditTokenDialog.tab.hero.xml = XML
diff --git a/src/main/resources/net/rptools/maptool/language/i18n_da.properties b/src/main/resources/net/rptools/maptool/language/i18n_da.properties
index 48440dc49c..b4c6313de3 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n_da.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n_da.properties
@@ -337,7 +337,7 @@ EditTokenDialog.label.hero.isAlly = Ally?
 EditTokenDialog.label.hero.statBlockSearch = Expression\: 
 EditTokenDialog.button.hero.statBlockSearch.tooltip = Search the statblock using the expression provided.
 EditTokenDialog.label.hero.statBlockSearch.tooltip = Enter raw text, a regular expression or an xPath expression to search the statblock for.
-EditTokenDialog.action.hero.statBlockRTextScroll = Find
+EditTokenDialog.action.hero.statBlockSearch.label = Find
 EditTokenDialog.tab.hero.images = Images
 EditTokenDialog.tab.hero.text = TEXT
 EditTokenDialog.tab.hero.xml = XML
diff --git a/src/main/resources/net/rptools/maptool/language/i18n_de.properties b/src/main/resources/net/rptools/maptool/language/i18n_de.properties
index c5f095ee66..33bbbe62f9 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n_de.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n_de.properties
@@ -337,7 +337,7 @@ EditTokenDialog.label.hero.isAlly = Verbündeter?
 EditTokenDialog.label.hero.statBlockSearch = Ausdruck\:
 EditTokenDialog.button.hero.statBlockSearch.tooltip = Durchsuche den Statblock mit dem angegebenen Ausdruck.
 EditTokenDialog.label.hero.statBlockSearch.tooltip = Geben Sie reinen Text, einen regulären Ausdruck oder einen xPath-Ausdruck ein, um damit den Statblock zu durchsuchen.
-EditTokenDialog.action.hero.statBlockRTextScroll = Find
+EditTokenDialog.action.hero.statBlockSearch.label = Find
 EditTokenDialog.tab.hero.images = Bilder
 EditTokenDialog.tab.hero.text = TEXT
 EditTokenDialog.tab.hero.xml = XML
diff --git a/src/main/resources/net/rptools/maptool/language/i18n_en_au.properties b/src/main/resources/net/rptools/maptool/language/i18n_en_au.properties
index 93a78441a2..8946b1961d 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n_en_au.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n_en_au.properties
@@ -337,7 +337,7 @@ EditTokenDialog.label.hero.isAlly = Ally?
 EditTokenDialog.label.hero.statBlockSearch = Expression: 
 EditTokenDialog.button.hero.statBlockSearch.tooltip = Search the statblock using the expression provided.
 EditTokenDialog.label.hero.statBlockSearch.tooltip = Enter raw text, a regular expression or an xPath expression to search the statblock for.
-EditTokenDialog.action.hero.statBlockRTextScroll = Find
+EditTokenDialog.action.hero.statBlockSearch.label = Find
 EditTokenDialog.tab.hero.images = Images
 EditTokenDialog.tab.hero.text = TEXT
 EditTokenDialog.tab.hero.xml = XML
diff --git a/src/main/resources/net/rptools/maptool/language/i18n_en_gb.properties b/src/main/resources/net/rptools/maptool/language/i18n_en_gb.properties
index 93a78441a2..8946b1961d 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n_en_gb.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n_en_gb.properties
@@ -337,7 +337,7 @@ EditTokenDialog.label.hero.isAlly = Ally?
 EditTokenDialog.label.hero.statBlockSearch = Expression: 
 EditTokenDialog.button.hero.statBlockSearch.tooltip = Search the statblock using the expression provided.
 EditTokenDialog.label.hero.statBlockSearch.tooltip = Enter raw text, a regular expression or an xPath expression to search the statblock for.
-EditTokenDialog.action.hero.statBlockRTextScroll = Find
+EditTokenDialog.action.hero.statBlockSearch.label = Find
 EditTokenDialog.tab.hero.images = Images
 EditTokenDialog.tab.hero.text = TEXT
 EditTokenDialog.tab.hero.xml = XML
diff --git a/src/main/resources/net/rptools/maptool/language/i18n_es.properties b/src/main/resources/net/rptools/maptool/language/i18n_es.properties
index ee6d4fbb19..718500ab58 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n_es.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n_es.properties
@@ -337,7 +337,7 @@ EditTokenDialog.label.hero.isAlly = Ally?
 EditTokenDialog.label.hero.statBlockSearch = Expression\: 
 EditTokenDialog.button.hero.statBlockSearch.tooltip = Search the statblock using the expression provided.
 EditTokenDialog.label.hero.statBlockSearch.tooltip = Enter raw text, a regular expression or an xPath expression to search the statblock for.
-EditTokenDialog.action.hero.statBlockRTextScroll = Find
+EditTokenDialog.action.hero.statBlockSearch.label = Find
 EditTokenDialog.tab.hero.images = Images
 EditTokenDialog.tab.hero.text = TEXT
 EditTokenDialog.tab.hero.xml = XML
diff --git a/src/main/resources/net/rptools/maptool/language/i18n_fr.properties b/src/main/resources/net/rptools/maptool/language/i18n_fr.properties
index 4991c51674..0f55e127c5 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n_fr.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n_fr.properties
@@ -337,7 +337,7 @@ EditTokenDialog.label.hero.isAlly = Ally?
 EditTokenDialog.label.hero.statBlockSearch = Expression\: 
 EditTokenDialog.button.hero.statBlockSearch.tooltip = Search the statblock using the expression provided.
 EditTokenDialog.label.hero.statBlockSearch.tooltip = Enter raw text, a regular expression or an xPath expression to search the statblock for.
-EditTokenDialog.action.hero.statBlockRTextScroll = Find
+EditTokenDialog.action.hero.statBlockSearch.label = Find
 EditTokenDialog.tab.hero.images = Images
 EditTokenDialog.tab.hero.text = TEXT
 EditTokenDialog.tab.hero.xml = XML
diff --git a/src/main/resources/net/rptools/maptool/language/i18n_it.properties b/src/main/resources/net/rptools/maptool/language/i18n_it.properties
index 89d52ec25f..76a4eca513 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n_it.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n_it.properties
@@ -337,7 +337,7 @@ EditTokenDialog.label.hero.isAlly = Alleato?
 EditTokenDialog.label.hero.statBlockSearch = Espressione\: 
 EditTokenDialog.button.hero.statBlockSearch.tooltip = Search the statblock using the expression provided.
 EditTokenDialog.label.hero.statBlockSearch.tooltip = Enter raw text, a regular expression or an xPath expression to search the statblock for.
-EditTokenDialog.action.hero.statBlockRTextScroll = Trova
+EditTokenDialog.action.hero.statBlockSearch.label = Trova
 EditTokenDialog.tab.hero.images = Immagini
 EditTokenDialog.tab.hero.text = TESTO
 EditTokenDialog.tab.hero.xml = XML
diff --git a/src/main/resources/net/rptools/maptool/language/i18n_ja.properties b/src/main/resources/net/rptools/maptool/language/i18n_ja.properties
index 41bd02658a..8ad795c045 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n_ja.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n_ja.properties
@@ -337,7 +337,7 @@ EditTokenDialog.label.hero.isAlly = 味方？
 EditTokenDialog.label.hero.statBlockSearch = 式：
 EditTokenDialog.button.hero.statBlockSearch.tooltip = 指定した式によりデータブロックを検索する。
 EditTokenDialog.label.hero.statBlockSearch.tooltip = データブロックを検索する、テキスト、正規表現、またはXPath式を入力する。
-EditTokenDialog.action.hero.statBlockRTextScroll = 検索
+EditTokenDialog.action.hero.statBlockSearch.label = 検索
 EditTokenDialog.tab.hero.images = 画像
 EditTokenDialog.tab.hero.text = テキスト
 EditTokenDialog.tab.hero.xml = XML
diff --git a/src/main/resources/net/rptools/maptool/language/i18n_nl.properties b/src/main/resources/net/rptools/maptool/language/i18n_nl.properties
index f8f568bf52..2e3eb72e3a 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n_nl.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n_nl.properties
@@ -337,7 +337,7 @@ EditTokenDialog.label.hero.isAlly = Ally?
 EditTokenDialog.label.hero.statBlockSearch = Expression\: 
 EditTokenDialog.button.hero.statBlockSearch.tooltip = Search the statblock using the expression provided.
 EditTokenDialog.label.hero.statBlockSearch.tooltip = Enter raw text, a regular expression or an xPath expression to search the statblock for.
-EditTokenDialog.action.hero.statBlockRTextScroll = Find
+EditTokenDialog.action.hero.statBlockSearch.label = Find
 EditTokenDialog.tab.hero.images = Images
 EditTokenDialog.tab.hero.text = TEXT
 EditTokenDialog.tab.hero.xml = XML
diff --git a/src/main/resources/net/rptools/maptool/language/i18n_pl.properties b/src/main/resources/net/rptools/maptool/language/i18n_pl.properties
index 5df132bad9..a45740174c 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n_pl.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n_pl.properties
@@ -337,7 +337,7 @@ EditTokenDialog.label.hero.isAlly = Sojusznik?
 EditTokenDialog.label.hero.statBlockSearch = Wyrażenie\:
 EditTokenDialog.button.hero.statBlockSearch.tooltip = Przeszukaj blok statystyk za pomocą podanego wyrażenia.
 EditTokenDialog.label.hero.statBlockSearch.tooltip = Wprowadź tekst, wyrażenie regularne lub wyrażenie xPath, aby wyszukać blok statystyk.
-EditTokenDialog.action.hero.statBlockRTextScroll = Znajdź
+EditTokenDialog.action.hero.statBlockSearch.label = Znajdź
 EditTokenDialog.tab.hero.images = Obrazy
 EditTokenDialog.tab.hero.text = TEKST
 EditTokenDialog.tab.hero.xml = XML
diff --git a/src/main/resources/net/rptools/maptool/language/i18n_pt.properties b/src/main/resources/net/rptools/maptool/language/i18n_pt.properties
index 1845a559f9..86f7039555 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n_pt.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n_pt.properties
@@ -337,7 +337,7 @@ EditTokenDialog.label.hero.isAlly = Aliado?
 EditTokenDialog.label.hero.statBlockSearch = Expression\: 
 EditTokenDialog.button.hero.statBlockSearch.tooltip = Search the statblock using the expression provided.
 EditTokenDialog.label.hero.statBlockSearch.tooltip = Enter raw text, a regular expression or an xPath expression to search the statblock for.
-EditTokenDialog.action.hero.statBlockRTextScroll = Find
+EditTokenDialog.action.hero.statBlockSearch.label = Find
 EditTokenDialog.tab.hero.images = Imagens
 EditTokenDialog.tab.hero.text = TEXT
 EditTokenDialog.tab.hero.xml = XML
diff --git a/src/main/resources/net/rptools/maptool/language/i18n_ru.properties b/src/main/resources/net/rptools/maptool/language/i18n_ru.properties
index 01146cd47c..be25329292 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n_ru.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n_ru.properties
@@ -337,7 +337,7 @@ EditTokenDialog.label.hero.isAlly = Ally?
 EditTokenDialog.label.hero.statBlockSearch = Expression\: 
 EditTokenDialog.button.hero.statBlockSearch.tooltip = Search the statblock using the expression provided.
 EditTokenDialog.label.hero.statBlockSearch.tooltip = Enter raw text, a regular expression or an xPath expression to search the statblock for.
-EditTokenDialog.action.hero.statBlockRTextScroll = Find
+EditTokenDialog.action.hero.statBlockSearch.label = Find
 EditTokenDialog.tab.hero.images = Images
 EditTokenDialog.tab.hero.text = TEXT
 EditTokenDialog.tab.hero.xml = XML
diff --git a/src/main/resources/net/rptools/maptool/language/i18n_sv.properties b/src/main/resources/net/rptools/maptool/language/i18n_sv.properties
index 549daebfb7..1ab67a34a3 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n_sv.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n_sv.properties
@@ -337,7 +337,7 @@ EditTokenDialog.label.hero.isAlly = Ally?
 EditTokenDialog.label.hero.statBlockSearch = Expression\: 
 EditTokenDialog.button.hero.statBlockSearch.tooltip = Search the statblock using the expression provided.
 EditTokenDialog.label.hero.statBlockSearch.tooltip = Enter raw text, a regular expression or an xPath expression to search the statblock for.
-EditTokenDialog.action.hero.statBlockRTextScroll = Find
+EditTokenDialog.action.hero.statBlockSearch.label = Find
 EditTokenDialog.tab.hero.images = Images
 EditTokenDialog.tab.hero.text = TEXT
 EditTokenDialog.tab.hero.xml = XML
diff --git a/src/main/resources/net/rptools/maptool/language/i18n_uk.properties b/src/main/resources/net/rptools/maptool/language/i18n_uk.properties
index 9d7c7c4def..5c84964cd0 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n_uk.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n_uk.properties
@@ -337,7 +337,7 @@ EditTokenDialog.label.hero.isAlly = Ally?
 EditTokenDialog.label.hero.statBlockSearch = Expression\: 
 EditTokenDialog.button.hero.statBlockSearch.tooltip = Search the statblock using the expression provided.
 EditTokenDialog.label.hero.statBlockSearch.tooltip = Enter raw text, a regular expression or an xPath expression to search the statblock for.
-EditTokenDialog.action.hero.statBlockRTextScroll = Find
+EditTokenDialog.action.hero.statBlockSearch.label = Find
 EditTokenDialog.tab.hero.images = Images
 EditTokenDialog.tab.hero.text = TEXT
 EditTokenDialog.tab.hero.xml = XML
diff --git a/src/main/resources/net/rptools/maptool/language/i18n_zh.properties b/src/main/resources/net/rptools/maptool/language/i18n_zh.properties
index af6a909294..eb207c1907 100644
--- a/src/main/resources/net/rptools/maptool/language/i18n_zh.properties
+++ b/src/main/resources/net/rptools/maptool/language/i18n_zh.properties
@@ -337,7 +337,7 @@ EditTokenDialog.label.hero.isAlly = Ally?
 EditTokenDialog.label.hero.statBlockSearch = Expression\: 
 EditTokenDialog.button.hero.statBlockSearch.tooltip = Search the statblock using the expression provided.
 EditTokenDialog.label.hero.statBlockSearch.tooltip = Enter raw text, a regular expression or an xPath expression to search the statblock for.
-EditTokenDialog.action.hero.statBlockRTextScroll = Find
+EditTokenDialog.action.hero.statBlockSearch.label = Find
 EditTokenDialog.tab.hero.images = Images
 EditTokenDialog.tab.hero.text = TEXT
 EditTokenDialog.tab.hero.xml = XML