diff --git a/src/app/accounts/settings.component.ts b/src/app/accounts/settings.component.ts
index 69e13cc873..bb9b090948 100644
--- a/src/app/accounts/settings.component.ts
+++ b/src/app/accounts/settings.component.ts
@@ -137,7 +137,7 @@ export class SettingsComponent implements OnInit {
             label.innerHTML = '<input type="checkbox" id="master-pass-restart" checked>';
             label.appendChild(checkboxText);
 
-            div.innerHTML = 
+            div.innerHTML =
                 `<div class="swal2-text">${this.i18nService.t('setYourPinCode')}</div>` +
                 '<input type="text" class="swal2-input" id="pin-val" autocomplete="off" ' +
                 'autocapitalize="none" autocorrect="none" spellcheck="false" inputmode="verbatim">';
@@ -146,9 +146,10 @@ export class SettingsComponent implements OnInit {
             div.appendChild(label);
 
             const submitted = await Swal.fire({
+                heightAuto: false,
+                buttonsStyling: false,
                 text: this.i18nService.t('setYourPinCode'),
                 html: div,
-
                 showCancelButton: true,
                 cancelButtonText: this.i18nService.t('cancel'),
                 showConfirmButton: true,
diff --git a/src/scss/plugins.scss b/src/scss/plugins.scss
index 13e013c2ca..0c3652f77f 100644
--- a/src/scss/plugins.scss
+++ b/src/scss/plugins.scss
@@ -129,7 +129,7 @@ $fa-font-path: "~font-awesome/fonts";
             border: 1px solid #000000;
             border-radius: $border-radius;
             margin-bottom: 0;
-
+            box-shadow: none;
             // Inherit theme font-size
             font-size: inherit;
 
@@ -168,21 +168,14 @@ $fa-font-path: "~font-awesome/fonts";
         margin: 0;
         justify-content: flex-end;
 
-        .swal2-styled {
+        button {
+            margin-left: 10px;
             @extend .btn;
 
-            &:focus {
-                box-shadow: none;
+            &.swal2-confirm {
+                @extend .btn.primary;
+                font-weight: bold;
             }
         }
-
-        .swal2-confirm {
-            // Overwrite border-left and border-right-color
-            @include themify($themes) {
-                border-color: themed('buttonBorderColor') !important;
-            }
-
-            @extend .btn.primary;
-        }
     }
 }