diff --git a/amadeus/static/css/base/amadeus.css b/amadeus/static/css/base/amadeus.css
index 06c0ff9..7027f78 100755
--- a/amadeus/static/css/base/amadeus.css
+++ b/amadeus/static/css/base/amadeus.css
@@ -15,6 +15,30 @@ a:focus {
     width: 100%;
 }
 
+.language-selector{
+    margin-left: 8%;
+}
+
+.language-selector img{
+    width: 3%;
+}
+
+.language-selector > ul img{
+    width: 15%;
+}
+
+.language-selector-on-header img{
+    width: 15%;
+    margin-top: 2%;
+}
+.language-selector-on-header > ul img{
+    width: 15%;
+}
+
+.navbar-header{
+    width: 20%;
+}
+
 /* Initial page starts */
 .users-cloud {
     
diff --git a/amadeus/static/img/brazilicon.png b/amadeus/static/img/brazilicon.png
new file mode 100644
index 0000000..ba01c7c
Binary files /dev/null and b/amadeus/static/img/brazilicon.png differ
diff --git a/amadeus/static/img/euaicon.png b/amadeus/static/img/euaicon.png
new file mode 100644
index 0000000..f8863a4
Binary files /dev/null and b/amadeus/static/img/euaicon.png differ
diff --git a/amadeus/templates/base.html b/amadeus/templates/base.html
index 73ed2a2..a9139a3 100644
--- a/amadeus/templates/base.html
+++ b/amadeus/templates/base.html
@@ -74,6 +74,26 @@
                     <img class="logo pull-left" src="{{ theme.small_logo_url }}" alt="Logo" />
                     <span class="pull-right project_name">{{ theme.title }}</span>
                 </a>
+
+                 <li class="dropdown language-selector-on-header"> 
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-close-others="true">
+                            <img src="{% static "img/brazilicon.png" %}" />
+                        </a>
+                        <ul class="dropdown-menu">
+                            <li class="active">
+                              <a href="#">
+                                <img src="{% static "img/brazilicon.png" %}" />
+                                <span>{% trans "PT-BR" %}</span>
+                              </a>
+                            </li>
+                            <li >
+                              <a href="#">
+                                <img src="{% static "img/euaicon.png" %}" />
+                                <span>{% trans "EN" %}</span>
+                              </a>
+                            </li>
+                        </ul>
+                </li>
             </div>
             <div class="navbar-collapse collapse navbar-responsive-collapse">
                 <div class="col-md-7 col-md-offset-1 col-sm-6 col-sm-offset-1 col-lg-7 col-lg-offset-1 text-center">
diff --git a/users/templates/users/login.html b/users/templates/users/login.html
index abedfb7..6eec09a 100644
--- a/users/templates/users/login.html
+++ b/users/templates/users/login.html
@@ -39,6 +39,7 @@
                             <h2 class="outside-title"><strong> {% trans 'Sign in with your account to continue' %} </strong></h2>
                         </div>
                     </div>
+                    <div class="row">
                     <form id="form-login" method="post" action="">
                         {% csrf_token %}
                         <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">
@@ -51,7 +52,28 @@
                                 <input form="form-login" for="inputSmall" type="password" name="password" class="form-control" id="inputPassword" placeholder="{% trans 'Password' %}">
                             </div>
                         </div>
+                   
                     </form>
+                    </div>
+                     <li class="dropdown language-selector"> 
+                        <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-close-others="true">
+                            <img src="{% static "img/brazilicon.png" %}" />
+                        </a>
+                        <ul class="dropdown-menu">
+                            <li class="active">
+                              <a href="#">
+                                <img src="{% static "img/brazilicon.png" %}" />
+                                <span>{% trans "PT-BR" %}</span>
+                              </a>
+                            </li>
+                            <li >
+                              <a href="#">
+                                <img src="{% static "img/euaicon.png" %}" />
+                                <span>{% trans "EN" %}</span>
+                              </a>
+                            </li>
+                        </ul>
+                    </li>
                     <div class="row">
                         <div class="col-lg-10 col-md-10 col-sm-10 col-lg-offset-1 col-md-offset-1 col-sm-offset-1">
                             {% if not deny_register %}
--
libgit2 0.21.2