-                               <form action="/i18n/setlang/" method="post">
-                                       {% trans "Choose your interface language: " %} <select name="language">
-                                               {% for lang in LANGUAGES %}
-                                               <option value="{{ lang.0 }}"{% ifequal lang.0 LANGUAGE_CODE %} selected="selected"{% endifequal %}>{{ lang.1 }}</option>
-                                               {% endfor %}
-                                       </select>
-                                       <input type="submit" value="{% trans "Choose language" %}">
+                               <form action="{% url django.views.i18n.set_language %}" method="POST">
+                                       {% spaceless %}
+                                       {% for lang in LANGUAGES %}                                          
+                                           <button type="submit" name="language" title="{{ lang.1 }}"
+                                                       class="{% ifequal lang.0 LANGUAGE_CODE %}active{% endifequal %} {% if forloop.last %}last{% endif %}" 
+                                                       value="{{ lang.0 }}">{{ lang.0|upper }}</button>
+                                       {% endfor %}    
+                                       {% endspaceless %}