diff --git a/src/main/resources/fxml/details.fxml b/src/main/resources/fxml/details.fxml
index 328916e..11b158f 100644
--- a/src/main/resources/fxml/details.fxml
+++ b/src/main/resources/fxml/details.fxml
@@ -15,13 +15,13 @@
         <Label fx:id="labelPronunciation" styleClass="pronunciation"/>
     </FlowPane>
     <TabPane fx:id="tabPaneDetails" tabClosingPolicy="UNAVAILABLE" VBox.vgrow="ALWAYS">
-        <Tab closable="false" text="%tab.definition">
+        <Tab closable="false" text="%details.tab.definition">
             <WebView fx:id="webViewDefinition"/>
         </Tab>
-        <Tab id="tabSentences" closable="false" text="%tab.sentences">
+        <Tab id="tabSentences" closable="false" text="%details.tab.sentences">
             <StackPane>
                 <ProgressIndicator fx:id="progressIndicatorSentences" visible="false"/>
-                <Label fx:id="labelNoSentencesFound" text="%list.no_sentences_found" textAlignment="CENTER"
+                <Label fx:id="labelNoSentencesFound" text="%details.list.no_sentences_found" textAlignment="CENTER"
                        visible="false" wrapText="true">
                     <padding>
                         <Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>
@@ -30,15 +30,15 @@
                 <ListView fx:id="listViewSentences"/>
             </StackPane>
         </Tab>
-        <Tab id="tabWords" closable="false" text="%tab.words">
+        <Tab id="tabWords" closable="false" text="%details.tab.words">
             <VBox maxHeight="1.7976931348623157E308">
-                <TitledPane animated="false" maxHeight="-Infinity" text="%list.words_beginning" VBox.vgrow="ALWAYS">
+                <TitledPane animated="false" maxHeight="-Infinity" text="%details.list.words_beginning" VBox.vgrow="ALWAYS">
                     <StackPane>
                         <padding>
                             <Insets bottom="0.0" left="0.0" right="0.0" top="0.0"/>
                         </padding>
                         <ProgressIndicator fx:id="progressIndicatorWordsBeginning" visible="false"/>
-                        <Label fx:id="labelNoWordsBeginningFound" text="%list.no_words_found" textAlignment="CENTER"
+                        <Label fx:id="labelNoWordsBeginningFound" text="%details.list.no_words_found" textAlignment="CENTER"
                                visible="false" wrapText="true">
                             <padding>
                                 <Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>
@@ -47,13 +47,13 @@
                         <ListView fx:id="listViewWordsBeginning" prefHeight="4000"/>
                     </StackPane>
                 </TitledPane>
-                <TitledPane animated="false" maxHeight="-Infinity" text="%list.words_containing" VBox.vgrow="ALWAYS">
+                <TitledPane animated="false" maxHeight="-Infinity" text="%details.list.words_containing" VBox.vgrow="ALWAYS">
                     <StackPane>
                         <padding>
                             <Insets bottom="0.0" left="0.0" right="0.0" top="0.0"/>
                         </padding>
                         <ProgressIndicator fx:id="progressIndicatorWordsContaining" visible="false"/>
-                        <Label fx:id="labelNoWordsContainingFound" text="%list.no_words_found" textAlignment="CENTER"
+                        <Label fx:id="labelNoWordsContainingFound" text="%details.list.no_words_found" textAlignment="CENTER"
                                visible="false" wrapText="true">
                             <padding>
                                 <Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>
@@ -64,10 +64,10 @@
                 </TitledPane>
             </VBox>
         </Tab>
-        <Tab fx:id="tabCharacters" id="tabCharacters" closable="false" text="%tab.characters">
+        <Tab fx:id="tabCharacters" id="tabCharacters" closable="false" text="%details.tab.characters">
             <StackPane>
                 <ListView fx:id="listViewCharacters"/>
-                <Label fx:id="labelNoCharactersFound" text="%list.no_characters_found" textAlignment="CENTER"
+                <Label fx:id="labelNoCharactersFound" text="%details.list.no_characters_found" textAlignment="CENTER"
                        visible="false" wrapText="true">
                     <padding>
                         <Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>
diff --git a/src/main/resources/fxml/search-results.fxml b/src/main/resources/fxml/search-results.fxml
index 61e6849..9c320e8 100644
--- a/src/main/resources/fxml/search-results.fxml
+++ b/src/main/resources/fxml/search-results.fxml
@@ -9,7 +9,7 @@
            fx:controller="com.marvinelsen.willow.ui.controllers.SearchResultsController"
            stylesheets="/css/search-results.css">
     <ListView fx:id="listViewSearchResults" disable="true"/>
