diff --git a/dashboard/templates/base.html b/dashboard/templates/base.html
index 06f917e..6ebd539 100644
--- a/dashboard/templates/base.html
+++ b/dashboard/templates/base.html
@@ -236,23 +236,7 @@
   <div class="container-fluid">
     <div class="d-flex justify-content-between align-items-center">
       <span class="text-muted mx-auto">{{ commit_id }}</span>
-      <div class="dropdown">
-        <form action="{% url 'set_language' %}" method="post">
-          {% csrf_token %}
-          <button class="btn btn-tertiary dropdown-toggle" type="button" id="languageDropdown" data-bs-toggle="dropdown" aria-expanded="false">
-            {% get_current_language as LANGUAGE_CODE %}
-            {% get_language_info_list for LANGUAGES as languages %}
-            {{ LANGUAGE_CODE|get_language_code:languages }}
-          </button>
-          <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="languageDropdown">
-            {% for lang in languages %}
-              <li>
-                <button class="dropdown-item" type="submit" name="language" value="{{ lang.code }}">{{ lang.name }}</button>
-              </li>
-            {% endfor %}
-          </ul>
-        </form>
-      </div>
+      {% include "language_picker.html" %}
     </div>
   </div>
 </footer>
diff --git a/dashboard/templates/language_picker.html b/dashboard/templates/language_picker.html
new file mode 100644
index 0000000..0389b0d
--- /dev/null
+++ b/dashboard/templates/language_picker.html
@@ -0,0 +1,20 @@
+
+{% load i18n language_code %}
+
+<div class="dropdown">
+    <form action="{% url 'set_language' %}" method="post">
+        {% csrf_token %}
+        <button class="btn btn-tertiary dropdown-toggle" type="button" id="languageDropdown" data-bs-toggle="dropdown" aria-expanded="false">
+            {% get_current_language as LANGUAGE_CODE %}
+            {% get_language_info_list for LANGUAGES as languages %}
+            {{ LANGUAGE_CODE|get_language_code:languages }}
+        </button>
+        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="languageDropdown">
+            {% for lang in languages %}
+                <li>
+                    <button class="dropdown-item" type="submit" name="language" value="{{ lang.code }}">{{ lang.name }}</button>
+                </li>
+            {% endfor %}
+        </ul>
+    </form>
+</div>
diff --git a/login/templates/login.html b/login/templates/login.html
index e92aeb6..294477b 100644
--- a/login/templates/login.html
+++ b/login/templates/login.html
@@ -38,7 +38,7 @@
   <input name="next" type="hidden" value="{{ success_url }}">
 
   <div class="col-12 mb-3">
-    <button class="btn btn-primary w-100" type="submit">{% trans "Next" %}</button>
+    <button class="btn btn-green-user w-100" type="submit">{% trans "Next" %}</button>
   </div>                      
 </form>
 
@@ -46,23 +46,7 @@
 
 <div id="login-footer" class="d-flex justify-content-between align-items-center mt-4">
   <a href="{% url 'login:password_reset' %}" data-toggle="modal" data-target="#forgotPasswordModal">{% trans "Forgot your password?" %}</a>
-  <div class="dropdown ms-auto">
-      <form action="{% url 'set_language' %}" method="post">
-        {% csrf_token %}
-        <button class="btn btn-tertiary dropdown-toggle" type="button" id="languageDropdown" data-bs-toggle="dropdown" aria-expanded="false">
-          {% get_current_language as LANGUAGE_CODE %}
-          {% get_language_info_list for LANGUAGES as languages %}
-          {{ LANGUAGE_CODE|get_language_code:languages }}
-        </button>
-        <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="languageDropdown">
-          {% for lang in languages %}
-            <li>
-              <button class="dropdown-item" type="submit" name="language" value="{{ lang.code }}">{{ lang.name_local }}</button>
-            </li>
-          {% endfor %}
-        </ul>
-      </form>
-  </div>
+  {% include "language_picker.html" %}
 </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/user/templates/panel.html b/user/templates/panel.html
index 13b4262..3988383 100644
--- a/user/templates/panel.html
+++ b/user/templates/panel.html
@@ -12,23 +12,8 @@
 
     {# The language picker is mostly here to fill up some space on user settings #}
     <div class="col text-end">
-      <div class="dropdown">
-        <form action="{% url 'set_language' %}" method="post">
-          {% csrf_token %}
-          <button class="btn btn-tertiary border dropdown-toggle" type="button" id="languageDropdown" data-bs-toggle="dropdown" aria-expanded="false">
-            {% get_current_language as LANGUAGE_CODE %}
-            {% get_language_info_list for LANGUAGES as languages %}
-            {{ LANGUAGE_CODE|get_language_code:languages }}
-          </button>
-          <ul class="dropdown-menu dropdown-menu-end" aria-labelledby="languageDropdown">
-            {% for lang in languages %}
-              <li>
-                <button class="dropdown-item" type="submit" name="language" value="{{ lang.code }}">{{ lang.name }}</button>
-              </li>
-            {% endfor %}
-          </ul>
-        </form>
-      </div>
+
+      {% include "language_picker.html" %}
     </div>
   </div>