diff --git a/themes/ilhasoft/login/login-form.ftl b/themes/ilhasoft/login/login-form.ftl
index 37fccde..b21beaa 100644
--- a/themes/ilhasoft/login/login-form.ftl
+++ b/themes/ilhasoft/login/login-form.ftl
@@ -7,76 +7,58 @@
         ${msg("greetings")}
     </div>
 
-    <form id="kc-form-login" ref="kc-form-login" class="${properties.kcFormClass!}" action="${url.loginAction}" method="post">
+    <form id="kc-form-login" ref="kc-form-login" class="${properties.kcFormClass!}" action="${url.loginAction}"
+        method="post">
         <unnnic-form-element
-            label="<#if !realm.loginWithEmailAllowed>${msg('username')}<#elseif !realm.registrationEmailAsUsername>${msg('usernameOrEmail')}<#else>${msg('email')}</#if>"
-        >
-            <unnnic-input
-                ref="loginUsername"
-                v-model="usernameInput"
-                icon-left="single-neutral-actions-1"
-                placeholder="${msg('placeholderLoginName')}"
-                name="username"
-                :disabled="<#if usernameEditDisabled??>true<#else>false</#if>"
-                autofocus
-            ></unnnic-input>
+            label="<#if !realm.loginWithEmailAllowed>${msg('username')}<#elseif !realm.registrationEmailAsUsername>${msg('usernameOrEmail')}<#else>${msg('email')}</#if>">
+            <unnnic-input ref="loginUsername" v-model="usernameInput" icon-left="single-neutral-actions-1"
+                placeholder="${msg('placeholderLoginName')}" name="username"
+                :disabled="<#if usernameEditDisabled??>true<#else>false</#if>" autofocus></unnnic-input>
         </unnnic-form-element>
 
-        <unnnic-form-element
-            label="${msg('password')}"
-        >
-            <unnnic-input
-                ref="password"
-                v-model="passwordInput"
-                native-type="password"
-                icon-left="lock-2-1"
-                placeholder="${msg('placeholderLoginPassword')}"
-                name="password"
-                allow-toggle-password
-            ></unnnic-input>
+        <unnnic-form-element label="${msg('password')}">
+            <unnnic-input ref="password" v-model="passwordInput" native-type="password" icon-left="lock-2-1"
+                placeholder="${msg('placeholderLoginPassword')}" name="password" allow-toggle-password></unnnic-input>
         </unnnic-form-element>
 
-                <div class="${properties.kcFormGroupClass!}">
-                    <div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}">
-                        <div class="${properties.kcFormButtonsWrapperClass!} login-buttons">
-                            <unnnic-button
-                                class="login-button"
-                                size="small"
-                                text="${msg('doLogIn')}"
-                                type="primary"
-                            ></unnnic-button>
+        <div class="${properties.kcFormGroupClass!}">
+            <div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}">
+                <div class="${properties.kcFormButtonsWrapperClass!} login-buttons">
+                    <unnnic-button class="login-button" size="small" text="${msg('doLogIn')}"
+                        type="primary"></unnnic-button>
 
-                            <#if realm.password?? && social.providers??>
-                                <#list social.providers as p>
-                                    <a id="zocial-${p.alias}" class="social-link" href="${p.loginUrl}">
-                                        <button type="button" class="social-button button-control" id="button-${p.alias}">
-                                            <img src="${url.resourcesPath}/img/login/icon-${p.alias}.svg" class="icon-image icon-button-left" >
-                                            <span>${msg("loginWith")} ${p.displayName} </span>
-                                        </button>
-                                    </a>
-                                </#list>
-                            </#if>
-                        </div>
-                    </div>
+                    <#if realm.password?? && social.providers??>
+                        <#list social.providers as p>
+                            <a id="zocial-${p.alias}" class="social-link" href="${p.loginUrl}">
+                                <button type="button" class="social-button button-control" id="button-${p.alias}">
+                                    <img src="${url.resourcesPath}/img/login/icon-${p.alias}.svg"
+                                        class="icon-image icon-button-left">
+                                </button>
+                            </a>
+                        </#list>
+                    </#if>
                 </div>
+            </div>
+        </div>
 
-                <div id="kc-form-options" class="${properties.kcFormOptionsClass!}">
-                    <#if realm.rememberMe && !usernameEditDisabled??>
-                        <div class="input-message remember-me">
-                            <#if login.rememberMe??>
-                                <input id="rememberMe" tabindex="3" name="rememberMe" type="checkbox" tabindex="3" checked>
-                            <#else>
-                                <input id="rememberMe" tabindex="3" name="rememberMe" type="checkbox" tabindex="3">
-                            </#if>
-
-                            <label for="rememberMe"></label>
-                            <label for="rememberMe">${msg("rememberMe")}</label>
-                        </div>
+        <div id="kc-form-options" class="${properties.kcFormOptionsClass!}">
+            <#if realm.rememberMe && !usernameEditDisabled??>
+                <div class="input-message remember-me">
+                    <#if login.rememberMe??>
+                        <input id="rememberMe" tabindex="3" name="rememberMe" type="checkbox" tabindex="3" checked>
+                        <#else>
+                            <input id="rememberMe" tabindex="3" name="rememberMe" type="checkbox" tabindex="3">
                     </#if>
 