-    <Label fx:id="labelNoEntriesFound" text="%list.no_entries_found" textAlignment="CENTER" visible="false"
+    <Label fx:id="labelNoEntriesFound" text="%search.results.list.no_entries_found" textAlignment="CENTER" visible="false"
            wrapText="true">
         <padding>
             <Insets bottom="8.0" left="8.0" right="8.0" top="8.0"/>
diff --git a/src/main/resources/i18n/willow.properties b/src/main/resources/i18n/willow.properties
index 5bdeede..c417639 100644
--- a/src/main/resources/i18n/willow.properties
+++ b/src/main/resources/i18n/willow.properties
@@ -1,13 +1,24 @@
+# Search
 search.prompt=Search dictionary…
-search.mode=Searching:
+search.mode=Search mode:
 search.mode.pinyin=Pinyin
-search.mode.traditional=Traditional Chinese
-search.mode.simplified=Simplified Chinese
-search.mode.english=English
-tab.definition=Definition
-tab.sentences=Sentences
-tab.words=Words
-tab.characters=Characters
+search.mode.traditional=Traditional
+search.mode.simplified=Simplified
+search.mode.phrase=Phrase
+
+# Details
+details.tab.definition=Definition
+details.tab.sentences=Sentences
+details.tab.words=Words
+details.tab.characters=Characters
+
+details.list.no_characters_found=No characters found
+details.list.no_words_found=No words found
+details.list.no_sentences_found=No sentences found.
+details.list.words_beginning=Words beginning
+details.list.words_containing=Words containing
+
+# Menubar
 menubar.file=_File
 menubar.file.quit=_Quit
 menubar.file.preferences=_Preferences…
@@ -16,10 +27,6 @@ menubar.edit.copy.headword=Copy Headword
 menubar.edit.copy.pronunciation=Copy Pronunciation
 menubar.help=_Help
 menubar.help.about=_About…
-list.no_entries_found=No matching entries found
-search.mode.phrase=Phrase
-list.no_characters_found=No characters found
-list.no_words_found=No words found
-list.no_sentences_found=No sentences found.
-list.words_beginning=Words beginning
-list.words_containing=Words containing
+
+# Search results
+search.results.list.no_entries_found=No matching entries found
\ No newline at end of file
diff --git a/src/main/resources/i18n/willow_de.properties b/src/main/resources/i18n/willow_de.properties
index dbfd94d..37de9d0 100644
--- a/src/main/resources/i18n/willow_de.properties
+++ b/src/main/resources/i18n/willow_de.properties
@@ -1,13 +1,24 @@
+# Search
 search.prompt=Durchsuche Wörterbuch…
-search.mode=Suche:
+search.mode=Suchmodus:
 search.mode.pinyin=Pinyin
 search.mode.traditional=Langzeichen
 search.mode.simplified=Kurzzeichen
-search.mode.english=Englisch
-tab.definition=Definition
-tab.sentences=Sätze
-tab.words=Wörter
-tab.characters=Schriftzeichen
+search.mode.phrase=Satz
+
+# Details
+details.tab.definition=Definition
+details.tab.sentences=Sätze
+details.tab.words=Wörter
+details.tab.characters=Schriftzeichen
+
+details.list.no_characters_found=Keine Schriftzeichen gefunden
+details.list.no_words_found=Keine Wörter gefunden
+details.list.no_sentences_found=Keine Sätze gefunden
+details.list.words_beginning=Am Wortanfang
+details.list.words_containing=Im Wort
+
+# Menubar
 menubar.file=_Datei
 menubar.file.quit=_Beenden
 menubar.file.preferences=_Einstellungen…
@@ -16,10 +27,6 @@ menubar.edit.copy.headword=Kopiere Wort
 menubar.edit.copy.pronunciation=Kopiere Aussprache
 menubar.help=_Hilfe
 menubar.help.about=_Über…
-list.no_entries_found=No matching entries found
-search.mode.phrase=Phrase
-list.no_characters_found=No characters found
-list.no_words_found=No words found
-list.no_sentences_found=No sentences found.
-list.words_beginning=Words beginning
-list.words_containing=Words containing
+
+# Search results
+search.results.list.no_entries_found=Keine passenden Einträge gefunden
\ No newline at end of file
diff --git a/src/main/resources/i18n/willow_en.properties b/src/main/resources/i18n/willow_en.properties
index 5bdeede..c417639 100644
--- a/src/main/resources/i18n/willow_en.properties
+++ b/src/main/resources/i18n/willow_en.properties
@@ -1,13 +1,24 @@
+# Search
 search.prompt=Search dictionary…
-search.mode=Searching:
+search.mode=Search mode:
 search.mode.pinyin=Pinyin
