diff --git a/core/language/en-GB/Flag.tid b/core/language/en-GB/icon.tid
similarity index 94%
rename from core/language/en-GB/Flag.tid
rename to core/language/en-GB/icon.tid
index c826dcc29..1967b895f 100644
--- a/core/language/en-GB/Flag.tid
+++ b/core/language/en-GB/icon.tid
@@ -1,4 +1,4 @@
-title: $:/language/Flag
+title: $:/languages/en-GB/icon
 type: image/svg+xml
 
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 60 30" width="1200" height="600">
diff --git a/core/ui/PageControls/language.tid b/core/ui/PageControls/language.tid
index b6afd1f7e..9c074b02a 100644
--- a/core/ui/PageControls/language.tid
+++ b/core/ui/PageControls/language.tid
@@ -3,10 +3,15 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/globe}} {{$:/language/Buttons/Language/Caption}}
 description: {{$:/language/Buttons/Language/Hint}}
 
+\define flag-title()
+$(languagePluginTitle)$/icon
+\end
 <$button popup=<<qualify "$:/state/popup/language">> title={{$:/language/Buttons/Language/Hint}} aria-label={{$:/language/Buttons/Language/Caption}} class=<<tw-config-toolbar-class>> selectedClass="tw-selected">
 <$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
 <span class="tw-image-button">
-<$image source="$:/language/Flag"/>
+<$set name="languagePluginTitle" value={{$:/language}}>
+<$image source=<<flag-title>>/>
+</$set>
 </span>
 </$list>
 <$list filter="[<tw-config-toolbar-text>prefix[yes]]">
@@ -27,11 +32,13 @@ description: {{$:/language/Buttons/Language/Hint}}
 </$reveal>
 </span>
 <span class="tw-image-button">
-<$transclude subtiddler="$:/language/Flag">
+<$set name="languagePluginTitle" value=<<currentTiddler>>>
+<$transclude subtiddler=<<flag-title>>>
 <$list filter="[all[current]field:title[$:/languages/en-GB]]">
-<$transclude tiddler="$:/core" subtiddler="$:/language/Flag"/>
+<$transclude tiddler="$:/languages/en-GB/icon"/>
 </$list>
 </$transclude>
+</$set>
 </span>
 <$view field="description">
 <$view field="name">
diff --git a/languages/de-AT/Flag.tid b/languages/de-AT/icon.tid
similarity index 88%
rename from languages/de-AT/Flag.tid
rename to languages/de-AT/icon.tid
index 4080293d7..a0b4315b0 100644
--- a/languages/de-AT/Flag.tid
+++ b/languages/de-AT/icon.tid
@@ -1,4 +1,4 @@
-title: $:/language/Flag
+title: $:/languages/de-AT/icon
 type: image/svg+xml
 
 <?xml version="1.0" encoding="UTF-8"?>
diff --git a/languages/de-DE/Flag.tid b/languages/de-DE/icon.tid
similarity index 94%
rename from languages/de-DE/Flag.tid
rename to languages/de-DE/icon.tid
index b4cede8da..4847c1df0 100644
--- a/languages/de-DE/Flag.tid
+++ b/languages/de-DE/icon.tid
@@ -1,4 +1,4 @@
-title: $:/language/Flag
+title: $:/languages/de-DE/icon
 type: image/svg+xml
 
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
diff --git a/languages/fr-FR/Flag.tid b/languages/fr-FR/icon.tid
similarity index 89%
rename from languages/fr-FR/Flag.tid
rename to languages/fr-FR/icon.tid
index 4d932af67..a7ec4d9d0 100644
--- a/languages/fr-FR/Flag.tid
+++ b/languages/fr-FR/icon.tid
@@ -1,4 +1,4 @@
-title: $:/language/Flag
+title: $:/languages/fr-FR/icon
 type: image/svg+xml
 
 <?xml version="1.0" encoding="UTF-8"?>
diff --git a/languages/it-IT/Flag.tid b/languages/it-IT/icon.tid
similarity index 95%
rename from languages/it-IT/Flag.tid
rename to languages/it-IT/icon.tid
index 41339390d..157744a52 100644
--- a/languages/it-IT/Flag.tid
+++ b/languages/it-IT/icon.tid
@@ -1,4 +1,4 @@
-title: $:/language/Flag
+title: $:/languages/it-IT/icon
 type: image/svg+xml
 
 <?xml version="1.0" standalone="no"?>
diff --git a/languages/ja-JP/Flag.tid b/languages/ja-JP/icon.tid
similarity index 88%
rename from languages/ja-JP/Flag.tid
rename to languages/ja-JP/icon.tid
index 0d97d6dd3..345771fb3 100644
--- a/languages/ja-JP/Flag.tid
+++ b/languages/ja-JP/icon.tid
@@ -1,4 +1,4 @@
-title: $:/language/Flag
+title: $:/languages/ja-JP/icon
 type: image/svg+xml
 
 <?xml version="1.0" encoding="UTF-8"?>
diff --git a/languages/zh-Hans/Flag.tid b/languages/zh-Hans/icon.tid
similarity index 96%
rename from languages/zh-Hans/Flag.tid
rename to languages/zh-Hans/icon.tid
index a2c02c02f..ba8400636 100644
--- a/languages/zh-Hans/Flag.tid
+++ b/languages/zh-Hans/icon.tid
@@ -1,4 +1,4 @@
-title: $:/language/Flag
+title: $:/languages/zh-Hans/icon
 type: image/svg+xml
 
 <?xml version="1.0" encoding="UTF-8"?>
diff --git a/languages/zh-Hant/Flag.tid b/languages/zh-Hant/icon.tid
similarity index 95%
rename from languages/zh-Hant/Flag.tid
rename to languages/zh-Hant/icon.tid
index 41ffb7007..97c8f6ab4 100644
--- a/languages/zh-Hant/Flag.tid
+++ b/languages/zh-Hant/icon.tid
@@ -1,4 +1,4 @@
-title: $:/language/Flag
+title: $:/languages/zh-Hant/icon
 type: image/svg+xml
 
 <?xml version="1.0" encoding="UTF-8"?>