-                    <#if realm.resetPasswordAllowed>
-                        <div class="forgot-password ${properties.kcInputMessageClass!}"><a tabindex="5" href="${url.loginResetCredentialsUrl}">${msg("doForgotPassword")}</a></div>
-                    </#if>
+                    <label for="rememberMe"></label>
+                    <label for="rememberMe">${msg("rememberMe")}</label>
                 </div>
-            </form>
+            </#if>
+
+            <#if realm.resetPasswordAllowed>
+                <div class="forgot-password ${properties.kcInputMessageClass!}"><a tabindex="5"
+                        href="${url.loginResetCredentialsUrl}">${msg("doForgotPassword")}</a></div>
+            </#if>
+        </div>
+    </form>
 </#macro>
\ No newline at end of file
diff --git a/themes/ilhasoft/login/login.ftl b/themes/ilhasoft/login/login.ftl
index 82fdd96..9c856b2 100644
--- a/themes/ilhasoft/login/login.ftl
+++ b/themes/ilhasoft/login/login.ftl
@@ -1,37 +1,36 @@
 <#import "template.ftl" as layout>
-<#import "login-form.ftl" as loginLayout>
-<@layout.registrationLayout displayInfo=social.displayInfo displayLoginFormScriptsAndStyles=true; section>
-    <#if section = "title">
-        ${msg("loginTitle",(realm.displayName!''))}
-    <#elseif section = "header">
-        ${msg("loginTitleHtml",(realm.displayNameHtml!''))?no_esc}
-    <#elseif section = "form">
-        <#if realm.password>
-            <@loginLayout.loginLayout></@loginLayout.loginLayout>
-        </#if>
-    <#elseif section = "info" >
-        <#if realm.password && realm.registrationAllowed && !usernameEditDisabled??>
-            <div id="separator-group">
-                <div class="separator"></div>
-                <span class="separator-text"> ${msg("separatorMessage")} </span>
-                <div class="separator"></div>
-            </div>
+    <#import "login-form.ftl" as loginLayout>
+        <@layout.registrationLayout displayInfo=social.displayInfo displayLoginFormScriptsAndStyles=true; section>
+            <#if section="title">
+                ${msg("loginTitle",(realm.displayName!''))}
+                <#elseif section="header">
+                    ${msg("loginTitleHtml",(realm.displayNameHtml!''))?no_esc}
+                    <#elseif section="form">
+                        <#if realm.password>
+                            <@loginLayout.loginLayout></@loginLayout.loginLayout>
+                        </#if>
+                        <#elseif section="info">
+                            <#if realm.password && realm.registrationAllowed && !usernameEditDisabled??>
+                                <div id="separator-group">
+                                    <div class="separator"></div>
+                                    <span class="separator-text"> ${msg("separatorMessage")} </span>
+                                    <div class="separator"></div>
+                                </div>
 
-            <div id="kc-registration">
-                <#--  <input class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!}" name="login" id="kc-login" ref="kc-login" type="submit" value="${msg("doLogIn")}" />  -->
-                <unnnic-button
-                    class="sign-up-button"
-                    size="small"
-                    text="${msg('doRegisterForFree')}"
-                    type="terciary"
-                    @click.prevent="location.href = '${url.registrationUrl}'"
-                ></unnnic-button>
-            </div>
-        </#if>
-        <div class="footer">
-            <a class="privacy-policy" target="_blank" href="${properties.urlPrivacyPolicy!}">
-                ${msg('termsOfService')}
-            </a>
-        </div>
-    </#if>
-</@layout.registrationLayout>
+                                <div id="kc-registration">
+                                    <#-- <input
+                                        class="${properties.kcButtonClass!} ${properties.kcButtonPrimaryClass!} ${properties.kcButtonLargeClass!}"
+                                        name="login" id="kc-login" ref="kc-login" type="submit" value="${msg("
+                                        doLogIn")}" /> -->
+                                    <unnnic-button class="sign-up-button" size="small"
+                                        text="${msg('doRegisterForFree')}" type="terciary"
+                                        @click.prevent="location.href = '${url.registrationUrl}'"></unnnic-button>
+                                </div>
+                            </#if>
+                            <div class="footer">
+                                <a class="privacy-policy" target="_blank" href="${properties.urlPrivacyPolicy!}">
+                                    ${msg('termsOfService')}
+                                </a>
+                            </div>
+            </#if>
+        </@layout.registrationLayout>
\ No newline at end of file
diff --git a/themes/ilhasoft/login/register.ftl b/themes/ilhasoft/login/register.ftl
index fa743c7..49045f6 100644
--- a/themes/ilhasoft/login/register.ftl
+++ b/themes/ilhasoft/login/register.ftl
@@ -1,17 +1,18 @@
 <#import "template.ftl" as layout>
