diff --git a/src/app/accounts/apiKey.component.html b/src/app/accounts/apiKey.component.html
index 710bacb6..2d817a59 100644
--- a/src/app/accounts/apiKey.component.html
+++ b/src/app/accounts/apiKey.component.html
@@ -19,7 +19,7 @@
                                     <input type="{{showSecret ? 'text' : 'password'}}" id="client_secret" name="ClientSecret"
                                     [(ngModel)]="clientSecret" class="form-control">
                                     <div class="input-group-append">
-                                        <button type="button" class="btn btn-outline-primary" appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleSecret()">
+                                        <button type="button" class="ml-1 btn btn-link" appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleSecret()">
                                             <i class="fa fa-lg" aria-hidden="true"[ngClass]="{'fa-eye': !showSecret, 'fa-eye-slash': showSecret}"></i>
                                         </button>
                                     </div>
diff --git a/src/app/accounts/apiKey.component.ts b/src/app/accounts/apiKey.component.ts
index 0df06b09..b3056dd8 100644
--- a/src/app/accounts/apiKey.component.ts
+++ b/src/app/accounts/apiKey.component.ts
@@ -80,6 +80,6 @@ export class ApiKeyComponent {
     }
     toggleSecret() {
         this.showSecret = !this.showSecret;
-        document.getElementById('clientSecret').focus();
+        document.getElementById('client_secret').focus();
     }
 }
diff --git a/src/app/tabs/settings.component.html b/src/app/tabs/settings.component.html
index bd67de09..f3f4f5fd 100644
--- a/src/app/tabs/settings.component.html
+++ b/src/app/tabs/settings.component.html
@@ -125,7 +125,7 @@
                                 <input type="{{showLdapPassword ? 'text' : 'password'}}" class="form-control" id="password" name="Password"
                                 [(ngModel)]="ldap.password">
                                 <div class="input-group-append">
-                                    <button type="button" class="btn btn-outline-primary" appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleLdapPassword()">
+                                    <button type="button" class="btn btn-outline-secondary" appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleLdapPassword()">
                                         <i class="fa fa-lg" aria-hidden="true"[ngClass]="{'fa-eye': !showLdapPassword, 'fa-eye-slash': showLdapPassword}"></i>
                                     </button>
                                 </div>
@@ -150,7 +150,7 @@
                             <input type="{{showAzureKey ? 'text' : 'password'}}" class="form-control" id="secretKey" name="SecretKey"
                             [(ngModel)]="azure.key">
                             <div class="input-group-append">
-                                <button type="button" class="btn btn-outline-primary" appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleAzureKey()">
+                                <button type="button" class="btn btn-outline-secondary" appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleAzureKey()">
                                     <i class="fa fa-lg" aria-hidden="true"[ngClass]="{'fa-eye': !showAzureKey, 'fa-eye-slash': showAzureKey}"></i>
                                 </button>
                             </div>
@@ -169,7 +169,7 @@
                             <input type="{{showOktaKey ? 'text' : 'password'}}" class="form-control" id="oktaToken" name="OktaToken"
                             [(ngModel)]="okta.token">
                             <div class="input-group-append"> 
-                                <button type="button" class="btn btn-outline-primary" appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleOktaKey()">
+                                <button type="button" class="btn btn-outline-secondary" appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleOktaKey()">
                                     <i class="fa fa-lg" aria-hidden="true"[ngClass]="{'fa-eye': !showOktaKey, 'fa-eye-slash': showOktaKey}"></i>
                                 </button>
                             </div>
@@ -188,7 +188,7 @@
                             <input type="{{showOneLoginSecret ? 'text' : 'password'}}" class="form-control" id="oneLoginClientSecret" name="OneLoginClientSecret"
                             [(ngModel)]="oneLogin.clientSecret">
                             <div class="input-group-append">
-                                <button type="button" class="btn btn-outline-primary" appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleOneLoginSecret()">
+                                <button type="button" class="btn btn-outline-secondary" appA11yTitle="{{'toggleVisibility' | i18n}}" (click)="toggleOneLoginSecret()">
                                     <i class="fa fa-lg" aria-hidden="true"[ngClass]="{'fa-eye': !showOneLoginSecret, 'fa-eye-slash': showOneLoginSecret}"></i>
                                 </button>
                             </div>
diff --git a/src/app/tabs/settings.component.ts b/src/app/tabs/settings.component.ts
index b58ac999..5d054f6e 100644
--- a/src/app/tabs/settings.component.ts
+++ b/src/app/tabs/settings.component.ts
@@ -132,18 +132,18 @@ export class SettingsComponent implements OnInit, OnDestroy {
     }
     toggleLdapPassword() {
         this.showLdapPassword = !this.showLdapPassword;
-        document.getElementById('masterPassword').focus();
+        document.getElementById('password').focus();
     }
     toggleAzureKey() {
         this.showAzureKey = !this.showAzureKey;
-        document.getElementById('masterPassword').focus();
+        document.getElementById('secretKey').focus();
     }
     toggleOktaKey() {
         this.showOktaKey = !this.showOktaKey;
-        document.getElementById('masterPassword').focus();
+        document.getElementById('oktaToken').focus();
     }
     toggleOneLoginSecret() {
         this.showOneLoginSecret = !this.showOneLoginSecret;
-        document.getElementById('masterPassword').focus();
+        document.getElementById('oneLoginClientSecret').focus();
     }
 }