diff --git a/i18n/nw_base.ts b/i18n/nw_base.ts
index c6fc3e6e..e458fa8b 100644
--- a/i18n/nw_base.ts
+++ b/i18n/nw_base.ts
@@ -842,14 +842,18 @@
   <context>
     <name>GuiDocEditSearch</name>
     <message>
-      <location filename="../novelwriter/gui/doceditor.py" line="2424" />
       <location filename="../novelwriter/gui/doceditor.py" line="2411" />
-      <source>Search</source>
+      <source>Search for</source>
       <translation type="unfinished" />
     </message>
     <message>
       <location filename="../novelwriter/gui/doceditor.py" line="2416" />
-      <source>Replace</source>
+      <source>Replace with</source>
+      <translation type="unfinished" />
+    </message>
+    <message>
+      <location filename="../novelwriter/gui/doceditor.py" line="2424" />
+      <source>Search</source>
       <translation type="unfinished" />
     </message>
     <message>
@@ -2155,9 +2159,8 @@
       <translation type="unfinished" />
     </message>
     <message>
-      <location filename="../novelwriter/tools/manuscript.py" line="179" />
       <location filename="../novelwriter/tools/manuscript.py" line="158" />
-      <source>Build</source>
+      <source>Details</source>
       <translation type="unfinished" />
     </message>
     <message>
@@ -2175,6 +2178,11 @@
       <source>Print</source>
       <translation type="unfinished" />
     </message>
+    <message>
+      <location filename="../novelwriter/tools/manuscript.py" line="179" />
+      <source>Build</source>
+      <translation type="unfinished" />
+    </message>
     <message>
       <location filename="../novelwriter/tools/manuscript.py" line="182" />
       <source>Close</source>
@@ -3008,7 +3016,7 @@
     </message>
     <message>
       <location filename="../novelwriter/gui/search.py" line="101" />
-      <source>Search</source>
+      <source>Search for</source>
       <translation type="unfinished" />
     </message>
   </context>
@@ -4562,12 +4570,12 @@
     </message>
     <message>
       <location filename="../novelwriter/tools/manuscript.py" line="1098" />
-      <source>Heading Words</source>
+      <source>Words in Headings</source>
       <translation type="unfinished" />
     </message>
     <message>
       <location filename="../novelwriter/tools/manuscript.py" line="1099" />
-      <source>Body Text Words</source>
+      <source>Words in Text</source>
       <translation type="unfinished" />
     </message>
     <message>
@@ -4582,12 +4590,12 @@
     </message>
     <message>
       <location filename="../novelwriter/tools/manuscript.py" line="1125" />
-      <source>Heading Characters</source>
+      <source>Characters in Headings</source>
       <translation type="unfinished" />
     </message>
     <message>
       <location filename="../novelwriter/tools/manuscript.py" line="1126" />
-      <source>Body Text Characters</source>
+      <source>Characters in Text</source>
       <translation type="unfinished" />
     </message>
     <message>
@@ -4597,12 +4605,12 @@
     </message>
     <message>
       <location filename="../novelwriter/tools/manuscript.py" line="1128" />
-      <source>Heading Characters, No Spaces</source>
+      <source>Characters in Headings, No Spaces</source>
       <translation type="unfinished" />
     </message>
     <message>
       <location filename="../novelwriter/tools/manuscript.py" line="1129" />
-      <source>Body Text Characters, No Spaces</source>
+      <source>Characters in Text, No Spaces</source>
       <translation type="unfinished" />
     </message>
   </context>
diff --git a/novelwriter/gui/doceditor.py b/novelwriter/gui/doceditor.py
index e6899b2b..13525ded 100644
--- a/novelwriter/gui/doceditor.py
+++ b/novelwriter/gui/doceditor.py
@@ -2408,12 +2408,12 @@ class GuiDocEditSearch(QFrame):
 
         self.searchBox = QLineEdit(self)
         self.searchBox.setFont(self.boxFont)
-        self.searchBox.setPlaceholderText(self.tr("Search"))
+        self.searchBox.setPlaceholderText(self.tr("Search for"))
         self.searchBox.returnPressed.connect(self._doSearch)
 
         self.replaceBox = QLineEdit(self)
         self.replaceBox.setFont(self.boxFont)
-        self.replaceBox.setPlaceholderText(self.tr("Replace"))
+        self.replaceBox.setPlaceholderText(self.tr("Replace with"))
         self.replaceBox.returnPressed.connect(self._doReplace)
 
         self.searchOpt = QToolBar(self)
diff --git a/novelwriter/gui/search.py b/novelwriter/gui/search.py
index 6811c026..0c475637 100644
--- a/novelwriter/gui/search.py
+++ b/novelwriter/gui/search.py
@@ -98,7 +98,7 @@ class GuiProjectSearch(QWidget):
 
         # Search Box
         self.searchText = QLineEdit(self)
