diff --git a/core/wiki/languageswitcher.tid b/core/wiki/languageswitcher.tid
index 48422fca1..7d79c0f5c 100644
--- a/core/wiki/languageswitcher.tid
+++ b/core/wiki/languageswitcher.tid
@@ -1,25 +1,12 @@
 title: $:/snippets/languageswitcher
 
-\define flag-title()
-$(languagePluginTitle)$/icon
-\end
 \whitespace trim
-
 <$linkcatcher to="$:/language">
 <div class="tc-chooser tc-language-chooser">
 <$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[description]]">
-<$set name="cls" filter="[all[current]field:title{$:/language}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item"><div class=<<cls>>>
+<$set name="cls" filter="[all[current]field:title{$:/language}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
+<div class=<<cls>> lang={{!!name}}>
 <$link>
-<span class="tc-image-button">
-<$set name="languagePluginTitle" value=<<currentTiddler>>>
-<$transclude subtiddler=<<flag-title>>>
-<$list filter="[all[current]field:title[$:/languages/en-GB]]">
-<$transclude tiddler="$:/languages/en-GB/icon"/>
-</$list>
-</$transclude>
-</$set>
-</span>
-&#32;
 <$view field="description">
 <$view field="name">
 <$view field="title"/>