diff --git a/account/account.ftl b/account/account.ftl
index 698ad39..b05ca98 100644
--- a/account/account.ftl
+++ b/account/account.ftl
@@ -56,6 +56,15 @@
             </div>
         </div>
 
+        <!--<div class="form-group">
+            <div id="kc-form-buttons" class="col-md-offset-2 col-md-10 submit">
+                <div class="">
+                    <#if url.referrerURI??><a href="${url.referrerURI}">${kcSanitize(msg("backToApplication")?no_esc)}</a></#if>
+                    <button type="submit" class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!}" name="submitAction" value="Save">${msg("doSave")}</button>
+                    <button type="submit" class="${properties.kcButtonClass!} ${properties.kcButtonDefaultClass!} ${properties.kcButtonLargeClass!}" name="submitAction" value="Cancel">${msg("doCancel")}</button>
+                </div>
+            </div>
+        </div>-->
     </form>
 
 </@layout.mainLayout>
diff --git a/account/template.ftl b/account/template.ftl
index 000c54e..324ec2d 100644
--- a/account/template.ftl
+++ b/account/template.ftl
@@ -8,6 +8,11 @@
 
     <title>${msg("accountManagementTitle")}</title>
     <link rel="icon" href="${url.resourcesPath}/img/favicon.ico">
+    <#if properties.stylesCommon?has_content>
+        <#list properties.stylesCommon?split(' ') as style>
+            <link href="${url.resourcesCommonPath}/${style}" rel="stylesheet" />
+        </#list>
+    </#if>
     <#if properties.styles?has_content>
         <#list properties.styles?split(' ') as style>
             <link href="${url.resourcesPath}/${style}" rel="stylesheet" />
@@ -69,8 +74,8 @@
             <#if message?has_content>
                 <div class="alert alert-${message.type}">
                     <#if message.type=='success' ><span class="pficon pficon-ok"></span></#if>
-                    <#if message.type=='error' ><span class="pficon pficon-error-octagon"></span><span class="pficon pficon-error-exclamation"></span></#if>
-                    ${kcSanitize(message.summary)?no_esc}
+                    <#if message.type=='error' ><span class="pficon pficon-error-circle-o"></span></#if>
+                    <span class="kc-feedback-text">${kcSanitize(message.summary)?no_esc}</span>
                 </div>
             </#if>
 
diff --git a/login/theme.properties b/login/theme.properties
index 84eee6a..ce01b66 100644
--- a/login/theme.properties
+++ b/login/theme.properties
@@ -2,6 +2,11 @@ parent=keycloak
 styles=css/bootstrap.min.css css/styles.css
 
 kcLoginClass=container
+kcInputClass=form-control
+kcButtonClass=btn
+kcButtonPrimaryClass=btn-primary
+kcButtonBlockClass=btn-block
+kcButtonLargeClass=btn-lg
 kcHeaderClass=page-header col-sm-10 col-sm-offset-1 col-md-6 col-md-offset-3
 kcSocialHeaderClass=page-header
 #kcHeaderClass=page-header col-sm-10 col-sm-offset-1 col-md-6 col-md-offset-3