diff --git a/themes/src/main/resources/theme/base/account/messages/messages_en.properties b/themes/src/main/resources/theme/base/account/messages/messages_en.properties
index e771eeeece..53a9a64c31 100755
--- a/themes/src/main/resources/theme/base/account/messages/messages_en.properties
+++ b/themes/src/main/resources/theme/base/account/messages/messages_en.properties
@@ -10,11 +10,19 @@ personalInfoHtmlTitle=Personal Info
 federatedIdentitiesHtmlTitle=Federated Identities
 accountLogHtmlTitle=Account Log
 changePasswordHtmlTitle=Change Password
+deviceActivityHtmlTitle=Device Activity
 sessionsHtmlTitle=Sessions
 accountManagementTitle=Keycloak Account Management
 authenticatorTitle=Authenticator
 applicationsHtmlTitle=Applications
 
+accountManagementWelcomeMessage=Welcome to Keycloak Account Management
+personalInfoIntroMessage=Manage your basic information
+accountSecurityTitle=Account Security
+accountSecurityIntroMessage=Control your password and account access
+applicationsIntroMessage=Track and manage your app permission to access your account
+resourceIntroMessage=Share your resources among team members
+
 authenticatorCode=One-time code
 email=Email
 firstName=First name
diff --git a/themes/src/main/resources/theme/keycloak-preview/account/index.ftl b/themes/src/main/resources/theme/keycloak-preview/account/index.ftl
index 1878831159..b5e12ef082 100644
--- a/themes/src/main/resources/theme/keycloak-preview/account/index.ftl
+++ b/themes/src/main/resources/theme/keycloak-preview/account/index.ftl
@@ -129,6 +129,28 @@
                 -->
                 <ul class="nav navbar-nav navbar-right navbar-iconic">
                     <li><button id="signInButton" style="visibility:hidden" onclick="keycloak.login();" class="btn btn-primary btn-lg btn-sign" type="button">Log In</button></li>
+                    <li class="dropdown">
+                      <a href="#0" class="dropdown-toggle nav-item-iconic" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        ${msg("locale_en")} <span class="caret"></span>
+                      </a>
+                      <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+                        <li><a href="#">${msg("locale_ca")}</a></li>
+                        <li><a href="#">${msg("locale_de")}</a></li>
+                        <li><a href="#">${msg("locale_en")}</a></li>
+                        <li><a href="#">${msg("locale_es")}</a></li>
+                        <li><a href="#">${msg("locale_fr")}</a></li>
+                        <li><a href="#">${msg("locale_it")}</a></li>
+                        <li><a href="#">${msg("locale_ja")}</a></li>
+                        <li><a href="#">${msg("locale_nl")}</a></li>
+                        <li><a href="#">${msg("locale_no")}</a></li>
+                        <li><a href="#">${msg("locale_lt")}</a></li>
+                        <li><a href="#">${msg("locale_pt-BR")}</a></li>
+                        <li><a href="#">${msg("locale_ru")}</a></li>
+                        <li><a href="#">${msg("locale_sk")}</a></li>
+                        <li><a href="#">${msg("locale_sv")}</a></li>
+                        <li><a href="#">${msg("locale_zh-CN")}</a></li>
+                      </ul>
+                    </li>
                 </ul>
             </nav>
         </nav>
@@ -136,10 +158,10 @@
 <!--Top Nav -->
 
 <!-- Home Page --->
-    
+
     <div class="cards-pf" id="welcomeScreen">
         <div class="text-center">
-          <h1>Welcome to Keycloak Account Management</h1>
+          <h1>${msg("accountManagementWelcomeMessage")}</h1>
         </div>
         <div class="container-fluid container-cards-pf">
             <div class="row row-cards-pf">
@@ -150,11 +172,11 @@
                                 <span class="fa pficon-user card-pf-icon-circle"></span>
                             </div>
                             <h2>
-                                Personal Info
+                                ${msg("personalInfoHtmlTitle")}
                             </h2>
-                            <p>Manage your basic information <br>such as name and email</p>
+                            <p>${msg("personalInfoIntroMessage")}</p>
                             <hr/>
-                            <h3><a href="${baseUrl}/#/account">Personal Info</a></h3>
+                            <h3><a href="${baseUrl}/#/account">${msg("personalInfoHtmlTitle")}</a></h3>
                         </div>
                     </div>
                 </div>
@@ -165,17 +187,17 @@
                                 <span class="fa fa-shield card-pf-icon-circle"></span>
                             </div>
                             <h2>
-                                Account Security
+                                ${msg("accountSecurityTitle")}
                             </h2>
-                            <p>Control your password and account access</p>
+                            <p>${msg("accountSecurityIntroMessage")}</p>
                             <hr/>
-                            <h3><a href="${baseUrl}/#/password">Change password</a></h3>
+                            <h3><a href="${baseUrl}/#/password">${msg("changePasswordHtmlTitle")}</a></h3>
                             <hr/>
-                            <h3><a href="${baseUrl}/#/authenticator">Authenticator</a></h3>
+                            <h3><a href="${baseUrl}/#/authenticator">${msg("authenticatorTitle")}</a></h3>
                             <hr/>
-                            <h3><a href="${baseUrl}/#/sessions">Device activity</a></h3>
+                            <h3><a href="${baseUrl}/#/sessions">${msg("deviceActivityHtmlTitle")}</a></h3>
                             <hr/>
-                            <h3><a href="${baseUrl}/#/account">Federated identities</a></h3>
+                            <h3><a href="${baseUrl}/#/account">${msg("federatedIdentity")}</a></h3>
                         </div>
                     </div>
                 </div>
@@ -186,11 +208,11 @@
                                 <span class="fa fa-th card-pf-icon-circle"></span>
                             </div>
                             <h2>
-                                Applications
+                                ${msg("applicationsHtmlTitle")}
                             </h2>
-                            <p>Track and manage your app permission to access your account</p>
+                            <p>${msg("applicationsIntroMessage")}</p>
                             <hr/>
-                            <h3><a href="${baseUrl}/#/applications">Applications</a></h3>
+                            <h3><a href="${baseUrl}/#/applications">${msg("applicationsHtmlTitle")}</a></h3>
                         </div>
                     </div>
                 </div>
@@ -201,11 +223,11 @@
                                 <span class="fa pficon-repository card-pf-icon-circle"></span>
                             </div>
                             <h2>
-                                My Resources
+                                ${msg("myResources")}
                             </h2>
-                            <p>Share your resources among team members</p>
+                            <p>${msg("resourceIntroMessage")}</p>
                             <hr/>
-                            <h3><a href="${baseUrl}/#/account">Resources</a></h3>
+                            <h3><a href="${baseUrl}/#/account">${msg("myResources")}</a></h3>
                         </div>
                     </div>
                 </div>
@@ -213,7 +235,7 @@
             </div>
         </div>
     </div>
-        
+
         <script>
             var winHash = window.location.hash;
             if (winHash.startsWith('#/') && !winHash.startsWith('#/&state')) {
diff --git a/themes/src/main/resources/theme/keycloak-preview/account/resources/styles.css b/themes/src/main/resources/theme/keycloak-preview/account/resources/styles.css
index d5546c700d..374a613fb9 100644
--- a/themes/src/main/resources/theme/keycloak-preview/account/resources/styles.css
+++ b/themes/src/main/resources/theme/keycloak-preview/account/resources/styles.css
@@ -20,6 +20,10 @@ p.description {
     margin-left: 210px;
 }
 
+.nav .nav-item-iconic {
+  color: #d1d1d1;
+}
+
 .content-area {
   padding: 30px 30px 20px;
   background: #ffffff;