-search.mode.traditional=Traditional Chinese
-search.mode.simplified=Simplified Chinese
-search.mode.english=English
-tab.definition=Definition
-tab.sentences=Sentences
-tab.words=Words
-tab.characters=Characters
+search.mode.traditional=Traditional
+search.mode.simplified=Simplified
+search.mode.phrase=Phrase
+
+# Details
+details.tab.definition=Definition
+details.tab.sentences=Sentences
+details.tab.words=Words
+details.tab.characters=Characters
+
+details.list.no_characters_found=No characters found
+details.list.no_words_found=No words found
+details.list.no_sentences_found=No sentences found.
+details.list.words_beginning=Words beginning
+details.list.words_containing=Words containing
+
+# Menubar
 menubar.file=_File
 menubar.file.quit=_Quit
 menubar.file.preferences=_Preferences…
@@ -16,10 +27,6 @@ menubar.edit.copy.headword=Copy Headword
 menubar.edit.copy.pronunciation=Copy Pronunciation
 menubar.help=_Help
 menubar.help.about=_About…
-list.no_entries_found=No matching entries found
-search.mode.phrase=Phrase
-list.no_characters_found=No characters found
-list.no_words_found=No words found
-list.no_sentences_found=No sentences found.
-list.words_beginning=Words beginning
-list.words_containing=Words containing
+
+# Search results
+search.results.list.no_entries_found=No matching entries found
\ No newline at end of file
diff --git a/src/main/resources/i18n/willow_zh_CN.properties b/src/main/resources/i18n/willow_zh_CN.properties
index 5257ace..18c3466 100644
--- a/src/main/resources/i18n/willow_zh_CN.properties
+++ b/src/main/resources/i18n/willow_zh_CN.properties
@@ -1,13 +1,24 @@
+#Search
 search.prompt=搜尋…
-search.mode=搜尋:
+search.mode=搜尋模式:
 search.mode.pinyin=漢語拼音
 search.mode.traditional=繁體字
 search.mode.simplified=簡體字
-search.mode.english=英文
-tab.definition=Definition
-tab.sentences=例句
-tab.words=詞
-tab.characters=字
+search.mode.phrase=句子
+
+# Details
+details.tab.definition=釋義
+details.tab.sentences=例句
+details.tab.words=詞
+details.tab.characters=字
+
+details.list.no_characters_found=No characters found
+details.list.no_words_found=No words found
+details.list.no_sentences_found=No sentences found.
+details.list.words_beginning=Words beginning
+details.list.words_containing=Words containing
+
+# Menubar
 menubar.file=_檔案
 menubar.file.quit=_結束 Willow
 menubar.file.preferences=_設定…
@@ -16,10 +27,6 @@ menubar.edit.copy.headword=複製 Wort
 menubar.edit.copy.pronunciation=複製 Aussprache
 menubar.help=_說明
 menubar.help.about=_關於 Willow…
-list.no_entries_found=No matching entries found
-search.mode.phrase=Phrase
-list.no_characters_found=No characters found
-list.no_words_found=No words found
-list.no_sentences_found=No sentences found.
-list.words_beginning=Words beginning
-list.words_containing=Words containing
+
+# Search results
+search.results.list.no_entries_found=No matching entries found
\ No newline at end of file
diff --git a/src/main/resources/i18n/willow_zh_TW.properties b/src/main/resources/i18n/willow_zh_TW.properties
index 5257ace..59630a6 100644
--- a/src/main/resources/i18n/willow_zh_TW.properties
+++ b/src/main/resources/i18n/willow_zh_TW.properties
@@ -1,13 +1,24 @@
+# Search
 search.prompt=搜尋…
-search.mode=搜尋:
+search.mode=搜尋模式:
 search.mode.pinyin=漢語拼音
 search.mode.traditional=繁體字
 search.mode.simplified=簡體字
-search.mode.english=英文
-tab.definition=Definition
-tab.sentences=例句
-tab.words=詞
-tab.characters=字
+search.mode.phrase=句子
+
+# Details
+details.tab.definition=釋義
+details.tab.sentences=例句
+details.tab.words=詞
+details.tab.characters=字
+
+details.list.no_characters_found=No characters found
+details.list.no_words_found=No words found
+details.list.no_sentences_found=No sentences found
+details.list.words_beginning=Words beginning
+details.list.words_containing=Words containing
+
+# Menubar
 menubar.file=_檔案
 menubar.file.quit=_結束 Willow
 menubar.file.preferences=_設定…
@@ -16,10 +27,6 @@ menubar.edit.copy.headword=複製 Wort
 menubar.edit.copy.pronunciation=複製 Aussprache
 menubar.help=_說明
 menubar.help.about=_關於 Willow…
-list.no_entries_found=No matching entries found
-search.mode.phrase=Phrase
-list.no_characters_found=No characters found
-list.no_words_found=No words found
-list.no_sentences_found=No sentences found.
-list.words_beginning=Words beginning
-list.words_containing=Words containing
+
+# Search results
+search.results.list.no_entries_found=No matching entries found
\ No newline at end of file