-<@layout.registrationLayout displayMessage=false displayRegisterScriptsAndStyles=true; section>
-    <#if section = "header">
-        ${msg("registerTitle")}
-    <#elseif section = "form">
-        <div class="greetings">
-            <a href="${url.loginUrl}">
-                <img class="brand-title" src="${url.resourcesPath}/img/login/Weni-Logo-Blue.svg">
-            </a>
-
-            ${msg("register_greetings")}
-        </div>
-        <form id="kc-register-form" class="${properties.kcFormClass!}" action="${url.registrationAction}" method="post">
-            <!-- <unnnic-form-element
+    <@layout.registrationLayout displayMessage=false displayRegisterScriptsAndStyles=true; section>
+        <#if section="header">
+            ${msg("registerTitle")}
+            <#elseif section="form">
+                <div class="greetings">
+                    <a href="${url.loginUrl}">
+                        <img class="brand-title" src="${url.resourcesPath}/img/login/Weni-Logo-Blue.svg">
+                    </a>
+
+                    ${msg("register_greetings")}
+                </div>
+                <form id="kc-register-form" class="${properties.kcFormClass!}" action="${url.registrationAction}"
+                    method="post">
+                    <!-- <unnnic-form-element
                 label="${msg('firstName')}"
                 error="${messagesPerField.get('firstName')}"
                 class="register-form-row-email"
@@ -39,135 +40,104 @@
                 ></unnnic-input>
             </unnnic-form-element> -->
 
-            <div class="register-form-row-email">
-                <unnnic-form-element
-                    label="${msg('email')}"
-                    error="${messagesPerField.get('email')}"
-                >
-                    <unnnic-input
-                        v-model="email"
-                        icon-left="email-action-unread-1"
-                        placeholder="${msg('placeholderRegisterEmail')}"
-                        name="email"
-                        autocomplete="email"
-                        :type="'${messagesPerField.get('email')}' ? 'error' : 'normal'"
-                    ></unnnic-input>
-                </unnnic-form-element>
-            </div>
-
-            <div class="register-form-row-password">
-                <unnnic-form-element
-                    label="${msg('password')}"
-                    :error="'${messagesPerField.get('password')}' ? '${messagesPerField.get('password')}' : false"
-                >
-                
-                    <unnnic-input
-                        ref="registerPassword"
-                        v-model="password"
-                        native-type="password"
-                        icon-left="lock-2-1"
-                        placeholder="${msg('placeholderRegisterPassword')}"
-                        name="password"
-                        autocomplete="password"
-                        :type="'${messagesPerField.get('password')}' ? 'error' : 'normal'"
-                        allow-toggle-password
-                    ></unnnic-input>
-                </unnnic-form-element>
-
-                <#if passwordRequired??>
-                    <unnnic-form-element
-                        label="${msg('passwordConfirm')}"
-                        error="${messagesPerField.get('password-confirm')}"
-                    >
-                        <unnnic-input
-                            ref="registerPasswordConfirm"
-                            v-model="passwordConfirm"
-                            native-type="password"
-                            icon-left="lock-2-1"
-                            placeholder="${msg('placeholderRegisterPasswordConfirm')}"
-                            name="password-confirm"
-                            autocomplete="password"
-                            :type="`${messagesPerField.get('password-confirm')}` ? 'error' : 'normal'"
-                            allow-toggle-password
-                        ></unnnic-input>
-                    </unnnic-form-element>
-                </#if>
-            </div>
-
-            <#if !realm.registrationEmailAsUsername>
-                <div ref="username" class="input-medium ${messagesPerField.printIfExists('username', properties.kcFormGroupErrorClass!)}">
-                    <label for="username">
-                        <div class="label">${msg("username")}</div>
-
-                        <div class="input">
-                            <div class="icon left">
-                                <#include "resources/img/login/read-email-at-1.svg">
-                            </div>
+                    <div class="register-form-row-email">
+                        <unnnic-form-element label="${msg('email')}" error="${messagesPerField.get('email')}">
+                            <unnnic-input v-model="email" icon-left="email-action-unread-1"
+                                placeholder="${msg('placeholderRegisterEmail')}" name="email" autocomplete="email"
+                                :type="'${messagesPerField.get('email')}' ? 'error' : 'normal'"></unnnic-input>
+                        </unnnic-form-element>
+                    </div>
 
-                            <input
-                                type="text"
-                                id="username"
-                                placeholder="${msg('placeholderRegisterUsername')}"
-                                name="username"
-                                v-model="username"
-                                autocomplete="username"
-                            />
+                    <div class="register-form-row-password">
+                        <unnnic-form-element label="${msg('password')}"
+                            :error="'${messagesPerField.get('password')}' ? '${messagesPerField.get('password')}' : false">
+
+                            <unnnic-input ref="registerPassword" v-model="password" native-type="password"
+                                icon-left="lock-2-1" placeholder="${msg('placeholderRegisterPassword')}" name="password"
+                                autocomplete="password"
+                                :type="'${messagesPerField.get('password')}' ? 'error' : 'normal'"
+                                allow-toggle-password></unnnic-input>
+                        </unnnic-form-element>
+
+                        <#if passwordRequired??>
+                            <unnnic-form-element label="${msg('passwordConfirm')}"
+                                error="${messagesPerField.get('password-confirm')}">
+                                <unnnic-input ref="registerPasswordConfirm" v-model="passwordConfirm"
+                                    native-type="password" icon-left="lock-2-1"
+                                    placeholder="${msg('placeholderRegisterPasswordConfirm')}" name="password-confirm"
+                                    autocomplete="password"
+                                    :type="`${messagesPerField.get('password-confirm')}` ? 'error' : 'normal'"
+                                    allow-toggle-password></unnnic-input>
+                            </unnnic-form-element>
+                        </#if>
+                    </div>
+
+                    <#if !realm.registrationEmailAsUsername>
+                        <div ref="username"
+                            class="input-medium ${messagesPerField.printIfExists('username', properties.kcFormGroupErrorClass!)}">
+                            <label for="username">
+                                <div class="label">${msg("username")}</div>
+
+                                <div class="input">
+                                    <div class="icon left">
+                                        <#include "resources/img/login/read-email-at-1.svg">
+                                    </div>
+
+                                    <input type="text" id="username" placeholder="${msg('placeholderRegisterUsername')}"
+                                        name="username" v-model="username" autocomplete="username" />
+                                </div>
+
+                                <div class="${properties.kcInputMessageClass!}"> ${messagesPerField.get('username')}
+                                </div>
+                            </label>
                         </div>
