diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index d22d5235249..b635a37de6e 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -137,33 +137,6 @@
                                                         <li><a t-attf-href="/web/session/logout?redirect=#{ url_for('') }" role="menuitem">Logout</a></li>
                                                     </ul>
                                                 </li>
-                                                <li t-if="request.multilang and
-                                                            (len(website.language_ids) &gt; 1 or editable)" class="dropdown">
-                                                    <!-- TODO: use flags for language selection -->
-                                                    <a class="dropdown-toggle js_language_selected" data-toggle="dropdown" href="#">
-                                                        <t t-esc="lang_selected[0]['name'].split('/').pop()"/> <span class="caret"></span>
-                                                    </a>
-                                                    <ul class="dropdown-menu js_language_selector" role="menu">
-                                                        <li t-foreach="website.language_ids" t-as="lg">
-                                                            <a t-att-href="url_for('', lang=lg.code)" role="menuitem"
-                                                               t-att-data-default-lang="editable and 'true' if lg.code == website.default_lang_id.code else None">
-                                                                <strong t-att-class="'icon-circle' if lg.code == lang
-                                                                    else 'icon-circle-blank'"></strong>
-                                                                <t t-esc="lg.name.split('/').pop()"/>
-                                                            </a>
-                                                        </li>
-                                                        <li t-if="editable" class="divider"/>
-                                                        <li t-if="editable">
-                                                            <t t-set="url_return" t-value="request.multilang and url_for(request.httprequest.path, '[lang]') or request.httprequest.path"/>
-                                                            <t t-if="request.httprequest.query_string">
-                                                                <t t-set="url_return" t-value="url_return + '?' + request.httprequest.query_string"/>
-                                                            </t>
-                                                            <a t-attf-href="/web#action=base.action_view_base_language_install&amp;website_id=#{website.id}&amp;url_return=#{url_return}">
-                                                                Add a language...
-                                                            </a>
-                                                        </li>
-                                                    </ul>
-                                                </li>
                                             </ul>
                                             <button t-if="editable" type="button" class="js_edit_menu btn btn-primary mt8 pull-right">
                                                 <i class="icon-reorder"/> Edit Menu
@@ -214,6 +187,22 @@
                                                 Our products are designed for small to medium companies willing to optimize
                                                 their performance.
                                             </p>
+                                            <ul class="nav nav-pills js_language_selector" t-if="request.multilang and
+                                                    (len(website.language_ids) &gt; 1 or editable)">
+                                                <li t-foreach="website.language_ids" t-as="lg">
+                                                    <a t-att-href="url_for('', lang=lg.code)"
+                                                       t-att-data-default-lang="editable and 'true' if lg.code == website.default_lang_id.code else None">
+                                                        <t t-esc="lg.name.split('/').pop()"/>
+                                                    </a>
+                                                </li>
+                                                <li t-if="editable">
+                                                    <t t-set="url_return" t-value="request.multilang and url_for(request.httprequest.path, '[lang]') or request.httprequest.path"/>
+                                                    <a t-attf-href="/web#action=base.action_view_base_language_install&amp;website_id=#{website.id}&amp;url_return=#{url_return}">
+                                                        <i class="icon-plus-sign"/>
+                                                        Add a language...
+                                                    </a>
+                                                </li>
+                                            </ul>
                                         </div>
                                     </div>
                                 </div>