-        self.searchText.setPlaceholderText(self.tr("Search"))
+        self.searchText.setPlaceholderText(self.tr("Search for"))
         self.searchText.setClearButtonEnabled(True)
 
         self.searchAction = self.searchText.addAction(
diff --git a/novelwriter/tools/manuscript.py b/novelwriter/tools/manuscript.py
index 0fac65fa..3b81429e 100644
--- a/novelwriter/tools/manuscript.py
+++ b/novelwriter/tools/manuscript.py
@@ -155,7 +155,7 @@ class GuiManuscript(QDialog):
         self.buildOutline = _OutlineWidget(self)
 
         self.detailsTabs = QTabWidget(self)
-        self.detailsTabs.addTab(self.buildDetails, self.tr("Build"))
+        self.detailsTabs.addTab(self.buildDetails, self.tr("Details"))
         self.detailsTabs.addTab(self.buildOutline, self.tr("Outline"))
         self.detailsTabs.setStyleSheet(SHARED.theme.getStyleSheet(STYLES_FLAT_TABS))
 
@@ -1008,7 +1008,7 @@ class _StatsWidget(QWidget):
 
         # Maximal
         self.maxTotalWords.setText("{0:n}".format(data.get("allWords", 0)))
-        self.maxHeaderWords.setText("{0:n}".format(data.get("titleWords", 0)))
+        self.maxHeadWords.setText("{0:n}".format(data.get("titleWords", 0)))
         self.maxTextWords.setText("{0:n}".format(data.get("textWords", 0)))
         self.maxTitleCount.setText("{0:n}".format(data.get("titleCount", 0)))
         self.maxParCount.setText("{0:n}".format(data.get("paragraphCount", 0)))
@@ -1018,7 +1018,7 @@ class _StatsWidget(QWidget):
         self.maxTextChars.setText("{0:n}".format(data.get("textChars", 0)))
 
         self.maxTotalWordChars.setText("{0:n}".format(data.get("allWordChars", 0)))
-        self.maxHeaderWordChars.setText("{0:n}".format(data.get("titleWordChars", 0)))
+        self.maxHeadWordChars.setText("{0:n}".format(data.get("titleWordChars", 0)))
         self.maxTextWordChars.setText("{0:n}".format(data.get("textWordChars", 0)))
 
         return
@@ -1082,21 +1082,21 @@ class _StatsWidget(QWidget):
 
         # Left Column
         self.maxTotalWords = QLabel(self)
-        self.maxHeaderWords = QLabel(self)
+        self.maxHeadWords = QLabel(self)
         self.maxTextWords = QLabel(self)
         self.maxTitleCount = QLabel(self)
         self.maxParCount = QLabel(self)
 
         self.maxTotalWords.setAlignment(QtAlignRight)
-        self.maxHeaderWords.setAlignment(QtAlignRight)
+        self.maxHeadWords.setAlignment(QtAlignRight)
         self.maxTextWords.setAlignment(QtAlignRight)
         self.maxTitleCount.setAlignment(QtAlignRight)
         self.maxParCount.setAlignment(QtAlignRight)
 
         self.leftForm = QFormLayout()
         self.leftForm.addRow(self.tr("Words"), self.maxTotalWords)
-        self.leftForm.addRow(self.tr("Heading Words"), self.maxHeaderWords)
-        self.leftForm.addRow(self.tr("Body Text Words"), self.maxTextWords)
+        self.leftForm.addRow(self.tr("Words in Headings"), self.maxHeadWords)
+        self.leftForm.addRow(self.tr("Words in Text"), self.maxTextWords)
         self.leftForm.addRow("", QLabel(self))
         self.leftForm.addRow(self.tr("Headings"), self.maxTitleCount)
         self.leftForm.addRow(self.tr("Paragraphs"), self.maxParCount)
@@ -1109,7 +1109,7 @@ class _StatsWidget(QWidget):
         self.maxTextChars = QLabel(self)
 
         self.maxTotalWordChars = QLabel(self)
-        self.maxHeaderWordChars = QLabel(self)
+        self.maxHeadWordChars = QLabel(self)
         self.maxTextWordChars = QLabel(self)
 
         self.maxTotalChars.setAlignment(QtAlignRight)
@@ -1117,16 +1117,16 @@ class _StatsWidget(QWidget):
         self.maxTextChars.setAlignment(QtAlignRight)
 
         self.maxTotalWordChars.setAlignment(QtAlignRight)
-        self.maxHeaderWordChars.setAlignment(QtAlignRight)
+        self.maxHeadWordChars.setAlignment(QtAlignRight)
         self.maxTextWordChars.setAlignment(QtAlignRight)
 
         self.rightForm = QFormLayout()
         self.rightForm.addRow(self.tr("Characters"), self.maxTotalChars)
-        self.rightForm.addRow(self.tr("Heading Characters"), self.maxHeaderChars)
-        self.rightForm.addRow(self.tr("Body Text Characters"), self.maxTextChars)
+        self.rightForm.addRow(self.tr("Characters in Headings"), self.maxHeaderChars)
+        self.rightForm.addRow(self.tr("Characters in Text"), self.maxTextChars)
         self.rightForm.addRow(self.tr("Characters, No Spaces"), self.maxTotalWordChars)
-        self.rightForm.addRow(self.tr("Heading Characters, No Spaces"), self.maxHeaderWordChars)
-        self.rightForm.addRow(self.tr("Body Text Characters, No Spaces"), self.maxTextWordChars)
+        self.rightForm.addRow(self.tr("Characters in Headings, No Spaces"), self.maxHeadWordChars)
+        self.rightForm.addRow(self.tr("Characters in Text, No Spaces"), self.maxTextWordChars)
         self.rightForm.setHorizontalSpacing(hPx)
         self.rightForm.setVerticalSpacing(vPx)