diff --git a/data/web/templates/base.twig b/data/web/templates/base.twig
index 3293a7ca..02b1a9f4 100644
--- a/data/web/templates/base.twig
+++ b/data/web/templates/base.twig
@@ -190,10 +190,10 @@ function recursiveBase64StrToArrayBuffer(obj) {
 
     // Confirm TFA modal
   {% if pending_tfa_method %}
-    $('#ConfirmTFAModal').modal({
+    new bootstrap.Modal(document.getElementById("ConfirmTFAModal"), {
       backdrop: 'static',
       keyboard: false
-    });
+    }).show();
 
     // validate WebAuthn tfa
     $('#start_webauthn_confirmation').click(function(){
diff --git a/data/web/templates/tfa_keys.twig b/data/web/templates/tfa_keys.twig
index 4e341375..e73c8916 100644
--- a/data/web/templates/tfa_keys.twig
+++ b/data/web/templates/tfa_keys.twig
@@ -4,9 +4,9 @@
       <form style="display:inline;" method="post">
         <input type="hidden" name="unset_tfa_key" value="{{ key_info.id }}">
         <p>
-          <span style="padding:4px;margin:4px" class="badge fs-5 bg-keys label-{% if tfa_id == key_info.id %}success{% else %}default{% endif %}">
+          <span style="padding:4px;margin:4px" class="badge fs-6 bg-{% if tfa_id == key_info.id %}success{% else %}dark{% endif %}">
             {{ key_info.key_id }}
-            <a href="#" style="font-weight:bold;color:white" onClick='return confirm("{{ lang.admin.ays }}")?$(this).closest("form").submit():"";'>[{{ lang.admin.remove }}]</a>
+            <a href="#" class="btn p-0 text-white" style="font-size: 12px; line-height: 1rem;" onClick='return confirm("{{ lang.admin.ays }}")?$(this).closest("form").submit():"";'>[{{ lang.admin.remove }}]</a>
           </span>
         </p>
       </form>