diff --git a/app/assets/javascripts/application.coffee b/app/assets/javascripts/application.coffee
index 79c3a2dbf..4e724e8bc 100644
--- a/app/assets/javascripts/application.coffee
+++ b/app/assets/javascripts/application.coffee
@@ -33,12 +33,14 @@ $("textarea, #form_answers input").keypress (event) ->
 
 # Add/Remove dynamically links in the news form
 langs =
+  xx: "!? hmmm ?!"
   fr: "Français"
   de: "Allemand"
   en: "Anglais"
   eu: "Basque"
   ct: "Catalan"
   cn: "Chinois"
+  wq: "Code/binaire"
   ko: "Coréen"
   da: "Danois"
   es: "Espagnol"
@@ -53,8 +55,6 @@ langs =
   pt: "Portugais"
   ru: "Russe"
   sv: "Suédois"
-  xx: "!? hmmm ?!"
-  wq: "Code/binaire"
 
 $("#form_links").nested_fields "news", "link", "lien", "fieldset", title: "text", url: "url", lang: langs
 $("#form_answers").nested_fields "poll", "answer", "choix", "p", answer: "text"
diff --git a/app/assets/stylesheets/contrib/grayscale.scss b/app/assets/stylesheets/contrib/grayscale.scss
index 878facdd5..a7b76022f 100644
--- a/app/assets/stylesheets/contrib/grayscale.scss
+++ b/app/assets/stylesheets/contrib/grayscale.scss
@@ -2311,6 +2311,11 @@ form#new_diary > p:nth-child(4) {
   position: relative;
   top: 2px;
 }
+*:not(.markItUpHeader) > ul > .link[lang="ee"]:before {
+  content: url("/images/langs/ee.png");
+  position: relative;
+  top: 2px;
+}
 *:not(.markItUpHeader) > ul > .link[lang="el"]:before {
   content: url("/images/contrib/grayscale/flags/el.png");
   position: relative;
@@ -2391,6 +2396,11 @@ form#new_diary > p:nth-child(4) {
   position: relative;
   top: 2px;
 }
+*:not(.markItUpHeader) > ul > .link[lang="wq"]:before {
+  content: url("/images/langs/wq.png");
+  position: relative;
+  top: 2px;
+}
 #phare .link,
 #phare .meta,
 #phare footer {
diff --git a/app/assets/stylesheets/contrib/kaiska-new.scss b/app/assets/stylesheets/contrib/kaiska-new.scss
index 0ddb7e9bb..67f3669e7 100644
--- a/app/assets/stylesheets/contrib/kaiska-new.scss
+++ b/app/assets/stylesheets/contrib/kaiska-new.scss
@@ -763,6 +763,9 @@ li.link[lang="da"] {
 li.link[lang="de"] {
   list-style: url("/images/langs/de.png");
 }
+li.link[lang="ee"] {
+  list-style: url("/images/langs/ee.png");
+}
 li.link[lang="el"] {
   list-style: url("/images/langs/el.png");
 }
@@ -811,6 +814,9 @@ li.link[lang="sv"] {
 li.link[lang="xx"] {
   list-style: url("/images/langs/xx.png");
 }
+li.link[lang="wq"] {
+  list-style: url("/images/langs/wq.png");
+}
 
 div.content a[href^="/wiki/"],
 div.content a[href^="//linuxfr.org/wiki/"] {
diff --git a/app/assets/stylesheets/contrib/solarized/langs.scss b/app/assets/stylesheets/contrib/solarized/langs.scss
index 1028ea83f..d30621569 100644
--- a/app/assets/stylesheets/contrib/solarized/langs.scss
+++ b/app/assets/stylesheets/contrib/solarized/langs.scss
@@ -15,6 +15,9 @@ li.link[lang="da"] {
 li.link[lang="de"] {
   list-style-image: url("/images/langs/de.png");
 }
+li.link[lang="ee"] {
+  list-style-image: url("/images/langs/ee.png");
+}
 li.link[lang="el"] {
   list-style-image: url("/images/langs/el.png");
 }
@@ -63,3 +66,6 @@ li.link[lang="sv"] {
 li.link[lang="xx"] {
   list-style-image: url("/images/langs/xx.png");
 }
+li.link[lang="wq"] {
+  list-style-image: url("/images/langs/wq.png");
+}
diff --git a/app/views/bookmarks/_preview.html.haml b/app/views/bookmarks/_preview.html.haml
index 6b96451fa..650c076ec 100644
--- a/app/views/bookmarks/_preview.html.haml
+++ b/app/views/bookmarks/_preview.html.haml
@@ -3,4 +3,4 @@
   - c.image = mini_avatar_img(preview.node.user)
   - c.body = capture do
     %ul
-      %li{lang: preview.lang}= "#{link_to preview.link, preview.link, hreflang: preview.lang}".html_safe
+      %li.link{lang: preview.lang}= "#{link_to preview.link, preview.link, hreflang: preview.lang}".html_safe
diff --git a/db/seeds.rb b/db/seeds.rb
index fff7b7525..e88d9e530 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -4,12 +4,14 @@
 Logo.image = '/images/logos/linuxfr2_classic.png'
 
 # Langs
-Lang['fr'] = 'Français'
+Lang['xx'] = '!? hmmm ?!' # default choice
+Lang['fr'] = 'Français'   # main language, then others sorted
 Lang['de'] = 'Allemand'
 Lang['en'] = 'Anglais'
 Lang['eu'] = 'Basque'
 Lang['ct'] = 'Catalan'
 Lang['cn'] = 'Chinois'
+Lang['wq'] = 'Code/binaire'
 Lang['ko'] = 'Coréen'
 Lang['da'] = 'Danois'
 Lang['es'] = 'Espagnol'
@@ -24,8 +26,6 @@
 Lang['pt'] = 'Portugais'
 Lang['ru'] = 'Russe'
 Lang['sv'] = 'Suédois'
-Lang['xx'] = '!? hmmm ?!'
-Lang['wq'] = 'Code/binaire'
 
 # Category
 %w(Autres Administration\ site Commentaires Feuilles\ de\ style\ (CSS) Dépêches Forums Journaux Modération Proposition Recherche Sondages Suivi Barre\ d’outils Tribune Wiki Avatars Étiquettes Vieux\ navigateurs Comptes\ utilisateurs Statistiques Rédaction Administration\ système À\ ranger\ quelque\ part Aide\ et\ documentation Notifications Syntaxe\ markdown API\ OAuth Images Flux\ Atom Epub Liens).each do |cat|