+                    </#if>
 
-                        <div class="${properties.kcInputMessageClass!}"> ${messagesPerField.get('username')} </div>
-                    </label>
-                </div>
-            </#if>
+                    <#if recaptchaRequired??>
+                        <div class="form-group">
+                            <div class="${properties.kcInputWrapperClass!}">
+                                <div class="g-recaptcha" data-size="compact" data-sitekey="${recaptchaSiteKey}"></div>
+                            </div>
+                        </div>
+                    </#if>
 
-            <#if recaptchaRequired??>
-                <div class="form-group">
-                    <div class="${properties.kcInputWrapperClass!}">
-                        <div class="g-recaptcha" data-size="compact" data-sitekey="${recaptchaSiteKey}"></div>
+                    <div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}">
+                        <unnnic-button class="login-button" size="small" text="${msg('doRegister')}" type="primary"
+                            :disabled="!email || !password || !passwordConfirm"></unnnic-button>
                     </div>
-                </div>
-            </#if>
-
-                <div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}">
-                    <unnnic-button
-                        class="login-button"
-                        size="small"
-                        text="${msg('doRegister')}"
-                        type="primary"
-                        :disabled="!email || !password || !passwordConfirm"
-                    ></unnnic-button>
-                </div>
 
-                <div id="separator-group">
-                    <div class="separator"></div>
-                    <span class="separator-text">${msg("separatorMessage")}</span>
-                    <div class="separator"></div>
-                </div>
-        
-                <div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}" style="text-align: right;">
-                    <div class="${properties.kcFormButtonsWrapperClass!} login-buttons">
-                        <#if realm.password?? && social.providers??>
-                            <#list social.providers as p>
-                                <a id="zocial-${p.alias}" class="social-link" href="${p.loginUrl}">
-                                    <button type="button" class="social-button button-control" id="button-${p.alias}">
-                                        <img src="${url.resourcesPath}/img/login/icon-${p.alias}.svg" class="icon-image icon-button-left" >
-                                        <span>${msg("loginWith")} ${p.displayName} </span>
-                                    </button>
-                                </a>
-                            </#list>
-                        </#if>
+                    <div id="separator-group">
+                        <div class="separator"></div>
+                        <span class="separator-text">${msg("separatorMessage")}</span>
+                        <div class="separator"></div>
                     </div>
-                </div>
 
-            <div class="footer">
-                <div class="back-to-login">
-                    ${msg("alreadyAccount")}
-                    <a href="${url.loginUrl}">${msg("backToLogin")?no_esc}</a>
-                </div>
+                    <div id="kc-form-buttons" class="${properties.kcFormButtonsClass!}" style="text-align: right;">
+                        <div class="${properties.kcFormButtonsWrapperClass!} login-buttons">
+                            <#if realm.password?? && social.providers??>
+                                <#list social.providers as p>
+                                    <a id="zocial-${p.alias}" class="social-link" href="${p.loginUrl}">
+                                        <button type="button" class="social-button button-control"
+                                            id="button-${p.alias}">
+                                            <img src="${url.resourcesPath}/img/login/icon-${p.alias}.svg"
+                                                class="icon-image icon-button-left">
+                                        </button>
+                                    </a>
+                                </#list>
+                            </#if>
+                        </div>
+                    </div>
 
-                <a class="privacy-policy" target="_blank" href="${properties.urlPrivacyPolicy!}">
-                    ${msg('termsOfService')}
-                </a>
-            </div>
-        </form>
-    </#if>
-</@layout.registrationLayout>
\ No newline at end of file
+                    <div class="footer">
+                        <div class="back-to-login">
+                            ${msg("alreadyAccount")}
+                            <a href="${url.loginUrl}">${msg("backToLogin")?no_esc}</a>
+                        </div>
+
+                        <a class="privacy-policy" target="_blank" href="${properties.urlPrivacyPolicy!}">
+                            ${msg('termsOfService')}
+                        </a>
+                    </div>
+                </form>
+        </#if>
+    </@layout.registrationLayout>
\ No newline at end of file
diff --git a/themes/ilhasoft/login/resources/css/login.css b/themes/ilhasoft/login/resources/css/login.css
index 49bcfb1..25eae9a 100644
--- a/themes/ilhasoft/login/resources/css/login.css
+++ b/themes/ilhasoft/login/resources/css/login.css
@@ -79,7 +79,7 @@ h1 {
     outline: none;
 }
 
-.input-control:focus-within .icon{
+.input-control:focus-within .icon {
     color: var(--unnic-color-brand-weni);
 }
 
@@ -111,7 +111,8 @@ h1 {
     cursor: pointer;
 }
 
-.icon-left, .icon-right {
+.icon-left,
+.icon-right {
     top: 25%;
     z-index: 1;
 }
@@ -132,10 +133,13 @@ h1 {
 
 ::placeholder {
     color: var(--unnic-color-brand-sec);
-    opacity: 1; /* Firefox */
+    opacity: 1;
+    /* Firefox */
 }
-  
-:-ms-input-placeholder, ::-ms-input-placeholder { /* Internet Explorer 10-11 */
+
+:-ms-input-placeholder,
+::-ms-input-placeholder {
+    /* Internet Explorer 10-11 */
     color: var(--unnic-color-brand-sec);
 }
 
@@ -162,7 +166,9 @@ label {
     width: 100%;
 }
 
-button, .btn, .bt-lg {
+button,
+.btn,
+.bt-lg {
     background: var(--unnic-color-neutral-light);
     border-radius: var(--unnic-border-radius-sm);
     font-size: var(--unnic-font-size-body-lg);
@@ -174,7 +180,7 @@ button, .btn, .bt-lg {
     outline: none;
 }
 
-.form-group + .form-group {
+.form-group+.form-group {
     margin: var(--unnic-spacing-stack-md) 0 0 0;
 }
 
@@ -182,11 +188,11 @@ button, .btn, .bt-lg {
     display: flex;
 }
 
-.form-group-nested > :not(:last-child) {
+.form-group-nested> :not(:last-child) {
     margin: 0 var(--unnic-inline-sm) 0 0;
 }
 
-.form-group-nested > :last-child {
+.form-group-nested> :last-child {
     margin: 0;
 }
 
@@ -279,14 +285,15 @@ button, .btn, .bt-lg {
     display: flex;
 }
 
-.card-pf .left-side-content > .content, .card-pf #kc-content > .content {
+.card-pf .left-side-content>.content,
+.card-pf #kc-content>.content {
     display: flex;
     flex-direction: column;
     max-width: 624px;
     width: 100%;
 }
 
-.card-pf .left-side-content > .content {
+.card-pf .left-side-content>.content {
     padding: 32px 16px;
     padding-right: 44px;
     box-sizing: border-box;
@@ -294,7 +301,7 @@ button, .btn, .bt-lg {
     row-gap: 48px;
 }
 
-.card-pf #kc-content > .content {
+.card-pf #kc-content>.content {
     padding: 32px 112px;
     row-gap: 16px;
     box-sizing: border-box;
@@ -389,13 +396,14 @@ a:has(.brand-title) {
 
 .card-pf #kc-content .login-buttons {
     display: grid;
-    grid-gap: 16px;
-    grid-template-columns: repeat(auto-fit, minmax(190px, 1fr));
+    grid-gap: 20px 8px;
+    grid-template-columns: repeat(3, 1fr);
 }
 
-.card-pf #kc-content .login-buttons .login-button:not(:disabled), .card-pf #kc-content #kc-form-buttons .login-button:not(:disabled) {
+.card-pf #kc-content .login-buttons .login-button:not(:disabled),
+.card-pf #kc-content #kc-form-buttons .login-button:not(:disabled) {
     background-color: var(--color-weni-600, #00A49F);
-    grid-area: 1/1/2/3;
+    grid-column: span 3;
 }
 
 .card-pf #kc-content .footer a.privacy-policy {
@@ -438,12 +446,12 @@ a:has(.brand-title) {
         margin-left: initial;
     }
 
-    .card-pf .left-side-content > .content {
+    .card-pf .left-side-content>.content {
         padding-left: 44px;
         justify-content: flex-start;
     }
 
-    .card-pf #kc-content > .content {
+    .card-pf #kc-content>.content {
         padding-left: 16px;
         padding-right: 16px;
     }
@@ -457,11 +465,13 @@ a:has(.brand-title) {
         display: none;
     }
 
-    .card-pf .left-side-content .brand-title, .card-pf .left-side-content .brand-title-spacing {
+    .card-pf .left-side-content .brand-title,
+    .card-pf .left-side-content .brand-title-spacing {
         display: none;
     }
 
-    .card-pf #kc-content .language-select.top, .card-pf #kc-content .language-select-counterpoint {
+    .card-pf #kc-content .language-select.top,
+    .card-pf #kc-content .language-select-counterpoint {
         display: none;
     }
 
@@ -491,7 +501,8 @@ a:has(.brand-title) {
         text-align: center;
     }
 
-    .card-pf #kc-content .greetings .brand-title, .card-pf #kc-content .greetings a:has(.brand-title) {
+    .card-pf #kc-content .greetings .brand-title,
+    .card-pf #kc-content .greetings a:has(.brand-title) {
         display: inline-block;
     }
 }
@@ -504,7 +515,8 @@ a:has(.brand-title) {
     grid-column: 1 / 6;
 }
 
-#kc-registration, .back-link {
+#kc-registration,
+.back-link {
     text-align: center;
     color: var(--unnic-color-neutral-cloudy);
 }
@@ -515,7 +527,9 @@ a:has(.brand-title) {
     font-size: var(--unnic-font-size-body-gt);
 }
 
-#kc-info-wrapper a, #kc-registration a, #kc-form-options a {
+#kc-info-wrapper a,
+#kc-registration a,
+#kc-form-options a {
     color: var(--unnic-color-brand-weni);
     text-decoration: none;
     font-weight: var(--unnic-font-weight-bold);
@@ -540,7 +554,7 @@ a:has(.brand-title) {
 }
 
 .social-button img {
-    height: 16px;
+    height: 20px;
 }
 
 .social-link {
@@ -549,8 +563,23 @@ a:has(.brand-title) {
 }
 
 #button-github {
-    background-color: var(--unnic-color-neutral-black);
-    color: var(--unnic-color-neutral-snow);
+    background-color: var(--unnic-color-neutral-snow);
+    color: var(--unnic-color-neutral-darkest);
+
+    outline-style: solid;
+    outline-color: var(--unnic-color-neutral-soft);
+    outline-width: 1px;
+    outline-offset: -1px;
+}
+
+#button-microsoft {
+    background-color: var(--unnic-color-neutral-snow);
+    color: var(--unnic-color-neutral-darkest);
+
+    outline-style: solid;
+    outline-color: var(--unnic-color-neutral-soft);
+    outline-width: 1px;
+    outline-offset: -1px;
 }
 
 #button-google {
@@ -563,7 +592,9 @@ a:has(.brand-title) {
     outline-offset: -1px;
 }
 
-#button-github:hover, #button-google:hover {
+#button-github:hover,
+#button-google:hover,
+#button-microsoft:hover {
     opacity: var(--unnic-opacity-level-clear);
 }
 
@@ -606,7 +637,7 @@ a:has(.brand-title) {
     border: var(--unnic-border-width-thinner) solid var(--unnic-color-neutral-clean);
 }
 
-.btn-secondary:hover{
+.btn-secondary:hover {
     border: none;
 }
 
@@ -617,11 +648,11 @@ a:has(.brand-title) {
 }
 
 .btn-tertiary {
-    background-color: rgba(0,0,0,0);
+    background-color: rgba(0, 0, 0, 0);
     color: var(--unnic-color-neutral-dark);
 }
 
-.btn-tertiary:hover{
+.btn-tertiary:hover {
     border: var(--unnic-border-width-thinner) solid var(--unnic-color-neutral-soft);
 }
 
@@ -630,7 +661,7 @@ a:has(.brand-title) {
     color: var(--unnic-color-neutral-cloudy);
 }
 
-#kc-form-wrapper #kc-register-form .form-group .btn-tertiary{
+#kc-form-wrapper #kc-register-form .form-group .btn-tertiary {
     margin-top: var(--unnic-spacing-stack-sm);
 }
 
@@ -680,7 +711,7 @@ a:has(.brand-title) {
     color: var(--unnic-color-neutral-dark);
 }
 
-.text-body-gt{
+.text-body-gt {
     font-family: var(--unnic-font-family-secondary);
     font-size: var(--unnic-font-size-body-gt);
     margin: 0 0 var(--unnic-spacing-stack-xs) 0;
@@ -742,7 +773,8 @@ a:has(.brand-title) {
     color: var(--unnic-color-feedback-red);
 }
 
-.home-back-link, .home-back-link * {
+.home-back-link,
+.home-back-link * {
     color: var(--unnic-color-neutral-dark)
 }
 
@@ -777,7 +809,7 @@ a:has(.brand-title) {
     font-size: var(--unnic-font-size-body-md);
 }
 
-#kc-form-options .forgot-password a{
+#kc-form-options .forgot-password a {
     color: var(--unnic-color-neutral-dark);
     text-decoration: none;
     font-weight: var(--unnic-font-weight-normal);
@@ -1036,24 +1068,34 @@ a:has(.brand-title) {
 }
 
 
-.input-itself {
-
-}
+.input-itself {}
 
-.input-itself:-webkit-autofill, .input-itself:autofill {
+.input-itself:-webkit-autofill,
+.input-itself:autofill {
     animation-name: onAutoFillStart;
-  }
+}
 
-.input-itself:not(:-webkit-autofill), .input-itself:not(:autofill) {
+.input-itself:not(:-webkit-autofill),
+.input-itself:not(:autofill) {
     animation-name: onAutoFillCancel;
 }
 
 @keyframes onAutoFillStart {
-    from {/**/}
-    to {/**/}
+    from {
+        /**/
+    }
+
+    to {
+        /**/
+    }
 }
 
 @keyframes onAutoFillCancel {
-    from {/**/}
-    to {/**/}
-}
+    from {
+        /**/
+    }
+
+    to {
+        /**/
+    }
+}
\ No newline at end of file
diff --git a/themes/ilhasoft/login/resources/img/login/icon-github.svg b/themes/ilhasoft/login/resources/img/login/icon-github.svg
index 07524fc..2c64b1f 100644
--- a/themes/ilhasoft/login/resources/img/login/icon-github.svg
+++ b/themes/ilhasoft/login/resources/img/login/icon-github.svg
@@ -1,3 +1,3 @@
-<svg width="19" height="18" viewBox="0 0 19 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M9.51529 0.201661C7.36969 0.201023 5.29425 0.965868 3.66216 2.35866C2.03008 3.75146 0.948423 5.68083 0.611699 7.79984C0.274975 9.91884 0.705273 12.0885 1.82522 13.9186C2.94516 15.7487 4.68128 17.1192 6.72138 17.7837H6.93919C7.04545 17.7903 7.1519 17.7742 7.25147 17.7366C7.35105 17.6989 7.44148 17.6405 7.51676 17.5652C7.59205 17.4899 7.65046 17.3995 7.68814 17.2999C7.72582 17.2003 7.74189 17.0939 7.7353 16.9876V16.8299V16.0112C7.72793 15.962 7.71085 15.9148 7.68507 15.8722C7.65928 15.8297 7.6253 15.7927 7.58509 15.7634C7.54146 15.7281 7.49048 15.703 7.43589 15.69C7.38131 15.677 7.3245 15.6764 7.26965 15.6883C5.25684 16.1239 4.82874 14.8621 4.7987 14.7795C4.54665 14.1119 4.09574 13.5378 3.50689 13.1347C3.47161 13.1042 3.43394 13.0766 3.39424 13.0521C3.48151 13.0051 3.58134 12.9867 3.67963 12.9995C3.8684 13.0258 4.04716 13.1004 4.19851 13.2163C4.34987 13.3321 4.46866 13.4851 4.54334 13.6605C4.83388 14.1663 5.30932 14.5398 5.86963 14.7023C6.42993 14.8648 7.03142 14.8036 7.54754 14.5317C7.60292 14.5075 7.65164 14.4702 7.68956 14.4232C7.72748 14.3761 7.75348 14.3206 7.76534 14.2613C7.7941 13.9139 7.94279 13.5873 8.18593 13.3375C8.23991 13.2896 8.27892 13.2271 8.29831 13.1576C8.31769 13.088 8.31662 13.0144 8.29522 12.9454C8.27383 12.8765 8.23301 12.8151 8.17766 12.7688C8.12231 12.7225 8.05478 12.693 7.98315 12.6841C6.20316 12.4813 4.38562 11.8579 4.38562 8.78615C4.37062 8.01473 4.65299 7.26712 5.17422 6.69823C5.22223 6.64521 5.25409 6.57958 5.26607 6.50906C5.27804 6.43855 5.26963 6.36607 5.24182 6.30018C5.03308 5.71701 5.03574 5.07907 5.24933 4.49766C5.94317 4.62065 6.5944 4.91784 7.14197 5.36137C7.18721 5.39329 7.23907 5.4146 7.29368 5.42371C7.3483 5.43281 7.40426 5.42947 7.45741 5.41394C8.12831 5.23195 8.82014 5.13852 9.51529 5.13605C10.213 5.13664 10.9076 5.23009 11.5807 5.41394C11.6327 5.4283 11.6873 5.43103 11.7405 5.42195C11.7937 5.41286 11.8443 5.39218 11.8886 5.36137C12.437 4.91924 13.0879 4.62222 13.7812 4.49766C13.9857 5.07595 13.9857 5.70686 13.7812 6.28516C13.7534 6.35105 13.745 6.42352 13.757 6.49404C13.769 6.56456 13.8008 6.63019 13.8488 6.68321C14.3647 7.24641 14.6467 7.98492 14.6374 8.7486C14.6374 11.8204 12.8124 12.4362 11.0249 12.639C10.9516 12.6467 10.8821 12.6757 10.8252 12.7225C10.7683 12.7694 10.7264 12.8319 10.7048 12.9024C10.6832 12.9729 10.6828 13.0481 10.7036 13.1188C10.7245 13.1895 10.7657 13.2525 10.8221 13.3C10.9885 13.4717 11.1156 13.6774 11.1947 13.9031C11.2738 14.1287 11.303 14.3688 11.2803 14.6068V16.9951C11.2765 17.1125 11.2988 17.2293 11.3456 17.3371C11.3923 17.4449 11.4624 17.541 11.5506 17.6185C11.663 17.7026 11.7936 17.7594 11.9318 17.7842C12.07 17.8089 12.2121 17.8011 12.3467 17.7612C14.3731 17.0833 16.0928 15.7074 17.1988 13.8791C18.3048 12.0508 18.7252 9.88902 18.385 7.77947C18.0449 5.66992 16.9663 3.74985 15.3416 2.36186C13.717 0.973877 11.6521 0.208273 9.51529 0.201661Z" fill="white"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.01274 0.668091C6.22474 0.66756 4.49521 1.30493 3.13514 2.46559C1.77506 3.62626 0.873686 5.23406 0.593083 6.9999C0.312479 8.76574 0.671061 10.5738 1.60435 12.0989C2.53764 13.624 3.9844 14.7661 5.68449 15.3198H5.86599C5.95454 15.3253 6.04325 15.3119 6.12623 15.2805C6.20921 15.2491 6.28457 15.2004 6.3473 15.1377C6.41004 15.075 6.45872 14.9996 6.49012 14.9166C6.52151 14.8336 6.53491 14.7449 6.52942 14.6564V14.5249V13.8427C6.52327 13.8017 6.50904 13.7624 6.48756 13.7269C6.46607 13.6915 6.43775 13.6606 6.40424 13.6362C6.36789 13.6068 6.3254 13.5859 6.27991 13.5751C6.23442 13.5642 6.18708 13.5637 6.14137 13.5736C4.46403 13.9366 4.10728 12.8852 4.08225 12.8163C3.87221 12.26 3.49645 11.7815 3.00574 11.4456C2.97634 11.4202 2.94495 11.3972 2.91186 11.3768C2.98459 11.3376 3.06779 11.3223 3.1497 11.333C3.307 11.3549 3.45597 11.4171 3.5821 11.5136C3.70822 11.6101 3.80722 11.7376 3.86945 11.8838C4.11157 12.3053 4.50777 12.6166 4.97469 12.752C5.44161 12.8874 5.94285 12.8364 6.37295 12.6098C6.4191 12.5896 6.4597 12.5586 6.4913 12.5193C6.5229 12.4801 6.54456 12.4338 6.55445 12.3845C6.57841 12.0949 6.70232 11.8228 6.90494 11.6146C6.94992 11.5747 6.98244 11.5226 6.99859 11.4647C7.01474 11.4067 7.01385 11.3453 6.99602 11.2879C6.97819 11.2304 6.94418 11.1793 6.89805 11.1407C6.85193 11.1021 6.79565 11.0776 6.73595 11.0701C5.25263 10.9011 3.73802 10.3817 3.73802 7.82183C3.72551 7.17898 3.96082 6.55597 4.39518 6.0819C4.43519 6.03772 4.46174 5.98302 4.47172 5.92426C4.4817 5.86549 4.47469 5.8051 4.45151 5.75019C4.27757 5.26422 4.27979 4.7326 4.45777 4.24809C5.03597 4.35058 5.57867 4.59824 6.03498 4.96785C6.07267 4.99445 6.11589 5.01221 6.1614 5.0198C6.20691 5.02738 6.25355 5.0246 6.29784 5.01166C6.85693 4.86 7.43345 4.78214 8.01274 4.78008C8.59419 4.78057 9.17299 4.85845 9.73389 5.01166C9.77726 5.02362 9.82273 5.0259 9.86707 5.01833C9.91142 5.01076 9.95356 4.99352 9.9905 4.96785C10.4475 4.59941 10.9899 4.35189 11.5677 4.24809C11.7381 4.73 11.7381 5.25576 11.5677 5.73767C11.5445 5.79259 11.5375 5.85298 11.5475 5.91174C11.5575 5.97051 11.584 6.0252 11.624 6.06938C12.0539 6.53871 12.2889 7.15414 12.2812 7.79054C12.2812 10.3504 10.7603 10.8636 9.27074 11.0326C9.20965 11.0389 9.15178 11.0631 9.10434 11.1022C9.05691 11.1412 9.022 11.1933 9.00399 11.252C8.98597 11.3108 8.98563 11.3735 9.00302 11.4324C9.0204 11.4913 9.05474 11.5438 9.10176 11.5833C9.2404 11.7264 9.34633 11.8979 9.41224 12.0859C9.47816 12.2739 9.50248 12.474 9.48354 12.6724V14.6626C9.48044 14.7605 9.49904 14.8578 9.53799 14.9476C9.57695 15.0374 9.6353 15.1175 9.70886 15.1821C9.80253 15.2522 9.9113 15.2995 10.0265 15.3202C10.1417 15.3408 10.2601 15.3343 10.3723 15.301C12.061 14.7361 13.494 13.5895 14.4156 12.066C15.3373 10.5424 15.6877 8.74089 15.4042 6.98293C15.1207 5.22497 14.2219 3.62491 12.868 2.46826C11.5142 1.3116 9.7934 0.673602 8.01274 0.668091Z" fill="#4E5666"/>
 </svg>
diff --git a/themes/ilhasoft/login/resources/img/login/icon-microsoft.svg b/themes/ilhasoft/login/resources/img/login/icon-microsoft.svg
new file mode 100644
index 0000000..7576403
--- /dev/null
+++ b/themes/ilhasoft/login/resources/img/login/icon-microsoft.svg
@@ -0,0 +1,6 @@
+<svg width="15" height="16" viewBox="0 0 15 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.416626 0.75H7.35141V7.68478H0.416626V0.75Z" fill="#F35325"/>
+<path d="M0.416626 8.31522H7.35141V15.25H0.416626V8.31522Z" fill="#05A6F0"/>
+<path d="M7.98184 0.75H14.9166V7.68478H7.98184V0.75Z" fill="#81BC06"/>
+<path d="M7.98184 8.31522H14.9166V15.25H7.98184V8.31522Z" fill="#FEB907"/>
+</svg>