diff --git a/.github/scripts/parse-webauthn-metadata.py b/.github/scripts/parse-webauthn-metadata.py
new file mode 100644
index 00000000000..4509ec46f7c
--- /dev/null
+++ b/.github/scripts/parse-webauthn-metadata.py
@@ -0,0 +1,144 @@
+#!/usr/bin/env python
+#
+# Parses the passkey authenticator AAGUID registry (combined_aaguid.json) and produces:
+#   1. keycloak-webauthn-metadata.json  — metadata consumed by the Keycloak server at runtime
+#   2. Passkey icon image files         — decoded from base64 data-URIs in the source
+#
+# The icon files are written to two directories so both the login theme and the
+# account console can reference them:
+#   - js/apps/account-ui/public/passkeys/
+#   - themes/src/main/resources/theme/base/login/resources/img/passkeys/
+#
+# See services/src/main/resources/README.md for full usage instructions.
+
+import base64
+import json
+import os
+import re
+import sys
+import unicodedata
+
+REPO_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", ".."))
+
+ICON_DEST_DIRS = [
+    os.path.join(REPO_ROOT, "js", "apps", "account-ui", "public", "passkeys"),
+    os.path.join(REPO_ROOT, "themes", "src", "main", "resources", "theme", "base", "login", "resources", "img", "passkeys"),
+]
+
+METADATA_DEST = os.path.join(REPO_ROOT, "services", "src", "main", "resources", "keycloak-webauthn-metadata.json")
+
+
+def normalize(input_str):
+    """Strip diacritics so authenticator names become safe ASCII filenames."""
+    nfkd_form = unicodedata.normalize('NFKD', input_str)
+    return u"".join([c for c in nfkd_form if not unicodedata.combining(c)])
+
+
+
+def write_file(name, data):
+    """Write binary data to every icon destination directory."""
+    if os.sep in name or name in ('.', '..') or '/' in name or not name:
+        print(f"Rejecting unsafe filename: '{name}'", file=sys.stderr)
+        return
+    for dest_dir in ICON_DEST_DIRS:
+        os.makedirs(dest_dir, exist_ok=True)
+        with open(os.path.join(dest_dir, name), "wb") as f:
+            f.write(data)
+
+
+def decode_base64(base64_str):
+    """Decode a base64 string with padding correction."""
+    base64_str += "=" * ((4 - len(base64_str) % 4) % 4)
+    return base64.b64decode(base64_str)
+
+
+def process_icon(icon_data_uri, short_name, flavor):
+    """Extract an image from a data-URI, write it to disk, and return the filename."""
+    if icon_data_uri is None:
+        return None
+
+    if icon_data_uri.startswith('data:image/svg+xml;base64,'):
+        base64_str = icon_data_uri[len('data:image/svg+xml;base64,'):]
+        name = short_name + "-" + flavor + ".svg"
+        write_file(name, decode_base64(base64_str))
+        return name
+    elif icon_data_uri.startswith('data:image/png;base64,'):
+        base64_str = icon_data_uri[len('data:image/png;base64,'):]
+        name = short_name + "-" + flavor + ".png"
+        write_file(name, decode_base64(base64_str))
+        return name
+    else:
+        print("Unknown data image format: " + icon_data_uri[:40], file=sys.stderr)
+        return None
+
+
+def parse_aaguids(input_file):
+    """
+    Read the given combined_aaguid.json file and produce
+    keycloak-webauthn-metadata.json plus decoded icon files.
+    """
+    names = set()
+    files = {}
+    output = {}
+
+    with open(input_file, 'r', encoding='utf-8') as f:
+        contents = json.load(f)
+
+    for aaguid, info in contents.items():
+        name = info.get('name')
+        if name is None:
+            continue
+
+        # Derive a short filesystem-safe name from the authenticator name
+        short_name = normalize(name)
+        short_name = re.split(r'[^0-9a-zA-Z_\-]', short_name)[0].lower()
+        if not short_name:
+            print(f"Skipping entry with no usable name: '{name}' (AAGUID: {aaguid})", file=sys.stderr)
+            continue
+
+        prefix = short_name
+        i = 0
+        while short_name in names:
+            i += 1
+            short_name = prefix + str(i)
+        names.add(short_name)
+
+        icon_light = info.get('icon_light')
+        icon_dark = info.get('icon_dark')
+
+        # Deduplicate identical icons across authenticators
+        if icon_light is not None and icon_light in files:
+            file_light = files[icon_light]
+        else:
+            file_light = process_icon(icon_light, short_name, 'light')
+            if icon_light is not None:
+                files[icon_light] = file_light
+
+        if icon_dark is not None and icon_dark in files:
+            file_dark = files[icon_dark]
+        else:
+            file_dark = process_icon(icon_dark, short_name, 'dark')
+            if icon_dark is not None:
+                files[icon_dark] = file_dark
+
+        entry = {"name": name}
+        if file_light is not None:
+            entry["icon_light"] = file_light
+        if file_dark is not None:
+            entry["icon_dark"] = file_dark
+
+        output[aaguid] = entry
+
+    with open(METADATA_DEST, 'w') as f:
+        json.dump(output, f, indent=2)
+        f.write('\n')
+
+    print(f"Wrote {len(output)} entries to {METADATA_DEST}")
+    print(f"Icons written to: {', '.join(ICON_DEST_DIRS)}")
+
+
+if __name__ == "__main__":
+    if len(sys.argv) != 2:
+        print(f"Usage: {sys.argv[0]} <combined_aaguid.json>", file=sys.stderr)
+        sys.exit(1)
+    parse_aaguids(sys.argv[1])
diff --git a/core/src/main/java/org/keycloak/representations/account/CredentialMetadataRepresentation.java b/core/src/main/java/org/keycloak/representations/account/CredentialMetadataRepresentation.java
index 3e81a3f7552..277eba2bdea 100644
--- a/core/src/main/java/org/keycloak/representations/account/CredentialMetadataRepresentation.java
+++ b/core/src/main/java/org/keycloak/representations/account/CredentialMetadataRepresentation.java
@@ -12,6 +12,8 @@ public class CredentialMetadataRepresentation {
     LocalizedMessage warningMessageDescription;
 
     private CredentialRepresentation credential;
+    private String iconLight;
+    private String iconDark;
 
 
     public CredentialRepresentation getCredential() {
@@ -53,4 +55,20 @@ public class CredentialMetadataRepresentation {
     public void setWarningMessageDescription(LocalizedMessage warningMessageDescription) {
         this.warningMessageDescription = warningMessageDescription;
     }
+
+    public String getIconLight() {
+        return iconLight;
+    }
+
+    public void setIconLight(String iconLight) {
+        this.iconLight = iconLight;
+    }
+
+    public String getIconDark() {
+        return iconDark;
+    }
+
+    public void setIconDark(String iconDark) {
+        this.iconDark = iconDark;
+    }
 }
diff --git a/docs/documentation/release_notes/topics/26_7_0.adoc b/docs/documentation/release_notes/topics/26_7_0.adoc
index e7e949407ee..823fb75c054 100644
--- a/docs/documentation/release_notes/topics/26_7_0.adoc
+++ b/docs/documentation/release_notes/topics/26_7_0.adoc
@@ -19,6 +19,14 @@ The `manage-realm` role continues to implicitly grant full organization manageme
 
 For per-organization granularity, organizations are now a first-class resource type in Fine-Grained Admin Permissions. Administrators can create permissions to control which specific organizations a delegated administrator can view or manage — for example, granting access to manage one organization without giving access to all organizations in the realm. When Fine-Grained Admin Permissions is enabled, organization member queries also respect user-level permissions, returning only members the administrator is permitted to view.
 
+== Passkey authenticator icons in login and account console
+
+The login page and account console now display vendor-specific icons for registered passkeys and security keys.
+When a user wants to authenticate with Passkeys, {project_name} shows the authenticator's icon alongside its label, making it easier to identify the correct device.
+
+As part of this change, the passkey authentication page in the login theme and the signing-in page in the account console were updated.
+If you use a custom theme that overrides these pages, verify that your customizations work as expected with this release.
+
 == Realm search now matches by display name
 
 When searching for realms in the admin console, the search now also matches against the realm's display name in addition to the realm name.
diff --git a/js/apps/account-ui/public/passkeys/1password-dark.svg b/js/apps/account-ui/public/passkeys/1password-dark.svg
new file mode 100644
index 00000000000..ff399889848
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/1password-dark.svg
@@ -0,0 +1,3 @@
+<svg width="240" height="240" viewBox="0 0 240 240" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M239.257 120.417C239.257 54.4193 185.755 0.916504 119.757 0.916504C53.7601 0.916504 0.257324 54.4193 0.257324 120.417C0.257324 186.417 53.7601 239.917 119.757 239.917C185.755 239.917 239.257 186.417 239.257 120.417ZM98.0069 54.0276C97.0674 55.8714 97.0674 58.2851 97.0674 63.1126V90.4729C97.0674 91.6788 97.0674 92.2817 97.2196 92.8392C97.3545 93.3331 97.5763 93.799 97.8746 94.215C98.2113 94.6847 98.6792 95.0648 99.6152 95.8251L106.536 101.447C107.664 102.364 108.228 102.822 108.433 103.374C108.613 103.857 108.613 104.39 108.433 104.873C108.228 105.425 107.664 105.883 106.536 106.8L99.6152 112.422C98.6793 113.182 98.2113 113.562 97.8746 114.032C97.5763 114.448 97.3545 114.914 97.2196 115.408C97.0674 115.965 97.0674 116.568 97.0674 117.774V177.719C97.0674 182.547 97.0674 184.961 98.0069 186.805C98.8333 188.426 100.152 189.745 101.774 190.571C103.618 191.511 106.031 191.511 110.859 191.511H128.656C133.483 191.511 135.897 191.511 137.741 190.571C139.363 189.745 140.681 188.426 141.508 186.805C142.447 184.961 142.447 182.547 142.447 177.719V150.359C142.447 149.153 142.447 148.55 142.295 147.993C142.16 147.499 141.938 147.033 141.64 146.617C141.303 146.147 140.835 145.767 139.899 145.007L132.978 139.385C131.85 138.468 131.286 138.01 131.082 137.459C130.902 136.975 130.902 136.443 131.082 135.959C131.286 135.407 131.85 134.949 132.978 134.033L139.899 128.41C140.835 127.65 141.303 127.27 141.64 126.8C141.938 126.384 142.16 125.918 142.295 125.424C142.447 124.867 142.447 124.264 142.447 123.058V63.1126C142.447 58.2851 142.447 55.8714 141.508 54.0276C140.681 52.4057 139.363 51.087 137.741 50.2606C135.897 49.3211 133.483 49.3211 128.656 49.3211H110.859C106.031 49.3211 103.618 49.3211 101.774 50.2606C100.152 51.087 98.8333 52.4057 98.0069 54.0276Z" fill="#FFFEFB"/>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/1password-light.svg b/js/apps/account-ui/public/passkeys/1password-light.svg
new file mode 100644
index 00000000000..dcd5b1ce0cf
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/1password-light.svg
@@ -0,0 +1,3 @@
+<svg width="240" height="240" viewBox="0 0 240 240" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M239.116 120.417C239.116 54.4193 185.613 0.916504 119.616 0.916504C53.619 0.916504 0.116211 54.4193 0.116211 120.417C0.116211 186.417 53.619 239.917 119.616 239.917C185.613 239.917 239.116 186.417 239.116 120.417ZM97.8658 54.0276C96.9263 55.8714 96.9263 58.2851 96.9263 63.1126V90.4729C96.9263 91.6788 96.9263 92.2817 97.0785 92.8392C97.2134 93.3331 97.4352 93.799 97.7335 94.215C98.0702 94.6847 98.5381 95.0648 99.4741 95.8251L106.395 101.447C107.523 102.364 108.087 102.822 108.292 103.374C108.471 103.857 108.471 104.39 108.292 104.873C108.087 105.425 107.523 105.883 106.395 106.8L99.4741 112.422C98.5382 113.182 98.0702 113.562 97.7335 114.032C97.4352 114.448 97.2134 114.914 97.0785 115.408C96.9263 115.965 96.9263 116.568 96.9263 117.774V177.719C96.9263 182.547 96.9263 184.961 97.8658 186.805C98.6922 188.426 100.011 189.745 101.633 190.571C103.477 191.511 105.89 191.511 110.718 191.511H128.515C133.342 191.511 135.756 191.511 137.6 190.571C139.221 189.745 140.54 188.426 141.367 186.805C142.306 184.961 142.306 182.547 142.306 177.719V150.359C142.306 149.153 142.306 148.55 142.154 147.993C142.019 147.499 141.797 147.033 141.499 146.617C141.162 146.147 140.694 145.767 139.758 145.007L132.837 139.385C131.709 138.468 131.145 138.01 130.94 137.459C130.761 136.975 130.761 136.443 130.94 135.959C131.145 135.407 131.709 134.949 132.837 134.033L139.758 128.41C140.694 127.65 141.162 127.27 141.499 126.8C141.797 126.384 142.019 125.918 142.154 125.424C142.306 124.867 142.306 124.264 142.306 123.058V63.1126C142.306 58.2851 142.306 55.8714 141.367 54.0276C140.54 52.4057 139.221 51.087 137.6 50.2606C135.756 49.3211 133.342 49.3211 128.515 49.3211H110.718C105.89 49.3211 103.477 49.3211 101.633 50.2606C100.011 51.087 98.6922 52.4057 97.8658 54.0276Z" fill="#1A285F"/>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/acs-light.png b/js/apps/account-ui/public/passkeys/acs-light.png
new file mode 100644
index 00000000000..711639ab70a
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/acs-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/aliasvault-light.svg b/js/apps/account-ui/public/passkeys/aliasvault-light.svg
new file mode 100644
index 00000000000..5876600fe70
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/aliasvault-light.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg enable-background="new 0 0 500 500" version="1.1" viewBox="0 0 500 500" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<path d="m459.87 294.95c0.016205 5.4005 0.03241 10.801-0.35022 16.873-1.111 6.3392-1.1941 12.173-2.6351 17.649-10.922 41.508-36.731 69.481-77.351 83.408-7.2157 2.4739-14.972 3.3702-22.479 4.995-23.629 0.042205-47.257 0.11453-70.886 0.12027-46.762 0.011322-93.523-0.01416-140.95-0.43411-8.59-2.0024-16.766-2.8352-24.398-5.3326-21.595-7.0666-39.523-19.656-53.708-37.552-10.227-12.903-17.579-27.17-21.28-43.221-1.475-6.3967-2.4711-12.904-3.6852-19.361-0.051849-5.747-0.1037-11.494 0.26915-17.886 4.159-42.973 27.68-71.638 63.562-92.153 0-0.70761-0.001961-1.6988 3.12e-4 -2.69 0.022484-9.8293-1.3071-19.894 0.35664-29.438 3.2391-18.579 11.08-35.272 23.763-49.773 12.098-13.832 26.457-23.989 43.609-30.029 7.813-2.7512 16.14-4.0417 24.234-5.9948 7.392-0.025734 14.784-0.05146 22.835 0.32253 4.1959 0.95392 7.7946 1.2538 11.258 2.1053 17.16 4.2192 32.287 12.176 45.469 24.104 2.2558 2.0411 4.372 6.6241 9.621 3.868 16.839-8.8419 34.718-11.597 53.603-8.594 16.791 2.6699 31.602 9.4308 44.236 20.636 11.531 10.227 19.84 22.841 25.393 37.236 6.3436 16.445 10.389 33.163 6.0798 49.389 7.9587 8.9321 15.807 16.704 22.421 25.414 9.162 12.065 15.33 25.746 18.144 40.776 0.97046 5.1848 1.9111 10.375 2.8654 15.563m-71.597 71.012c5.5615-5.2284 12.002-9.7986 16.508-15.817 10.474-13.992 14.333-29.916 11.288-47.446-2.2496-12.95-8.1973-24.076-17.243-33.063-12.746-12.663-28.865-18.614-46.786-18.569-69.912 0.17712-139.82 0.56831-209.74 0.96176-15.922 0.089599-29.168 7.4209-39.685 18.296-14.45 14.944-20.408 33.343-16.655 54.368 2.2763 12.754 8.2167 23.748 17.158 32.66 13.299 13.255 30.097 18.653 48.728 18.651 59.321-0.005188 118.64 0.042358 177.96-0.046601 9.5912-0.014374 19.181-0.86588 28.773-0.88855 10.649-0.025146 19.978-3.825 29.687-9.1074z" fill="#EEC170"/>
+<path d="m162.77 293c15.654 4.3883 20.627 22.967 10.304 34.98-5.3104 6.1795-14.817 8.3208-24.278 5.0472-7.0723-2.4471-12.332-10.362-12.876-17.933-1.0451-14.542 11.089-23.176 21.705-23.046 1.5794 0.019287 3.1517 0.61566 5.1461 0.95184z" fill="#EEC170"/>
+<path d="m227.18 293.64c7.8499 2.3973 11.938 8.2143 13.524 15.077 1.8591 8.0439-0.44817 15.706-7.1588 21.121-6.7633 5.4572-14.417 6.8794-22.578 3.1483-8.2972-3.7933-12.836-10.849-12.736-19.438 0.1687-14.497 14.13-25.368 28.948-19.908z" fill="#EEC170"/>
+<path d="m261.57 319.07c-2.495-14.418 4.6853-22.603 14.596-26.108 9.8945-3.4995 23.181 3.4303 26.267 13.779 4.6504 15.591-7.1651 29.064-21.665 28.161-8.5254-0.53088-17.202-6.5094-19.198-15.831z" fill="#EEC170"/>
+<path d="m336.91 333.41c-9.0175-4.2491-15.337-14.349-13.829-21.682 3.0825-14.989 13.341-20.304 23.018-19.585 10.653 0.79141 17.93 7.407 19.765 17.547 1.9588 10.824-4.1171 19.939-13.494 23.703-5.272 2.1162-10.091 1.5086-15.46 0.017883z" fill="#EEC170"/>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/allthenticator-light.png b/js/apps/account-ui/public/passkeys/allthenticator-light.png
new file mode 100644
index 00000000000..119ec6cb69e
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/allthenticator-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/android-light.png b/js/apps/account-ui/public/passkeys/android-light.png
new file mode 100644
index 00000000000..d220a9c769e
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/android-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/apple-light.svg b/js/apps/account-ui/public/passkeys/apple-light.svg
new file mode 100644
index 00000000000..bd1715076d6
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/apple-light.svg
@@ -0,0 +1,38 @@
+<svg viewBox="0 0 322 322" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2">
+    <path d="M321.347 72.106C321.347 32.31 289.037 0 249.241 0H72.106C32.31 0 0 32.31 0 72.106v177.135c0 39.796 32.31 72.106 72.106 72.106h177.135c39.796 0 72.106-32.31 72.106-72.106V72.106Z" style="fill:#fff"/>
+    <path d="M126.106 266.574c.775.965.309 2.517.017 2.43l-7.773 7.741c-1.686 1.206-3.365 1.132-5.009.135l-18.424-19.268c-.452-.649-.762-1.328-.833-2.058v-94.735c-22.821-8.67-39.057-30.754-39.057-56.6 0-33.006 26.478-59.876 59.333-60.511-18.551 13.563-30.61 35.488-30.61 60.208 0 28.109 15.593 52.604 38.593 65.301v87.841h.006c-.004.137-.006.275-.006.413 0 3.551 1.699 6.535 3.763 9.103Z" style="fill:#ebebeb"/>
+    <clipPath id="a">
+        <path d="M126.106 266.574c.775.965.309 2.517.017 2.43l-7.773 7.741c-1.686 1.206-3.365 1.132-5.009.135l-18.424-19.268c-.452-.649-.762-1.328-.833-2.058v-94.735c-22.821-8.67-39.057-30.754-39.057-56.6 0-33.006 26.478-59.876 59.333-60.511-18.551 13.563-30.61 35.488-30.61 60.208 0 28.109 15.593 52.604 38.593 65.301v87.841h.006c-.004.137-.006.275-.006.413 0 3.551 1.699 6.535 3.763 9.103Z"/>
+    </clipPath>
+    <g clip-path="url(#a)">
+        <path d="M126.531 277.545V43.603H55.027v233.942h71.504Z" style="fill:url(#b)"/>
+    </g>
+    <path d="M167.618 266.574c.775.965.309 2.517.017 2.43l-7.773 7.741c-1.686 1.206-3.365 1.132-5.009.135l-18.424-19.268c-.452-.649-.762-1.328-.833-2.058v-94.735c-22.82-8.67-39.056-30.754-39.056-56.6 0-33.006 26.477-59.876 59.333-60.511-18.552 13.563-30.611 35.488-30.611 60.208 0 28.109 15.593 52.604 38.593 65.301v87.841h.007c-.005.137-.007.275-.007.413 0 3.551 1.699 6.535 3.763 9.103Z" style="fill:#ebebeb"/>
+    <clipPath id="c">
+        <path d="M167.618 266.574c.775.965.309 2.517.017 2.43l-7.773 7.741c-1.686 1.206-3.365 1.132-5.009.135l-18.424-19.268c-.452-.649-.762-1.328-.833-2.058v-94.735c-22.82-8.67-39.056-30.754-39.056-56.6 0-33.006 26.477-59.876 59.333-60.511-18.552 13.563-30.611 35.488-30.611 60.208 0 28.109 15.593 52.604 38.593 65.301v87.841h.007c-.005.137-.007.275-.007.413 0 3.551 1.699 6.535 3.763 9.103Z"/>
+    </clipPath>
+    <g clip-path="url(#c)">
+        <path d="M168.043 277.545V43.603H96.54v233.942h71.503Z" style="fill:url(#d)"/>
+    </g>
+    <path d="M177.014 160.725c-22.82-8.67-39.056-30.753-39.056-56.599 0-33.404 27.119-60.523 60.523-60.523 33.403 0 60.523 27.119 60.523 60.523 0 28.22-19.357 51.956-45.506 58.642l26.358 26.862c.994 1.581.943 3.037-.059 4.377l-25.881 26.464 18.777 18.979c1.571 2.132 1.323 4.182-.256 6.171l-31.157 31.03c-1.686 1.207-3.364 1.133-5.008.135l-18.424-19.268c-.453-.648-.763-1.327-.834-2.057v-94.736Zm21.662-93.481c8.924 0 16.169 7.245 16.169 16.169s-7.245 16.169-16.169 16.169-16.169-7.245-16.169-16.169 7.245-16.169 16.169-16.169Z" style="fill:none"/>
+    <clipPath id="e">
+        <path d="M177.014 160.725c-22.82-8.67-39.056-30.753-39.056-56.599 0-33.404 27.119-60.523 60.523-60.523 33.403 0 60.523 27.119 60.523 60.523 0 28.22-19.357 51.956-45.506 58.642l26.358 26.862c.994 1.581.943 3.037-.059 4.377l-25.881 26.464 18.777 18.979c1.571 2.132 1.323 4.182-.256 6.171l-31.157 31.03c-1.686 1.207-3.364 1.133-5.008.135l-18.424-19.268c-.453-.648-.763-1.327-.834-2.057v-94.736Zm21.662-93.481c8.924 0 16.169 7.245 16.169 16.169s-7.245 16.169-16.169 16.169-16.169-7.245-16.169-16.169 7.245-16.169 16.169-16.169Z"/>
+    </clipPath>
+    <g clip-path="url(#e)">
+        <path d="M259.004 277.545V43.603H137.958v233.942h121.046Z" style="fill:url(#f)"/>
+    </g>
+    <defs>
+        <linearGradient id="b" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 233.943 -71.5033 0 90.78 43.603)">
+            <stop offset="0" style="stop-color:#ffdd53;stop-opacity:1"/>
+            <stop offset="1" style="stop-color:#ffbf01;stop-opacity:1"/>
+        </linearGradient>
+        <linearGradient id="d" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 233.943 -71.5033 0 132.291 43.603)">
+            <stop offset="0" style="stop-color:#51e376;stop-opacity:1"/>
+            <stop offset="1" style="stop-color:#34c759;stop-opacity:1"/>
+        </linearGradient>
+        <linearGradient id="f" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 233.943 -121.046 0 198.481 43.603)">
+            <stop offset="0" style="stop-color:#62ccf8;stop-opacity:1"/>
+            <stop offset="1" style="stop-color:#0079ff;stop-opacity:1"/>
+        </linearGradient>
+    </defs>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/arculus-light.png b/js/apps/account-ui/public/passkeys/arculus-light.png
new file mode 100644
index 00000000000..352c8fa5188
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/arculus-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/atkey-light.png b/js/apps/account-ui/public/passkeys/atkey-light.png
new file mode 100644
index 00000000000..8e49f89bd8a
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/atkey-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/atkey1-light.png b/js/apps/account-ui/public/passkeys/atkey1-light.png
new file mode 100644
index 00000000000..e8999b259cd
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/atkey1-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/atkey2-light.png b/js/apps/account-ui/public/passkeys/atkey2-light.png
new file mode 100644
index 00000000000..e8999b259cd
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/atkey2-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/atkey4-light.png b/js/apps/account-ui/public/passkeys/atkey4-light.png
new file mode 100644
index 00000000000..13666ed7013
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/atkey4-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/atlkey-light.png b/js/apps/account-ui/public/passkeys/atlkey-light.png
new file mode 100644
index 00000000000..bfd6f75d1ec
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/atlkey-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/atos-light.png b/js/apps/account-ui/public/passkeys/atos-light.png
new file mode 100644
index 00000000000..ce465847683
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/atos-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/authenton1-light.png b/js/apps/account-ui/public/passkeys/authenton1-light.png
new file mode 100644
index 00000000000..99362a70a7c
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/authenton1-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/bitwarden-light.svg b/js/apps/account-ui/public/passkeys/bitwarden-light.svg
new file mode 100644
index 00000000000..761c97ab74f
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/bitwarden-light.svg
@@ -0,0 +1,11 @@
+<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_68_61)">
+<path d="M300 253.125C300 279.023 279.023 300 253.125 300H46.875C20.9766 300 0 279.023 0 253.125V46.875C0 20.9766 20.9766 0 46.875 0H253.125C279.023 0 300 20.9766 300 46.875V253.125Z" fill="#175DDC"/>
+<path d="M243.105 37.6758C241.201 35.7715 238.945 34.834 236.367 34.834H63.6328C61.0254 34.834 58.7988 35.7715 56.8945 37.6758C54.9902 39.5801 54.0527 41.8359 54.0527 44.4141V159.58C54.0527 168.164 55.7227 176.689 59.0625 185.156C62.4023 193.594 66.5625 201.094 71.5137 207.656C76.4648 214.189 82.3535 220.576 89.209 226.787C96.0645 232.998 102.393 238.125 108.164 242.227C113.965 246.328 120 250.195 126.299 253.857C132.598 257.52 137.08 259.98 139.717 261.27C142.354 262.559 144.492 263.584 146.074 264.258C147.275 264.844 148.564 265.166 149.971 265.166C151.377 265.166 152.666 264.873 153.867 264.258C155.479 263.555 157.588 262.559 160.254 261.27C162.891 259.98 167.373 257.49 173.672 253.857C179.971 250.195 186.006 246.328 191.807 242.227C197.607 238.125 203.936 232.969 210.791 226.787C217.646 220.576 223.535 214.219 228.486 207.656C233.438 201.094 237.568 193.623 240.938 185.156C244.277 176.719 245.947 168.193 245.947 159.58V44.4434C245.977 41.8359 245.01 39.5801 243.105 37.6758ZM220.84 160.664C220.84 202.354 150 238.271 150 238.271V59.502H220.84C220.84 59.502 220.84 118.975 220.84 160.664Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_68_61">
+<rect width="300" height="300" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/burp-light.svg b/js/apps/account-ui/public/passkeys/burp-light.svg
new file mode 100644
index 00000000000..2460a71db34
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/burp-light.svg
@@ -0,0 +1,4 @@
+<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <rect x="0.5" y="0.5" width="14" height="14" rx="2.10106" fill="#FF6633"/>
+    <path d="M8.01028 12.5H6.98972V10.9057L8.36534 9.1189H6.98972V6.95141H4.5L6.98972 3.71585V2.5H8.01028V4.09427L6.63678 5.8811H8.01028V8.04859H10.5L8.01028 11.2841V12.5Z" fill="white"/>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/cardos-light.png b/js/apps/account-ui/public/passkeys/cardos-light.png
new file mode 100644
index 00000000000..a8b2aec8244
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/cardos-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/chipwon-light.png b/js/apps/account-ui/public/passkeys/chipwon-light.png
new file mode 100644
index 00000000000..3a8d1eabef3
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/chipwon-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/chrome-light.svg b/js/apps/account-ui/public/passkeys/chrome-light.svg
new file mode 100644
index 00000000000..2a61bf86971
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/chrome-light.svg
@@ -0,0 +1,25 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48">
+  <defs>
+    <linearGradient id="a" x1="3.2173" y1="15" x2="44.7812" y2="15" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#d93025"/>
+      <stop offset="1" stop-color="#ea4335"/>
+    </linearGradient>
+    <linearGradient id="b" x1="20.7219" y1="47.6791" x2="41.5039" y2="11.6837" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#fcc934"/>
+      <stop offset="1" stop-color="#fbbc04"/>
+    </linearGradient>
+    <linearGradient id="c" x1="26.5981" y1="46.5015" x2="5.8161" y2="10.506" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#1e8e3e"/>
+      <stop offset="1" stop-color="#34a853"/>
+    </linearGradient>
+    
+    <path id="p" d="M13.6086 30.0031 3.218 12.006A23.994 23.994 0 0 0 24.0025 48l10.3906-17.9971-.0067-.0068a11.9852 11.9852 0 0 1-20.7778.007Z"/>
+  </defs>
+  
+  <use xlink:href="#p" fill="url(#a)" transform="rotate(120 24 24)"/>
+  <use xlink:href="#p" fill="url(#b)" transform="rotate(-120 24 24)"/>
+  <use xlink:href="#p" fill="url(#c)"/>
+  
+  <circle cx="24" cy="24" r="12" style="fill:#fff"/>
+  <circle cx="24" cy="24" r="9.5" style="fill:#1a73e8"/>
+</svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/chunghwa-light.png b/js/apps/account-ui/public/passkeys/chunghwa-light.png
new file mode 100644
index 00000000000..9de4b8b7283
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/chunghwa-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/crayonic-light.png b/js/apps/account-ui/public/passkeys/crayonic-light.png
new file mode 100644
index 00000000000..f7510ba5069
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/crayonic-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/cryptnox-light.png b/js/apps/account-ui/public/passkeys/cryptnox-light.png
new file mode 100644
index 00000000000..a6df0316c5e
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/cryptnox-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/dapple-light.png b/js/apps/account-ui/public/passkeys/dapple-light.png
new file mode 100644
index 00000000000..e9ca8f26082
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/dapple-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/dashlane-dark.svg b/js/apps/account-ui/public/passkeys/dashlane-dark.svg
new file mode 100644
index 00000000000..f23ec9e3f26
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/dashlane-dark.svg
@@ -0,0 +1,8 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M257.474 359.209C257.474 356.189 254.454 353.169 250.215 351.959L199.411 333.231C190.895 329.601 181.264 333.831 181.264 339.89V475.779C181.264 478.809 184.283 482.438 187.303 483.648L239.326 502.376C247.195 505.396 257.474 501.166 257.474 494.508V359.209Z" fill="white"/>
+<path d="M352.736 321.104C352.736 318.084 349.717 315.064 345.477 313.854L294.674 295.126C286.157 291.496 276.526 295.726 276.526 301.785V437.674C276.526 440.704 279.546 444.333 282.566 445.543L334.589 464.271C342.458 467.291 352.736 463.061 352.736 456.403V321.104Z" fill="white"/>
+<path d="M257.474 35.3211C257.474 32.3013 254.454 29.2815 250.215 28.0717L199.411 9.34343C190.895 5.71399 181.264 9.94358 181.264 16.0022V151.892C181.264 154.921 184.283 158.551 187.303 159.76L239.326 178.489C247.195 181.509 257.474 177.279 257.474 170.62V35.3211Z" fill="white"/>
+<path d="M352.736 92.4777C352.736 89.4579 349.717 86.4382 345.477 85.2283L294.674 66.5C286.157 62.8706 276.526 67.1002 276.526 73.1588V209.048C276.526 212.078 279.546 215.707 282.566 216.917L334.589 235.645C342.458 238.665 352.736 234.436 352.736 227.777V92.4777Z" fill="white"/>
+<path d="M448 168.687C448 165.667 444.98 162.647 440.741 161.437L389.937 142.709C381.421 139.079 371.79 143.309 371.79 149.368V361.466C371.79 364.495 374.81 368.125 377.829 369.335L429.852 388.063C437.721 391.083 448 386.853 448 380.194V168.687Z" fill="white"/>
+<path d="M162.21 35.3306C162.21 32.3108 159.19 29.2815 154.951 28.0717L104.148 9.34343C95.6787 5.71399 86 9.94358 86 16.0022V475.789C86 478.808 89.0198 482.438 92.0492 483.648L144.063 502.376C151.931 505.396 162.21 501.166 162.21 494.507V35.3306Z" fill="white"/>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/dashlane-light.svg b/js/apps/account-ui/public/passkeys/dashlane-light.svg
new file mode 100644
index 00000000000..49f658ffde4
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/dashlane-light.svg
@@ -0,0 +1,8 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M257.474 359.209C257.474 356.189 254.454 353.169 250.215 351.959L199.411 333.231C190.895 329.601 181.264 333.831 181.264 339.89V475.779C181.264 478.809 184.283 482.438 187.303 483.648L239.326 502.376C247.195 505.396 257.474 501.166 257.474 494.508V359.209Z" fill="#09363F"/>
+<path d="M352.736 321.103C352.736 318.084 349.717 315.064 345.477 313.854L294.674 295.126C286.157 291.496 276.526 295.726 276.526 301.785V437.674C276.526 440.704 279.546 444.333 282.566 445.543L334.589 464.271C342.458 467.291 352.736 463.061 352.736 456.403V321.103Z" fill="#09363F"/>
+<path d="M257.474 35.3211C257.474 32.3013 254.454 29.2815 250.215 28.0717L199.411 9.34343C190.895 5.71399 181.264 9.94358 181.264 16.0022V151.892C181.264 154.921 184.283 158.551 187.303 159.76L239.326 178.489C247.195 181.508 257.474 177.279 257.474 170.62V35.3211Z" fill="#09363F"/>
+<path d="M352.736 92.4777C352.736 89.4579 349.717 86.4382 345.477 85.2283L294.674 66.5C286.157 62.8706 276.526 67.1002 276.526 73.1588V209.048C276.526 212.078 279.546 215.707 282.566 216.917L334.589 235.645C342.458 238.665 352.736 234.436 352.736 227.777V92.4777Z" fill="#09363F"/>
+<path d="M448 168.687C448 165.667 444.98 162.647 440.741 161.437L389.937 142.709C381.421 139.079 371.79 143.309 371.79 149.368V361.466C371.79 364.495 374.81 368.125 377.829 369.335L429.852 388.063C437.721 391.083 448 386.853 448 380.194V168.687Z" fill="#09363F"/>
+<path d="M162.21 35.3306C162.21 32.3108 159.19 29.2815 154.951 28.0717L104.148 9.34343C95.6787 5.71399 86 9.94358 86 16.0022V475.789C86 478.808 89.0198 482.438 92.0492 483.648L144.063 502.376C151.931 505.396 162.21 501.166 162.21 494.507V35.3306Z" fill="#09363F"/>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/deepnet-light.png b/js/apps/account-ui/public/passkeys/deepnet-light.png
new file mode 100644
index 00000000000..ddc8ef8226a
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/deepnet-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/devolutions-light.svg b/js/apps/account-ui/public/passkeys/devolutions-light.svg
new file mode 100644
index 00000000000..0ea7851ca1f
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/devolutions-light.svg
@@ -0,0 +1,23 @@
+
+<svg xmlns="http://www.w3.org/2000/svg" width="72px" height="72px" viewBox="0 0 72 72">	<defs>
+        <filter id="a" width="200%" height="200%">
+            <feOffset result="offOut" in="SourceAlpha" dy="2.2"/>
+            <feGaussianBlur result="blurOut" in="offOut" stdDeviation="1.5"/>
+            <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.4 0"/>
+            <feMerge>
+                <feMergeNode/>
+                <feMergeNode in="SourceGraphic"/>
+            </feMerge>
+        </filter>
+    </defs>
+<path fill="#ffffff" filter="url(#a)" d="M31.059,5.395c16.89-2.727,32.817,8.772,35.545,25.662c2.727,16.89-8.772,32.817-25.662,35.545
+	C24.051,69.329,8.124,57.83,5.397,40.94C2.67,24.049,14.169,8.122,31.059,5.395z"/>
+<path fill="#0068c3" d="M55.364,17.202c-5.047-5.197-11.802-8.109-19.02-8.2c-7.191-0.09-13.985,2.669-19.149,7.768
+	C11.91,21.989,9,28.955,9,36.392l0.044,1.26c0,1.181,0.961,2.142,2.142,2.142s2.141-0.96,2.142-2.14l0.01-0.913
+	c0-9.945,8.453-20.593,21.035-20.593c13.132,0,21.261,10.712,21.261,20.637c0,5.173-2.063,9.919-5.808,13.363
+	C46.17,53.509,41.26,55.36,36,55.36c-3.13,0-6.219-0.755-8.958-2.186l18.87-8.686c1.267-0.583,2.115-1.81,2.213-3.201
+	s-0.569-2.725-1.754-3.487l-15.706-8.415c-0.554-0.357-1.213-0.477-1.858-0.337c-0.644,0.139-1.195,0.521-1.552,1.075
+	c-0.737,1.144-0.406,2.673,0.721,3.397l8.454,6.923l-18.419,8.478c-1.427,0.657-2.298,2.1-2.218,3.675
+	c0.048,0.949,0.493,1.884,1.253,2.634C22.158,60.269,28.84,63,35.985,63c0.445,0,0.892-0.011,1.341-0.032
+	c14.156-0.673,25.432-12.315,25.671-26.505C63.118,29.236,60.407,22.396,55.364,17.202z"/>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/edge-light.svg b/js/apps/account-ui/public/passkeys/edge-light.svg
new file mode 100644
index 00000000000..3e7e9eeac16
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/edge-light.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 256 256"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{opacity:0.35;fill:url(#radial-gradient);}.cls-2,.cls-4{isolation:isolate;}.cls-3{fill:url(#linear-gradient-2);}.cls-4{opacity:0.41;fill:url(#radial-gradient-2);}.cls-5{fill:url(#radial-gradient-3);}.cls-6{fill:url(#radial-gradient-4);}</style><linearGradient id="linear-gradient" x1="63.33" y1="84.03" x2="241.67" y2="84.03" gradientTransform="matrix(1, 0, 0, -1, 0, 266)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0c59a4"/><stop offset="1" stop-color="#114a8b"/></linearGradient><radialGradient id="radial-gradient" cx="161.83" cy="68.91" r="95.38" gradientTransform="matrix(1, 0, 0, -0.95, 0, 248.84)" gradientUnits="userSpaceOnUse"><stop offset="0.72" stop-opacity="0"/><stop offset="0.95" stop-opacity="0.53"/><stop offset="1"/></radialGradient><linearGradient id="linear-gradient-2" x1="157.35" y1="161.39" x2="45.96" y2="40.06" gradientTransform="matrix(1, 0, 0, -1, 0, 266)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1b9de2"/><stop offset="0.16" stop-color="#1595df"/><stop offset="0.67" stop-color="#0680d7"/><stop offset="1" stop-color="#0078d4"/></linearGradient><radialGradient id="radial-gradient-2" cx="-340.29" cy="62.99" r="143.24" gradientTransform="matrix(0.15, -0.99, -0.8, -0.12, 176.64, -125.4)" gradientUnits="userSpaceOnUse"><stop offset="0.76" stop-opacity="0"/><stop offset="0.95" stop-opacity="0.5"/><stop offset="1"/></radialGradient><radialGradient id="radial-gradient-3" cx="113.37" cy="570.21" r="202.43" gradientTransform="matrix(-0.04, 1, 2.13, 0.08, -1179.54, -106.69)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#35c1f1"/><stop offset="0.11" stop-color="#34c1ed"/><stop offset="0.23" stop-color="#2fc2df"/><stop offset="0.31" stop-color="#2bc3d2"/><stop offset="0.67" stop-color="#36c752"/></radialGradient><radialGradient id="radial-gradient-4" cx="376.52" cy="567.97" r="97.34" gradientTransform="matrix(0.28, 0.96, 0.78, -0.23, -303.76, -148.5)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#66eb6e"/><stop offset="1" stop-color="#66eb6e" stop-opacity="0"/></radialGradient></defs><title>Edge_Logo_265x265</title><path class="cls-1" d="M235.68,195.46a93.73,93.73,0,0,1-10.54,4.71,101.87,101.87,0,0,1-35.9,6.46c-47.32,0-88.54-32.55-88.54-74.32A31.48,31.48,0,0,1,117.13,105c-42.8,1.8-53.8,46.4-53.8,72.53,0,73.88,68.09,81.37,82.76,81.37,7.91,0,19.84-2.3,27-4.56l1.31-.44A128.34,128.34,0,0,0,241,201.1,4,4,0,0,0,235.68,195.46Z" transform="translate(-4.63 -4.92)"/><path class="cls-2" d="M235.68,195.46a93.73,93.73,0,0,1-10.54,4.71,101.87,101.87,0,0,1-35.9,6.46c-47.32,0-88.54-32.55-88.54-74.32A31.48,31.48,0,0,1,117.13,105c-42.8,1.8-53.8,46.4-53.8,72.53,0,73.88,68.09,81.37,82.76,81.37,7.91,0,19.84-2.3,27-4.56l1.31-.44A128.34,128.34,0,0,0,241,201.1,4,4,0,0,0,235.68,195.46Z" transform="translate(-4.63 -4.92)"/><path class="cls-3" d="M110.34,246.34A79.2,79.2,0,0,1,87.6,225,80.72,80.72,0,0,1,117.13,105c3.12-1.47,8.45-4.13,15.54-4a32.35,32.35,0,0,1,25.69,13,31.88,31.88,0,0,1,6.36,18.66c0-.21,24.46-79.6-80-79.6-43.9,0-80,41.66-80,78.21a130.15,130.15,0,0,0,12.11,56,128,128,0,0,0,156.38,67.11,75.55,75.55,0,0,1-62.78-8Z" transform="translate(-4.63 -4.92)"/><path class="cls-4" d="M110.34,246.34A79.2,79.2,0,0,1,87.6,225,80.72,80.72,0,0,1,117.13,105c3.12-1.47,8.45-4.13,15.54-4a32.35,32.35,0,0,1,25.69,13,31.88,31.88,0,0,1,6.36,18.66c0-.21,24.46-79.6-80-79.6-43.9,0-80,41.66-80,78.21a130.15,130.15,0,0,0,12.11,56,128,128,0,0,0,156.38,67.11,75.55,75.55,0,0,1-62.78-8Z" transform="translate(-4.63 -4.92)"/><path class="cls-5" d="M156.94,153.78c-.81,1.05-3.3,2.5-3.3,5.66,0,2.61,1.7,5.12,4.72,7.23,14.38,10,41.49,8.68,41.56,8.68A59.56,59.56,0,0,0,230.19,167a61.38,61.38,0,0,0,30.43-52.88c.26-22.41-8-37.31-11.34-43.91C228.09,28.76,182.35,4.92,132.61,4.92a128,128,0,0,0-128,126.2c.48-36.54,36.8-66.05,80-66.05,3.5,0,23.46.34,42,10.07,16.34,8.58,24.9,18.94,30.85,29.21,6.18,10.67,7.28,24.15,7.28,29.52S162,147.2,156.94,153.78Z" transform="translate(-4.63 -4.92)"/><path class="cls-6" d="M156.94,153.78c-.81,1.05-3.3,2.5-3.3,5.66,0,2.61,1.7,5.12,4.72,7.23,14.38,10,41.49,8.68,41.56,8.68A59.56,59.56,0,0,0,230.19,167a61.38,61.38,0,0,0,30.43-52.88c.26-22.41-8-37.31-11.34-43.91C228.09,28.76,182.35,4.92,132.61,4.92a128,128,0,0,0-128,126.2c.48-36.54,36.8-66.05,80-66.05,3.5,0,23.46.34,42,10.07,16.34,8.58,24.9,18.94,30.85,29.21,6.18,10.67,7.28,24.15,7.28,29.52S162,147.2,156.94,153.78Z" transform="translate(-4.63 -4.92)"/></svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/egomet-light.png b/js/apps/account-ui/public/passkeys/egomet-light.png
new file mode 100644
index 00000000000..f630703b671
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/egomet-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/ellipticsecure-light.png b/js/apps/account-ui/public/passkeys/ellipticsecure-light.png
new file mode 100644
index 00000000000..daf9931998a
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/ellipticsecure-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/enpass-dark.svg b/js/apps/account-ui/public/passkeys/enpass-dark.svg
new file mode 100644
index 00000000000..8cf8e7f3123
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/enpass-dark.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M256.483 28.0554C313.899 28.0554 371.315 27.8856 428.745 28.1405C440.68 27.9076 452.521 30.2889 463.441 35.1179C474.362 39.9469 484.099 47.1073 491.971 56.0984C504.062 69.6962 511.132 87.0387 512 105.23C512.028 121.933 510.035 138.578 506.063 154.801C498.444 198.706 490.515 242.527 482.726 286.376C476.012 324.134 469.581 361.95 462.513 399.68C457.672 420.969 446.545 440.303 430.58 455.165C414.616 470.027 394.555 479.727 373.011 483.002C367.752 483.629 362.462 483.946 357.166 483.95C290.053 484.017 222.94 484.017 155.828 483.95C130.466 483.9 105.93 474.915 86.5132 458.566C67.0965 442.218 54.0362 419.548 49.618 394.525C36.1804 319.177 22.6297 243.853 8.96597 168.553C6.28034 153.639 3.312 138.811 1.2059 123.784C-2.46105 102.729 2.31093 81.0744 14.4852 63.5244C26.6596 45.9745 45.2529 33.9462 66.2266 30.0525C73.0557 28.7451 79.9959 28.1094 86.9484 28.1546C143.46 27.9941 199.971 27.961 256.483 28.0554ZM210.926 339.643C210.926 354.67 210.926 369.697 210.926 384.738C210.773 388.205 211.343 391.665 212.597 394.899C213.852 398.134 215.764 401.071 218.213 403.525C220.662 405.979 223.593 407.895 226.821 409.152C230.049 410.409 233.503 410.979 236.962 410.826C249.387 410.826 261.812 410.826 274.236 410.826C277.922 411.183 281.642 410.717 285.127 409.462C288.612 408.208 291.777 406.196 294.394 403.57C297.012 400.945 299.017 397.772 300.265 394.278C301.514 390.785 301.975 387.058 301.615 383.364C301.615 353.919 301.616 324.46 301.474 295.015C301.311 293.331 301.67 291.637 302.502 290.165C303.334 288.692 304.599 287.512 306.125 286.786C323.79 276.298 337.551 260.314 345.313 241.266C353.075 222.219 354.413 201.151 349.123 181.272C342.356 156.853 326.286 136.075 304.376 123.414C282.466 110.754 256.469 107.225 231.987 113.586C217.669 116.544 204.289 122.959 193.007 132.274C181.726 141.588 172.884 153.522 167.249 167.038C159.027 188.686 158.548 212.521 165.893 234.484C173.238 256.447 187.954 275.181 207.533 287.495C208.67 288.038 209.613 288.917 210.237 290.013C210.861 291.109 211.136 292.37 211.025 293.627C210.841 309.008 210.926 324.333 210.926 339.671V339.643Z" fill="white"/>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/enpass-light.svg b/js/apps/account-ui/public/passkeys/enpass-light.svg
new file mode 100644
index 00000000000..a69a66c8a0e
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/enpass-light.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M256.483 28.0554C313.899 28.0554 371.315 27.8856 428.745 28.1405C440.68 27.9076 452.521 30.2889 463.441 35.1179C474.362 39.9469 484.099 47.1073 491.971 56.0984C504.062 69.6962 511.132 87.0387 512 105.23C512.028 121.933 510.035 138.578 506.063 154.801C498.444 198.706 490.515 242.527 482.726 286.376C476.012 324.134 469.581 361.95 462.513 399.68C457.672 420.969 446.545 440.303 430.58 455.165C414.616 470.027 394.555 479.727 373.011 483.002C367.752 483.629 362.462 483.946 357.166 483.95C290.053 484.017 222.94 484.017 155.828 483.95C130.466 483.9 105.93 474.915 86.5132 458.566C67.0965 442.218 54.0362 419.548 49.618 394.525C36.1804 319.177 22.6297 243.853 8.96597 168.553C6.28034 153.639 3.312 138.811 1.2059 123.784C-2.46105 102.729 2.31093 81.0744 14.4852 63.5244C26.6596 45.9745 45.2529 33.9462 66.2266 30.0525C73.0557 28.7451 79.9959 28.1094 86.9484 28.1546C143.46 27.9941 199.971 27.961 256.483 28.0554ZM210.926 339.643C210.926 354.67 210.926 369.697 210.926 384.738C210.773 388.205 211.343 391.665 212.597 394.899C213.852 398.134 215.764 401.071 218.213 403.525C220.662 405.979 223.593 407.895 226.821 409.152C230.049 410.409 233.503 410.979 236.962 410.826C249.387 410.826 261.812 410.826 274.236 410.826C277.922 411.183 281.642 410.717 285.127 409.462C288.612 408.208 291.777 406.196 294.394 403.57C297.012 400.945 299.017 397.772 300.265 394.278C301.514 390.785 301.975 387.058 301.615 383.364C301.615 353.919 301.616 324.46 301.474 295.015C301.311 293.331 301.67 291.637 302.502 290.165C303.334 288.692 304.599 287.512 306.125 286.786C323.79 276.298 337.551 260.314 345.313 241.266C353.075 222.219 354.413 201.151 349.123 181.272C342.356 156.853 326.286 136.075 304.376 123.414C282.466 110.754 256.469 107.225 231.987 113.586C217.669 116.544 204.289 122.959 193.007 132.274C181.726 141.588 172.884 153.522 167.249 167.038C159.027 188.686 158.548 212.521 165.893 234.484C173.238 256.447 187.954 275.181 207.533 287.495C208.67 288.038 209.613 288.917 210.237 290.013C210.861 291.109 211.136 292.37 211.025 293.627C210.841 309.008 210.926 324.333 210.926 339.671V339.643Z" fill="#0D338F"/>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/ensurity-light.png b/js/apps/account-ui/public/passkeys/ensurity-light.png
new file mode 100644
index 00000000000..01189dfb2cc
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/ensurity-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/ensurity1-light.png b/js/apps/account-ui/public/passkeys/ensurity1-light.png
new file mode 100644
index 00000000000..b9aae557d8a
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/ensurity1-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/ensurity2-light.png b/js/apps/account-ui/public/passkeys/ensurity2-light.png
new file mode 100644
index 00000000000..2b5f482e132
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/ensurity2-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/ensurity3-light.png b/js/apps/account-ui/public/passkeys/ensurity3-light.png
new file mode 100644
index 00000000000..22223df9bd9
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/ensurity3-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/enterprise-light.svg b/js/apps/account-ui/public/passkeys/enterprise-light.svg
new file mode 100644
index 00000000000..b9716d72a3b
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/enterprise-light.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" width="1000pt" height="1000pt" viewBox="0 0 1000 1000" version="1.2" baseProfile="tiny-ps"><title>YubiKey</title><defs id="defs1"></defs><desc id="logo-desc-v2">YubiKey</desc><g id="#76b93dff"><path fill="#76B93D" d=" M 491.78 0.00 L 511.37 0.00 C 574.24 1.38 636.67 15.16 694.57 39.58 C 717.73 50.60 741.13 61.38 762.77 75.25 C 779.69 84.71 794.83 96.89 809.98 108.88 C 825.12 120.25 839.38 132.80 852.61 146.36 C 856.92 150.72 860.78 155.50 865.23 159.73 C 879.49 173.96 892.14 189.73 903.77 206.16 C 910.61 216.29 918.36 225.81 924.67 236.30 C 934.75 252.39 943.29 269.37 951.53 286.45 C 979.45 343.28 995.28 405.80 999.29 468.92 C 999.90 481.28 1000.86 493.63 1000.62 506.02 C 999.92 530.28 998.27 554.55 994.28 578.51 C 990.71 600.50 985.66 622.25 979.40 643.62 C 974.54 659.88 969.46 676.12 962.49 691.61 C 949.88 720.01 936.37 748.21 918.72 773.87 C 915.53 778.61 911.86 783.01 908.71 787.78 C 898.94 802.36 887.86 816.03 876.17 829.11 C 862.46 844.35 848.22 859.16 832.84 872.74 C 822.70 882.04 811.43 889.96 800.96 898.85 C 784.93 911.66 767.54 922.65 749.80 932.90 C 721.00 949.90 690.64 964.30 658.92 974.98 C 613.06 990.59 564.79 998.98 516.36 1000.00 L 504.47 1000.00 C 511.75 981.42 519.01 962.82 526.11 944.17 C 537.32 919.39 545.95 893.55 556.42 868.47 C 562.86 852.73 568.51 836.67 575.21 821.04 C 582.59 805.63 588.10 789.42 594.54 773.61 C 605.97 746.81 615.42 719.19 627.74 692.77 C 643.77 653.10 659.30 613.22 676.12 573.87 C 692.91 533.90 707.98 493.23 725.31 453.49 C 732.94 435.27 740.06 416.84 747.34 398.48 C 753.89 382.51 760.21 366.44 766.50 350.37 C 774.97 332.55 781.46 313.91 788.79 295.63 C 730.56 295.64 672.33 296.00 614.10 295.47 C 600.44 332.35 588.31 369.78 574.40 406.57 C 559.72 448.61 545.43 490.78 530.66 532.79 C 524.97 546.15 520.39 559.94 515.44 573.59 C 508.03 595.34 499.38 616.64 491.75 638.31 C 487.72 622.08 482.01 606.34 476.44 590.59 C 462.53 549.76 447.48 509.33 431.80 469.15 C 425.09 452.88 419.43 436.21 413.27 419.73 C 404.83 396.70 396.42 373.65 388.53 350.42 C 386.62 344.61 384.02 339.07 381.78 333.39 C 376.47 320.42 371.13 307.43 364.99 294.82 C 306.81 296.76 248.59 295.12 190.40 295.90 C 204.79 334.07 218.81 372.38 233.78 410.33 C 250.79 452.59 266.56 495.33 283.11 537.76 C 293.49 560.74 301.47 584.68 311.01 608.00 C 319.20 628.80 326.75 649.86 335.75 670.32 C 347.17 698.67 358.08 727.21 369.24 755.66 C 377.66 776.87 386.64 797.85 394.94 819.12 C 385.00 843.03 374.52 866.71 364.56 890.62 C 359.78 902.38 354.90 914.11 349.80 925.74 C 343.36 940.74 337.11 955.86 329.50 970.32 C 302.81 960.87 277.35 948.27 252.82 934.20 C 241.07 927.41 229.30 920.61 218.24 912.72 C 144.26 861.18 83.20 790.37 46.19 707.92 C 41.31 698.44 36.89 688.71 33.49 678.59 C -16.51 550.54 -9.90 401.20 52.89 278.72 C 63.95 256.51 75.92 234.61 90.79 214.69 C 106.43 193.02 122.74 171.66 141.97 153.01 C 159.09 134.08 178.85 117.78 199.06 102.26 C 207.27 96.06 215.25 89.53 223.94 83.99 C 253.70 64.41 285.58 48.15 318.48 34.55 C 373.61 12.90 432.58 1.25 491.78 0.00 Z" id="path1"></path></g><metadata></metadata></svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/ess-light.png b/js/apps/account-ui/public/passkeys/ess-light.png
new file mode 100644
index 00000000000..80fd970dad0
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/ess-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/ewbm-light.png b/js/apps/account-ui/public/passkeys/ewbm-light.png
new file mode 100644
index 00000000000..8367c4e97f6
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/ewbm-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/excelsecu-light.png b/js/apps/account-ui/public/passkeys/excelsecu-light.png
new file mode 100644
index 00000000000..6801a472a8a
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/excelsecu-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/feitian-light.png b/js/apps/account-ui/public/passkeys/feitian-light.png
new file mode 100644
index 00000000000..6e800533ca3
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/feitian-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/fido-light.png b/js/apps/account-ui/public/passkeys/fido-light.png
new file mode 100644
index 00000000000..502983c48de
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/fido-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/fido1-light.png b/js/apps/account-ui/public/passkeys/fido1-light.png
new file mode 100644
index 00000000000..f32ce4846be
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/fido1-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/foongtone-light.png b/js/apps/account-ui/public/passkeys/foongtone-light.png
new file mode 100644
index 00000000000..d425076cd26
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/foongtone-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/goldkey-light.png b/js/apps/account-ui/public/passkeys/goldkey-light.png
new file mode 100644
index 00000000000..74b0675986b
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/goldkey-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/google-light.png b/js/apps/account-ui/public/passkeys/google-light.png
new file mode 100644
index 00000000000..875a1c652b4
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/google-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/google1-light.svg b/js/apps/account-ui/public/passkeys/google1-light.svg
new file mode 100644
index 00000000000..b13ae8a5eb4
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/google1-light.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 192 192" height="24px" viewBox="0 0 192 192" width="24px"><rect fill="none" height="192" width="192" y="0"/><g><path d="M69.29,106c-3.46,5.97-9.91,10-17.29,10c-11.03,0-20-8.97-20-20s8.97-20,20-20 c7.38,0,13.83,4.03,17.29,10h25.55C90.3,66.54,72.82,52,52,52C27.74,52,8,71.74,8,96s19.74,44,44,44c20.82,0,38.3-14.54,42.84-34 H69.29z" fill="#4285F4"/><rect fill="#FBBC04" height="24" width="44" x="94" y="84"/><path d="M94.32,84H68v0.05c2.5,3.34,4,7.47,4,11.95s-1.5,8.61-4,11.95V108h26.32 c1.08-3.82,1.68-7.84,1.68-12S95.41,87.82,94.32,84z" fill="#EA4335"/><path d="M184,106v26h-16v-8c0-4.42-3.58-8-8-8s-8,3.58-8,8v8h-16v-26H184z" fill="#34A853"/><rect fill="#188038" height="24" width="48" x="136" y="84"/></g></svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/gotrust-light.png b/js/apps/account-ui/public/passkeys/gotrust-light.png
new file mode 100644
index 00000000000..1c34cc74fe3
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/gotrust-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/gstag-light.png b/js/apps/account-ui/public/passkeys/gstag-light.png
new file mode 100644
index 00000000000..017c4c83be9
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/gstag-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/heimlane-light.svg b/js/apps/account-ui/public/passkeys/heimlane-light.svg
new file mode 100644
index 00000000000..7e90bbb85a8
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/heimlane-light.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="1023.9999"
+   height="1023.9999"
+   viewBox="0 0 270.93333 270.93333"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <rect
+       style="fill:#1a2332;fill-opacity:1;stroke:#ffffff;stroke-width:10.5723;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers"
+       id="rect1-8"
+       width="260"
+       height="260"
+       x="4.7742004"
+       y="5.8167515"
+       ry="60" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.73551;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="path9"
+       cx="189.89941"
+       cy="76.238014"
+       rx="9.259469"
+       ry="9.8423595" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.73551;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="circle9"
+       cx="132.08908"
+       cy="-189.40054"
+       transform="rotate(90)"
+       rx="9.8423595"
+       ry="9.259469" />
+    <circle
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.74178;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="circle10"
+       cx="-2.7947109"
+       cy="-269.53699"
+       r="9.5553598"
+       transform="matrix(-0.68521017,0.7283454,-0.68521093,-0.72834468,0,0)" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.73551;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="circle11"
+       cx="-131.84821"
+       cy="-194.32492"
+       transform="scale(-1)"
+       rx="9.259469"
+       ry="9.8423595" />
+    <circle
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.74178;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="circle12"
+       cx="-191.27057"
+       cy="-75.471619"
+       r="9.5553598"
+       transform="matrix(-0.68521042,-0.72834516,0.68521068,-0.72834492,0,0)" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.73551;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="circle13"
+       cx="-76.21656"
+       cy="78.785728"
+       transform="rotate(-90)"
+       rx="9.8423595"
+       ry="9.259469" />
+    <circle
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.74178;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="circle14"
+       cx="45.708427"
+       cy="149.80536"
+       r="9.5553598"
+       transform="matrix(0.68521084,-0.72834477,0.68521026,0.72834532,0,0)" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.73551;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="circle15"
+       cx="78.785728"
+       cy="131.98999"
+       rx="9.259469"
+       ry="9.8423595" />
+    <circle
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.74178;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="circle16"
+       cx="188.22224"
+       cy="-7.2915931"
+       r="9.5553598"
+       transform="matrix(0.68521027,0.7283453,-0.68521083,0.72834478,0,0)" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:11.0968;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       d="M 221.8944,44.132803 H 48.522174 V 227.39621 H 221.8944 Z"
+       id="path16" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:10.5833;stroke-dasharray:none;stroke-opacity:1"
+       d="M 80.057285,76.239981 V 196.23997 H 190.05727 V 76.239981 Z"
+       id="path1" />
+  </g>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/hid-light.png b/js/apps/account-ui/public/passkeys/hid-light.png
new file mode 100644
index 00000000000..763a54a251e
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/hid-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/hideez-light.png b/js/apps/account-ui/public/passkeys/hideez-light.png
new file mode 100644
index 00000000000..56fa1984102
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/hideez-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/hyper-light.png b/js/apps/account-ui/public/passkeys/hyper-light.png
new file mode 100644
index 00000000000..9a077c0fd7f
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/hyper-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/hyper1-light.png b/js/apps/account-ui/public/passkeys/hyper1-light.png
new file mode 100644
index 00000000000..0f8ffa00641
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/hyper1-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/hypr-light.png b/js/apps/account-ui/public/passkeys/hypr-light.png
new file mode 100644
index 00000000000..4d8dc8f423f
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/hypr-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/icloud-dark.svg b/js/apps/account-ui/public/passkeys/icloud-dark.svg
new file mode 100644
index 00000000000..30f4f117ce3
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/icloud-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" fill="none"><path d="m217.36,90.69c-15.58,9.54-25.17,26.41-25.38,44.68.06,20.67,12.43,39.32,31.46,47.41-3.67,11.84-9.1,23.06-16.11,33.28-10.03,14.44-20.52,28.87-36.47,28.87s-20.06-9.27-38.45-9.27-24.32,9.57-38.9,9.57-24.77-13.37-36.47-29.79c-15.46-22.99-23.95-49.96-24.47-77.66,0-45.59,29.63-69.75,58.81-69.75,15.5,0,28.42,10.18,38.15,10.18s23.71-10.79,41.34-10.79c18.41-.47,35.84,8.24,46.5,23.25Zm-54.86-42.55c7.77-9.14,12.17-20.67,12.46-32.67.01-1.58-.14-3.16-.46-4.71-13.35,1.3-25.69,7.67-34.5,17.78-7.85,8.78-12.41,20-12.92,31.76,0,1.43.16,2.86.46,4.26,1.05.2,2.12.3,3.19.3,12.43-.99,23.91-7.04,31.76-16.73Z" fill="#FFF"/></svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/icloud-light.svg b/js/apps/account-ui/public/passkeys/icloud-light.svg
new file mode 100644
index 00000000000..db821819e5f
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/icloud-light.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" fill="none"><path d="m217.36,90.69c-15.58,9.54-25.17,26.41-25.38,44.68.06,20.67,12.43,39.32,31.46,47.41-3.67,11.84-9.1,23.06-16.11,33.28-10.03,14.44-20.52,28.87-36.47,28.87s-20.06-9.27-38.45-9.27-24.32,9.57-38.9,9.57-24.77-13.37-36.47-29.79c-15.46-22.99-23.95-49.96-24.47-77.66,0-45.59,29.63-69.75,58.81-69.75,15.5,0,28.42,10.18,38.15,10.18s23.71-10.79,41.34-10.79c18.41-.47,35.84,8.24,46.5,23.25Zm-54.86-42.55c7.77-9.14,12.17-20.67,12.46-32.67.01-1.58-.14-3.16-.46-4.71-13.35,1.3-25.69,7.67-34.5,17.78-7.85,8.78-12.41,20-12.92,31.76,0,1.43.16,2.86.46,4.26,1.05.2,2.12.3,3.19.3,12.43-.99,23.91-7.04,31.76-16.73Z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/id-one-light.png b/js/apps/account-ui/public/passkeys/id-one-light.png
new file mode 100644
index 00000000000..cb3c34a9671
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/id-one-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/ideem-light.png b/js/apps/account-ui/public/passkeys/ideem-light.png
new file mode 100644
index 00000000000..133098a5086
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/ideem-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/idemia-light.png b/js/apps/account-ui/public/passkeys/idemia-light.png
new file mode 100644
index 00000000000..444bab5f4c1
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/idemia-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/idex-light.png b/js/apps/account-ui/public/passkeys/idex-light.png
new file mode 100644
index 00000000000..ef6b3c444d7
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/idex-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/idmelon-light.svg b/js/apps/account-ui/public/passkeys/idmelon-light.svg
new file mode 100644
index 00000000000..a4815b1d7fb
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/idmelon-light.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><defs><style>.cls-1{fill:#f15b5c;}.cls-2{fill:#921b1d;}.cls-3{fill:#ee3025;}.cls-4{fill:#bb2026;}</style></defs><path class="cls-1" d="M341.87,100.2l-4.29-1.64c-32.31-11.81-65.36-13.27-76.92-13.4l-.89,0H120.12A23.43,23.43,0,0,0,111.6,87c-.41.21-.81.42-1.17.64l-1.85,1.76,133.35,65.8,103.38-52.89Z"/><line class="cls-2" x1="294.58" y1="137.07" x2="296.99" y2="138.27"/><line class="cls-2" x1="239.53" y1="152.11" x2="241.93" y2="153.31"/><path class="cls-3" d="M106.74,91q-2.62,4.2-2.35,11.26t.26,13.37V423.21q0,5.76-.26,14.41t1.31,12.84a14.55,14.55,0,0,0,1.14,2.19l136-299.56L110.43,87.65A11.24,11.24,0,0,0,106.74,91Z"/><path class="cls-4" d="M361.86,111.53c-2.32-1.55-4.7-3.1-7.13-4.68a93.92,93.92,0,0,0-12-6.32c-.27-.11-.55-.23-.83-.33l-99,52.89L387.63,402.31A164.07,164.07,0,0,0,397,388.12q29.82-51.21,29.82-125a284.83,284.83,0,0,0-7.08-61.25,164.16,164.16,0,0,0-26.53-59.75,134.9,134.9,0,0,0-9.05-11.38A153.2,153.2,0,0,0,361.86,111.53Z"/><path class="cls-2" d="M106.65,452.34a10.07,10.07,0,0,0,7.69,5.19l1.74.2h156c50.27,0,88.64-18.69,115.52-55.42L242.89,153.09Z"/></svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/idmelon1-light.png b/js/apps/account-ui/public/passkeys/idmelon1-light.png
new file mode 100644
index 00000000000..dca9bb18cf0
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/idmelon1-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/iist-light.png b/js/apps/account-ui/public/passkeys/iist-light.png
new file mode 100644
index 00000000000..115b97985d6
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/iist-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/initial-light.svg b/js/apps/account-ui/public/passkeys/initial-light.svg
new file mode 100644
index 00000000000..902bf13c795
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/initial-light.svg
@@ -0,0 +1,5 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="1024" height="1024" fill="#577FFF"/>
+<path d="M512 396C556.735 396 593 359.735 593 315C593 270.265 556.735 234 512 234C467.265 234 431 270.265 431 315C431 359.735 467.265 396 512 396Z" stroke="white" stroke-width="16"/>
+<path d="M590 458H434V798H590V458Z" fill="white"/>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/ipasswords-light.svg b/js/apps/account-ui/public/passkeys/ipasswords-light.svg
new file mode 100644
index 00000000000..6fe8a4dfe6d
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/ipasswords-light.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 1080 1080" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(0.983827,0,0,0.983827,13.661,-0.284699)">
+        <path d="M723.253,493.704C756.288,495.22 782.644,522.52 782.644,555.927L782.644,834.304C782.644,868.683 754.733,896.593 720.355,896.593L351.393,896.593C317.015,896.593 289.104,868.683 289.104,834.304L289.104,555.927C289.104,523.117 314.526,496.198 346.73,493.81L346.73,390.119C346.73,286.215 431.088,201.858 534.992,201.858C638.896,201.858 723.253,286.215 723.253,390.119L723.253,493.704ZM433.328,490.966L636.686,492.116C636.686,492.116 637.142,385.132 637.086,384.489C631.849,324.163 579.118,288.079 534.992,288.535C493.017,288.969 435.92,318.1 433.656,383.797C433.476,389.017 433.328,490.966 433.328,490.966ZM503.296,714.382L492.433,784.455C492.433,784.455 490.376,798.284 492.416,802.664C496.78,812.031 503.822,811.111 503.822,811.111L565.6,810.838C565.6,810.838 572.863,811.472 577.637,802.155C579.88,797.775 577.323,783.74 577.323,783.74L566.649,714.401C590.743,702.649 607.359,677.908 607.359,649.318C607.359,609.377 574.932,576.95 534.992,576.95C495.051,576.95 462.624,609.377 462.624,649.318C462.624,677.893 479.223,702.622 503.296,714.382Z" style="fill:rgb(0,152,248);"/>
+    </g>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/kaspersky-light.svg b/js/apps/account-ui/public/passkeys/kaspersky-light.svg
new file mode 100644
index 00000000000..e0f82e19eac
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/kaspersky-light.svg
@@ -0,0 +1 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_7484_8745)"><g clip-path="url(#clip1_7484_8745)"><g clip-path="url(#clip2_7484_8745)"><path d="M281.964 6.96171C265.893 -2.29974 246.107 -2.29974 230.036 6.96171L46.0365 113.002C29.9271 122.286 20 139.466 20 158.06V353.972C20 372.566 29.9271 389.745 46.0365 399.029L230.036 505.07C246.107 514.331 265.893 514.331 281.964 505.07L465.964 399.029C482.073 389.745 492 372.566 492 353.972V158.06C492 139.466 482.073 122.286 465.964 113.002L281.964 6.96171Z" fill="url(#paint0_linear_7484_8745)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M453.98 133.798L269.98 27.7574C261.327 22.7704 250.673 22.7704 242.02 27.7574L58.0196 133.798C49.3453 138.797 44 148.047 44 158.06V353.972C44 363.984 49.3453 373.234 58.0196 378.233L242.02 484.274C250.673 489.261 261.327 489.261 269.98 484.274L453.98 378.233C462.655 373.234 468 363.984 468 353.972V158.06C468 148.047 462.655 138.797 453.98 133.798ZM281.964 6.96171C265.893 -2.29974 246.107 -2.29974 230.036 6.96171L46.0365 113.002C29.9271 122.286 20 139.466 20 158.06V353.972C20 372.566 29.9271 389.745 46.0365 399.029L230.036 505.07C246.107 514.331 265.893 514.331 281.964 505.07L465.964 399.029C482.073 389.745 492 372.566 492 353.972V158.06C492 139.466 482.073 122.286 465.964 113.002L281.964 6.96171Z" fill="black"/></g><path fill-rule="evenodd" clip-rule="evenodd" d="M256 140C242.745 140 232 150.745 232 164C232 177.255 242.745 188 256 188C269.255 188 280 177.255 280 164C280 150.745 269.255 140 256 140ZM248 164C248 159.582 251.582 156 256 156C260.418 156 264 159.582 264 164C264 168.418 260.418 172 256 172C251.582 172 248 168.418 248 164Z" fill="black"/><path fill-rule="evenodd" clip-rule="evenodd" d="M172 192C172 145.608 209.608 108 256 108C302.392 108 340 145.608 340 192C340 227.061 318.519 257.105 288 269.69V386.67C288 392.391 284.946 397.676 279.989 400.533L263.989 409.753C259.044 412.603 252.956 412.603 248.011 409.753L232.011 400.533C227.054 397.676 224 392.391 224 386.67V372C224 369.878 224.843 367.844 226.343 366.343L236 356.686V355.314L226.343 345.657C224.843 344.157 224 342.122 224 340V332C224 329.878 224.843 327.844 226.343 326.343L236 316.686V315.314L226.343 305.657C224.843 304.157 224 302.122 224 300V269.69C193.481 257.105 172 227.061 172 192ZM256 124C218.445 124 188 154.445 188 192C188 229.555 218.445 260 256 260C293.555 260 324 229.555 324 192C324 154.445 293.555 124 256 124ZM256 276C261.471 276 266.82 275.477 272 274.478V386.67L256 395.89L240 386.67V375.314L249.657 365.657C251.157 364.157 252 362.122 252 360V352C252 349.878 251.157 347.844 249.657 346.343L240 336.686V335.314L249.657 325.657C251.157 324.157 252 322.122 252 320V312C252 309.878 251.157 307.844 249.657 306.343L240 296.686V274.478C245.18 275.477 250.529 276 256 276Z" fill="black"/></g></g><defs><linearGradient id="paint0_linear_7484_8745" x1="393.865" y1="63.2796" x2="99.2043" y2="429.998" gradientUnits="userSpaceOnUse"><stop stop-color="#4DFF88"/><stop offset="1" stop-color="#3DE8CA"/></linearGradient><clipPath id="clip0_7484_8745"><rect width="512" height="512" fill="white"/></clipPath><clipPath id="clip1_7484_8745"><rect width="512" height="512" fill="white"/></clipPath><clipPath id="clip2_7484_8745"><rect width="512" height="512" fill="white"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/keepassdx-dark.svg b/js/apps/account-ui/public/passkeys/keepassdx-dark.svg
new file mode 100644
index 00000000000..0c95ba006f9
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/keepassdx-dark.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" width="192" height="192">
+  <defs>
+    <linearGradient id="a">
+      <stop offset="0" stop-color="#439447"/>
+      <stop offset="1" stop-color="#42ab46"/>
+    </linearGradient>
+    <linearGradient xlink:href="#a" id="b" x1="0" x2="192" y1="0" y2="192" gradientUnits="userSpaceOnUse"/>
+  </defs>
+  <circle cx="96" cy="96" r="88" fill="url(#b)"/>
+  <path fill="#ffa726" d="M56 56v10l70 70h10v-9L65 56Z"/>
+  <path fill="#fff" d="m83 99-27 28v9h9l10-10h10v-9h9v-7zm25-46L95 79l21 21 25-13-4-29zm19 18c4 0 8 5 7 9s-6 7-10 5c-4-1-6-7-3-11 1-1 3-3 6-3z"/>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/keepassdx-light.svg b/js/apps/account-ui/public/passkeys/keepassdx-light.svg
new file mode 100644
index 00000000000..6a1da82dd39
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/keepassdx-light.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" width="192" height="192">
+  <defs>
+    <linearGradient id="a">
+      <stop offset="0" stop-color="#42ab46"/>
+      <stop offset="1" stop-color="#439447"/>
+    </linearGradient>
+    <linearGradient xlink:href="#a" id="b" x1="0" x2="192" y1="0" y2="192" gradientUnits="userSpaceOnUse"/>
+  </defs>
+  <circle cx="96" cy="96" r="88" fill="url(#b)"/>
+  <path fill="#ffa726" d="M56 56v10l70 70h10v-9L65 56Z"/>
+  <path fill="#fff" d="m83 99-27 28v9h9l10-10h10v-9h9v-7zm25-46L95 79l21 21 25-13-4-29zm19 18c4 0 8 5 7 9s-6 7-10 5c-4-1-6-7-3-11 1-1 3-3 6-3z"/>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/keepassxc-dark.svg b/js/apps/account-ui/public/passkeys/keepassxc-dark.svg
new file mode 100644
index 00000000000..80a12953f8c
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/keepassxc-dark.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><g id="c"><rect width="128" height="128" style="fill:none; stroke-width:0px;"/><g id="d"><rect x="57.0112" y="56.5771" width="3.558" height="35.2061" style="fill:#ffffff; stroke-width:0px;"/><path d="m64,28.4885c4.8287,0,8.7679-3.94,8.7679-8.7698,0-.6355-.1271-1.2709-.2542-1.9064-2.7956-.5084-5.5911-.8897-8.5138-.7626-2.7956,0-5.7182.2542-8.5138.7626-.1271.6355-.2542,1.271-.2542,1.9064,0,4.8297,3.9392,8.7698,8.7679,8.7698Z" style="fill:#ffffff; stroke-width:0px;"/><path d="m88.1436,23.6587c.3812,1.6523.5083,3.1775.5083,4.8297,0,9.7865-5.8453,18.3021-14.1049,22.2421l-.6354,10.422,7.4972,7.4988-7.4972,7.4988,4.9558,4.9568-4.9558,4.9568.6354,9.2781-10.5469,10.5491-10.5469-10.5491v-44.6113c-8.3867-3.94-14.1049-12.4556-14.1049-22.2421,0-1.6523.2541-3.1775.5083-4.8297-14.2319,8.5155-22.8728,23.7673-22.8728,40.29,0,26.055,21.0938,47.0261,47.0163,47.0261,26.0496,0,47.0163-21.0982,47.0163-47.0261-.1271-16.5227-8.7679-31.7744-22.8728-40.29Z" style="fill:#ffffff; stroke-width:0px;"/><path d="m64,3.1001C30.4195,3.1001,3.0999,30.4196,3.0999,64s27.3196,60.9,60.9001,60.9,60.8999-27.3198,60.8999-60.9S97.5806,3.1001,64,3.1001Zm0,116.6759c-30.7415,0-55.7514-25.0212-55.7514-55.7759S33.2586,8.2241,64,8.2241s55.7512,25.0209,55.7512,55.7759-25.0097,55.7759-55.7512,55.7759Z" style="fill:#ffffff; stroke-width:0px;"/></g></g></svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/keepassxc-light.svg b/js/apps/account-ui/public/passkeys/keepassxc-light.svg
new file mode 100644
index 00000000000..aad6c5a16be
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/keepassxc-light.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 128 128"><defs><linearGradient id="e" x1="63.9998" y1="-3.314" x2="63.9998" y2="118.486" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#414141"/><stop offset=".196" stop-color="#3e3e3e"/><stop offset="1" stop-color="#3a3a3a"/></linearGradient><radialGradient id="g" cx="302.8014" cy="-375.5301" fx="302.8014" fy="-375.5301" r="207.2339" gradientTransform="translate(-46.999 185.5275) scale(.3539)" gradientUnits="userSpaceOnUse"><stop offset=".6733" stop-color="#fcfcfc" stop-opacity="0"/><stop offset="1" stop-color="#fcfcfc"/></radialGradient><radialGradient id="i" cx="311.1472" cy="-348.2325" fx="311.1472" fy="-348.2325" r="172.3893" gradientTransform="translate(-46.999 185.5275) scale(.3539)" gradientUnits="userSpaceOnUse"><stop offset=".1088" stop-color="#0f0f0d" stop-opacity="0"/><stop offset=".8856" stop-color="#414141" stop-opacity="0"/><stop offset=".9339" stop-color="#1e1e1d" stop-opacity=".6841"/><stop offset=".9874" stop-color="#0f0f0d"/></radialGradient><radialGradient id="n" cx="316.8927" cy="-451.5973" fx="316.8927" fy="-451.5973" r="334.8364" gradientTransform="translate(-46.999 117.9256) scale(.3539 .2026)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#2e6b26"/><stop offset="1" stop-color="#6ab536"/></radialGradient><radialGradient id="p" cx="314.3875" cy="-453.363" fx="314.3875" fy="-453.363" r="65.3925" gradientTransform="translate(-46.999 185.5275) scale(.3539)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#6ab536"/><stop offset="1" stop-color="#2e6b26"/></radialGradient><radialGradient id="r" cx="322.2128" cy="-390.2547" fx="322.2128" fy="-390.2547" r="96.5851" gradientTransform="translate(-44.2199 256.5751) scale(.3356 .5572)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#000"/><stop offset=".7842" stop-color="#4f4f4f" stop-opacity="0"/></radialGradient><radialGradient id="u" cx="312.9946" cy="-473.0178" fx="312.9946" fy="-473.0178" r="223.5101" gradientTransform="translate(-46.999 185.5275) scale(.3539)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f5f5f5"/><stop offset=".5481" stop-color="#f2f2f2"/></radialGradient></defs><g style="isolation:isolate;"><g id="b"><g id="c"><rect width="128" height="128" style="fill:none; stroke-width:0px;"/><g id="d"><path id="f" d="m63.9999,124.9c-33.5805,0-60.9001-27.3198-60.9001-60.9S30.4194,3.1,63.9999,3.1s60.8999,27.3195,60.8999,60.9-27.3193,60.9-60.8999,60.9Zm0-116.6759c-30.7415,0-55.7515,25.021-55.7515,55.7759s25.01,55.7759,55.7515,55.7759,55.7512-25.0212,55.7512-55.7759S94.7414,8.2241,63.9999,8.2241Z" style="fill:url(#e); stroke-width:0px;"/><path id="h" d="m63.9999,3.1238C30.4325,3.1238,3.1236,30.4327,3.1236,64s27.3089,60.8762,60.8763,60.8762,60.8761-27.3091,60.8761-60.8762S97.5674,3.1238,63.9999,3.1238Z" style="fill:url(#g); mix-blend-mode:lighten; opacity:.32; stroke-width:0px;"/><path id="j" d="m63.9999,124.9c-33.5805,0-60.9001-27.3198-60.9001-60.9S30.4194,3.1,63.9999,3.1s60.8999,27.3195,60.8999,60.9-27.3193,60.9-60.8999,60.9Zm0-116.6759c-30.7415,0-55.7515,25.021-55.7515,55.7759s25.01,55.7759,55.7515,55.7759,55.7512-25.0212,55.7512-55.7759S94.7414,8.2241,63.9999,8.2241Z" style="fill:url(#i); opacity:.44; stroke-width:0px;"/><path id="k" d="m63.9999,8.5504c-30.9783,0-56.1809,25.2025-56.1809,56.1808s25.2025,56.1808,56.1809,56.1808,56.1807-25.2028,56.1807-56.1808S94.9783,8.5504,63.9999,8.5504Z" style="fill:rgba(15,15,13,.35); stroke-width:0px;"/><path id="l" d="m63.9999,124.9c-33.5805,0-60.9001-27.3198-60.9001-60.9S30.4194,3.1,63.9999,3.1s60.8999,27.3195,60.8999,60.9-27.3193,60.9-60.8999,60.9Zm0-120.4966C30.4195,4.4034,3.0998,31.3596,3.0998,64.4932s27.3197,60.0898,60.9001,60.0898,60.8999-26.9565,60.8999-60.0898S97.5804,4.4034,64,4.4034Z" style="fill:#0f0f0d; opacity:.35; stroke-width:0px;"/></g><g id="m"><path id="o" d="m63.9999,8.2241c-30.7551,0-55.776,25.0209-55.776,55.7759s25.0209,55.7759,55.776,55.7759,55.7758-25.0211,55.7758-55.7759S94.755,8.2241,63.9999,8.2241Z" style="fill:url(#n); stroke-width:0px;"/><path id="q" d="m63.9998,12.8613c-9.1608,0-16.6136,7.4528-16.6136,16.6135s7.4528,16.6135,16.6136,16.6135,16.6135-7.4528,16.6135-16.6135-7.4527-16.6135-16.6135-16.6135Z" style="fill:url(#p); mix-blend-mode:lighten; opacity:.7; stroke-width:0px;"/><path id="s" d="m34.6871,16.3645c-.0027.0191-.0054.0378-.0081.0569-.0725.0136-.0736-.0037.0081-.0569Zm42.1177,35.8001l-.7714,13.7822,9.1023,9.9165-9.1023,9.9165,6.0168,6.5549-6.0168,6.5549.7714,13.6696h-25.61v-60.3946c-10.1823-5.2104-17.1248-16.4714-17.1248-29.4132,0-2.1659.3032-4.1671.609-6.33,1.1046-.2082,18.9673-7.6947,18.9673-7.6947-.1483.8092,20.8551.8092,20.7068,0,0,0,17.2577,7.4257,18.9891,7.7899.438,2.1264.5873,4.101.5873,6.2348,0,12.9418-7.0968,24.2029-17.1248,29.4133Zm16.5077-35.8001c.0108.0511.0194.1011.0299.1521.1896.0399.196-.0035-.0299-.1521Z" style="fill:url(#r); mix-blend-mode:multiply; opacity:.3; stroke-width:0px;"/><path id="t" d="m34.1161,100.4319c-9.8977-8.6081-16.164-21.2969-16.164-35.4968,0-16.5227,8.6409-31.7744,22.8728-40.29-.2541,1.6523-.5083,3.1774-.5083,4.8297,0,9.7865,5.7182,18.302,14.1049,22.2421v44.6113l10.5469,10.5491,10.5469-10.5491-.6354-9.2781,4.9558-4.9568-4.9558-4.9568,7.4972-7.4988-7.4972-7.4988.6354-10.422c8.2596-3.94,14.1049-12.4556,14.1049-22.2421,0-1.6523-.1271-3.1774-.5083-4.8297,5.1643,3.1178,9.5922,7.1416,13.1419,11.7972-8.5841-11.7889-22.5293-19.4587-38.2766-19.4587-26.0911,0-47.2421,21.05-47.2421,47.0165,0,14.693,6.7736,27.8101,17.3809,36.4318Zm27.4214-7.6624h-3.558v-35.2061h3.558v35.2061Zm-5.0828-73.9708c2.7956-.5084,5.7182-.7626,8.5138-.7626,2.9226-.1271,5.7182.2542,8.5138.7626.1271.6355.2542,1.271.2542,1.9064,0,4.8297-3.9392,8.7698-8.7679,8.7698s-8.7679-3.94-8.7679-8.7698c0-.6355.1271-1.2709.2542-1.9064Z" style="fill:#0f0f0d; mix-blend-mode:multiply; opacity:.2; stroke-width:0px;"/><path id="v" d="m63.9999,8.2241c-30.7415,0-55.7514,25.0209-55.7514,55.7759s25.01,55.7759,55.7514,55.7759,55.7512-25.0212,55.7512-55.7759S94.7414,8.2241,63.9999,8.2241Zm-8.5138,9.5882c2.7956-.5084,5.7182-.7626,8.5138-.7626,2.9226-.1271,5.7182.2542,8.5138.7626.1271.6355.2542,1.271.2542,1.9064,0,4.8297-3.9392,8.7698-8.7679,8.7698s-8.7679-3.94-8.7679-8.7698c0-.6355.1271-1.2709.2542-1.9064Zm5.0828,38.7648v35.2061h-3.558v-35.2061h3.558Zm3.4309,54.3978c-25.9225,0-47.0163-20.9711-47.0163-47.0261,0-16.5227,8.6409-31.7744,22.8728-40.29-.2541,1.6523-.5083,3.1774-.5083,4.8297,0,9.7865,5.7182,18.302,14.1049,22.2421v44.6113l10.5469,10.5491,10.5469-10.5491-.6354-9.2781,4.9558-4.9568-4.9558-4.9568,7.4972-7.4988-7.4972-7.4988.6354-10.422c8.2596-3.94,14.1049-12.4556,14.1049-22.2421,0-1.6523-.1271-3.1774-.5083-4.8297,14.1049,8.5156,22.7457,23.7673,22.8728,40.29,0,25.9279-20.9668,47.0261-47.0163,47.0261Z" style="fill:url(#u); stroke-width:0px;"/></g></g></g></g></svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/keeper-light.svg b/js/apps/account-ui/public/passkeys/keeper-light.svg
new file mode 100644
index 00000000000..450cef168c5
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/keeper-light.svg
@@ -0,0 +1,18 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_6034_33627)">
+<circle cx="12" cy="12" r="12" fill="white"/>
+<path d="M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z" fill="black"/>
+<path d="M10.1218 3.27325H11.6666V9.51527H14.8575L18.696 6.46317L19.6607 7.66821L15.3989 11.0564H10.1218V3.27325Z" fill="#FFC700"/>
+<path d="M13.1438 3.48366L14.6887 3.87694V6.03492L16.4173 4.61811L17.7008 5.56097L14.407 8.26013L13.1438 8.25341V3.48366Z" fill="#FFC700"/>
+<path d="M4.0387 15.0849L5.58354 16.3958V7.81427L4.0387 9.22772V15.0849Z" fill="#FFC700"/>
+<path d="M8.61257 18.2411L7.06604 19.5806V4.49485L8.61257 5.83434V18.2411Z" fill="#FFC700"/>
+<path d="M14.6887 18.1174L16.4173 19.5342L17.7008 18.5897L14.407 15.8922L13.1438 15.8989V20.6687L14.6887 20.2754V18.1174Z" fill="#FFC700"/>
+<path d="M18.696 17.4786L14.8575 14.4248H11.6666V20.6668H10.1218V12.8853H15.3989L19.6607 16.2735L18.696 17.4786Z" fill="#FFC700"/>
+<path d="M16.7376 11.9706L19.8981 14.5706L20.883 13.3823L19.1661 11.9706L20.883 10.5588L19.8981 9.37056L16.7376 11.9706Z" fill="#FFC700"/>
+</g>
+<defs>
+<clipPath id="clip0_6034_33627">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/key-id-light.png b/js/apps/account-ui/public/passkeys/key-id-light.png
new file mode 100644
index 00000000000..9f214041314
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/key-id-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/keyvault-light.png b/js/apps/account-ui/public/passkeys/keyvault-light.png
new file mode 100644
index 00000000000..ae854f0b31e
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/keyvault-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/keyxentic-light.png b/js/apps/account-ui/public/passkeys/keyxentic-light.png
new file mode 100644
index 00000000000..45d900cf0ec
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/keyxentic-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/konai-light.png b/js/apps/account-ui/public/passkeys/konai-light.png
new file mode 100644
index 00000000000..857225020d6
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/konai-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/kqc-light.png b/js/apps/account-ui/public/passkeys/kqc-light.png
new file mode 100644
index 00000000000..7931c8b9964
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/kqc-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/lastpass-dark.svg b/js/apps/account-ui/public/passkeys/lastpass-dark.svg
new file mode 100644
index 00000000000..764d273f583
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/lastpass-dark.svg
@@ -0,0 +1,13 @@
+<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="50" height="50" rx="7.84782" fill="url(#paint0_linear_284_5743)"/>
+<path d="M39.3518 17.6383C38.905 17.6383 38.5668 17.9747 38.5668 18.4287V31.5604C38.5668 32.0108 38.9014 32.3509 39.3518 32.3509C39.8022 32.3509 40.1368 32.0144 40.1368 31.5604V18.4287C40.1368 17.9784 39.8022 17.6383 39.3518 17.6383Z" fill="white"/>
+<path d="M21.8918 22.5449C20.3814 22.5449 19.0954 23.7857 19.0954 25.3069C19.0954 26.8281 20.3272 28.1232 21.8375 28.1232C23.3478 28.1232 24.6339 26.8824 24.6339 25.3612C24.6339 23.84 23.4021 22.5449 21.8918 22.5449Z" fill="white"/>
+<path d="M31.0694 22.5449C29.5591 22.5449 28.2731 23.7857 28.2731 25.3069C28.2731 26.8281 29.5048 28.1232 31.0152 28.1232C32.5255 28.1232 33.8115 26.8824 33.8115 25.3612C33.8658 23.84 32.634 22.5449 31.0694 22.5449Z" fill="white"/>
+<path d="M12.6596 22.5449C11.1493 22.5449 9.86328 23.7857 9.86328 25.3069C9.86328 26.8281 11.0951 28.1232 12.6054 28.1232C14.1157 28.1232 15.4017 26.8824 15.4017 25.3612C15.4017 23.84 14.17 22.5449 12.6596 22.5449Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_284_5743" x1="25" y1="0" x2="25" y2="50" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3C3D3D"/>
+<stop offset="1" stop-color="#262626"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/lastpass-light.svg b/js/apps/account-ui/public/passkeys/lastpass-light.svg
new file mode 100644
index 00000000000..aac8009ea32
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/lastpass-light.svg
@@ -0,0 +1,13 @@
+<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="50" height="50" rx="7.84782" fill="url(#paint0_linear_284_5774)"/>
+<path d="M39.3517 17.6384C38.9049 17.6384 38.5667 17.9749 38.5667 18.4289V31.5605C38.5667 32.0108 38.9013 32.3509 39.3517 32.3509C39.8021 32.3509 40.1367 32.0145 40.1367 31.5605V18.4289C40.1367 17.9785 39.8021 17.6384 39.3517 17.6384Z" fill="white"/>
+<path d="M21.8918 22.545C20.3814 22.545 19.0954 23.7859 19.0954 25.307C19.0954 26.8282 20.3272 28.1233 21.8375 28.1233C23.3478 28.1233 24.6338 26.8825 24.6338 25.3613C24.6338 23.8401 23.4021 22.545 21.8918 22.545Z" fill="white"/>
+<path d="M31.0694 22.545C29.5591 22.545 28.273 23.7859 28.273 25.307C28.273 26.8282 29.5048 28.1233 31.0151 28.1233C32.5254 28.1233 33.8115 26.8825 33.8115 25.3613C33.8657 23.8401 32.634 22.545 31.0694 22.545Z" fill="white"/>
+<path d="M12.6597 22.545C11.1494 22.545 9.86339 23.7859 9.86339 25.307C9.86339 26.8282 11.0952 28.1233 12.6055 28.1233C14.1158 28.1233 15.4018 26.8825 15.4018 25.3613C15.4018 23.8401 14.17 22.545 12.6597 22.545Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_284_5774" x1="25" y1="0" x2="25" y2="50" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ED194A"/>
+<stop offset="1" stop-color="#C30833"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/ledger-light.png b/js/apps/account-ui/public/passkeys/ledger-light.png
new file mode 100644
index 00000000000..c424a76ea4a
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/ledger-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/logmeonce-dark.svg b/js/apps/account-ui/public/passkeys/logmeonce-dark.svg
new file mode 100644
index 00000000000..3535740492f
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/logmeonce-dark.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" viewBox="0 0 2048 2048" width="128" height="128" xmlns="http://www.w3.org/2000/svg">
+<path d="M 0 0 L -5 1 L -15 4 L -38 11 L -57 18 L -76 29 L -90 38 L -109 52 L -116 59 L -127 68 L -140 81 L -148 88 L -149 91 L -151 91 L -161 101 L -169 108 L -169 110 L -171 110 L -180 119 L -188 126 L -201 137 L -212 146 L -226 157 L -239 167 L -250 175 L -270 188 L -291 202 L -309 212 L -330 224 L -353 235 L -386 250 L -407 259 L -449 273 L -472 281 L -502 289 L -551 298 L -615 309 L -647 316 L -681 324 L -698 330 L -714 338 L -735 351 L -745 358 L -756 367 L -764 375 L -766 379 L -768 379 L -773 385 L -781 395 L -791 410 L -801 428 L -810 447 L -816 465 L -822 500 L -827 545 L -830 592 L -832 653 L -832 712 L -831 742 L -828 794 L -822 866 L -816 928 L -812 957 L -800 1020 L -789 1072 L -783 1098 L -765 1162 L -751 1207 L -744 1225 L -734 1254 L -720 1290 L -704 1328 L -689 1361 L -668 1403 L -653 1431 L -639 1456 L -620 1488 L -607 1509 L -594 1529 L -584 1544 L -571 1563 L -558 1581 L -544 1600 L -533 1615 L -520 1632 L -507 1648 L -479 1682 L -470 1693 L -460 1704 L -449 1716 L -442 1724 L -432 1734 L -425 1742 L -368 1799 L -351 1815 L -335 1830 L -327 1837 L -314 1849 L -288 1871 L -271 1885 L -261 1893 L -244 1907 L -228 1919 L -215 1929 L -196 1943 L -184 1952 L -168 1963 L -148 1977 L -133 1987 L -112 2000 L -88 2013 L -72 2021 L -52 2030 L -32 2037 L 12 2048 L 60 2048 L 61 2047 L 73 2044 L 100 2037 L 121 2029 L 149 2015 L 167 2005 L 186 1994 L 210 1979 L 231 1965 L 266 1941 L 284 1928 L 295 1920 L 306 1911 L 324 1898 L 338 1887 L 349 1877 L 358 1870 L 369 1860 L 380 1851 L 380 1849 L 382 1849 L 385 1846 L 396 1837 L 403 1830 L 411 1823 L 418 1816 L 426 1809 L 475 1760 L 477 1756 L 479 1756 L 487 1747 L 503 1730 L 510 1722 L 519 1712 L 526 1704 L 538 1691 L 547 1680 L 558 1667 L 566 1656 L 579 1640 L 590 1626 L 606 1605 L 621 1583 L 631 1569 L 645 1549 L 655 1533 L 670 1510 L 685 1485 L 696 1467 L 706 1449 L 730 1405 L 745 1374 L 762 1338 L 774 1310 L 792 1267 L 811 1216 L 827 1166 L 842 1117 L 858 1051 L 870 996 L 875 967 L 881 917 L 886 882 L 891 846 L 894 812 L 896 774 L 896 655 L 895 630 L 892 593 L 888 559 L 877 470 L 872 445 L 865 426 L 857 411 L 847 395 L 834 378 L 814 358 L 800 347 L 785 337 L 766 327 L 750 321 L 727 315 L 693 308 L 650 301 L 597 292 L 570 286 L 548 280 L 515 270 L 487 261 L 459 250 L 438 241 L 414 230 L 382 213 L 358 199 L 347 192 L 330 180 L 312 167 L 300 157 L 286 146 L 271 133 L 263 126 L 251 115 L 240 106 L 228 95 L 200 71 L 189 62 L 174 50 L 158 38 L 142 27 L 127 19 L 115 14 L 95 8 L 71 0 L 0 0 z M 30 622 L 51 623 L 79 627 L 100 633 L 121 641 L 141 652 L 157 663 L 172 676 L 186 690 L 186 692 L 188 692 L 206 716 L 216 734 L 221 745 L 226 758 L 233 784 L 236 798 L 237 808 L 237 840 L 233 865 L 226 891 L 219 909 L 209 928 L 195 949 L 186 959 L 179 967 L 166 980 L 155 989 L 142 998 L 126 1007 L 113 1012 L 114 1024 L 122 1060 L 137 1123 L 156 1208 L 170 1271 L 174 1296 L 176 1310 L 176 1335 L 173 1349 L 166 1359 L 157 1367 L 146 1372 L 140 1374 L 119 1376 L 51 1376 L -32 1377 L -64 1377 L -78 1374 L -85 1370 L -98 1359 L -106 1349 L -110 1341 L -112 1333 L -112 1318 L -107 1288 L -100 1256 L -85 1196 L -69 1124 L -57 1072 L -50 1036 L -47 1011 L -53 1009 L -69 1001 L -81 994 L -93 985 L -103 976 L -111 969 L -120 960 L -131 946 L -142 929 L -152 910 L -160 890 L -166 870 L -169 853 L -170 844 L -170 814 L -167 794 L -161 767 L -154 746 L -137 713 L -126 698 L -119 690 L -108 678 L -93 665 L -77 653 L -56 641 L -38 633 L -16 627 L 3 624 L 30 622 z " transform="translate(991)" style="fill:#ffffff" />
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/logmeonce-light.svg b/js/apps/account-ui/public/passkeys/logmeonce-light.svg
new file mode 100644
index 00000000000..f48c5b8f02f
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/logmeonce-light.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 2048 2048" width="128" height="128" xmlns="http://www.w3.org/2000/svg">
+<path transform="translate(991)" d="m0 0h71l24 8 20 6 12 5 15 8 16 11 16 12 15 12 11 9 28 24 12 11 11 9 12 11 8 7 15 13 14 11 12 10 18 13 17 12 11 7 24 14 32 17 24 11 21 9 28 11 28 9 33 10 22 6 27 6 53 9 43 7 34 7 23 6 16 6 19 10 15 10 14 11 20 20 13 17 10 16 8 15 7 19 5 25 11 89 4 34 3 37 1 25v119l-2 38-3 34-5 36-5 35-6 50-5 29-12 55-16 66-15 49-16 50-19 51-18 43-12 28-17 36-15 31-24 44-10 18-11 18-15 25-15 23-10 16-14 20-10 14-15 22-16 21-11 14-13 16-8 11-11 13-9 11-12 13-7 8-9 10-7 8-16 17-8 9h-2l-2 4-49 49-8 7-7 7-8 7-7 7-11 9-3 3h-2v2l-11 9-11 10-9 7-11 10-14 11-18 13-11 9-11 8-18 13-35 24-21 14-24 15-19 11-18 10-28 14-21 8-27 7-12 3-1 1h-48l-44-11-20-7-20-9-16-8-24-13-21-13-15-10-20-14-16-11-12-9-19-14-13-10-16-12-17-14-10-8-17-14-26-22-13-12-8-7-16-15-17-16-57-57-7-8-10-10-7-8-11-12-10-11-9-11-28-34-13-16-13-17-11-15-14-19-13-18-13-19-10-15-13-20-13-21-19-32-14-25-15-28-21-42-15-33-16-38-14-36-10-29-7-18-14-45-18-64-6-26-11-52-12-63-4-29-6-62-6-72-3-52-1-30v-59l2-61 3-47 5-45 6-35 6-18 9-19 10-18 10-15 8-10 5-6h2l2-4 8-8 11-9 10-7 21-13 16-8 17-6 34-8 32-7 64-11 49-9 30-8 23-8 42-14 21-9 33-15 23-11 21-12 18-10 21-14 20-13 11-8 13-10 14-11 11-9 13-11 8-7 9-9h2v-2l8-7 10-10h2l1-3 8-7 13-13 11-9 7-7 19-14 14-9 19-11 19-7 23-7 10-3z" fill="#F18429"/>
+<path transform="translate(1021,622)" d="m0 0 21 1 28 4 21 6 21 8 20 11 16 11 15 13 14 14v2h2l18 24 10 18 5 11 5 13 7 26 3 14 1 10v32l-4 25-7 26-7 18-10 19-14 21-9 10-7 8-13 13-11 9-13 9-16 9-13 5 1 12 8 36 15 63 19 85 14 63 4 25 2 14v25l-3 14-7 10-9 8-11 5-6 2-21 2h-68l-83 1h-32l-14-3-7-4-13-11-8-10-4-8-2-8v-15l5-30 7-32 15-60 16-72 12-52 7-36 3-25-6-2-16-8-12-7-12-9-10-9-8-7-9-9-11-14-11-17-10-19-8-20-6-20-3-17-1-9v-30l3-20 6-27 7-21 17-33 11-15 7-8 11-12 15-13 16-12 21-12 18-8 22-6 19-3z" fill="#FEFFFE"/>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/mettlesemi-light.png b/js/apps/account-ui/public/passkeys/mettlesemi-light.png
new file mode 100644
index 00000000000..02d90d60c24
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/mettlesemi-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/microsoft-light.svg b/js/apps/account-ui/public/passkeys/microsoft-light.svg
new file mode 100644
index 00000000000..f2e2b2becd3
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/microsoft-light.svg
@@ -0,0 +1,14 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 23V24C15 24.5523 14.5523 25 14 25H12V26C12 27.1046 11.1046 28 10 28H6C4.89543 28 4 27.1046 4 26V23.4142C4 22.8838 4.21071 22.3751 4.58579 22L12.3244 14.2614C12.1131 13.5434 12 12.7842 12 12C12 7.58172 15.5817 4 20 4C24.4183 4 28 7.58172 28 12C28 16.4183 24.4183 20 20 20H18V22C18 22.5523 17.5523 23 17 23H15ZM22 12C23.1046 12 24 11.1046 24 10C24 8.89543 23.1046 8 22 8C20.8954 8 20 8.89543 20 10C20 11.1046 20.8954 12 22 12Z" fill="url(#paint0_linear_32_137)"/>
+<path d="M25.4004 6.09863C26.9978 7.56126 28 9.66341 28 12C28 16.4183 24.4183 20 20 20H18V22C18 22.5523 17.5523 23 17 23H15V24C15 24.5523 14.5523 25 14 25H12V26C12 27.1046 11.1046 28 10 28H6C5.3196 28 4.72066 27.6588 4.35938 27.1396L20.3584 11.1396C20.7196 11.659 21.3194 12 22 12C23.1046 12 24 11.1046 24 10C24 9.3194 23.659 8.71965 23.1396 8.3584L25.4004 6.09863Z" fill="url(#paint1_radial_32_137)"/>
+<defs>
+<linearGradient id="paint0_linear_32_137" x1="9.33333" y1="8" x2="26.6667" y2="24" gradientUnits="userSpaceOnUse">
+<stop stop-color="#29C3FF"/>
+<stop offset="1" stop-color="#2052CB"/>
+</linearGradient>
+<radialGradient id="paint1_radial_32_137" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(4.86778 20.8826) rotate(51.7901) scale(17.2157 18.5001)">
+<stop stop-color="#236FD9"/>
+<stop offset="0.767782" stop-color="#236FD9" stop-opacity="0"/>
+</radialGradient>
+</defs>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/neowave-light.png b/js/apps/account-ui/public/passkeys/neowave-light.png
new file mode 100644
index 00000000000..c6a43fdc915
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/neowave-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/nitrokey-light.png b/js/apps/account-ui/public/passkeys/nitrokey-light.png
new file mode 100644
index 00000000000..5488c47d6f1
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/nitrokey-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/nordpass-dark.svg b/js/apps/account-ui/public/passkeys/nordpass-dark.svg
new file mode 100644
index 00000000000..8b303ea6cdd
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/nordpass-dark.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M7.6134 70C2.82435 63.352 0 55.1722 0 46.3273C0 24.0552 17.9086 6 40 6C62.0914 6 80 24.0552 80 46.3273C80 55.1721 77.1757 63.3518 72.3867 69.9999L53.1747 38.5466L51.3195 41.7046L53.2018 50.4877L40 27.7147L31.8334 41.6161L33.7346 50.4877L26.8147 38.5646L7.6134 70Z" fill="white"/>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/nordpass-light.svg b/js/apps/account-ui/public/passkeys/nordpass-light.svg
new file mode 100644
index 00000000000..dce77b77e53
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/nordpass-light.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M7.6134 70C2.82435 63.352 0 55.1722 0 46.3273C0 24.0552 17.9086 6 40 6C62.0914 6 80 24.0552 80 46.3273C80 55.1721 77.1757 63.3518 72.3867 69.9999L53.1747 38.5466L51.3195 41.7046L53.2018 50.4877L40 27.7147L31.8334 41.6161L33.7346 50.4877L26.8147 38.5646L7.6134 70Z" fill="#0CAAAB"/>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/nxp-light.png b/js/apps/account-ui/public/passkeys/nxp-light.png
new file mode 100644
index 00000000000..0f2b10a7d8c
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/nxp-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/nymi-light.png b/js/apps/account-ui/public/passkeys/nymi-light.png
new file mode 100644
index 00000000000..1abafe4d816
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/nymi-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/octatco-light.png b/js/apps/account-ui/public/passkeys/octatco-light.png
new file mode 100644
index 00000000000..c9eae1bc0bf
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/octatco-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/onekey-light.png b/js/apps/account-ui/public/passkeys/onekey-light.png
new file mode 100644
index 00000000000..8c24418f38c
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/onekey-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/onespan-light.png b/js/apps/account-ui/public/passkeys/onespan-light.png
new file mode 100644
index 00000000000..717e0a7e459
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/onespan-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/onespan1-light.png b/js/apps/account-ui/public/passkeys/onespan1-light.png
new file mode 100644
index 00000000000..d934d9145ba
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/onespan1-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/onespan2-light.png b/js/apps/account-ui/public/passkeys/onespan2-light.png
new file mode 100644
index 00000000000..31d00e3da58
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/onespan2-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/onespan3-light.png b/js/apps/account-ui/public/passkeys/onespan3-light.png
new file mode 100644
index 00000000000..2effb9cab6c
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/onespan3-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/onespan4-light.png b/js/apps/account-ui/public/passkeys/onespan4-light.png
new file mode 100644
index 00000000000..31d00e3da58
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/onespan4-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/onespan5-light.png b/js/apps/account-ui/public/passkeys/onespan5-light.png
new file mode 100644
index 00000000000..2effb9cab6c
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/onespan5-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/onespan7-light.png b/js/apps/account-ui/public/passkeys/onespan7-light.png
new file mode 100644
index 00000000000..f94573cd42e
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/onespan7-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/onlykey-light.png b/js/apps/account-ui/public/passkeys/onlykey-light.png
new file mode 100644
index 00000000000..d527f749c1e
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/onlykey-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/opensk-light.png b/js/apps/account-ui/public/passkeys/opensk-light.png
new file mode 100644
index 00000000000..719ad415be3
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/opensk-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/pone-light.png b/js/apps/account-ui/public/passkeys/pone-light.png
new file mode 100644
index 00000000000..cf961760c53
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/pone-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/precision-light.png b/js/apps/account-ui/public/passkeys/precision-light.png
new file mode 100644
index 00000000000..01ac45de8d3
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/precision-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/precision1-light.png b/js/apps/account-ui/public/passkeys/precision1-light.png
new file mode 100644
index 00000000000..f5e09a76d56
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/precision1-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/precision2-light.png b/js/apps/account-ui/public/passkeys/precision2-light.png
new file mode 100644
index 00000000000..f5e09a76d56
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/precision2-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/proton-light.svg b/js/apps/account-ui/public/passkeys/proton-light.svg
new file mode 100644
index 00000000000..08d95f2785b
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/proton-light.svg
@@ -0,0 +1,36 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M353.274 214.391C408.835 158.832 436.614 131.052 468.648 120.644C496.825 111.489 527.175 111.489 555.352 120.644C587.386 131.052 615.165 158.832 670.726 214.391L809.608 353.274C865.169 408.835 892.948 436.614 903.356 468.648C912.512 496.825 912.512 527.175 903.356 555.352C892.948 587.386 865.169 615.165 809.608 670.726L670.726 809.608C615.165 865.169 587.386 892.948 555.352 903.356C527.175 912.512 496.825 912.512 468.648 903.356C436.614 892.948 408.835 865.169 353.274 809.608L327.162 780.336C311.361 762.621 303.462 753.763 297.827 743.688C292.833 734.754 289.166 725.137 286.947 715.144C284.444 703.878 284.444 692.008 284.444 668.271V355.729C284.444 331.992 284.444 320.122 286.947 308.855C289.166 298.863 292.833 289.246 297.827 280.311C303.462 270.237 311.361 261.38 327.162 243.665L353.274 214.391Z" fill="url(#paint0_radial_12155_41873)"/>
+<path d="M353.274 214.391C408.835 158.832 436.614 131.052 468.648 120.644C496.825 111.489 527.175 111.489 555.352 120.644C587.386 131.052 615.165 158.832 670.726 214.391L809.608 353.274C865.169 408.835 892.948 436.614 903.356 468.648C912.512 496.825 912.512 527.175 903.356 555.352C892.948 587.386 865.169 615.165 809.608 670.726L670.726 809.608C615.165 865.169 587.386 892.948 555.352 903.356C527.175 912.512 496.825 912.512 468.648 903.356C436.614 892.948 408.835 865.169 353.274 809.608L327.162 780.336C311.361 762.621 303.462 753.763 297.827 743.688C292.833 734.754 289.166 725.137 286.947 715.144C284.444 703.878 284.444 692.008 284.444 668.271V355.729C284.444 331.992 284.444 320.122 286.947 308.855C289.166 298.863 292.833 289.246 297.827 280.311C303.462 270.237 311.361 261.38 327.162 243.665L353.274 214.391Z" fill="url(#paint1_linear_12155_41873)"/>
+<path d="M343.356 224.303C371.135 196.524 385.024 182.634 401.041 177.43C415.13 172.852 430.305 172.852 444.393 177.43C460.41 182.634 474.3 196.524 502.079 224.303L710.406 432.629C738.185 460.408 752.074 474.3 757.279 490.314C761.856 504.403 761.856 519.581 757.279 533.669C752.074 549.686 738.185 563.576 710.406 591.354L502.079 799.681C474.3 827.46 460.41 841.35 444.393 846.555C430.305 851.132 415.13 851.132 401.041 846.555C385.024 841.35 371.135 827.46 343.356 799.681L214.391 670.717C158.832 615.157 131.052 587.378 120.644 555.346C111.489 527.167 111.489 496.816 120.644 468.639C131.052 436.605 158.832 408.826 214.391 353.266L343.356 224.303Z" fill="url(#paint2_radial_12155_41873)"/>
+<defs>
+<radialGradient id="paint0_radial_12155_41873" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(354.145 925.744) rotate(-58.142) scale(664.835 1039.67)">
+<stop stop-color="#FFD580"/>
+<stop offset="0.09375" stop-color="#F6C592"/>
+<stop offset="0.205" stop-color="#EBB6A2"/>
+<stop offset="0.324466" stop-color="#DFA5AF"/>
+<stop offset="0.42875" stop-color="#D397BE"/>
+<stop offset="0.53375" stop-color="#C486CB"/>
+<stop offset="0.64875" stop-color="#B578D9"/>
+<stop offset="0.77125" stop-color="#A166E5"/>
+<stop offset="0.89125" stop-color="#8B57F2"/>
+<stop offset="1" stop-color="#704CFF"/>
+</radialGradient>
+<linearGradient id="paint1_linear_12155_41873" x1="326.713" y1="-44.3649" x2="481.598" y2="901.077" gradientUnits="userSpaceOnUse">
+<stop stop-color="#6D4AFF"/>
+<stop offset="0.392009" stop-color="#B39FFB" stop-opacity="0.978022"/>
+<stop offset="1" stop-color="#FFE8DB" stop-opacity="0.8"/>
+</linearGradient>
+<radialGradient id="paint2_radial_12155_41873" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(295.746 844.786) rotate(-58.142) scale(534.758 836.255)">
+<stop stop-color="#FFD580"/>
+<stop offset="0.09375" stop-color="#F6C592"/>
+<stop offset="0.205" stop-color="#EBB6A2"/>
+<stop offset="0.324466" stop-color="#DFA5AF"/>
+<stop offset="0.42875" stop-color="#D397BE"/>
+<stop offset="0.53375" stop-color="#C486CB"/>
+<stop offset="0.64875" stop-color="#B578D9"/>
+<stop offset="0.77125" stop-color="#A166E5"/>
+<stop offset="0.89125" stop-color="#8B57F2"/>
+<stop offset="1" stop-color="#704CFF"/>
+</radialGradient>
+</defs>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/pwsafe-light.svg b/js/apps/account-ui/public/passkeys/pwsafe-light.svg
new file mode 100644
index 00000000000..094897da943
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/pwsafe-light.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" version="1.1" id="svg2" width="177.77733" height="177.77733" viewBox="0 0 177.77733 177.77733" style="zoom: 1;"><defs id="defs6"><clipPath clipPathUnits="userSpaceOnUse" id="clipPath16"><path d="M 0,132.333 H 133.333 V 0 H 0 Z" id="path14"></path></clipPath></defs><g id="g8" transform="matrix(1.3333333,0,0,-1.3333333,0,176.444)"><g id="g10"><g id="g12" clip-path="url(#clipPath16)"><g id="g18" transform="translate(113.1494,84.6616)"><path d="M0,0 c-9.621,16.264 -23.704,29.888 -37.254,40.433 c-1.042,0.812 -2.082,1.605 -3.114,2.38 c-1.811,1.355 -3.603,2.654 -5.365,3.896 c-0.518,-0.356 -1.038,-0.718 -1.561,-1.084 c-12.852,-9.012 -27.292,-21.098 -38.564,-35.836 c-2.943,-3.848 -5.67,-7.876 -8.096,-12.078 c-7.45,-12.902 -12.065,-27.441 -14.885,-41.388 c-1.582,-7.824 -2.599,-15.462 -3.235,-22.521 c18.152,-8.633 42.345,-17.26 66.54,-17.26 c23.257,0 46.514,7.972 64.407,16.259 c-1.6,20.036 -6.225,45.304 -18.322,66.257 C0.368,-0.626 0.186,-0.313 0,0 " id="path20" style="fill:#263248;fill-opacity:1;fill-rule:nonzero;stroke:none"></path></g><g id="g22" transform="translate(97.1611,74.4946)"><path d="M0,0 c-6.414,10.842 -15.803,19.925 -24.835,26.955 c-0.696,0.542 -1.388,1.069 -2.077,1.587 c-1.206,0.903 -2.401,1.769 -3.576,2.597 c-0.346,-0.238 -0.694,-0.479 -1.041,-0.723 c-8.569,-6.008 -18.196,-14.065 -25.71,-23.89 c-1.962,-2.566 -3.78,-5.251 -5.397,-8.052 c-4.967,-8.601 -8.043,-18.294 -9.924,-27.593 c-1.055,-5.216 -1.732,-10.308 -2.156,-15.013 c12.102,-5.755 28.231,-11.506 44.361,-11.506 c15.503,-0.001 31.008,5.314 42.937,10.839 C11.516,-31.442 8.433,-14.597 0.367,-0.627 C0.246,-0.418 0.124,-0.209 0,0 " id="path24" style="fill:#7f89a1;fill-opacity:1;fill-rule:nonzero;stroke:none"></path></g><g id="g26" transform="translate(81.6289,65.3379)"><path d="M0,0.75005 c-3.208,5.421 -7.902,9.962 -12.42,13.478 c-0.347,0.27 -0.693,0.534 -1.038,0.793 c-0.604,0.452 -1.2,0.885 -1.787,1.299 c-0.173,-0.12 -0.348,-0.24 -0.521,-0.362 c-4.284,-3.004 -9.097,-7.032 -12.855,-11.945 c-0.981,-1.283 -1.89,-2.626 -2.698,-4.027 c-2.483,-4.299 -4.022,-9.147 -4.962,-13.796 c-0.527,-2.608 -0.867,-5.154 -1.078,-7.506 c6.05,-2.878 14.115,-5.753 22.18,-5.753 c7.752,0 15.504,2.657 21.469,5.42 C5.758,-14.971951 4.215,-6.54795 0.182,0.43605 C0.122,0.54205 0.061,0.64605 0,0.75005 " id="path28" style="fill:#f7971d;fill-opacity:1;fill-rule:nonzero;stroke:none"></path></g></g></g></g></svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/rsa-light.png b/js/apps/account-ui/public/passkeys/rsa-light.png
new file mode 100644
index 00000000000..f09ffa6505f
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/rsa-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/samsung-light.svg b/js/apps/account-ui/public/passkeys/samsung-light.svg
new file mode 100644
index 00000000000..399033941d8
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/samsung-light.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg version="1.1" width="52px" height="52px" viewBox="0 0 52.0 52.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><clipPath id="i0"><path d="M360,0 L360,800 L0,800 L0,0 L360,0 Z"></path></clipPath><clipPath id="i1"><path d="M26,0 C33.9910278,0 41.1395833,0.975 45.9087778,5.77777778 C49.7101944,9.60591667 52,15.8650556 52,26 C52,36.1349444 49.7098333,42.3944444 45.9080556,46.2225833 C41.1388611,51.0246389 33.9903056,52 26,52 C18.0089722,52 10.8607778,51.0246389 6.09158333,46.2225833 C2.29016667,42.3944444 0,36.1349444 0,26 C0,15.8650556 2.28980556,9.60555556 6.09086111,5.77777778 C10.8600556,0.975 18.0086111,0 26,0 Z"></path></clipPath><linearGradient id="i2" x1="26px" y1="52px" x2="26px" y2="0.195921148px" gradientUnits="userSpaceOnUse"><stop stop-color="#2929B2" offset="0%"></stop><stop stop-color="#1A40CC" offset="100%"></stop></linearGradient><clipPath id="i3"><path d="M37.1944444,0 L37.1944444,5.72222222 L0,5.72222222 L0,0 L37.1944444,0 Z"></path></clipPath><clipPath id="i4"><path d="M1.88342213,0 C2.62075987,0 3.64356402,0.181610871 3.64356402,1.32111819 L3.64356402,1.68911562 L2.34279339,1.68911562 L2.34279339,1.36490659 C2.34279339,1.07957573 2.16319664,0.889153371 1.8581768,0.889153371 C1.52931788,0.889153371 1.41648398,1.07527088 1.38085927,1.24215109 C1.36679688,1.30026657 1.36090408,1.41172184 1.38614941,1.51725793 C1.53460802,2.1304973 3.51244902,2.45611887 3.73255883,3.55553727 C3.75371937,3.6670598 3.80079488,3.96113488 3.73804986,4.41300963 C3.61182321,5.28965203 2.8380572,5.61217949 1.89581043,5.61217949 C0.915729136,5.61217949 0,5.25998892 0,4.0888006 L0,3.68824773 L1.39940823,3.68824773 L1.40121625,4.19231879 C1.40121625,4.4786586 1.59608073,4.66928275 1.92185932,4.66928275 C2.2707404,4.66928275 2.38839569,4.49150589 2.43118552,4.31541061 C2.45622996,4.21639905 2.47149769,4.05463085 2.42100703,3.92864671 C2.15134406,3.25096911 0.297921677,2.94128895 0.0721199473,1.87032292 C0.0173436085,1.60564189 0.0238390912,1.39907634 0.0617405677,1.16426021 C0.200221581,0.308873007 0.957112727,0 1.88342213,0 Z M18.8411186,0.0296631089 C19.5704877,0.0296631089 20.5778901,0.206969129 20.5778901,1.33564706 L20.5778901,1.70075217 L19.2921864,1.70075217 L19.2921864,1.38044441 C19.2921864,1.0974005 19.115603,0.90879425 18.8144001,0.90879425 C18.4912331,0.90879425 18.3790688,1.09161586 18.34177,1.25937049 C18.3297835,1.31681334 18.3230871,1.42665428 18.3462566,1.53017248 C18.4943134,2.13641647 20.4503912,2.46311425 20.6660144,3.54921452 C20.6896526,3.65905547 20.7340496,3.95070907 20.6751885,4.3984135 C20.5517743,5.26510093 19.7824949,5.58480333 18.8510962,5.58480333 C17.8785818,5.58480333 16.9756428,5.23543783 16.9756428,4.07750037 L16.9756428,3.67788919 L18.3595154,3.67788919 L18.3599172,4.18061498 C18.3599172,4.46305352 18.5551834,4.65044903 18.8797567,4.65044903 C19.2257583,4.65044903 19.3424761,4.47516091 19.3823865,4.30088174 C19.4063595,4.20556966 19.4198192,4.04380146 19.3728107,3.9169429 C19.1064289,3.24726963 17.2711537,2.94007821 17.0477627,1.8811523 C16.9901069,1.6193636 16.9990801,1.41421058 17.0353074,1.18309393 C17.1723153,0.333827686 17.92251,0.0296631089 18.8411186,0.0296631089 Z M23.2364845,0.166880211 L23.2362291,4.11137366 C23.2372063,4.15798462 23.2408818,4.20406745 23.2496764,4.24115194 C23.2751226,4.37123913 23.3877556,4.62159308 23.7469491,4.62159308 C24.1108301,4.62159308 24.2205836,4.37123913 24.2481057,4.24115194 C24.2596905,4.1855252 24.2617663,4.10965222 24.2596905,4.04211988 L24.2596905,0.166880211 L25.5786083,0.166880211 L25.5786083,3.92185312 C25.5843002,4.01864499 25.5747244,4.21639905 25.5674253,4.26819178 C25.4747475,5.24667079 24.707477,5.56435529 23.7469491,5.56435529 C22.7882962,5.56435529 22.020557,5.24667079 21.9295532,4.26819178 C21.9238613,4.21639905 21.9162944,4.01864499 21.9179685,3.92185312 L21.9179685,0.166880211 L23.2364845,0.166880211 Z M34.6297621,0.0259636282 C35.5539956,0.0259636282 36.3600382,0.336854534 36.4587427,1.31950387 C36.465573,1.39119692 36.4683814,1.46511378 36.4693607,1.52618022 L36.469004,1.65575402 L36.4687203,1.66617884 L36.4687203,1.83803654 L35.1553605,1.83803654 L35.15515,1.53355556 C35.1544471,1.49873362 35.15149,1.40564123 35.1394901,1.34526571 C35.1166555,1.2313217 35.0170804,0.966035306 34.6181774,0.966035306 C34.2381582,0.966035306 34.1255921,1.21759999 34.0996772,1.34526571 C34.0817978,1.41542132 34.0761059,1.50811012 34.0761059,1.5927946 L34.0761059,3.98689672 C34.0761059,4.05463085 34.0801907,4.12761151 34.0897665,4.18613057 C34.1125342,4.327518 34.2438501,4.5682533 34.6209899,4.5682533 C35.0004064,4.5682533 35.134133,4.327518 35.1553605,4.18613057 C35.1669452,4.12761151 35.1706282,4.05463085 35.1689541,3.98689672 L35.1689541,3.22890676 L34.6344496,3.22890676 L34.6344496,2.46493036 L36.4791667,2.46493036 L36.4791667,3.86851334 C36.4770908,3.96443078 36.4754837,4.03868945 36.460015,4.21397757 C36.3728282,5.16958707 35.5539956,5.50832497 34.6260791,5.50832497 C33.7038545,5.50832497 32.87933,5.16958707 32.7936164,4.21397757 C32.775938,4.03868945 32.7728576,3.96443078 32.7728576,3.86851334 L32.7728576,1.66617884 C32.7728576,1.5702614 32.788728,1.40909857 32.7991074,1.31950387 C32.9141511,0.339746855 33.7038545,0.0259636282 34.6297621,0.0259636282 Z M12.1447447,0.166880211 L12.8022616,4.26159998 L13.4601804,0.166880211 L15.5852746,0.166880211 L15.7019255,5.40521036 L14.395262,5.40521036 L14.3598382,0.555931054 L13.4622562,5.40521036 L12.1398563,5.40521036 L11.2430779,0.555931054 L11.207788,5.40521036 L9.9044058,5.40521036 L10.0172397,0.166880211 L12.1447447,0.166880211 Z M7.9012525,0.166880211 L8.86325358,5.40521036 L7.4643141,5.40521036 L6.75382883,0.555931054 L6.02586602,5.40521036 L4.61714983,5.40521036 L5.58316873,0.166880211 L7.9012525,0.166880211 Z M28.304836,5.35059257 L27.0246233,5.35059257 L27.0246233,0.166880211 L28.9598753,0.166880211 L30.1879903,4.38435547 L30.1168748,0.166880211 L31.4054581,0.166880211 L31.4054581,5.35059257 L29.5494241,5.35059257 L28.23,0.999 L28.304836,5.35059257 Z"></path></clipPath><clipPath id="i5"><path d="M24.3352966,2.47006432 C25.3096502,2.47006432 26.121323,2.65660564 26.7692768,3.02897356 C27.4172305,3.40169883 27.9295017,3.90843367 28.3060902,4.55025015 L26.3954573,5.48259937 C26.1960869,5.1463247 25.9191836,4.88009236 25.5647473,4.68461708 C25.2103111,4.48914179 24.8004942,4.39122547 24.3352966,4.39122547 C23.8036422,4.39122547 23.4104395,4.49485953 23.1556885,4.70212766 C22.9005913,4.90939579 22.7735619,5.14954093 22.7735619,5.42220573 C22.7735619,5.73846831 22.9618562,5.96503381 23.3384447,6.10083017 C23.714687,6.23734125 24.2688398,6.38207158 24.9998646,6.53466381 C25.3986054,6.6111386 25.799769,6.71155644 26.204394,6.83734675 C26.6086729,6.9627797 26.9769543,7.13181043 27.3092383,7.34479631 C27.6415222,7.55742482 27.9101185,7.82973226 28.1150269,8.1627907 C28.3199354,8.49549178 28.4223896,8.91252955 28.4223896,9.41426137 C28.4223896,9.75232283 28.3448567,10.1043213 28.1897908,10.469542 C28.0343788,10.8347628 27.7938191,11.1731816 27.4670731,11.4837264 C27.1403272,11.794986 26.7277413,12.0483534 26.2293153,12.2445434 C25.7308893,12.4410908 25.1327782,12.5390071 24.4349818,12.5390071 C23.3605969,12.5390071 22.4689682,12.332811 21.7600957,11.9200616 C21.0512233,11.5069548 20.5029547,10.9105228 20.11529,10.1300511 L22.1920649,9.16518225 C22.4246637,9.60473363 22.7403335,9.94243774 23.1390743,10.1786519 C23.5378151,10.4145088 24.0030126,10.5320798 24.534667,10.5320798 C25.0884736,10.5320798 25.5038286,10.417725 25.7807319,10.1890153 C26.0572891,9.95994832 26.1960869,9.68764088 26.1960869,9.37102095 C26.1960869,9.19662983 26.1323992,9.05511573 26.0050236,8.94576392 C25.8776481,8.83712683 25.7115061,8.74135466 25.5065976,8.65987685 C25.3013431,8.57804167 25.0607833,8.51014349 24.78388,8.45511023 C24.5069767,8.40079169 24.2189972,8.3407554 23.9199416,8.27535873 C23.4987025,8.18816318 23.0864626,8.08488647 22.6821838,7.9648139 C22.277905,7.84509869 21.9151616,7.67856947 21.5939538,7.46629831 C21.2727459,7.25331244 21.0124568,6.98064764 20.8130864,6.64830392 C20.613716,6.3159602 20.5140308,5.89892243 20.5140308,5.39754797 C20.5140308,5.01553137 20.6054089,4.64780912 20.7881651,4.2936665 C20.9709213,3.93916653 21.2284414,3.62612018 21.5607254,3.35309803 C21.8930093,3.08079059 22.294173,2.86566056 22.7652548,2.7073506 C23.2359904,2.54904063 23.7593377,2.47006432 24.3352966,2.47006432 Z M33.1073515,2.47006432 C34.081705,2.47006432 34.8933779,2.65660564 35.5413316,3.02897356 C36.1892854,3.40169883 36.7015565,3.90843367 37.0781451,4.55025015 L35.1675122,5.48259937 C34.9681418,5.1463247 34.6912384,4.88009236 34.3368022,4.68461708 C33.9823659,4.48914179 33.572549,4.39122547 33.1073515,4.39122547 C32.5756971,4.39122547 32.1824944,4.49485953 31.9277433,4.70212766 C31.6726461,4.90939579 31.5456167,5.14954093 31.5456167,5.42220573 C31.5456167,5.73846831 31.733911,5.96503381 32.1104995,6.10083017 C32.4867419,6.23734125 33.0408947,6.38207158 33.7719194,6.53466381 C34.1706602,6.6111386 34.5718239,6.71155644 34.9764489,6.83734675 C35.3807277,6.9627797 35.7490091,7.13181043 36.0812931,7.34479631 C36.4135771,7.55742482 36.6821733,7.82973226 36.8870818,8.1627907 C37.0919902,8.49549178 37.1944444,8.91252955 37.1944444,9.41426137 C37.1944444,9.75232283 37.1169115,10.1043213 36.9618457,10.469542 C36.8064337,10.8347628 36.5658739,11.1731816 36.239128,11.4837264 C35.9123821,11.794986 35.4997961,12.0483534 35.0013702,12.2445434 C34.5029442,12.4410908 33.904833,12.5390071 33.2070367,12.5390071 C32.1326518,12.5390071 31.2410231,12.332811 30.5321506,11.9200616 C29.8232781,11.5069548 29.2750095,10.9105228 28.8873449,10.1300511 L30.9641198,9.16518225 C31.1967186,9.60473363 31.5123883,9.94243774 31.9111291,10.1786519 C32.3098699,10.4145088 32.7750675,10.5320798 33.3067218,10.5320798 C33.8605285,10.5320798 34.2758835,10.417725 34.5527868,10.1890153 C34.829344,9.95994832 34.9681418,9.68764088 34.9681418,9.37102095 C34.9681418,9.19662983 34.904454,9.05511573 34.7770785,8.94576392 C34.6497029,8.83712683 34.483561,8.74135466 34.2786525,8.65987685 C34.0733979,8.57804167 33.8328382,8.51014349 33.5559348,8.45511023 C33.2790315,8.40079169 32.9910521,8.3407554 32.6919965,8.27535873 C32.2707573,8.18816318 31.8585175,8.08488647 31.4542386,7.9648139 C31.0499598,7.84509869 30.6872165,7.67856947 30.3660086,7.46629831 C30.0448008,7.25331244 29.7845116,6.98064764 29.5851412,6.64830392 C29.3857709,6.3159602 29.2860857,5.89892243 29.2860857,5.39754797 C29.2860857,5.01553137 29.3774638,4.64780912 29.5602199,4.2936665 C29.7429761,3.93916653 30.0004962,3.62612018 30.3327802,3.35309803 C30.6650642,3.08079059 31.0662279,2.86566056 31.5373096,2.7073506 C32.0080453,2.54904063 32.5313926,2.47006432 33.1073515,2.47006432 Z M13.7732057,2.47002859 C14.4156214,2.47002859 15.0081945,2.59010116 15.550925,2.82953159 C16.0933094,3.06967673 16.5422389,3.39666007 16.8966751,3.81083897 L16.8966751,2.48718181 L19.139592,2.48718181 L19.139592,12.5218181 L16.8966751,12.5218181 L16.8966751,11.0959563 C16.5422389,11.5440843 16.0881174,11.8967975 15.5343108,12.1537385 C14.9805042,12.4106795 14.382393,12.5389714 13.7399773,12.5389714 C13.1529423,12.5389714 12.5742143,12.4264033 12.0037935,12.2005525 C11.4333726,11.9743444 10.9211015,11.646289 10.4669801,11.2163863 C10.0128586,10.7864836 9.64700011,10.260094 9.37044292,9.63757491 C9.0935396,9.01469844 8.95508794,8.30641322 8.95508794,7.51307658 C8.95508794,6.70830447 9.09042444,5.99501622 9.36213582,5.3717824 C9.63350107,4.74890593 9.99347539,4.22287371 10.4420588,3.79297103 C10.8906421,3.36271098 11.4056823,3.03501292 11.9871793,2.80951949 C12.5686763,2.58331134 13.1640184,2.47002859 13.7732057,2.47002859 Z M4.15354978,0 C4.78488935,0 5.36638632,0.117213701 5.89804069,0.351998461 C6.42969506,0.586425862 6.88900844,0.903403156 7.27701922,1.30400242 C7.66468386,1.70424432 7.96893138,2.175958 8.19080017,2.71914344 C8.41232282,3.26197152 8.52308415,3.84232228 8.52308415,4.46019572 C8.52308415,5.07735444 8.41232282,5.66056408 8.19080017,6.20946726 C7.96893138,6.75837044 7.66468386,7.23294299 7.27701922,7.63354225 C6.88900844,8.03378416 6.42692603,8.35111881 5.88973359,8.58518885 C5.35219502,8.81961625 4.76827515,8.93682995 4.13693558,8.93682995 L2.25953108,8.93682995 L2.25953108,12.5218539 L0,12.5218539 L0,0 L4.15354978,0 Z M14.1054897,4.58023256 C13.6956728,4.58023256 13.3107771,4.65563527 12.9508028,4.80572599 C12.5908285,4.9558167 12.2779278,5.16022596 12.0121006,5.41752433 C11.7462734,5.67553741 11.5385959,5.98179394 11.3890681,6.33629391 C11.2395403,6.69079389 11.1647764,7.07173841 11.1647764,7.48019957 C11.1647764,7.88830337 11.2395403,8.27246413 11.3890681,8.63196712 C11.5385959,8.99147012 11.7462734,9.30272967 12.0121006,9.5664605 C12.2779278,9.82947661 12.5908285,10.03603 12.9508028,10.1868354 C13.3107771,10.3369262 13.6956728,10.4119715 14.1054897,10.4119715 C14.5263827,10.4119715 14.9137012,10.3369262 15.2684836,10.1868354 C15.6229199,10.03603 15.9271674,9.82661774 16.1822646,9.55788389 C16.4370156,9.28950739 16.639155,8.97789048 16.7886828,8.62374787 C16.9382106,8.26960526 17.0129745,7.88830337 17.0129745,7.48019957 C17.0129745,7.08281654 16.9382106,6.70687503 16.7886828,6.35237506 C16.639155,5.99787509 16.4370156,5.68911705 16.1822646,5.42610094 C15.9271674,5.16272747 15.6229199,4.9558167 15.2684836,4.80572599 C14.9137012,4.65563527 14.5263827,4.58023256 14.1054897,4.58023256 Z M3.98740779,2.16130628 L2.25953108,2.16130628 L2.25953108,6.77552367 L3.98740779,6.77552367 C4.31969177,6.77552367 4.62428542,6.71548738 4.90118874,6.59541481 C5.17774593,6.47534224 5.41622892,6.30952774 5.6155993,6.09832866 C5.81496969,5.88677222 5.97003555,5.64055198 6.08079688,5.36038265 C6.19121208,5.08057067 6.24693887,4.78003189 6.24693887,4.46019572 C6.24693887,4.13964484 6.19121208,3.83946341 6.08079688,3.55929408 C5.97003555,3.27912475 5.81496969,3.03612073 5.6155993,2.83028204 C5.41622892,2.62444334 5.17774593,2.46148771 4.90118874,2.34141514 C4.62428542,2.22134257 4.31969177,2.16130628 3.98740779,2.16130628 Z"></path></clipPath></defs><g transform="translate(-233.0 -160.0)"><g clip-path="url(#i0)"><g transform="translate(233.0 160.0)"><g transform="translate(-0.00018055555555207548 0.0)"><g clip-path="url(#i1)"><polygon points="0,0 52,0 52,52 0,52 0,0" stroke="none" fill="url(#i2)"></polygon></g></g><g transform="translate(7.583333333333332 14.80555555555555)"><g clip-path="url(#i3)"><g clip-path="url(#i4)"><polygon points="0,0 36.4791667,0 36.4791667,5.61217949 0,5.61217949 0,0" stroke="none" fill="#FFFFFF"></polygon></g></g></g><g transform="translate(7.583333333333371 24.43208025547733)"><g clip-path="url(#i5)"><polygon points="0,0 37.1944444,0 37.1944444,12.5390071 0,12.5390071 0,0" stroke="none" fill="#FFFFFF"></polygon></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/secora-light.png b/js/apps/account-ui/public/passkeys/secora-light.png
new file mode 100644
index 00000000000..7853293c027
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/secora-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/secora1-light.png b/js/apps/account-ui/public/passkeys/secora1-light.png
new file mode 100644
index 00000000000..c511d33a45c
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/secora1-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/securitag-light.png b/js/apps/account-ui/public/passkeys/securitag-light.png
new file mode 100644
index 00000000000..01eb9d7feb7
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/securitag-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/sentry-light.png b/js/apps/account-ui/public/passkeys/sentry-light.png
new file mode 100644
index 00000000000..43679057172
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/sentry-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/sesame-light.svg b/js/apps/account-ui/public/passkeys/sesame-light.svg
new file mode 100644
index 00000000000..55424277f1e
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/sesame-light.svg
@@ -0,0 +1,11 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="1024" height="1024" rx="176" fill="url(#paint0_linear_202_3)"/>
+<path d="M769.175 452.118L370.579 451.678C339.658 451.685 310.006 463.963 288.144 485.812C266.282 507.662 254 537.294 254 568.19V798.71C254 807.537 257.509 816.004 263.755 822.247C270.002 828.49 278.474 831.998 287.308 832H652.94C683.864 831.998 713.52 819.722 735.386 797.872C757.252 776.022 769.536 746.388 769.536 715.488L770 459.631V423.853C769.788 376.523 755.149 330.382 728.034 291.575C700.919 252.767 662.614 223.136 618.222 206.627C573.83 190.118 525.458 187.516 479.548 199.167C433.639 210.817 392.372 236.168 361.243 271.842" stroke="white" stroke-width="32" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M512.001 692C539.615 692 562.001 669.614 562.001 642C562.001 614.386 539.615 592 512.001 592C484.387 592 462.001 614.386 462.001 642C462.001 669.614 484.387 692 512.001 692Z" stroke="white" stroke-width="32"/>
+<defs>
+<linearGradient id="paint0_linear_202_3" x1="0" y1="0" x2="1024" y2="1024" gradientUnits="userSpaceOnUse">
+<stop stop-color="#006DE6"/>
+<stop offset="1" stop-color="#00A6FF"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/shalo-light.png b/js/apps/account-ui/public/passkeys/shalo-light.png
new file mode 100644
index 00000000000..1dd81821588
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/shalo-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/sherlocked-light.svg b/js/apps/account-ui/public/passkeys/sherlocked-light.svg
new file mode 100644
index 00000000000..9459ac5d242
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/sherlocked-light.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="1024px" height="1024px" viewBox="0 0 1024 1024" enable-background="new 0 0 1024 1024" xml:space="preserve">
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="511.9995" y1="0" x2="511.9995" y2="1024.0005">
+	<stop  offset="0" style="stop-color:#50B6FC"/>
+	<stop  offset="1" style="stop-color:#5091F9"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="1024" height="1024"/>
+<g>
+	<path fill="#FFFFFF" d="M289.66,474.826c6.887-15.649,25.21-22.769,40.845-15.87c15.627,6.872,22.755,25.203,15.87,40.837
+		c-0.199,0.441-0.426,0.818-0.641,1.259l38.354,16.887c0.207-0.427,0.441-0.818,0.641-1.259
+		c16.204-36.783-0.541-79.896-37.324-96.094c-36.797-16.197-79.911,0.548-96.101,37.331c-0.191,0.435-0.32,0.882-0.505,1.309"/>
+	<path fill="#FFFFFF" d="M513.822,410.622h-0.009v41.754h0.009c86.29,0,156.484,69.917,156.484,155.859
+		c0,85.943-70.194,155.853-156.484,155.853c-86.286,0-156.494-69.909-156.494-155.853c0-12.789-0.229-15.741,1.665-29.114
+		l-30.9-8.003l-1.863-27.172c-8.167,21.616-10.812,39.855-10.812,64.289c0,108.962,89.008,197.601,198.405,197.601
+		c109.395,0,198.402-88.639,198.402-197.601C712.225,499.274,623.217,410.622,513.822,410.622z"/>
+	<path fill="#FFFFFF" d="M593.361,427.203L593.361,427.203l-16.907,38.17l0,0c78.893,34.948,114.757,127.313,79.945,205.887
+		c-34.805,78.573-127.313,114.075-206.2,79.121c-78.886-34.926-114.751-127.307-79.945-205.873
+		c5.186-11.701,6.686-15.123,13.834-26.568l-25.536-19.206l9.297-25.607c-16.225,16.453-26.027,32.074-35.916,54.402
+		c-44.129,99.622,1.338,216.734,101.365,261.015c100.013,44.323,217.303-0.683,261.421-100.305
+		C738.855,588.609,693.388,471.504,593.361,427.203z"/>
+	<g>
+		<path fill="#FFFFFF" d="M515.329,514.497c-17.086,0-30.993-13.907-30.993-30.979c0-17.086,13.209-31.143,30.295-31.143
+			c0.477,0,1.622,0.007,2.099,0.021v-41.705c-0.477-0.014-0.932-0.071-1.401-0.071c-40.19,0-72.897,32.7-72.897,72.897
+			s32.707,72.904,72.897,72.904c0.47,0,0.925-0.063,1.401-0.079"/>
+		<path fill="#FFFFFF" d="M512.413,514.532h-0.008v41.912h0.008c28.126,0,50.995,22.884,50.995,50.994
+			c0,28.127-22.868,50.995-50.995,50.995c-17.3,0-32.6-8.677-41.826-21.894l-26.028,34.292
+			c16.965,18.161,41.094,29.534,67.854,29.534c51.236,0,92.914-41.697,92.914-92.928
+			C605.326,556.223,563.648,514.532,512.413,514.532z"/>
+	</g>
+	<path fill="#FFFFFF" d="M635.949,330.199c-32.955-14.519-67.136-22.599-101.137-24.882l-18.146,41.193
+		c34.286,0.292,69.069,7.363,102.388,22.044C750.559,426.463,810.409,580.551,752.5,712.047
+		c-57.916,131.475-212.005,191.348-343.493,133.432c-131.489-57.91-191.352-211.998-133.438-343.479
+		c5.221-11.887,11.274-23.168,17.996-33.853l-38.66-17.036c-6.509,10.833-12.484,22.122-17.706,33.994
+		c-67.22,152.644,2.27,331.515,154.914,398.742c152.643,67.235,331.515-2.276,398.728-154.913
+		C858.083,576.283,788.592,397.427,635.949,330.199z"/>
+	<path fill="#FFFFFF" d="M514.02,112.61c-96.868,0-178.116,67.903-198.816,158.577h43.32
+		c19.683-67.327,81.902-116.665,155.496-116.665c82.209,0,150.247,61.516,160.661,140.928c15.108,7.825,29.584,16.723,43.334,26.583
+		v-5.441C718.015,204.123,626.51,112.61,514.02,112.61z"/>
+	<path fill="#FFFFFF" d="M510.691,304.555c-36.022,0.398-70.465,7.17-102.389,19.113l0.491,45.02
+		c31.348-13.906,65.934-21.823,102.346-22.229c143.681-1.593,261.853,114.012,263.447,257.679
+		c1.58,143.666-114.004,261.832-257.671,263.434c-143.667,1.594-261.847-114.006-263.44-257.672
+		c-0.142-12.996,0.697-25.764,2.404-38.263l-42.239,0.478c-1.448,12.54-2.223,25.286-2.073,38.248
+		c1.838,166.791,139.025,300.963,305.811,299.119c166.778-1.863,300.962-139.035,299.119-305.813
+		C814.648,436.876,677.455,302.698,510.691,304.555z"/>
+	<g>
+		<path opacity="0.55" fill="#FFFFFF" d="M465.585,325.198c1.586-3.058,3.03-6.195,4.233-9.439h-4.233V325.198z"/>
+		<path fill="#FFFFFF" d="M411.354,337.198v-14.504c-5.206,2.604-11.061,4.09-17.256,4.09c-21.418,0-38.461-17.42-38.461-38.832
+			c0-8.415,1.743-14.276,4.552-22.108l-10.399-0.42v-44.821c-21.922,14.44-36.441,39.194-36.441,67.349
+			c0,44.537,36.222,80.75,80.75,80.75c25.984,0,49.089-12.37,63.834-31.504H411.354z"/>
+	</g>
+</g>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/smartdisplayer-light.png b/js/apps/account-ui/public/passkeys/smartdisplayer-light.png
new file mode 100644
index 00000000000..dd5a5b6dff2
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/smartdisplayer-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/solo-light.png b/js/apps/account-ui/public/passkeys/solo-light.png
new file mode 100644
index 00000000000..fd13fc23d1a
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/solo-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/starsign-light.png b/js/apps/account-ui/public/passkeys/starsign-light.png
new file mode 100644
index 00000000000..3e27e386532
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/starsign-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/sticky-light.svg b/js/apps/account-ui/public/passkeys/sticky-light.svg
new file mode 100644
index 00000000000..4b2f5f457ef
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/sticky-light.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 108 108"
+   width="108"
+   height="108"
+   version="1.1"
+   id="svg5"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <title>Sticky Password Manager</title>
+  <defs
+     id="defs5" />
+  <circle
+     style="fill:#ffffff;stroke-width:1.76201"
+     id="path6"
+     cx="54"
+     cy="54"
+     r="54" />
+  <g
+     id="g6"
+     transform="matrix(1.3433243,0,0,1.3433243,-18.540607,-18.527594)">
+    <path
+       d="m 64.35,53.11 -9.5,-9.5 c -0.48,-0.48 -1.26,-0.48 -1.75,0 l -9.5,9.5 c -0.48,0.48 -0.48,1.26 0,1.74 l 9.5,9.5 c 0.24,0.24 0.56,0.36 0.87,0.36 0.31,0 0.63,-0.12 0.87,-0.36 l 9.5,-9.5 c 0.23,-0.23 0.36,-0.54 0.36,-0.87 0,-0.33 -0.13,-0.64 -0.36,-0.87 z"
+       fill="#000000"
+       fill-rule="evenodd"
+       stroke="#000000"
+       stroke-width="3.62"
+       stroke-opacity="0"
+       id="path1" />
+    <path
+       d="m 50.11,67.34 -9.5,-9.5 c -0.48,-0.48 -1.26,-0.48 -1.74,0 l -9.49,9.5 c -0.48,0.48 -0.48,1.26 0,1.75 l 9.49,9.5 c 0.24,0.24 0.56,0.36 0.87,0.36 0.31,0 0.63,-0.12 0.87,-0.36 l 9.5,-9.5 c 0.23,-0.24 0.36,-0.54 0.36,-0.87 0,-0.33 -0.13,-0.64 -0.36,-0.87"
+       fill="#00a9e0"
+       fill-rule="evenodd"
+       stroke="#000000"
+       stroke-width="3.62"
+       stroke-opacity="0"
+       id="path2" />
+    <path
+       d="m 78.57,38.88 -9.5,-9.49 c -0.48,-0.48 -1.27,-0.48 -1.74,0 l -9.5,9.5 c -0.48,0.48 -0.48,1.26 0,1.74 l 9.5,9.5 c 0.24,0.24 0.55,0.36 0.87,0.36 0.31,0 0.63,-0.12 0.87,-0.36 l 9.5,-9.5 c 0.23,-0.24 0.36,-0.54 0.36,-0.87 0,-0.33 -0.13,-0.64 -0.36,-0.87"
+       fill="#d61818"
+       fill-rule="evenodd"
+       stroke="#000000"
+       stroke-width="3.62"
+       stroke-opacity="0"
+       id="path3" />
+    <path
+       d="m 50.1,38.86 -9.5,-9.5 c -0.48,-0.48 -1.27,-0.48 -1.74,0 l -9.5,9.5 c -0.48,0.48 -0.48,1.26 0,1.75 l 9.5,9.5 c 0.24,0.24 0.55,0.36 0.87,0.36 0.32,0 0.63,-0.12 0.87,-0.36 l 9.49,-9.5 c 0.23,-0.23 0.37,-0.54 0.37,-0.88 0,-0.33 -0.13,-0.64 -0.37,-0.87"
+       fill="#7ab800"
+       fill-rule="evenodd"
+       stroke="#000000"
+       stroke-width="3.62"
+       stroke-opacity="0"
+       id="path4" />
+    <path
+       d="m 78.64,67.39 -9.5,-9.49 c -0.48,-0.48 -1.27,-0.48 -1.75,0 l -9.49,9.49 c -0.48,0.48 -0.48,1.26 0,1.75 l 9.49,9.5 c 0.24,0.24 0.55,0.36 0.87,0.36 0.32,0 0.63,-0.12 0.87,-0.36 l 9.5,-9.5 c 0.23,-0.23 0.36,-0.54 0.36,-0.87 0,-0.33 -0.13,-0.64 -0.36,-0.88"
+       fill="#0046ad"
+       fill-rule="evenodd"
+       stroke="#000000"
+       stroke-width="3.62"
+       stroke-opacity="0"
+       id="path5" />
+  </g>
+</svg>
diff --git a/js/apps/account-ui/public/passkeys/swissbit-light.png b/js/apps/account-ui/public/passkeys/swissbit-light.png
new file mode 100644
index 00000000000..ac23d8ea257
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/swissbit-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/t-shield-light.png b/js/apps/account-ui/public/passkeys/t-shield-light.png
new file mode 100644
index 00000000000..5a405a301f3
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/t-shield-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/taglio-light.png b/js/apps/account-ui/public/passkeys/taglio-light.png
new file mode 100644
index 00000000000..4d7417e40b9
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/taglio-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/thales-light.png b/js/apps/account-ui/public/passkeys/thales-light.png
new file mode 100644
index 00000000000..da6aaa1f29a
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/thales-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/thales1-dark.svg b/js/apps/account-ui/public/passkeys/thales1-dark.svg
new file mode 100644
index 00000000000..367d2b49bf0
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/thales1-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 77.6 77.6" style="enable-background:new 0 0 77.6 77.6;"><g><path fill="#FFF" d="M77.6,55.1c-4.9,1.4-11.4,1.9-16.2,2l-22.7-45.8h-1.3l-22.6,45.8c-4.8-0.1-10.5-0.6-15.4-2l28.7-53.7h20.5 L77.6,55.1z"></path><path fill="#FFF" d="M47.7,41.4c0,5.3-4.3,9.5-9.6,9.5c-5.3,0-9.5-4.3-9.5-9.5c0-5.3,4.3-9.5,9.5-9.5 C43.4,31.9,47.7,36.1,47.7,41.4"></path></g></svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/thales1-light.svg b/js/apps/account-ui/public/passkeys/thales1-light.svg
new file mode 100644
index 00000000000..baab67dba79
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/thales1-light.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 77.6 77.6" style="enable-background:new 0 0 77.6 77.6;"><g><path fill="#2C2F73" d="M77.6,55.1c-4.9,1.4-11.4,1.9-16.2,2l-22.7-45.8h-1.3l-22.6,45.8c-4.8-0.1-10.5-0.6-15.4-2l28.7-53.7h20.5 L77.6,55.1z"></path><path fill="#5EBFD4" d="M47.7,41.4c0,5.3-4.3,9.5-9.6,9.5c-5.3,0-9.5-4.3-9.5-9.5c0-5.3,4.3-9.5,9.5-9.5 C43.4,31.9,47.7,36.1,47.7,41.4"></path></g></svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/thales3-dark.svg b/js/apps/account-ui/public/passkeys/thales3-dark.svg
new file mode 100644
index 00000000000..367d2b49bf0
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/thales3-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 77.6 77.6" style="enable-background:new 0 0 77.6 77.6;"><g><path fill="#FFF" d="M77.6,55.1c-4.9,1.4-11.4,1.9-16.2,2l-22.7-45.8h-1.3l-22.6,45.8c-4.8-0.1-10.5-0.6-15.4-2l28.7-53.7h20.5 L77.6,55.1z"></path><path fill="#FFF" d="M47.7,41.4c0,5.3-4.3,9.5-9.6,9.5c-5.3,0-9.5-4.3-9.5-9.5c0-5.3,4.3-9.5,9.5-9.5 C43.4,31.9,47.7,36.1,47.7,41.4"></path></g></svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/thales3-light.svg b/js/apps/account-ui/public/passkeys/thales3-light.svg
new file mode 100644
index 00000000000..baab67dba79
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/thales3-light.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 77.6 77.6" style="enable-background:new 0 0 77.6 77.6;"><g><path fill="#2C2F73" d="M77.6,55.1c-4.9,1.4-11.4,1.9-16.2,2l-22.7-45.8h-1.3l-22.6,45.8c-4.8-0.1-10.5-0.6-15.4-2l28.7-53.7h20.5 L77.6,55.1z"></path><path fill="#5EBFD4" d="M47.7,41.4c0,5.3-4.3,9.5-9.6,9.5c-5.3,0-9.5-4.3-9.5-9.5c0-5.3,4.3-9.5,9.5-9.5 C43.4,31.9,47.7,36.1,47.7,41.4"></path></g></svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/thetis-light.png b/js/apps/account-ui/public/passkeys/thetis-light.png
new file mode 100644
index 00000000000..65bbff0e831
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/thetis-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/token-light.png b/js/apps/account-ui/public/passkeys/token-light.png
new file mode 100644
index 00000000000..db5ddd7c03b
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/token-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/token2-light.png b/js/apps/account-ui/public/passkeys/token2-light.png
new file mode 100644
index 00000000000..4f3f0df2915
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/token2-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/toothpic-dark.svg b/js/apps/account-ui/public/passkeys/toothpic-dark.svg
new file mode 100644
index 00000000000..0c4d14840c9
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/toothpic-dark.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 666.66669 666.66669"
+   height="666.66669"
+   width="666.66669"
+   xml:space="preserve"
+   id="svg2"
+   version="1.1"
+   sodipodi:docname="logoQuadrato_03.svg"
+   inkscape:export-filename="logoQuadrato_fondo_trasparente.svg"
+   inkscape:export-xdpi="480.54"
+   inkscape:export-ydpi="480.54"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false" /><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6"><clipPath
+       id="clipPath20"
+       clipPathUnits="userSpaceOnUse"><path
+         id="path18"
+         d="M 0,500 H 500 V 0 H 0 Z" /></clipPath></defs><g
+     transform="matrix(1.3333333,0,0,-1.3333333,0,666.66667)"
+     id="g10"><g
+       id="g14"><g
+         clip-path="url(#clipPath20)"
+         id="g16"><g
+           transform="translate(271.2935,160.3877)"
+           id="g22"><path
+             id="path24"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -1.609,22.325 8.191,35.961 27.969,45.722 38.251,18.878 60.677,49.906 65.954,92.756 5.869,47.664 -19.012,94.411 -62.555,117.173 -43.086,22.523 -96.23,15.726 -131.639,-16.836 -62.664,-57.627 -49.157,-155.027 27.378,-192.975 20.369,-10.1 29.516,-24.409 28.827,-47.051 l -0.665,-90.957 c -0.154,-5.219 -0.106,-15.163 -9.273,-15.163 -10.151,0 -9.377,9.863 -9.54,15.055 l -0.2,89.462 c 0.529,15.969 -4.733,25.222 -19.548,32.457 -54.064,26.399 -81.765,81.218 -74.085,143.239 6.547,52.882 50.489,99.204 105.937,111.678 C 14.723,299.442 82.008,262.771 105.332,199.118 129.124,134.186 102.615,62.173 41.647,31.314 23.795,22.279 17.162,11.385 18.236,-8.143 l 0.322,-82.005 c -0.04,-7.051 1.517,-17.418 -8.73,-17.113 -10.808,0.322 -9.425,10.388 -9.563,17.791 z" /></g><g
+           transform="translate(353.7485,312.6514)"
+           id="g26"><path
+             id="path28"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -1.877,-44.525 -21.488,-76.549 -60.95,-95.686 -6.669,-3.234 -14.311,-8.589 -20.382,0.667 -3.59,11.012 4.853,13.02 11.947,16.465 33.823,16.422 53.209,49.665 50.034,85.561 -2.976,33.636 -27.851,64.073 -60.433,73.944 -42.422,12.853 -86.942,-8.274 -104.044,-49.373 -16.916,-40.655 0.188,-87.587 39.473,-108.165 3.501,-1.835 7.268,-3.688 10.525,-5.194 4.814,-2.226 9.273,-6.641 6.214,-13.097 -3.773,-5.949 -10.158,-4.928 -13.83,-3.573 -34.05,12.558 -56.148,37.094 -65.057,71.953 -14.43,56.456 20.322,113.536 76.31,127.514 C -73.479,115.175 -16.533,80.27 -2.776,22.613 -0.949,14.958 -0.808,6.9 0,0" /></g><g
+           transform="translate(302.3062,312.1279)"
+           id="g30"><path
+             id="path32"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -0.127,30.031 -24.61,54.313 -54.134,53.687 -28.701,-0.609 -53.155,-25.097 -53.515,-53.591 -0.367,-28.98 24.858,-54.236 54.151,-54.22 C -23.44,-54.107 0.128,-30.263 0,0 m -52.069,72.649 c 39.811,-0.438 72.627,-34.097 72.046,-73.896 -0.592,-40.524 -34.503,-73.024 -75.363,-72.226 -39.888,0.78 -71.077,33.778 -70.68,74.781 0.389,40.156 33.202,71.792 73.997,71.341" /></g><g
+           transform="translate(239.5879,212.7441)"
+           id="g34"><path
+             id="path36"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0.214,5.411 -1.726,15.9 9.05,15.9 10.048,0 9.444,-10.235 9.519,-15.42 l -0.015,-181.282 c -0.077,-5.364 0.544,-15.175 -9.095,-15.149 -9.831,-0.56 -10.001,8.323 -9.952,16.165 z" /></g><g
+           transform="translate(179.6133,474.2949)"
+           id="g38"><path
+             id="path40"
+             style="fill:none;stroke:#ffffff;stroke-width:17.902;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+             d="M 0,0 C -47.839,0 -84.575,-35.961 -84.575,-82.561" /></g><g
+           transform="translate(406.3682,391.7344)"
+           id="g42"><path
+             id="path44"
+             style="fill:none;stroke:#ffffff;stroke-width:17.902;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+             d="M 0,0 C 0,53.184 -40.61,82.561 -84.575,82.561" /></g><g
+           transform="translate(321.793,24.8623)"
+           id="g46"><path
+             id="path48"
+             style="fill:none;stroke:#ffffff;stroke-width:17.902;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+             d="M 0,0 C 47.839,0 84.575,35.962 84.575,82.561" /></g><g
+           transform="translate(95.0386,107.4229)"
+           id="g50"><path
+             id="path52"
+             style="fill:none;stroke:#ffffff;stroke-width:17.902;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+             d="M 0,0 C 0,-53.183 40.61,-82.561 84.575,-82.561" /></g><g
+           transform="translate(272.5391,311.7549)"
+           id="g54"><path
+             id="path56"
+             style="fill:#f68712;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0,-13.019 -10.553,-23.572 -23.572,-23.572 -13.019,0 -23.573,10.553 -23.573,23.572 0,13.019 10.554,23.572 23.573,23.572 C -10.553,23.572 0,13.019 0,0" /></g><g
+           transform="translate(248.9668,288.1826)"
+           id="g58"><path
+             id="path60"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -13.019,0 -23.572,10.554 -23.572,23.572 0,13.019 10.553,23.573 23.572,23.573 13.019,0 23.572,-10.554 23.572,-23.573 C 23.572,10.554 13.019,0 0,0 M 1.402,64.451 C -22.017,64.884 -40.659,47.335 -41.213,24.336 -41.76,1.626 -23.248,-17.143 -0.132,-17.313 23.614,-17.489 41.229,-0.094 41.225,23.53 41.222,46.62 24.28,64.029 1.402,64.451" /></g></g></g></g></svg>
diff --git a/js/apps/account-ui/public/passkeys/toothpic-light.svg b/js/apps/account-ui/public/passkeys/toothpic-light.svg
new file mode 100644
index 00000000000..1117024037c
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/toothpic-light.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   viewBox="0 0 666.66669 666.66669"
+   height="666.66669"
+   width="666.66669"
+   xml:space="preserve"
+   id="svg2"
+   version="1.1"><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6"><clipPath
+       id="clipPath18"
+       clipPathUnits="userSpaceOnUse"><path
+         id="path16"
+         d="M 0,500 H 500 V 0 H 0 Z" /></clipPath></defs><g
+     transform="matrix(1.3333333,0,0,-1.3333333,0,666.66667)"
+     id="g10"><g
+       id="g12"><g
+         clip-path="url(#clipPath18)"
+         id="g14"><g
+           transform="translate(271.9302,161.9868)"
+           id="g20"><path
+             id="path22"
+             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -1.609,22.325 8.191,35.961 27.969,45.722 38.251,18.878 60.677,49.906 65.954,92.756 5.87,47.664 -19.012,94.411 -62.555,117.173 -43.086,22.523 -96.23,15.726 -131.639,-16.836 -62.664,-57.626 -49.156,-155.026 27.378,-192.975 20.369,-10.099 29.516,-24.409 28.827,-47.051 l -0.665,-90.956 c -0.154,-5.22 -0.105,-15.164 -9.272,-15.164 -10.152,0 -9.378,9.864 -9.541,15.055 l -0.2,89.461 c 0.529,15.971 -4.733,25.223 -19.548,32.458 -54.064,26.399 -81.764,81.218 -74.085,143.239 6.547,52.882 50.489,99.204 105.937,111.678 C 14.723,299.443 82.008,262.772 105.332,199.118 129.124,134.186 102.615,62.173 41.647,31.314 23.796,22.279 17.162,11.385 18.236,-8.142 l 0.322,-82.006 c -0.04,-7.051 1.518,-17.418 -8.73,-17.113 -10.808,0.322 -9.425,10.388 -9.563,17.791 z" /></g><g
+           transform="translate(354.3853,314.251)"
+           id="g24"><path
+             id="path26"
+             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -1.877,-44.525 -21.488,-76.549 -60.95,-95.686 -6.669,-3.234 -14.311,-8.59 -20.382,0.667 -3.59,11.012 4.853,13.019 11.948,16.465 33.822,16.422 53.208,49.665 50.033,85.561 -2.976,33.635 -27.851,64.073 -60.433,73.944 -42.422,12.852 -86.942,-8.275 -104.044,-49.374 -16.916,-40.654 0.188,-87.586 39.473,-108.164 3.501,-1.835 7.268,-3.689 10.525,-5.195 4.814,-2.225 9.273,-6.64 6.214,-13.096 -3.773,-5.949 -10.158,-4.928 -13.83,-3.574 -34.05,12.559 -56.148,37.094 -65.057,71.953 -14.43,56.457 20.322,113.537 76.31,127.515 C -73.479,115.174 -16.533,80.27 -2.776,22.613 -0.949,14.958 -0.808,6.9 0,0" /></g><g
+           transform="translate(302.9429,313.7275)"
+           id="g28"><path
+             id="path30"
+             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="M 0,0 C -0.126,30.031 -24.61,54.312 -54.134,53.687 -82.835,53.078 -107.289,28.589 -107.649,0.095 -108.016,-28.884 -82.791,-54.14 -53.497,-54.124 -23.44,-54.107 0.128,-30.263 0,0 m -52.069,72.649 c 39.811,-0.439 72.627,-34.098 72.046,-73.897 -0.592,-40.524 -34.503,-73.023 -75.363,-72.225 -39.888,0.779 -71.077,33.777 -70.68,74.78 0.389,40.156 33.202,71.793 73.997,71.342" /></g><g
+           transform="translate(240.2246,214.3433)"
+           id="g32"><path
+             id="path34"
+             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0.214,5.411 -1.726,15.9 9.05,15.9 10.049,0 9.444,-10.235 9.519,-15.42 l -0.014,-181.282 c -0.077,-5.364 0.544,-15.174 -9.096,-15.149 -9.831,-0.56 -10.001,8.324 -9.952,16.165 z" /></g><g
+           transform="translate(180.2505,475.8945)"
+           id="g36"><path
+             id="path38"
+             style="fill:none;stroke:#231f20;stroke-width:17.90200043;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+             d="M 0,0 C -47.839,0 -84.575,-35.961 -84.575,-82.561" /></g><g
+           transform="translate(407.0049,393.334)"
+           id="g40"><path
+             id="path42"
+             style="fill:none;stroke:#231f20;stroke-width:17.90200043;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+             d="M 0,0 C 0,53.183 -40.61,82.561 -84.575,82.561" /></g><g
+           transform="translate(322.4302,26.4619)"
+           id="g44"><path
+             id="path46"
+             style="fill:none;stroke:#231f20;stroke-width:17.90200043;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+             d="M 0,0 C 47.839,0 84.575,35.961 84.575,82.561" /></g><g
+           transform="translate(95.6753,109.0225)"
+           id="g48"><path
+             id="path50"
+             style="fill:none;stroke:#231f20;stroke-width:17.90200043;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+             d="M 0,0 C 0,-53.183 40.61,-82.561 84.575,-82.561" /></g><g
+           transform="translate(273.1763,313.354)"
+           id="g52"><path
+             id="path54"
+             style="fill:#f68712;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0,-13.019 -10.554,-23.572 -23.572,-23.572 -13.019,0 -23.573,10.553 -23.573,23.572 0,13.019 10.554,23.572 23.573,23.572 C -10.554,23.572 0,13.019 0,0" /></g><g
+           transform="translate(249.6035,289.7817)"
+           id="g56"><path
+             id="path58"
+             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -13.019,0 -23.572,10.554 -23.572,23.572 0,13.019 10.553,23.573 23.572,23.573 13.019,0 23.573,-10.554 23.573,-23.573 C 23.573,10.554 13.019,0 0,0 M 1.402,64.452 C -22.017,64.884 -40.659,47.335 -41.213,24.336 -41.76,1.626 -23.248,-17.143 -0.132,-17.313 23.614,-17.489 41.229,-0.094 41.225,23.53 41.222,46.621 24.28,64.029 1.402,64.452" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/truu-light.png b/js/apps/account-ui/public/passkeys/truu-light.png
new file mode 100644
index 00000000000..729e072b151
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/truu-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/utrust-light.png b/js/apps/account-ui/public/passkeys/utrust-light.png
new file mode 100644
index 00000000000..d22d32f66da
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/utrust-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/valmido-light.png b/js/apps/account-ui/public/passkeys/valmido-light.png
new file mode 100644
index 00000000000..4d763d1801c
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/valmido-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/veridium-light.png b/js/apps/account-ui/public/passkeys/veridium-light.png
new file mode 100644
index 00000000000..a2604ff4041
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/veridium-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/verimark-light.png b/js/apps/account-ui/public/passkeys/verimark-light.png
new file mode 100644
index 00000000000..7b1c861a222
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/verimark-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/verimark1-light.png b/js/apps/account-ui/public/passkeys/verimark1-light.png
new file mode 100644
index 00000000000..27da03b2ae1
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/verimark1-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/verocard-light.png b/js/apps/account-ui/public/passkeys/verocard-light.png
new file mode 100644
index 00000000000..3c557f24582
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/verocard-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/vincss-light.png b/js/apps/account-ui/public/passkeys/vincss-light.png
new file mode 100644
index 00000000000..d8dad417d06
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/vincss-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/vivokey-light.png b/js/apps/account-ui/public/passkeys/vivokey-light.png
new file mode 100644
index 00000000000..2a2385d0be5
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/vivokey-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/webcomm-light.png b/js/apps/account-ui/public/passkeys/webcomm-light.png
new file mode 100644
index 00000000000..b24d4d14fef
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/webcomm-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/windows-light.svg b/js/apps/account-ui/public/passkeys/windows-light.svg
new file mode 100644
index 00000000000..960a7af56e4
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/windows-light.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><defs><style>.cls-1{fill:#0078d4;stroke-width:0px;}</style></defs><rect class="cls-1" x="24.25" y="24.25" width="98.35" height="98.35"/><rect class="cls-1" x="133.4" y="24.25" width="98.35" height="98.35"/><rect class="cls-1" x="24.25" y="133.4" width="98.35" height="98.35"/><rect class="cls-1" x="133.4" y="133.4" width="98.35" height="98.35"/></svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/winmagic-light.png b/js/apps/account-ui/public/passkeys/winmagic-light.png
new file mode 100644
index 00000000000..07c8c1d82d4
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/winmagic-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/yubikey-light.png b/js/apps/account-ui/public/passkeys/yubikey-light.png
new file mode 100644
index 00000000000..d1c1b3a87b9
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/yubikey-light.png differ
diff --git a/js/apps/account-ui/public/passkeys/zoho-light.svg b/js/apps/account-ui/public/passkeys/zoho-light.svg
new file mode 100644
index 00000000000..ccf3e05d528
--- /dev/null
+++ b/js/apps/account-ui/public/passkeys/zoho-light.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #226eb3;
+      }
+
+      .cls-2 {
+        fill: #fff;
+      }
+
+      .cls-3 {
+        opacity: .9;
+      }
+
+      .cls-4 {
+        fill: #e42528;
+      }
+    </style>
+  </defs>
+  <path class="cls-2" d="M26.1,3.62H5.9c-1.24,0-2.25,1.01-2.25,2.25v16.94c0,1.24,1.01,2.25,2.25,2.25h.1c.3.07.67.29.67.91v2.11c0,.15.12.27.27.27h2.75c.15,0,.27-.12.27-.27v-1.23s.07-1.56,1.75-1.79h8.58c1.68.23,1.75,1.79,1.75,1.79v1.23c0,.15.12.27.27.27h2.75c.15,0,.27-.12.27-.27v-2.11c0-.62.37-.83.67-.91h.09c1.24,0,2.25-1.01,2.25-2.25V5.87c0-1.24-1.01-2.25-2.25-2.25Z"/>
+  <g>
+    <g class="cls-3">
+      <path class="cls-1" d="M25.06,30h-2.75c-1.06,0-1.92-.86-1.92-1.92v-1.13c0-.15-.12-.27-.27-.27h-8.24c-.15,0-.27.12-.27.27v1.13c0,1.06-.86,1.92-1.92,1.92h-2.75c-1.06,0-1.92-.86-1.92-1.92v-1.49c-1.72-.38-3.02-1.92-3.02-3.76V5.84c0-2.12,1.72-3.84,3.84-3.84h20.31c2.12,0,3.84,1.72,3.84,3.84v16.99c0,1.84-1.3,3.38-3.02,3.76v1.49c0,1.06-.86,1.92-1.92,1.92ZM11.88,25.03h8.24c1.06,0,1.92.86,1.92,1.92v1.13c0,.15.12.27.27.27h2.75c.15,0,.27-.12.27-.27v-2.22c0-.46.37-.82.82-.82,1.21,0,2.2-.99,2.2-2.2V5.84c0-1.21-.99-2.2-2.2-2.2H5.84c-1.21,0-2.2.99-2.2,2.2v16.99c0,1.21.99,2.2,2.2,2.2.46,0,.82.37.82.82v2.22c0,.15.12.27.27.27h2.75c.15,0,.27-.12.27-.27v-1.13c0-1.06.86-1.92,1.92-1.92Z"/>
+    </g>
+    <g class="cls-3">
+      <path class="cls-4" d="M10.77,19.25c-.17,0-.34-.05-.48-.16-.37-.27-.45-.78-.18-1.15l2.67-3.68c.27-.37.78-.45,1.15-.18.37.27.45.78.18,1.15l-2.67,3.68c-.16.22-.41.34-.67.34Z"/>
+    </g>
+    <g class="cls-3">
+      <path class="cls-4" d="M16.12,19.25c-.26,0-.51-.12-.67-.34l-2.67-3.68c-.27-.37-.19-.88.18-1.15.37-.27.88-.19,1.15.18l2.67,3.68c.27.37.19.88-.18,1.15-.15.11-.32.16-.48.16Z"/>
+    </g>
+    <g class="cls-3">
+      <path class="cls-4" d="M13.44,15.57c-.46,0-.82-.37-.82-.82v-4.51c0-.46.37-.82.82-.82s.82.37.82.82v4.51c0,.46-.37.82-.82.82Z"/>
+    </g>
+    <g class="cls-3">
+      <path class="cls-4" d="M13.44,15.58c-.35,0-.67-.22-.78-.57-.14-.43.1-.9.53-1.04l4.32-1.39c.43-.14.9.1,1.04.53.14.43-.1.9-.53,1.04l-4.32,1.39c-.09.03-.17.04-.26.04Z"/>
+    </g>
+    <g class="cls-3">
+      <path class="cls-4" d="M13.44,15.58c-.09,0-.17-.01-.25-.04l-4.32-1.39c-.43-.14-.67-.6-.53-1.04.14-.43.6-.67,1.04-.53l4.32,1.39c.43.14.67.6.53,1.04-.11.35-.43.57-.78.57Z"/>
+    </g>
+    <g class="cls-3">
+      <path class="cls-1" d="M22.85,19.23c-.46,0-.82-.37-.82-.82v-8.15c0-.46.37-.82.82-.82s.82.37.82.82v8.15c0,.46-.37.82-.82.82Z"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/js/apps/account-ui/public/passkeys/ztpass-light.png b/js/apps/account-ui/public/passkeys/ztpass-light.png
new file mode 100644
index 00000000000..c12293c80ba
Binary files /dev/null and b/js/apps/account-ui/public/passkeys/ztpass-light.png differ
diff --git a/js/apps/account-ui/src/account-security/SigningIn.tsx b/js/apps/account-ui/src/account-security/SigningIn.tsx
index b67b9f2dbeb..8ff4281824f 100644
--- a/js/apps/account-ui/src/account-security/SigningIn.tsx
+++ b/js/apps/account-ui/src/account-security/SigningIn.tsx
@@ -38,6 +38,7 @@ import type { TFuncKey } from "../i18n-type";
 import { formatDate } from "../utils/formatDate";
 import { usePromise } from "../utils/usePromise";
 import { AccountEnvironment } from "..";
+import { joinPath } from "../utils/joinPath";
 
 type MobileLinkProps = {
   title: string;
@@ -98,19 +99,67 @@ export const SigningIn = () => {
 
   const credentialRowCells = (
     credMetadata: CredentialMetadataRepresentation,
+    showIcon: boolean,
   ) => {
     const credential = credMetadata.credential;
     const maxWidth = {
       "--pf-v5-u-max-width--MaxWidth": "300px",
     } as CSSProperties;
+    const icon = credMetadata.iconLight || credMetadata.iconDark;
+    const authenticatorProvider = credMetadata.infoProperties?.find(
+      (p) => p.key === "webauthn-authenticator-provider",
+    )?.parameters?.[0];
+    const iconSrc = icon
+      ? joinPath(context.environment.resourceUrl, "passkeys", icon)
+      : joinPath(context.environment.resourceUrl, "favicon.svg");
+    const iconDarkSrc = credMetadata.iconDark
+      ? joinPath(
+          context.environment.resourceUrl,
+          "passkeys",
+          credMetadata.iconDark,
+        )
+      : undefined;
+
     const items = [
+      ...(showIcon
+        ? [
+            <DataListCell
+              key="icon"
+              data-testrole="icon"
+              className="pf-v5-c-data-list__cell pf-m-icon pf-v5-u-display-flex pf-v5-u-align-items-center pf-v5-u-pt-0"
+            >
+              <div className="pf-v5-c-icon pf-m-xl">
+                <picture>
+                  {iconDarkSrc && (
+                    <source
+                      srcSet={iconDarkSrc}
+                      media="(prefers-color-scheme: dark)"
+                    />
+                  )}
+                  <img
+                    src={iconSrc}
+                    alt=""
+                    width="40"
+                    height="40"
+                    style={{ maxWidth: "none" }}
+                  />
+                </picture>
+              </div>
+            </DataListCell>,
+          ]
+        : []),
       <DataListCell
         key="title"
         data-testrole="label"
-        className="pf-v5-u-max-width"
+        className="pf-v5-u-max-width pf-v5-u-pt-0"
         style={maxWidth}
       >
-        {t(credential.userLabel) || t(credential.type as TFuncKey)}
+        <div>{t(credential.userLabel) || t(credential.type as TFuncKey)}</div>
+        {authenticatorProvider && (
+          <div className="pf-v5-u-color-200 pf-v5-u-font-size-sm">
+            {authenticatorProvider}
+          </div>
+        )}
       </DataListCell>,
     ];
 
@@ -119,6 +168,7 @@ export const SigningIn = () => {
         <DataListCell
           key={"created" + credential.id}
           data-testrole="created-at"
+          className="pf-v5-u-pt-0"
         >
           <Trans
             i18nKey="credentialCreatedAt"
@@ -170,14 +220,21 @@ export const SigningIn = () => {
                       "2xl": "15ch",
                     }}
                   >
-                    {credMetadata.infoProperties.map((prop) => (
-                      <DescriptionListGroup key={prop.key}>
-                        <DescriptionListTerm>{t(prop.key)}</DescriptionListTerm>
-                        <DescriptionListDescription>
-                          {prop.parameters ? prop.parameters[0] : ""}
-                        </DescriptionListDescription>
-                      </DescriptionListGroup>
-                    ))}
+                    {credMetadata.infoProperties
+                      .filter(
+                        (prop) =>
+                          prop.key !== "webauthn-authenticator-provider",
+                      )
+                      .map((prop) => (
+                        <DescriptionListGroup key={prop.key}>
+                          <DescriptionListTerm>
+                            {t(prop.key)}
+                          </DescriptionListTerm>
+                          <DescriptionListDescription>
+                            {prop.parameters ? prop.parameters[0] : ""}
+                          </DescriptionListDescription>
+                        </DescriptionListGroup>
+                      ))}
                   </DescriptionList>
                 </SplitItem>
               </Split>
@@ -290,9 +347,12 @@ export const SigningIn = () => {
                     <DataListItem key={meta.credential.id}>
                       <DataListItemRow id={`cred-${meta.credential.id}`}>
                         <DataListItemCells
-                          className="pf-v5-u-py-0"
+                          className="pf-v5-u-py-0 pf-v5-u-align-items-center"
                           dataListCells={[
-                            ...credentialRowCells(meta),
+                            ...credentialRowCells(
+                              meta,
+                              container.type.startsWith("webauthn"),
+                            ),
                             <DataListAction
                               key="action"
                               id={`action-${meta.credential.id}`}
diff --git a/js/apps/account-ui/src/api/representations.ts b/js/apps/account-ui/src/api/representations.ts
index 9f439e6f701..8b3c2811dd7 100644
--- a/js/apps/account-ui/src/api/representations.ts
+++ b/js/apps/account-ui/src/api/representations.ts
@@ -45,6 +45,8 @@ export interface CredentialMetadataRepresentation {
   warningMessageTitle: CredentialMetadataRepresentationMessage;
   warningMessageDescription: CredentialMetadataRepresentationMessage;
   credential: CredentialRepresentation;
+  iconLight?: string;
+  iconDark?: string;
 }
 
 export interface DeviceRepresentation {
diff --git a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java
index bd2cc61a826..7b7569da780 100644
--- a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java
+++ b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/KeycloakProcessor.java
@@ -52,6 +52,7 @@ import jakarta.persistence.PersistenceUnitTransactionType;
 import org.keycloak.Config;
 import org.keycloak.authentication.AuthenticatorSpi;
 import org.keycloak.authentication.authenticators.browser.DeployedScriptAuthenticatorFactory;
+import org.keycloak.authentication.authenticators.browser.WebAuthnMetadataService;
 import org.keycloak.authorization.policy.provider.PolicySpi;
 import org.keycloak.authorization.policy.provider.js.DeployedScriptPolicyFactory;
 import org.keycloak.common.Profile;
@@ -774,6 +775,24 @@ class KeycloakProcessor {
         }
     }
 
+    @BuildStep
+    @Consume(ProfileBuildItem.class)
+    void parseWebAuthnMetadata(BuildProducer<WebAuthnMetadataBuildItem> producer) {
+        if (Profile.isFeatureEnabled(Profile.Feature.WEB_AUTHN)) {
+            producer.produce(new WebAuthnMetadataBuildItem(WebAuthnMetadataService.parseMetadata()));
+        }
+    }
+
+    @Record(ExecutionTime.STATIC_INIT)
+    @Consume(ProfileBuildItem.class)
+    @Consume(WebAuthnMetadataBuildItem.class)
+    @BuildStep
+    void configureWebAuthnMetadata(KeycloakRecorder recorder, WebAuthnMetadataBuildItem metadataBuildItem) {
+        if (Profile.isFeatureEnabled(Profile.Feature.WEB_AUTHN)) {
+            recorder.setDefaultWebAuthnMetadata(metadataBuildItem.getMetadata());
+        }
+    }
+
     /**
      * This will cause quarkus to include specified modules in the jandex index. For example keycloak-services is needed as it includes
      * most of the JAX-RS resources, which are required to register Resteasy builtin providers.
diff --git a/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/WebAuthnMetadataBuildItem.java b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/WebAuthnMetadataBuildItem.java
new file mode 100644
index 00000000000..a4a9dbbfcda
--- /dev/null
+++ b/quarkus/deployment/src/main/java/org/keycloak/quarkus/deployment/WebAuthnMetadataBuildItem.java
@@ -0,0 +1,20 @@
+package org.keycloak.quarkus.deployment;
+
+import java.util.Map;
+
+import org.keycloak.authentication.authenticators.browser.WebAuthnAuthenticatorMetadata;
+
+import io.quarkus.builder.item.SimpleBuildItem;
+
+final class WebAuthnMetadataBuildItem extends SimpleBuildItem {
+
+    private final Map<String, WebAuthnAuthenticatorMetadata> metadata;
+
+    WebAuthnMetadataBuildItem(Map<String, WebAuthnAuthenticatorMetadata> metadata) {
+        this.metadata = metadata;
+    }
+
+    Map<String, WebAuthnAuthenticatorMetadata> getMetadata() {
+        return metadata;
+    }
+}
diff --git a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakRecorder.java b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakRecorder.java
index c30029cc0df..e24825af4c9 100644
--- a/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakRecorder.java
+++ b/quarkus/runtime/src/main/java/org/keycloak/quarkus/runtime/KeycloakRecorder.java
@@ -28,6 +28,8 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.keycloak.Config;
+import org.keycloak.authentication.authenticators.browser.WebAuthnAuthenticatorMetadata;
+import org.keycloak.authentication.authenticators.browser.WebAuthnMetadataService;
 import org.keycloak.common.Profile;
 import org.keycloak.common.crypto.CryptoIntegration;
 import org.keycloak.common.crypto.CryptoProvider;
@@ -169,6 +171,11 @@ public class KeycloakRecorder {
         DeclarativeUserProfileProviderFactory.setDefaultConfig(configuration);
     }
 
+    public void setDefaultWebAuthnMetadata(Map<String, WebAuthnAuthenticatorMetadata> metadata) {
+        WebAuthnMetadataService.setDefaultMetadata(metadata);
+    }
+
+
     public HibernateOrmIntegrationRuntimeInitListener createUserDefinedUnitListener(String name) {
         return propertyCollector -> {
             try (InstanceHandle<AgroalDataSource> instance = Arc.container().instance(
diff --git a/server-spi-private/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java b/server-spi-private/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java
index 7c5f3eb3679..308ad835cdd 100755
--- a/server-spi-private/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java
+++ b/server-spi-private/src/main/java/org/keycloak/models/utils/ModelToRepresentation.java
@@ -801,6 +801,8 @@ public class ModelToRepresentation {
                 .toList());
         rep.setWarningMessageDescription(toLocalizedMessage(credentialMetadata.getWarningMessageDescription()));
         rep.setWarningMessageTitle(toLocalizedMessage(credentialMetadata.getWarningMessageTitle()));
+        rep.setIconLight(credentialMetadata.getIconLight());
+        rep.setIconDark(credentialMetadata.getIconDark());
         return rep;
     }
 
diff --git a/server-spi/src/main/java/org/keycloak/credential/CredentialMetadata.java b/server-spi/src/main/java/org/keycloak/credential/CredentialMetadata.java
index e6d999e7386..b0dc6276d28 100644
--- a/server-spi/src/main/java/org/keycloak/credential/CredentialMetadata.java
+++ b/server-spi/src/main/java/org/keycloak/credential/CredentialMetadata.java
@@ -8,6 +8,8 @@ public class CredentialMetadata {
     LocalizedMessage warningMessageTitle;
     LocalizedMessage warningMessageDescription;
     CredentialModel credentialModel;
+    private String iconLight;
+    private String iconDark;
 
     public CredentialModel getCredentialModel() {
         return credentialModel;
@@ -52,6 +54,22 @@ public class CredentialMetadata {
         this.infoProperties = infoProperties;
     }
 
+    public String getIconLight() {
+        return iconLight;
+    }
+
+    public void setIconLight(String iconLight) {
+        this.iconLight = iconLight;
+    }
+
+    public String getIconDark() {
+        return iconDark;
+    }
+
+    public void setIconDark(String iconDark) {
+        this.iconDark = iconDark;
+    }
+
     public static class LocalizedMessage {
         private final String key;
         private final Object[] parameters;
diff --git a/server-spi/src/main/java/org/keycloak/models/credential/dto/WebAuthnCredentialPresentationData.java b/server-spi/src/main/java/org/keycloak/models/credential/dto/WebAuthnCredentialPresentationData.java
index ec242b520a5..b8be9a0d9b5 100644
--- a/server-spi/src/main/java/org/keycloak/models/credential/dto/WebAuthnCredentialPresentationData.java
+++ b/server-spi/src/main/java/org/keycloak/models/credential/dto/WebAuthnCredentialPresentationData.java
@@ -11,6 +11,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 public class WebAuthnCredentialPresentationData extends WebAuthnCredentialData {
 
     private final String authenticatorProvider;
+    private final String iconLight;
+    private final String iconDark;
 
     @JsonCreator
     public WebAuthnCredentialPresentationData(@JsonProperty("aaguid") String aaguid,
@@ -20,12 +22,24 @@ public class WebAuthnCredentialPresentationData extends WebAuthnCredentialData {
                                               @JsonProperty("credentialPublicKey") String credentialPublicKey,
                                               @JsonProperty("attestationStatementFormat") String attestationStatementFormat,
                                               @JsonProperty("transports") Set<String> transports,
-                                              @JsonProperty("authenticatorProvider") String authenticatorProvider) {
+                                              @JsonProperty("authenticatorProvider") String authenticatorProvider,
+                                              @JsonProperty("iconLight") String iconLight,
+                                              @JsonProperty("iconDark") String iconDark) {
         super(aaguid, credentialId, counter, attestationStatement, credentialPublicKey, attestationStatementFormat, transports);
         this.authenticatorProvider = authenticatorProvider;
+        this.iconLight = iconLight;
+        this.iconDark = iconDark;
     }
 
     public String getAuthenticatorProvider() {
         return authenticatorProvider;
     }
+
+    public String getIconLight() {
+        return iconLight;
+    }
+
+    public String getIconDark() {
+        return iconDark;
+    }
 }
diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticator.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticator.java
index afedcbbb39a..59532742e57 100644
--- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticator.java
+++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticator.java
@@ -103,7 +103,8 @@ public class WebAuthnAuthenticator implements Authenticator, CredentialValidator
         boolean isUserIdentified = false;
         if (user != null) {
             // in 2 Factor Scenario where the user has already been identified
-            WebAuthnAuthenticatorsBean authenticators = new WebAuthnAuthenticatorsBean(context.getSession(), context.getRealm(), user, getCredentialType());
+            WebAuthnMetadataService metadataService = getCredentialProvider(context.getSession()).getMetadataService();
+            WebAuthnAuthenticatorsBean authenticators = new WebAuthnAuthenticatorsBean(context.getSession(), context.getRealm(), user, getCredentialType(), metadataService);
             if (authenticators.getAuthenticators().isEmpty()) {
                 // require the user to register webauthn authenticator
                 return null;
@@ -360,7 +361,8 @@ public class WebAuthnAuthenticator implements Authenticator, CredentialValidator
         LoginFormsProvider provider = context.form().setError(errorCase, "");
         UserModel user = context.getUser();
         if (user != null) {
-            WebAuthnAuthenticatorsBean authenticators = new WebAuthnAuthenticatorsBean(context.getSession(), context.getRealm(), user, getCredentialType());
+            WebAuthnMetadataService metadataService = getCredentialProvider(context.getSession()).getMetadataService();
+            WebAuthnAuthenticatorsBean authenticators = new WebAuthnAuthenticatorsBean(context.getSession(), context.getRealm(), user, getCredentialType(), metadataService);
             if (authenticators.getAuthenticators() != null) {
                 provider.setAttribute(WebAuthnConstants.ALLOWED_AUTHENTICATORS, authenticators);
             }
diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticatorMetadata.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticatorMetadata.java
new file mode 100644
index 00000000000..f8f832a6c45
--- /dev/null
+++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnAuthenticatorMetadata.java
@@ -0,0 +1,16 @@
+package org.keycloak.authentication.authenticators.browser;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Metadata for a WebAuthn authenticator identified by its AAGUID.
+ *
+ * @param name human-readable authenticator provider name
+ * @param iconLight icon for light theme (data URI)
+ * @param iconDark icon for dark theme (data URI)
+ */
+public record WebAuthnAuthenticatorMetadata(
+        String name,
+        @JsonProperty("icon_light") String iconLight,
+        @JsonProperty("icon_dark") String iconDark) {
+}
diff --git a/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnMetadataService.java b/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnMetadataService.java
index 9f92372a256..6cbb04fc49b 100644
--- a/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnMetadataService.java
+++ b/services/src/main/java/org/keycloak/authentication/authenticators/browser/WebAuthnMetadataService.java
@@ -3,57 +3,66 @@ package org.keycloak.authentication.authenticators.browser;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.keycloak.util.JsonSerialization;
 import org.keycloak.utils.FileUtils;
+import org.keycloak.utils.StringUtil;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import org.jboss.logging.Logger;
 
 /**
- * Provides metadata for WebAuthn credentials
+ * Provides metadata for WebAuthn credentials.
+ * Based on <a href="https://github.com/passkeydeveloper/passkey-authenticator-aaguids">passkey-authenticator-aaguids</a>
  *
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
  */
 public class WebAuthnMetadataService {
 
-    // Based on https://github.com/duo-labs/webauthn.io/blob/master/_app/homepage/services/metadata.py
+    private static final Logger logger = Logger.getLogger(WebAuthnMetadataService.class);
     private static final String FILE_NAME = "keycloak-webauthn-metadata.json";
 
-    private Map<String, String> aaguidToProviderNames;
+    private static volatile Map<String, WebAuthnAuthenticatorMetadata> aaguidToMetadata;
 
-    private Map<String, String> readMetadata() {
+    public static void setDefaultMetadata(Map<String, WebAuthnAuthenticatorMetadata> metadata) {
+        if (aaguidToMetadata == null) {
+            aaguidToMetadata = metadata;
+        }
+    }
+
+    private Map<String, WebAuthnAuthenticatorMetadata> getAaguidToMetadata() {
+        if (aaguidToMetadata == null) {
+            synchronized (this) {
+                if (aaguidToMetadata == null) {
+                    aaguidToMetadata = parseMetadata();
+                }
+            }
+        }
+        return aaguidToMetadata;
+    }
+
+    public static Map<String, WebAuthnAuthenticatorMetadata> parseMetadata() {
         try {
             try (InputStream is = FileUtils.getJsonFileFromClasspathOrConfFolder(FILE_NAME)) {
-                Map<String, Map<String, String>> map = JsonSerialization.readValue(is, new TypeReference<>() {});
-                return map.entrySet().stream()
-                                .collect(Collectors.toMap(Map.Entry::getKey, entry -> {
-                                    String value = entry.getValue().get("name");
-                                    if (value == null) {
-                                        throw new IllegalStateException("Not found 'name' for the AAGUID '" + entry.getKey() + "' in the file '" + FILE_NAME + "'.");
-                                    }
-                                    return value;
-                                }));
+                Map<String, WebAuthnAuthenticatorMetadata> parsed = JsonSerialization.readValue(is, new TypeReference<>() {});
+                for (Map.Entry<String, WebAuthnAuthenticatorMetadata> entry : parsed.entrySet()) {
+                    if (StringUtil.isBlank(entry.getValue().name())) {
+                        throw new IllegalStateException("Not found 'name' for the AAGUID '" + entry.getKey() + "' in the file '" + FILE_NAME + "'.");
+                    }
+                }
+                return parsed;
             }
         } catch (IOException ioe) {
             throw new IllegalStateException("Error loading the webauthn metadata from file " + FILE_NAME, ioe);
         }
-
     }
 
-    private Map<String, String> getAaguidToProviderNames() {
-        if (aaguidToProviderNames == null) {
-            synchronized (this) {
-                if (aaguidToProviderNames == null) {
-                    // Make sure the file is not parsed during server startup, but "lazily" when needed for the 1st time
-                    this.aaguidToProviderNames = readMetadata();
-                }
-            }
-        }
-        return aaguidToProviderNames;
+    public WebAuthnAuthenticatorMetadata getAuthenticatorMetadata(String aaguid) {
+        return aaguid == null ? null : getAaguidToMetadata().get(aaguid);
     }
 
     public String getAuthenticatorProvider(String aaguid) {
-        return aaguid == null ? null : getAaguidToProviderNames().get(aaguid);
+        WebAuthnAuthenticatorMetadata metadata = getAuthenticatorMetadata(aaguid);
+        return metadata == null ? null : metadata.name();
     }
 }
diff --git a/services/src/main/java/org/keycloak/credential/WebAuthnCredentialProvider.java b/services/src/main/java/org/keycloak/credential/WebAuthnCredentialProvider.java
index 325526a33d4..413c01a9fd4 100644
--- a/services/src/main/java/org/keycloak/credential/WebAuthnCredentialProvider.java
+++ b/services/src/main/java/org/keycloak/credential/WebAuthnCredentialProvider.java
@@ -26,6 +26,7 @@ import java.util.stream.Collectors;
 
 import jakarta.annotation.Nonnull;
 
+import org.keycloak.authentication.authenticators.browser.WebAuthnAuthenticatorMetadata;
 import org.keycloak.authentication.authenticators.browser.WebAuthnMetadataService;
 import org.keycloak.authentication.requiredactions.WebAuthnRegisterFactory;
 import org.keycloak.common.util.Time;
@@ -103,13 +104,14 @@ public class WebAuthnCredentialProvider implements CredentialProvider<WebAuthnCr
         WebAuthnCredentialModel origCredential = getCredentialFromModel(model);
         WebAuthnCredentialData data = origCredential.getWebAuthnCredentialData();
 
-        String authenticatorProvider = metadataService.getAuthenticatorProvider(data.getAaguid());
-        if (authenticatorProvider == null)
+        WebAuthnAuthenticatorMetadata metadata = metadataService.getAuthenticatorMetadata(data.getAaguid());
+        if (metadata == null) {
             return origCredential;
+        }
 
         WebAuthnCredentialPresentationData presentationData = new WebAuthnCredentialPresentationData(
                 data.getAaguid(), data.getCredentialId(), data.getCounter(), data.getAttestationStatement(), data.getCredentialPublicKey(),
-                data.getAttestationStatementFormat(), data.getTransports(), authenticatorProvider);
+                data.getAttestationStatementFormat(), data.getTransports(), metadata.name(), metadata.iconLight(), metadata.iconDark());
         return WebAuthnCredentialModel.create(origCredential.getId(), origCredential.getType(), origCredential.getCreatedDate(), origCredential.getUserLabel(),
                 presentationData, origCredential.getWebAuthnSecretData());
     }
@@ -345,6 +347,8 @@ public class WebAuthnCredentialProvider implements CredentialProvider<WebAuthnCr
             if (!properties.isEmpty()) {
                 credentialMetadata.setInfoProperties(properties);
             }
+            credentialMetadata.setIconLight(credentialData.getIconLight());
+            credentialMetadata.setIconDark(credentialData.getIconDark());
         } catch (
                 IOException e) {
             logger.warn("unable to deserialize model information, skipping messages", e);
@@ -354,4 +358,8 @@ public class WebAuthnCredentialProvider implements CredentialProvider<WebAuthnCr
         return credentialMetadata;
     }
 
+    public WebAuthnMetadataService getMetadataService() {
+        return metadataService;
+    }
+
 }
diff --git a/services/src/main/java/org/keycloak/forms/login/freemarker/model/WebAuthnAuthenticatorsBean.java b/services/src/main/java/org/keycloak/forms/login/freemarker/model/WebAuthnAuthenticatorsBean.java
index 1a6b05412ad..ccc1f2dd9f4 100644
--- a/services/src/main/java/org/keycloak/forms/login/freemarker/model/WebAuthnAuthenticatorsBean.java
+++ b/services/src/main/java/org/keycloak/forms/login/freemarker/model/WebAuthnAuthenticatorsBean.java
@@ -22,6 +22,8 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.keycloak.authentication.authenticators.browser.WebAuthnAuthenticatorMetadata;
+import org.keycloak.authentication.authenticators.browser.WebAuthnMetadataService;
 import org.keycloak.common.util.Base64Url;
 import org.keycloak.common.util.CollectionUtil;
 import org.keycloak.models.KeycloakSession;
@@ -37,7 +39,8 @@ public class WebAuthnAuthenticatorsBean {
 
     private final List<WebAuthnAuthenticatorBean> authenticators;
 
-    public WebAuthnAuthenticatorsBean(KeycloakSession session, RealmModel realm, UserModel user, String credentialType) {
+    public WebAuthnAuthenticatorsBean(KeycloakSession session, RealmModel realm, UserModel user, String credentialType,
+                                      WebAuthnMetadataService metadataService) {
         // should consider multiple credentials in the future, but only single credential supported now.
         this.authenticators = user.credentialManager().getStoredCredentialsByTypeStream(credentialType)
                 .map(WebAuthnCredentialModel::createFromCredentialModel)
@@ -47,7 +50,13 @@ public class WebAuthnAuthenticatorsBean {
                     String createdAt = DateTimeFormatterUtil.getDateTimeFromMillis(webAuthnCredential.getCreatedDate(), session.getContext().resolveLocale(user));
                     final Set<String> transports = webAuthnCredential.getWebAuthnCredentialData().getTransports();
 
-                    return new WebAuthnAuthenticatorBean(credentialId, label, createdAt, transports);
+                    String aaguid = webAuthnCredential.getWebAuthnCredentialData().getAaguid();
+                    WebAuthnAuthenticatorMetadata metadata = metadataService.getAuthenticatorMetadata(aaguid);
+                    String authenticatorProvider = metadata != null ? metadata.name() : null;
+                    String iconLight = metadata != null ? metadata.iconLight() : null;
+                    String iconDark = metadata != null ? metadata.iconDark() : null;
+
+                    return new WebAuthnAuthenticatorBean(credentialId, label, createdAt, transports, authenticatorProvider, iconLight, iconDark);
                 }).collect(Collectors.toList());
     }
 
@@ -63,12 +72,19 @@ public class WebAuthnAuthenticatorsBean {
         private final String label;
         private final String createdAt;
         private final TransportsBean transports;
+        private final String authenticatorProvider;
+        private final String iconLight;
+        private final String iconDark;
 
-        public WebAuthnAuthenticatorBean(String credentialId, String label, String createdAt, Set<String> transports) {
+        public WebAuthnAuthenticatorBean(String credentialId, String label, String createdAt, Set<String> transports,
+                                         String authenticatorProvider, String iconLight, String iconDark) {
             this.credentialId = credentialId;
             this.label = label;
             this.createdAt = createdAt;
             this.transports = TransportsBean.convertFromSet(transports);
+            this.authenticatorProvider = authenticatorProvider;
+            this.iconLight = iconLight;
+            this.iconDark = iconDark;
         }
 
         public String getCredentialId() {
@@ -87,6 +103,18 @@ public class WebAuthnAuthenticatorsBean {
             return transports;
         }
 
+        public String getAuthenticatorProvider() {
+            return authenticatorProvider;
+        }
+
+        public String getIconLight() {
+            return iconLight;
+        }
+
+        public String getIconDark() {
+            return iconDark;
+        }
+
         public static class TransportsBean {
             private final Set<String> displayNameProperties;
             private final String iconClass;
diff --git a/services/src/main/resources/WebAuthnMetadataReadme.md b/services/src/main/resources/WebAuthnMetadataReadme.md
new file mode 100644
index 00000000000..62e4d8c4bb5
--- /dev/null
+++ b/services/src/main/resources/WebAuthnMetadataReadme.md
@@ -0,0 +1,29 @@
+# Updating WebAuthn / Passkey Metadata
+
+The file `keycloak-webauthn-metadata.json` maps passkey authenticator AAGUIDs to
+display names and icon filenames. It is generated from the community-maintained
+[passkey-authenticator-aaguids](https://github.com/passkeydeveloper/passkey-authenticator-aaguids) registry.
+
+## Steps to update
+
+1. Download the latest source data:
+
+   ```sh
+   curl -LO https://raw.githubusercontent.com/passkeydeveloper/passkey-authenticator-aaguids/refs/heads/main/combined_aaguid.json
+   ```
+
+2. Run the parser script, passing the downloaded file as an argument:
+
+   ```sh
+   python .github/scripts/parse-webauthn-metadata.py combined_aaguid.json
+   ```
+
+3. The script produces:
+   - `services/src/main/resources/keycloak-webauthn-metadata.json` (overwritten in place)
+   - Icon image files in two directories:
+     - `js/apps/account-ui/public/passkeys/` (account console)
+     - `themes/src/main/resources/theme/base/login/resources/img/passkeys/` (login theme)
+
+4. Review the changes before committing. In particular, inspect SVG icon files
+   for malicious content (e.g. `<script>` tags, event handler attributes) since
+   they are served by Keycloak and rendered in the browser.
diff --git a/services/src/main/resources/keycloak-webauthn-metadata.json b/services/src/main/resources/keycloak-webauthn-metadata.json
index aee9dad4d3e..a15e55f8dae 100644
--- a/services/src/main/resources/keycloak-webauthn-metadata.json
+++ b/services/src/main/resources/keycloak-webauthn-metadata.json
@@ -1,124 +1,1779 @@
 {
-  "ea9b8d66-4d01-1d21-3ce4-b6b48cb575d4": {
-    "name": "Google Password Manager"
+  "fcb1bcb4-f370-078c-6993-bc24d0ae3fbe": {
+    "name": "Ledger Nano X FIDO2 Authenticator",
+    "icon_light": "ledger-light.png",
+    "icon_dark": "ledger-light.png"
   },
-  "adce0002-35bc-c60a-648b-0b25f1f05503": {
-    "name": "Chrome on Mac"
+  "6e8d1eae-8d40-4c25-bcf8-4633959afc71": {
+    "name": "Veridium iOS SDK",
+    "icon_light": "veridium-light.png",
+    "icon_dark": "veridium-light.png"
+  },
+  "e8b7f4a2-c3d5-e6f7-890a-b1c2d3e4f567": {
+    "name": "Sherlocked",
+    "icon_light": "sherlocked-light.svg",
+    "icon_dark": "sherlocked-light.svg"
+  },
+  "9eb7eabc-9db5-49a1-b6c3-555a802093f4": {
+    "name": "YubiKey 5 Series with NFC KVZR57",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "4d41190c-7beb-4a84-8018-adf265a6352d": {
+    "name": "Thales IDPrime FIDO Bio",
+    "icon_light": "thales-light.png",
+    "icon_dark": "thales-light.png"
+  },
+  "2772ce93-eb4b-4090-8b73-330f48477d73": {
+    "name": "Security Key NFC by Yubico - Enterprise Edition Preview",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "6dae43be-af9c-417b-8b9f-1b611168ec60": {
+    "name": "Dapple Authenticator from Dapple Security Inc.",
+    "icon_light": "dapple-light.png",
+    "icon_dark": "dapple-light.png"
+  },
+  "5626bed4-e756-430b-a7ff-ca78c8b12738": {
+    "name": "VALMIDO PRO FIDO",
+    "icon_light": "valmido-light.png",
+    "icon_dark": "valmido-light.png"
+  },
+  "260e3021-482d-442d-838c-7edfbe153b7e": {
+    "name": "Feitian ePass FIDO2-NFC Plus Authenticator",
+    "icon_light": "feitian-light.png",
+    "icon_dark": "feitian-light.png"
+  },
+  "95e4d58c-056e-4a65-866d-f5a69659e880": {
+    "name": "TruU Windows Authenticator",
+    "icon_light": "truu-light.png",
+    "icon_dark": "truu-light.png"
+  },
+  "90636e1f-ef82-43bf-bdcf-5255f139d12f": {
+    "name": "YubiKey Bio Series - Multi-protocol Edition",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "9c835346-796b-4c27-8898-d6032f515cc5": {
+    "name": "Cryptnox FIDO2",
+    "icon_light": "cryptnox-light.png",
+    "icon_dark": "cryptnox-light.png"
+  },
+  "c3f47802-de73-4dfc-ba22-671fe3304f90": {
+    "name": "eToken Fusion NFC PIV Enterprise",
+    "icon_light": "thales-light.png",
+    "icon_dark": "thales-light.png"
+  },
+  "0d9b2e56-566b-c393-2940-f821b7f15d6d": {
+    "name": "Excelsecu eSecu FIDO2 Pro Security Key",
+    "icon_light": "excelsecu-light.png",
+    "icon_dark": "excelsecu-light.png"
+  },
+  "2bff89f2-323a-48fc-b7c8-9ff7fe87c07e": {
+    "name": "Feitian BioPass FIDO2 Pro (Enterprise Profile)",
+    "icon_light": "feitian-light.png",
+    "icon_dark": "feitian-light.png"
+  },
+  "c5ef55ff-ad9a-4b9f-b580-adebafe026d0": {
+    "name": "YubiKey 5 Series with Lightning",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "2194b428-9397-4046-8f39-007a1605a482": {
+    "name": "IDPrime 931 Fido",
+    "icon_light": "thales-light.png",
+    "icon_dark": "thales-light.png"
+  },
+  "39a5647e-1853-446c-a1f6-a79bae9f5bc7": {
+    "name": "IDmelon",
+    "icon_light": "idmelon-light.svg",
+    "icon_dark": "idmelon-light.svg"
+  },
+  "664d9f67-84a2-412a-9ff7-b4f7d8ee6d05": {
+    "name": "OpenSK authenticator",
+    "icon_light": "opensk-light.png",
+    "icon_dark": "opensk-light.png"
+  },
+  "3789da91-f943-46bc-95c3-50ea2012f03a": {
+    "name": "NEOWAVE Winkeo FIDO2",
+    "icon_light": "neowave-light.png",
+    "icon_dark": "neowave-light.png"
+  },
+  "fa2b99dc-9e39-4257-8f92-4a30d23c4118": {
+    "name": "YubiKey 5 Series with NFC",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "341e4da9-3c2e-8103-5a9f-aad887135200": {
+    "name": "Ledger Nano S FIDO2 Authenticator",
+    "icon_light": "ledger-light.png",
+    "icon_dark": "ledger-light.png"
+  },
+  "69700f79-d1fb-472e-bd9b-a3a3b9a9eda0": {
+    "name": "Pone Biometrics OFFPAD Authenticator",
+    "icon_light": "pone-light.png",
+    "icon_dark": "pone-light.png"
+  },
+  "8da0e4dc-164b-454e-972e-88f362b23d59": {
+    "name": "CardOS FIDO2 Token",
+    "icon_light": "cardos-light.png",
+    "icon_dark": "cardos-light.png"
+  },
+  "89b19028-256b-4025-8872-255358d950e4": {
+    "name": "Sentry Enterprises CTAP2 Authenticator",
+    "icon_light": "sentry-light.png",
+    "icon_dark": "sentry-light.png"
+  },
+  "4e768f2c-5fab-48b3-b300-220eb487752b": {
+    "name": "Hideez Key 4 FIDO2 SDK",
+    "icon_light": "hideez-light.png",
+    "icon_dark": "hideez-light.png"
+  },
+  "47ab2fb4-66ac-4184-9ae1-86be814012d5": {
+    "name": "Security Key NFC by Yubico - Enterprise Edition",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "931327dd-c89b-406c-a81e-ed7058ef36c6": {
+    "name": "Swissbit iShield Key FIDO2",
+    "icon_light": "swissbit-light.png",
+    "icon_dark": "swissbit-light.png"
+  },
+  "f8d5c4e9-e539-4c06-8662-ec2a4155a555": {
+    "name": "StarSign Key Fob",
+    "icon_light": "starsign-light.png",
+    "icon_dark": "starsign-light.png"
+  },
+  "b7d3f68e-88a6-471e-9ecf-2df26d041ede": {
+    "name": "Security Key NFC by Yubico",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "8d1b1fcb-3c76-49a9-9129-5515b346aa02": {
+    "name": "IDEMIA ID-ONE Card",
+    "icon_light": "idemia-light.png",
+    "icon_dark": "idemia-light.png"
+  },
+  "30b5035e-d297-4ff7-020b-addc96ba6a98": {
+    "name": "OneSpan DIGIPASS FX7",
+    "icon_light": "onespan-light.png",
+    "icon_dark": "onespan-light.png"
+  },
+  "454e5346-4944-4ffd-6c93-8e9267193e9a": {
+    "name": "Ensurity ThinC",
+    "icon_light": "ensurity-light.png",
+    "icon_dark": "ensurity-light.png"
+  },
+  "e1a96183-5016-4f24-b55b-e3ae23614cc6": {
+    "name": "ATKey.Pro CTAP2.0",
+    "icon_light": "atkey-light.png",
+    "icon_dark": "atkey-light.png"
+  },
+  "9ff4cc65-6154-4fff-ba09-9e2af7882ad2": {
+    "name": "Security Key NFC by Yubico - Enterprise Edition (Enterprise Profile)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "4599062e-6926-4fe7-9566-9e8fb1aedaa0": {
+    "name": "YubiKey 5 Series (Enterprise Profile)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "9d3df6ba-282f-11ed-a261-0242ac120002": {
+    "name": "Arculus FIDO2/U2F Key Card",
+    "icon_light": "arculus-light.png",
+    "icon_dark": "arculus-light.png"
+  },
+  "fbefdf68-fe86-0106-213e-4d5fa24cbe2e": {
+    "name": "Excelsecu eSecu FIDO2 NFC Security Key",
+    "icon_light": "excelsecu-light.png",
+    "icon_dark": "excelsecu-light.png"
+  },
+  "62e54e98-c209-4df3-b692-de71bb6a8528": {
+    "name": "YubiKey 5 FIPS Series with NFC Preview",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "ab32f0c6-2239-afbb-c470-d2ef4e254db7": {
+    "name": "TOKEN2 FIDO2 Security Key",
+    "icon_light": "token2-light.png",
+    "icon_dark": "token2-light.png"
+  },
+  "ce6bf97f-9f69-4ba7-9032-97adc6ca5cf1": {
+    "name": "YubiKey 5 FIPS Series with NFC (RC Preview)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "ad08c78a-4e41-49b9-86a2-ac15b06899e2": {
+    "name": "YubiKey Bio Series - FIDO Edition (Enterprise Profile)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "930b0c03-ef46-4ac4-935c-538dccd1fcdb": {
+    "name": "Chipwon Clife Key",
+    "icon_light": "chipwon-light.png",
+    "icon_dark": "chipwon-light.png"
+  },
+  "7787a482-13e8-4784-8a06-c7ed49a7aaf4": {
+    "name": "Swissbit iShield Key 2",
+    "icon_light": "swissbit-light.png",
+    "icon_dark": "swissbit-light.png"
+  },
+  "72c6b72d-8512-4c66-8359-9d3d10d9222f": {
+    "name": "Security Key NFC by Yubico - Enterprise Edition (Enterprise Profile)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "99ed6c29-4573-4847-816d-78ad8f1c75ef": {
+    "name": "VeroCard FIDO2 Authenticator",
+    "icon_light": "verocard-light.png",
+    "icon_dark": "verocard-light.png"
+  },
+  "973446ca-e21c-9a9b-99f5-9b985a67af0f": {
+    "name": "ACS FIDO Authenticator Card",
+    "icon_light": "acs-light.png",
+    "icon_dark": "acs-light.png"
+  },
+  "74820b05-a6c9-40f9-8fb0-9f86aca93998": {
+    "name": "SafeNet eToken Fusion",
+    "icon_light": "thales-light.png",
+    "icon_dark": "thales-light.png"
+  },
+  "1105e4ed-af1d-02ff-ffff-ffffffffffff": {
+    "name": "Egomet FIDO2 Authenticator for Android",
+    "icon_light": "egomet-light.png",
+    "icon_dark": "egomet-light.png"
   },
   "08987058-cadc-4b81-b6e1-30de50dcbe96": {
-    "name": "Windows Hello"
+    "name": "Windows Hello",
+    "icon_light": "windows-light.svg",
+    "icon_dark": "windows-light.svg"
+  },
+  "a4e9fc6d-4cbe-4758-b8ba-37598bb5bbaa": {
+    "name": "Security Key NFC by Yubico",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "0acf3011-bc60-f375-fb53-6f05f43154e0": {
+    "name": "Nymi FIDO2 Authenticator",
+    "icon_light": "nymi-light.png",
+    "icon_dark": "nymi-light.png"
+  },
+  "d91c5288-0ef0-49b7-b8ae-21ca0aa6b3f3": {
+    "name": "KEY-ID FIDO2 Authenticator",
+    "icon_light": "key-id-light.png",
+    "icon_dark": "key-id-light.png"
+  },
+  "8eec9bf9-486c-46da-9a67-1fbb4f66b9ed": {
+    "name": "HID Crescendo 4000 FIPS",
+    "icon_light": "hid-light.png",
+    "icon_dark": "hid-light.png"
+  },
+  "4c50ff10-1057-4fc6-b8ed-43a529530c3c": {
+    "name": "ImproveID Authenticator",
+    "icon_light": "idemia-light.png",
+    "icon_dark": "idemia-light.png"
+  },
+  "c611b55c-77b2-4527-8082-590e931b2f08": {
+    "name": "GoTrust Idem Key ",
+    "icon_light": "gotrust-light.png",
+    "icon_dark": "gotrust-light.png"
+  },
+  "ee041bce-25e5-4cdb-8f86-897fd6418464": {
+    "name": "Feitian ePass FIDO2-NFC Authenticator",
+    "icon_light": "feitian-light.png",
+    "icon_dark": "feitian-light.png"
+  },
+  "4b89f401-464e-4745-a520-486ddfc5d80e": {
+    "name": "IIST FIDO2 Authenticator",
+    "icon_light": "iist-light.png",
+    "icon_dark": "iist-light.png"
+  },
+  "2cd2f727-f6ca-44da-8f48-5c2e5da000a2": {
+    "name": "Nitrokey 3 AM",
+    "icon_light": "nitrokey-light.png",
+    "icon_dark": "nitrokey-light.png"
+  },
+  "10c70715-2a9a-4de1-b0aa-3cff6d496d39": {
+    "name": "eToken Fusion NFC FIPS",
+    "icon_light": "thales-light.png",
+    "icon_dark": "thales-light.png"
+  },
+  "efb96b10-a9ee-4b6c-a4a9-d32125ccd4a4": {
+    "name": "Safenet eToken FIDO",
+    "icon_light": "thales-light.png",
+    "icon_dark": "thales-light.png"
+  },
+  "24083bcb-3034-4867-99de-a3b52e1d426a": {
+    "name": "Enterprise Security Key Series with NFC (Consumer Profile)",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "4b3f8944-d4f2-4d21-bb19-764a986ec160": {
+    "name": "KeyXentic FIDO2 Secp256R1 FIDO2 CTAP2 Authenticator",
+    "icon_light": "keyxentic-light.png",
+    "icon_dark": "keyxentic-light.png"
+  },
+  "4c0cf95d-2f40-43b5-ba42-4c83a11c04ba": {
+    "name": "Feitian BioPass FIDO2 Pro Authenticator",
+    "icon_light": "feitian-light.png",
+    "icon_dark": "feitian-light.png"
+  },
+  "5343502d-5343-5343-6172-644649444f32": {
+    "name": "ESS Smart Card Inc. Authenticator",
+    "icon_light": "ess-light.png",
+    "icon_dark": "ess-light.png"
+  },
+  "69e7c36f-f2f6-9e0d-07a6-bcc243262e6b": {
+    "name": "OneKey FIDO2 Authenticator",
+    "icon_light": "onekey-light.png",
+    "icon_dark": "onekey-light.png"
+  },
+  "524de2de-982f-49b4-a769-2b5e3b73ad79": {
+    "name": "YubiKey 5 Series (Enterprise Profile)",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "09591fc6-9811-48f7-8f57-b9f23df6413f": {
+    "name": "Pone Biometrics OFFPAD Authenticator",
+    "icon_light": "pone-light.png",
+    "icon_dark": "pone-light.png"
+  },
+  "912435d9-4a88-42f3-972d-1244b0d51420": {
+    "name": "SI0X FIDO CL WRIST v1.0",
+    "icon_light": "starsign-light.png",
+    "icon_dark": "starsign-light.png"
+  },
+  "7e3f3d30-3557-4442-bdae-139312178b39": {
+    "name": "RSA DS100",
+    "icon_light": "rsa-light.png",
+    "icon_dark": "rsa-light.png"
+  },
+  "73bb0cd4-e502-49b8-9c6f-b59445bf720b": {
+    "name": "YubiKey 5 FIPS Series",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "39589099-9a75-49fc-afaa-801ca211c62a": {
+    "name": "Feitian ePass FIDO-NFC (Enterprise Profile) (CTAP2.1, CTAP2.0, U2F)",
+    "icon_light": "feitian-light.png",
+    "icon_dark": "feitian-light.png"
+  },
+  "dc5e949d-f939-43b3-9877-a85c7186b753": {
+    "name": "YubiKey Bio Multi-protocol Edition (Enterprise Profile)",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "149a2021-8ef6-4133-96b8-81f8d5b7f1f5": {
+    "name": "Security Key by Yubico with NFC",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "5df66f62-5b47-43d3-aa1d-a6e31c8dbeb5": {
+    "name": "Securitag Assembly Group FIDO Authenticator NFC",
+    "icon_light": "securitag-light.png",
+    "icon_dark": "securitag-light.png"
+  },
+  "9a272558-5cfa-4424-be37-65509677b77d": {
+    "name": "SECORA ID Key S USB by Infineon Consumer Edition",
+    "icon_light": "secora-light.png",
+    "icon_dark": "secora-light.png"
+  },
+  "09619fbf-d75e-4a62-be1d-fe4d240864ae": {
+    "name": "VeriMark(TM) Guard 2.1 Fingerprint Security Key",
+    "icon_light": "verimark-light.png",
+    "icon_dark": "verimark-light.png"
+  },
+  "50cbf15a-238c-4457-8f16-812c43bf3c49": {
+    "name": "Ensurity AUTH TouchPro",
+    "icon_light": "ensurity1-light.png",
+    "icon_dark": "ensurity1-light.png"
+  },
+  "ee7fa1e0-9539-432f-bd43-9c2fc6d4f311": {
+    "name": "VeriMark NFC+ USB-C Security Key",
+    "icon_light": "verimark1-light.png",
+    "icon_dark": "verimark1-light.png"
+  },
+  "b90e7dc1-316e-4fee-a25a-56a666a670fe": {
+    "name": "YubiKey 5 Series with Lightning (Enterprise Profile)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "175cd298-83d2-4a26-b637-313c07a6434e": {
+    "name": "Chunghwa Telecom FIDO2 Smart Card Authenticator",
+    "icon_light": "chunghwa-light.png",
+    "icon_dark": "chunghwa-light.png"
+  },
+  "34744913-4f57-4e6e-a527-e9ec3c4b94e6": {
+    "name": "YubiKey Bio Series - Multi-protocol Edition",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "5ea308b2-7ac7-48b9-ac09-7e2da9015f8c": {
+    "name": "Veridium Android SDK",
+    "icon_light": "veridium-light.png",
+    "icon_dark": "veridium-light.png"
+  },
+  "3b1adb99-0dfe-46fd-90b8-7f7614a4de2a": {
+    "name": "GoTrust Idem Key",
+    "icon_light": "gotrust-light.png",
+    "icon_dark": "gotrust-light.png"
+  },
+  "46544d5d-8f5d-4db4-89ac-ea8977073fff": {
+    "name": "Foongtone FIDO Authenticator",
+    "icon_light": "foongtone-light.png",
+    "icon_dark": "foongtone-light.png"
+  },
+  "0a357157-9b18-4c8a-920e-d156e972b2f8": {
+    "name": "YubiKey 5 Series (Consumer Profile)",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "998f358b-2dd2-4cbe-a43a-e8107438dfb3": {
+    "name": "OnlyKey Secp256R1 FIDO2 CTAP2 Authenticator",
+    "icon_light": "onlykey-light.png",
+    "icon_dark": "onlykey-light.png"
+  },
+  "30b5035e-d297-4ff2-010b-addc96ba6a98": {
+    "name": "OneSpan DIGIPASS FX2-A",
+    "icon_light": "onespan1-light.png",
+    "icon_dark": "onespan1-light.png"
+  },
+  "817cdab8-0d51-4de1-a821-e25b88519cf3": {
+    "name": "Swissbit iShield Key 2 FIPS",
+    "icon_light": "swissbit-light.png",
+    "icon_dark": "swissbit-light.png"
+  },
+  "61250591-b2bc-4456-b719-0b17be90bb30": {
+    "name": "eWBM eFPA FIDO2 Authenticator",
+    "icon_light": "ewbm-light.png",
+    "icon_dark": "ewbm-light.png"
+  },
+  "8c39ee86-7f9a-4a95-9ba3-f6b097e5c2ee": {
+    "name": "YubiKey Bio Series - FIDO Edition (Enterprise Profile)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "f8a011f3-8c0a-4d15-8006-17111f9edc7d": {
+    "name": "Security Key by Yubico",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "8976631b-d4a0-427f-5773-0ec71c9e0279": {
+    "name": "Solo Tap Secp256R1 FIDO2 CTAP2 Authenticator",
+    "icon_light": "solo-light.png",
+    "icon_dark": "solo-light.png"
+  },
+  "7dab85a5-d16d-4eaf-a7ef-4c1385b151c5": {
+    "name": "YubiKey 5 Series with NFC (Consumer Profile) KVZR57-2",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "516d3969-5a57-5651-5958-4e7a49434167": {
+    "name": "SmartDisplayer BobeePass FIDO2 Authenticator",
+    "icon_light": "smartdisplayer-light.png",
+    "icon_dark": "smartdisplayer-light.png"
+  },
+  "8681a073-5f50-4d52-bce4-e21658d207b3": {
+    "name": "RSA Authenticator 4 for iOS",
+    "icon_light": "rsa-light.png",
+    "icon_dark": "rsa-light.png"
+  },
+  "30b5035e-d297-4ff7-030b-addc96ba6a98": {
+    "name": "OneSpan DIGIPASS FX7-C",
+    "icon_light": "onespan-light.png",
+    "icon_dark": "onespan-light.png"
+  },
+  "e41b42a3-60ac-4afb-8757-a98f2d7f6c9f": {
+    "name": "Deepnet SafeKey/Classic (FP)",
+    "icon_light": "deepnet-light.png",
+    "icon_dark": "deepnet-light.png"
+  },
+  "c89e6a38-6c00-5426-5aa5-c9cbf48f0382": {
+    "name": "ACS FIDO Authenticator NFC",
+    "icon_light": "acs-light.png",
+    "icon_dark": "acs-light.png"
+  },
+  "eb7ef748-cbe0-4b40-b8f6-07bd2d592d35": {
+    "name": "YubiKey 5 CCN Series with NFC (Consumer Profile)",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "a02167b9-ae71-4ac7-9a07-06432ebb6f1c": {
+    "name": "YubiKey 5 Series with Lightning",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "82b0a720-127a-4788-b56d-d1d4b2d82eac": {
+    "name": "ID-One Key",
+    "icon_light": "id-one-light.png",
+    "icon_dark": "id-one-light.png"
+  },
+  "2c0df832-92de-4be1-8412-88a8f074df4a": {
+    "name": "Feitian FIDO Smart Card",
+    "icon_light": "feitian-light.png",
+    "icon_dark": "feitian-light.png"
+  },
+  "59f85fe7-faa5-4c92-9f52-697b9d4d5473": {
+    "name": "RSA Authenticator 4 for Android",
+    "icon_light": "rsa-light.png",
+    "icon_dark": "rsa-light.png"
+  },
+  "22682ee5-4f0e-4c19-be3e-797d5770ebfe": {
+    "name": "Precision InnaIT Key FIDO 2 Level 2 certified",
+    "icon_light": "precision-light.png",
+    "icon_dark": "precision-light.png"
+  },
+  "79f3c8ba-9e35-484b-8f47-53a5a0f5c630": {
+    "name": "YubiKey 5 FIPS Series with NFC (Enterprise Profile)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "6e34341a-88c7-483d-b777-a425c355be93": {
+    "name": "WebComm OETHenticator",
+    "icon_light": "webcomm-light.png",
+    "icon_dark": "webcomm-light.png"
+  },
+  "7a53c643-9dec-4219-b3a4-f9d24aca4e12": {
+    "name": "G+D StarKey FIDO2-NFC",
+    "icon_light": "starsign-light.png",
+    "icon_dark": "starsign-light.png"
+  },
+  "def8ab1a-9f91-44f1-a103-088d8dc7d681": {
+    "name": "IDEMIA SOLVO Fly 80 R3 FIDO Card e",
+    "icon_light": "id-one-light.png",
+    "icon_dark": "id-one-light.png"
+  },
+  "9955a1cd-564c-d388-ad68-9878a27be9f1": {
+    "name": "StarSign Chase FIDO Card",
+    "icon_light": "starsign-light.png",
+    "icon_dark": "starsign-light.png"
+  },
+  "9dd8d593-2213-438a-97f8-d6b813d51c27": {
+    "name": "YubiKey Bio Fido Edition (Consumer Profile)",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "970c8d9c-19d2-46af-aa32-3f448db49e35": {
+    "name": "WinMagic FIDO Eazy - TPM",
+    "icon_light": "winmagic-light.png",
+    "icon_dark": "winmagic-light.png"
+  },
+  "c5703116-972b-4851-a3e7-ae1259843399": {
+    "name": "NEOWAVE Badgeo FIDO2",
+    "icon_light": "neowave-light.png",
+    "icon_dark": "neowave-light.png"
+  },
+  "c80dbd9a-533f-4a17-b941-1a2f1c7cedff": {
+    "name": "HID Crescendo C3000",
+    "icon_light": "hid-light.png",
+    "icon_dark": "hid-light.png"
+  },
+  "0b8b05a4-ebd4-4b0b-8f5f-33d7b6e606ab": {
+    "name": "HID Crescendo 4000",
+    "icon_light": "hid-light.png",
+    "icon_dark": "hid-light.png"
+  },
+  "5b0e46ba-db02-44ac-b979-ca9b84f5e335": {
+    "name": "YubiKey 5 FIPS Series with Lightning Preview",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "12755c32-8ad1-46eb-881c-e0b38d848b09": {
+    "name": "Feitian ePass FIDO Authenticator (CTAP2.1, CTAP2.0, U2F)",
+    "icon_light": "feitian-light.png",
+    "icon_dark": "feitian-light.png"
+  },
+  "2a55aee6-27cb-42c0-bc6e-04efe999e88a": {
+    "name": "HID Crescendo 4000",
+    "icon_light": "hid-light.png",
+    "icon_dark": "hid-light.png"
+  },
+  "820d89ed-d65a-409e-85cb-f73f0578f82a": {
+    "name": "IDmelon Authenticator",
+    "icon_light": "idmelon1-light.png",
+    "icon_dark": "idmelon1-light.png"
+  },
+  "019614a3-2703-7e35-a453-285fd06c5d24": {
+    "name": "ATLKey Authenticator",
+    "icon_light": "atlkey-light.png",
+    "icon_dark": "atlkey-light.png"
+  },
+  "3124e301-f14e-4e38-876d-fbeeb090e7bf": {
+    "name": "YubiKey 5 Series with Lightning Preview",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "b6ede29c-3772-412c-8a78-539c1f4c62d2": {
+    "name": "Feitian BioPass FIDO2 Plus Authenticator",
+    "icon_light": "feitian-light.png",
+    "icon_dark": "feitian-light.png"
+  },
+  "ed042a3a-4b22-4455-bb69-a267b652ae7e": {
+    "name": "Security Key NFC by Yubico - Enterprise Edition",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "b2c1a50b-dad8-4dc7-ba4d-0ce9597904bc": {
+    "name": "YubiKey 5 Series with NFC - Enhanced PIN (Enterprise Profile)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "85203421-48f9-4355-9bc8-8a53846e5083": {
+    "name": "YubiKey 5 FIPS Series with Lightning",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "fcc0118f-cd45-435b-8da1-9782b2da0715": {
+    "name": "YubiKey 5 FIPS Series with NFC",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "d821a7d4-e97c-4cb6-bd82-4237731fd4be": {
+    "name": "Hyper FIDO Bio Security Key",
+    "icon_light": "hyper-light.png",
+    "icon_dark": "hyper-light.png"
+  },
+  "9876631b-d4a0-427f-5773-0ec71c9e0279": {
+    "name": "Somu Secp256R1 FIDO2 CTAP2 Authenticator",
+    "icon_light": "solo-light.png",
+    "icon_dark": "solo-light.png"
+  },
+  "522a3f91-5f5d-480d-be37-6cecfad5a27b": {
+    "name": "Precision InnaIT Key FIDO 2 Level 2 certified",
+    "icon_light": "precision-light.png",
+    "icon_dark": "precision-light.png"
+  },
+  "f56f58b3-d711-4afc-ba7d-6ac05f88cb19": {
+    "name": "WinMagic FIDO Eazy - Phone",
+    "icon_light": "winmagic-light.png",
+    "icon_dark": "winmagic-light.png"
+  },
+  "6ec5cff2-a0f9-4169-945b-f33b563f7b99": {
+    "name": "YubiKey Bio Series - Multi-protocol Edition (Enterprise Profile)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "882adaf5-3aa9-4708-8e7d-3957103775b4": {
+    "name": "T-Shield TrustSec FIDO2 Bio and client PIN version",
+    "icon_light": "t-shield-light.png",
+    "icon_dark": "t-shield-light.png"
+  },
+  "49a15c1c-3f63-3f51-23a7-b9e00096edd1": {
+    "name": "IDEX CTAP2.1 Biometrics",
+    "icon_light": "idex-light.png",
+    "icon_dark": "idex-light.png"
+  },
+  "f4c63eff-d26c-4248-801c-3736c7eaa93a": {
+    "name": "FIDO KeyPass S3",
+    "icon_light": "fido-light.png",
+    "icon_dark": "fido-light.png"
+  },
+  "d384db22-4d50-ebde-2eac-5765cf1e2a44": {
+    "name": "Excelsecu eSecu FIDO2 Fingerprint Security Key",
+    "icon_light": "excelsecu-light.png",
+    "icon_dark": "excelsecu-light.png"
+  },
+  "0db01cd6-5618-455b-bb46-1ec203d3213e": {
+    "name": "GoldKey Security Token",
+    "icon_light": "goldkey-light.png",
+    "icon_dark": "goldkey-light.png"
+  },
+  "b93fd961-f2e6-462f-b122-82002247de78": {
+    "name": "Android Authenticator",
+    "icon_light": "android-light.png",
+    "icon_dark": "android-light.png"
+  },
+  "aa79f476-ea00-417e-9628-1e8365123922": {
+    "name": "HID Crescendo 4000 FIDO",
+    "icon_light": "hid-light.png",
+    "icon_dark": "hid-light.png"
+  },
+  "1e906e14-77af-46bc-ae9f-fe6ef18257e4": {
+    "name": "VeridiumID Passkey iOS SDK",
+    "icon_light": "veridium-light.png",
+    "icon_dark": "veridium-light.png"
+  },
+  "2fc0579f-8113-47ea-b116-bb5a8db9202a": {
+    "name": "YubiKey 5 Series with NFC",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "31c3f7ff-bf15-4327-83ec-9336abcbcd34": {
+    "name": "WinMagic FIDO Eazy - Software",
+    "icon_light": "winmagic-light.png",
+    "icon_dark": "winmagic-light.png"
+  },
+  "cb4f796c-a20a-af9e-d639-213c1ec247f3": {
+    "name": "ACS PocketKey+ Bio",
+    "icon_light": "acs-light.png",
+    "icon_dark": "acs-light.png"
   },
   "9ddd1817-af5a-4672-a2b9-3e3dd95000a9": {
-    "name": "Windows Hello"
+    "name": "Windows Hello",
+    "icon_light": "windows-light.svg",
+    "icon_dark": "windows-light.svg"
+  },
+  "d8522d9f-575b-4866-88a9-ba99fa02f35b": {
+    "name": "YubiKey Bio Series - FIDO Edition",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "050dd0bc-ff20-4265-8d5d-305c4b215192": {
+    "name": "eToken Fusion FIPS",
+    "icon_light": "thales-light.png",
+    "icon_dark": "thales-light.png"
+  },
+  "50a45b0c-80e7-f944-bf29-f552bfa2e048": {
+    "name": "ACS FIDO Authenticator",
+    "icon_light": "acs-light.png",
+    "icon_dark": "acs-light.png"
+  },
+  "f7c558a0-f465-11e8-b568-0800200c9a66": {
+    "name": "KONAI Secp256R1 FIDO2 Conformance Testing CTAP2 Authenticator",
+    "icon_light": "konai-light.png",
+    "icon_dark": "konai-light.png"
+  },
+  "3f59672f-20aa-4afe-b6f4-7e5e916b6d98": {
+    "name": "Arculus FIDO 2.1 Key Card [P71]",
+    "icon_light": "arculus-light.png",
+    "icon_dark": "arculus-light.png"
+  },
+  "42b4fb4a-2866-43b2-9bf7-6c6669c2e5d3": {
+    "name": "Google Titan Security Key v2",
+    "icon_light": "google-light.png",
+    "icon_dark": "google-light.png"
+  },
+  "361a3082-0278-4583-a16f-72a527f973e4": {
+    "name": "eWBM eFA500 FIDO2 Authenticator",
+    "icon_light": "ewbm-light.png",
+    "icon_dark": "ewbm-light.png"
+  },
+  "2ffd6452-01da-471f-821b-ea4bf6c8676a": {
+    "name": "IDPrime 941 Fido",
+    "icon_light": "thales-light.png",
+    "icon_dark": "thales-light.png"
+  },
+  "9806a2c8-c0da-478e-b4ca-620005d34182": {
+    "name": "YubiKey Bio Multi-protocol Edition (Consumer Profile) 1VDJSN-2",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "03012cb7-4fb2-42e7-9e8d-a81f10e2a5e9": {
+    "name": "YubiKey 5 Series with Lightning (Consumer Profile)",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "30b5035e-d297-4ff7-b00b-addc96ba6a98": {
+    "name": "OneSpan DIGIPASS FX7",
+    "icon_light": "onespan-light.png",
+    "icon_dark": "onespan-light.png"
+  },
+  "0f083f18-4105-43a8-ad69-24e812e38141": {
+    "name": "Security Key Series with NFC (Consumer Profile)",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "5eaff75a-dd43-451f-af9f-87c9eeae293e": {
+    "name": "Swissbit iShield Key 2 FIPS Enterprise",
+    "icon_light": "swissbit-light.png",
+    "icon_dark": "swissbit-light.png"
+  },
+  "b415094c-49d3-4c8b-b3fe-7d0ad28a6bc4": {
+    "name": "ZTPass SmartAuth",
+    "icon_light": "ztpass-light.png",
+    "icon_dark": "ztpass-light.png"
+  },
+  "692db549-7ae5-44d5-a1e5-dd20a493b723": {
+    "name": "HID Crescendo Key",
+    "icon_light": "hid-light.png",
+    "icon_dark": "hid-light.png"
+  },
+  "0ebd9f2c-f685-441c-8c3e-a02a234a840a": {
+    "name": "YubiKey 5 Series with NFC Enhanced PIN (Consumer Profile)",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "23315ad0-6aca-4ba1-952e-f044f1e36976": {
+    "name": "Clife Key 2 NFC",
+    "icon_light": "chipwon-light.png",
+    "icon_dark": "chipwon-light.png"
+  },
+  "1d1b4e33-76a1-47fb-97a0-14b10d0933f1": {
+    "name": "Cryptnox FIDO2.1",
+    "icon_light": "cryptnox-light.png",
+    "icon_dark": "cryptnox-light.png"
+  },
+  "bbf4b6a7-679d-f6fc-c4f2-8ac0ddf9015a": {
+    "name": "Excelsecu eSecu FIDO2 PRO Security Key",
+    "icon_light": "excelsecu-light.png",
+    "icon_dark": "excelsecu-light.png"
+  },
+  "3e22415d-7fdf-4ea4-8a0c-dd60c4249b9d": {
+    "name": "Feitian iePass FIDO Authenticator",
+    "icon_light": "feitian-light.png",
+    "icon_dark": "feitian-light.png"
+  },
+  "ab7d1767-3fa0-4388-b6c4-feef7a844809": {
+    "name": "Enterprise Security Key Series with NFC (Enterprise Profile)",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "f4ce5fc0-57d3-46f5-a736-efb7d5bc63b5": {
+    "name": "YubiKey 5 Series with NFC (Consumer Profile)",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "23786452-f02d-4344-87ed-aaf703726881": {
+    "name": "SafeNet eToken Fusion CC",
+    "icon_light": "thales-light.png",
+    "icon_dark": "thales-light.png"
+  },
+  "5e264d9d-28ef-4d34-95b4-5941e7a4faa8": {
+    "name": "Ideem ZSM FIDO2 Authenticator",
+    "icon_light": "ideem-light.png",
+    "icon_dark": "ideem-light.png"
+  },
+  "d2fbd093-ee62-488d-9dad-1e36389f8826": {
+    "name": "YubiKey 5 FIPS Series (RC Preview)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "234cd403-35a2-4cc2-8015-77ea280c77f5": {
+    "name": "Feitian ePass FIDO2-NFC Series (CTAP2.1, CTAP2.0, U2F)",
+    "icon_light": "feitian-light.png",
+    "icon_dark": "feitian-light.png"
+  },
+  "6999180d-630c-442d-b8f7-424b90a43fae": {
+    "name": "Hyper FIDO Pro (CTAP2.1, CTAP2.0, U2F)",
+    "icon_light": "hyper1-light.png",
+    "icon_dark": "hyper1-light.png"
+  },
+  "662ef48a-95e2-4aaa-a6c1-5b9c40375824": {
+    "name": "YubiKey 5 Series with NFC - Enhanced PIN",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "aeb6569c-f8fb-4950-ac60-24ca2bbe2e52": {
+    "name": "HID Crescendo C2300",
+    "icon_light": "hid-light.png",
+    "icon_dark": "hid-light.png"
+  },
+  "87dbc5a1-4c94-4dc8-8a47-97d800fd1f3c": {
+    "name": "eWBM eFA320 FIDO2 Authenticator",
+    "icon_light": "ewbm-light.png",
+    "icon_dark": "ewbm-light.png"
+  },
+  "58276709-bb4b-4bb3-baf1-60eea99282a7": {
+    "name": "YubiKey Bio Series - Multi-protocol Edition 1VDJSN",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "7d2afadd-bf6b-44a2-a66b-e831fceb8eff": {
+    "name": "Taglio CTAP2.1 EP",
+    "icon_light": "taglio-light.png",
+    "icon_dark": "taglio-light.png"
+  },
+  "30b5035e-d297-4ff1-020b-addc96ba6a98": {
+    "name": "OneSpan DIGIPASS FX1-C",
+    "icon_light": "onespan4-light.png",
+    "icon_dark": "onespan4-light.png"
+  },
+  "04a8fcf2-19c1-457b-911e-69219f17583f": {
+    "name": "Thales PAY GFCX13 authenticator",
+    "icon_light": "thales-light.png",
+    "icon_dark": "thales-light.png"
+  },
+  "20ac7a17-c814-4833-93fe-539f0d5e3389": {
+    "name": "YubiKey 5 Series (Enterprise Profile)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "9012593f-43e4-4461-a97a-d92777b55d74": {
+    "name": "VinCSS FIDO2 Fingerprint",
+    "icon_light": "vincss-light.png",
+    "icon_dark": "vincss-light.png"
+  },
+  "d7781e5d-e353-46aa-afe2-3ca49f13332a": {
+    "name": "YubiKey 5 Series with NFC",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "9f0d8150-baa5-4c00-9299-ad62c8bb4e87": {
+    "name": "GoTrust Idem Card",
+    "icon_light": "gotrust-light.png",
+    "icon_dark": "gotrust-light.png"
+  },
+  "12ded745-4bed-47d4-abaa-e713f51d6393": {
+    "name": "Feitian AllinOne FIDO2 Authenticator",
+    "icon_light": "feitian-light.png",
+    "icon_dark": "feitian-light.png"
+  },
+  "88bbd2f0-342a-42e7-9729-dd158be5407a": {
+    "name": "Precision InnaIT Key FIDO 2 Level 2 certified",
+    "icon_light": "precision2-light.png",
+    "icon_dark": "precision2-light.png"
+  },
+  "1d8cac46-47a1-3386-af50-e88ae46fe802": {
+    "name": "Ledger Flex FIDO2 Authenticator",
+    "icon_light": "ledger-light.png",
+    "icon_dark": "ledger-light.png"
+  },
+  "dd86a2da-86a0-4cbe-b462-4bd31f57bc6f": {
+    "name": "YubiKey Bio Series - FIDO Edition",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "773c30d9-5919-4e96-a4f5-db65e95cf890": {
+    "name": "GSTAG OAK FIDO2 Authenticator",
+    "icon_light": "gstag-light.png",
+    "icon_dark": "gstag-light.png"
+  },
+  "34f5766d-1536-4a24-9033-0e294e510fb0": {
+    "name": "YubiKey 5 Series with NFC Preview",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "83c47309-aabb-4108-8470-8be838b573cb": {
+    "name": "YubiKey Bio Series - FIDO Edition (Enterprise Profile)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "c1288a5c-d66b-495c-a68f-4e81f9ec5b53": {
+    "name": "Deepnet SafeKey/Classic (FP) XF",
+    "icon_light": "deepnet-light.png",
+    "icon_dark": "deepnet-light.png"
+  },
+  "4e2ddbc2-2687-4709-8551-cb66c9776bfe": {
+    "name": "SECORA ID V2 FIDO2.1 L1",
+    "icon_light": "secora1-light.png",
+    "icon_dark": "secora1-light.png"
+  },
+  "be727034-574a-f799-5c76-0929e0430973": {
+    "name": "Crayonic KeyVault K1 (USB-NFC-BLE FIDO2 Authenticator)",
+    "icon_light": "crayonic-light.png",
+    "icon_dark": "crayonic-light.png"
+  },
+  "092277e5-8437-46b5-b911-ea64b294acb7": {
+    "name": "Taglio CTAP2.1 CS",
+    "icon_light": "taglio-light.png",
+    "icon_dark": "taglio-light.png"
+  },
+  "ca87cb70-4c1b-4579-a8e8-4efdd7c007e0": {
+    "name": "FIDO Alliance TruU Sample FIDO2 Authenticator",
+    "icon_light": "fido1-light.png",
+    "icon_dark": "fido1-light.png"
+  },
+  "23195a52-62d9-40fa-8ee5-23b173f4fb52": {
+    "name": "Hyper FIDO Pro NFC",
+    "icon_light": "hyper1-light.png",
+    "icon_dark": "hyper1-light.png"
+  },
+  "ba0a9266-40d8-4048-9786-d710b5474752": {
+    "name": "YubiKey Bio Multi-protocol Edition (Consumer Profile)",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "3e9db280-256a-4e17-b08e-19d79e9be166": {
+    "name": "SECORA ID V2 by Infineon Pay Edition",
+    "icon_light": "secora-light.png",
+    "icon_dark": "secora-light.png"
+  },
+  "a7fc3f84-86a3-4da4-a3d7-eb6485a066d8": {
+    "name": "NEOWAVE Badgeo FIDO2 (CTAP 2.1)",
+    "icon_light": "neowave-light.png",
+    "icon_dark": "neowave-light.png"
+  },
+  "1f8e43df-71ff-e11d-bea3-c4ee7003b232": {
+    "name": "Thetis Pro FIDO2 Key",
+    "icon_light": "thetis-light.png",
+    "icon_dark": "thetis-light.png"
+  },
+  "3ec9c8d3-a5a7-415b-a7b5-f1d606368d3f": {
+    "name": "YubiKey 5 CCN Series with NFC (Enterprise Profile)",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "9e66c661-e428-452a-a8fb-51f7ed088acf": {
+    "name": "YubiKey 5 FIPS Series with Lightning (RC Preview)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "58b44d0b-0a7c-f33a-fd48-f7153c871352": {
+    "name": "Ledger Nano S Plus FIDO2 Authenticator",
+    "icon_light": "ledger-light.png",
+    "icon_dark": "ledger-light.png"
+  },
+  "9a3f2abd-a73d-439c-9ee7-1b53a857eaa7": {
+    "name": "YubiKey 5 Series with NFC Enhanced PIN (Enterprise Profile)",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "454e5346-4944-4ffd-6c93-8e9267193e9b": {
+    "name": "Ensurity AUTH BioPro",
+    "icon_light": "ensurity2-light.png",
+    "icon_dark": "ensurity2-light.png"
+  },
+  "41e39911-c669-4811-b860-c6ad0b411b96": {
+    "name": "YubiKey 5 Series with NFC (Enterprise Profile)",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "146e77ef-11eb-4423-b847-ce77864e9411": {
+    "name": "eToken Fusion NFC PIV",
+    "icon_light": "thales-light.png",
+    "icon_dark": "thales-light.png"
+  },
+  "13ac47cf-1d78-4fd5-9060-aedaabacf826": {
+    "name": "HID Crescendo Key V3 - Enterprise Edition",
+    "icon_light": "hid-light.png",
+    "icon_dark": "hid-light.png"
+  },
+  "e77e3c64-05e3-428b-8824-0cbeb04b829d": {
+    "name": "Security Key NFC by Yubico",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "33d6d7d0-279f-4ef3-96b3-2d3282f4bde6": {
+    "name": "Thales eToken Fusion BIO Enterprise",
+    "icon_light": "thales-light.png",
+    "icon_dark": "thales-light.png"
+  },
+  "8d4378b0-725d-4432-b3c2-01fcdaf46286": {
+    "name": "VeridiumID Passkey Android SDK",
+    "icon_light": "veridium-light.png",
+    "icon_dark": "veridium-light.png"
+  },
+  "7409272d-1ff9-4e10-9fc9-ac0019c124fd": {
+    "name": "YubiKey Bio Series - FIDO Edition",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "bb66c294-de08-47e4-b7aa-d12c2cd3fb20": {
+    "name": "Mettlesemi Vishwaas Hawk Authenticator using FIDO2",
+    "icon_light": "mettlesemi-light.png",
+    "icon_dark": "mettlesemi-light.png"
+  },
+  "c4ddaf11-3032-4e77-b3b9-3a340369b9ad": {
+    "name": "HID Crescendo Fusion",
+    "icon_light": "hid-light.png",
+    "icon_dark": "hid-light.png"
+  },
+  "add92433-0d69-4026-8166-29b25bce64e9": {
+    "name": "YubiKey Bio Fido Edition (Enterprise Profile)",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "7d1351a6-e097-4852-b8bf-c9ac5c9ce4a3": {
+    "name": "YubiKey Bio Series - Multi-protocol Edition",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "07a9f89c-6407-4594-9d56-621d5f1e358b": {
+    "name": "NXP Semiconductros FIDO2 Conformance Testing CTAP2 Authenticator",
+    "icon_light": "nxp-light.png",
+    "icon_dark": "nxp-light.png"
+  },
+  "d61d3b87-3e7c-4aea-9c50-441c371903ad": {
+    "name": "KeyVault Secp256R1 FIDO2 CTAP2 Authenticator",
+    "icon_light": "keyvault-light.png",
+    "icon_dark": "keyvault-light.png"
+  },
+  "c62100de-759b-4bf8-b22b-63b3e3a80401": {
+    "name": "Token Ring 3 FIDO2 Authenticator",
+    "icon_light": "token-light.png",
+    "icon_dark": "token-light.png"
+  },
+  "5ca1ab1e-1337-fa57-f1d0-a117e71ca702": {
+    "name": "Allthenticator iOS App: roaming BLE FIDO2 Allthenticator for Windows, Mac, Linux, and Allthenticate door readers",
+    "icon_light": "allthenticator-light.png",
+    "icon_dark": "allthenticator-light.png"
+  },
+  "b92c3f9a-c014-4056-887f-140a2501163b": {
+    "name": "Security Key by Yubico",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "54d9fee8-e621-4291-8b18-7157b99c5bec": {
+    "name": "HID Crescendo Enabled",
+    "icon_light": "hid-light.png",
+    "icon_dark": "hid-light.png"
+  },
+  "72a2b5b1-95a5-4df9-a881-4192aff4f72e": {
+    "name": "GoTrust Idem Key mini",
+    "icon_light": "gotrust-light.png",
+    "icon_dark": "gotrust-light.png"
+  },
+  "a25342c0-3cdc-4414-8e46-f4807fca511c": {
+    "name": "YubiKey 5 Series with NFC",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "3a662962-c6d4-4023-bebb-98ae92e78e20": {
+    "name": "YubiKey 5 FIPS Series with Lightning (Enterprise Profile)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "20f0be98-9af9-986a-4b42-8eca4acb28e4": {
+    "name": "Excelsecu eSecu FIDO2 Fingerprint Security Key",
+    "icon_light": "excelsecu-light.png",
+    "icon_dark": "excelsecu-light.png"
+  },
+  "ca4cff1b-5a81-4404-8194-59aabcf1660b": {
+    "name": "IDPrime 3930 FIDO",
+    "icon_light": "thales-light.png",
+    "icon_dark": "thales-light.png"
+  },
+  "ab32f0c6-2239-afbb-c470-d2ef4e254db6": {
+    "name": "TEST (DUMMY RECORD)",
+    "icon_light": "token2-light.png",
+    "icon_dark": "token2-light.png"
+  },
+  "760eda36-00aa-4d29-855b-4012a182cdeb": {
+    "name": "Security Key NFC by Yubico Preview",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
   },
   "6028b017-b1d4-4c02-b4b3-afcdafc96bb2": {
-    "name": "Windows Hello"
+    "name": "Windows Hello",
+    "icon_light": "windows-light.svg",
+    "icon_dark": "windows-light.svg"
+  },
+  "b12eac35-586c-4809-a4b1-d81af6c305cf": {
+    "name": "Deepnet SafeKey/Classic (NFC)",
+    "icon_light": "deepnet-light.png",
+    "icon_dark": "deepnet-light.png"
+  },
+  "30b5035e-d297-4fc1-b00b-addc96ba6a97": {
+    "name": "OneSpan FIDO Touch",
+    "icon_light": "onespan5-light.png",
+    "icon_dark": "onespan5-light.png"
+  },
+  "560a780c-b6ae-4f03-b110-082f856425b4": {
+    "name": "KQC QuKey Bio FIDO2 Authenticator",
+    "icon_light": "kqc-light.png",
+    "icon_dark": "kqc-light.png"
+  },
+  "1ac71f64-468d-4fe0-bef1-0e5f2f551f18": {
+    "name": "YubiKey 5 Series with NFC (Enterprise Profile)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "6d44ba9b-f6ec-2e49-b930-0c8fe920cb73": {
+    "name": "Security Key by Yubico with NFC",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "6832d205-75f2-44c7-a864-e868c796d06e": {
+    "name": "Precision InnaIT Key FIDO 2 Level 2 certified",
+    "icon_light": "precision-light.png",
+    "icon_dark": "precision-light.png"
+  },
+  "9eb85bb6-9625-4a72-815d-0487830ccab2": {
+    "name": "Ensurity AUTH BioPro Desktop",
+    "icon_light": "ensurity3-light.png",
+    "icon_dark": "ensurity3-light.png"
+  },
+  "30b5035e-d297-4ff7-010b-addc96ba6a98": {
+    "name": "OneSpan DIGIPASS FX7-B",
+    "icon_light": "onespan-light.png",
+    "icon_dark": "onespan-light.png"
+  },
+  "5ca1ab1e-fa57-1337-f1d0-a117371ca702": {
+    "name": "Allthenticator Android App: roaming BLE FIDO2 Allthenticator for Windows, Mac, Linux, and Allthenticate door readers",
+    "icon_light": "allthenticator-light.png",
+    "icon_dark": "allthenticator-light.png"
+  },
+  "eabb46cc-e241-80bf-ae9e-96fa6d2975cf": {
+    "name": "TOKEN2 PIN Plus Security Key Series ",
+    "icon_light": "token2-light.png",
+    "icon_dark": "token2-light.png"
+  },
+  "53414d53-554e-4700-0000-000000000000": {
+    "name": "Samsung Pass",
+    "icon_light": "samsung-light.svg",
+    "icon_dark": "samsung-light.svg"
+  },
+  "e416201b-afeb-41ca-a03d-2281c28322aa": {
+    "name": "ATKey.Pro CTAP2.1",
+    "icon_light": "atkey-light.png",
+    "icon_dark": "atkey-light.png"
+  },
+  "905b4cb4-ed6f-4da9-92fc-45e0d4e9b5c7": {
+    "name": "YubiKey 5 FIPS Series (Enterprise Profile)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "cfcb13a2-244f-4b36-9077-82b79d6a7de7": {
+    "name": "USB/NFC Passcode Authenticator"
+  },
+  "76692dc1-c56a-48d9-8e7d-31b5ced430ac": {
+    "name": "VeriMark NFC+ USB-A Security Key",
+    "icon_light": "verimark1-light.png",
+    "icon_dark": "verimark1-light.png"
+  },
+  "91ad6b93-264b-4987-8737-3a690cad6917": {
+    "name": "Token Ring FIDO2 Authenticator"
+  },
+  "a02140b7-0cbd-42e1-a9b5-a39da2545114": {
+    "name": "Feitian BioPass FIDO2 Plus (Enterprise Profile)",
+    "icon_light": "feitian-light.png",
+    "icon_dark": "feitian-light.png"
+  },
+  "5753362b-4e6b-6345-7b2f-255438404c75": {
+    "name": "WiSECURE Blentity FIDO2 Authenticator",
+    "icon_light": "idemia-light.png",
+    "icon_dark": "idemia-light.png"
+  },
+  "9f77e279-a6e2-4d58-b700-31e5943c6a98": {
+    "name": "Hyper FIDO Pro",
+    "icon_light": "hyper-light.png",
+    "icon_dark": "hyper-light.png"
+  },
+  "b9f6b7b6-f929-4189-bca9-dd951240c132": {
+    "name": "Deepnet SafeKey/Classic (USB)",
+    "icon_light": "deepnet-light.png",
+    "icon_dark": "deepnet-light.png"
+  },
+  "cc45f64e-52a2-451b-831a-4edd8022a202": {
+    "name": "ToothPic Passkey Provider",
+    "icon_light": "toothpic-light.svg",
+    "icon_dark": "toothpic-dark.svg"
+  },
+  "0bb43545-fd2c-4185-87dd-feb0b2916ace": {
+    "name": "Security Key NFC by Yubico - Enterprise Edition",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "73402251-f2a8-4f03-873e-3cb6db604b03": {
+    "name": "uTrust FIDO2 Security Key",
+    "icon_light": "utrust-light.png",
+    "icon_dark": "utrust-light.png"
+  },
+  "c1f9a0bc-1dd2-404a-b27f-8e29047a43fd": {
+    "name": "YubiKey 5 FIPS Series with NFC",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "70e7c36f-f2f6-9e0d-07a6-bcc243262e6b": {
+    "name": "OneKey FIDO2 Bluetooth Authenticator",
+    "icon_light": "onekey-light.png",
+    "icon_dark": "onekey-light.png"
+  },
+  "4fc84f16-2545-4e53-b8fc-7bf4d7282a10": {
+    "name": "YubiKey 5 CCN Series with NFC (Enterprise Profile)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "6ab56fad-881f-4a43-acb2-0be065924522": {
+    "name": "YubiKey 5 Series with NFC (Enterprise Profile)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "504d7149-4e4c-3841-4555-55445a677357": {
+    "name": "WiSECURE AuthTron USB FIDO2 Authenticator",
+    "icon_light": "idemia-light.png",
+    "icon_dark": "idemia-light.png"
+  },
+  "2c2aeed8-8174-4159-814b-486e92a261d0": {
+    "name": "NEOWAVE WINKEO V2.0",
+    "icon_light": "neowave-light.png",
+    "icon_dark": "neowave-light.png"
+  },
+  "f2145e86-211e-4931-b874-e22bba7d01cc": {
+    "name": "ID-One Key",
+    "icon_light": "id-one-light.png",
+    "icon_dark": "id-one-light.png"
+  },
+  "53334693-4b3f-4198-8857-53772de2ab65": {
+    "name": "Precision InnaIT Key FIDO 2 Level 2 certified",
+    "icon_light": "precision-light.png",
+    "icon_dark": "precision-light.png"
+  },
+  "a3975549-b191-fd67-b8fb-017e2917fdb3": {
+    "name": "Excelsecu eSecu FIDO2 NFC Security Key",
+    "icon_light": "excelsecu-light.png",
+    "icon_dark": "excelsecu-light.png"
+  },
+  "19083c3d-8383-4b18-bc03-8f1c9ab2fd1b": {
+    "name": "YubiKey 5 Series",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "da1fa263-8b25-42b6-a820-c0036f21ba7f": {
+    "name": "ATKey.Card NFC",
+    "icon_light": "atkey2-light.png",
+    "icon_dark": "atkey2-light.png"
+  },
+  "6002f033-3c07-ce3e-d0f7-0ffe5ed42543": {
+    "name": "Excelsecu eSecu FIDO2 Fingerprint Key",
+    "icon_light": "excelsecu-light.png",
+    "icon_dark": "excelsecu-light.png"
+  },
+  "5fdb81b8-53f0-4967-a881-f5ec26fe4d18": {
+    "name": "VinCSS FIDO2 Authenticator",
+    "icon_light": "vincss-light.png",
+    "icon_dark": "vincss-light.png"
+  },
+  "78ba3993-d784-4f44-8d6e-cc0a8ad5230e": {
+    "name": "Feitian ePass FIDO-NFC(CTAP2.1, CTAP2.0, U2F)",
+    "icon_light": "feitian-light.png",
+    "icon_dark": "feitian-light.png"
+  },
+  "57f7de54-c807-4eab-b1c6-1c9be7984e92": {
+    "name": "YubiKey 5 FIPS Series",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "bb405265-40cf-4115-93e5-a332c1968d8c": {
+    "name": "ID-One Card",
+    "icon_light": "id-one-light.png",
+    "icon_dark": "id-one-light.png"
+  },
+  "2d3bec26-15ee-4f5d-88b2-53622490270b": {
+    "name": "HID Crescendo Key V2",
+    "icon_light": "hid-light.png",
+    "icon_dark": "hid-light.png"
+  },
+  "489ff376-b48d-6640-bb69-782a860ca795": {
+    "name": "Mettlesemi Vishwaas Eagle Authenticator using FIDO2",
+    "icon_light": "mettlesemi-light.png",
+    "icon_dark": "mettlesemi-light.png"
+  },
+  "3b24bf49-1d45-4484-a917-13175df0867b": {
+    "name": "YubiKey 5 Series with Lightning (Enterprise Profile)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "30b5035e-d297-4ff1-010b-addc96ba6a98": {
+    "name": "OneSpan DIGIPASS FX1a",
+    "icon_light": "onespan7-light.png",
+    "icon_dark": "onespan7-light.png"
+  },
+  "cb69481e-8ff7-4039-93ec-0a2729a154a8": {
+    "name": "YubiKey 5 Series",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "0076631b-d4a0-427f-5773-0ec71c9e0279": {
+    "name": "HYPR FIDO2 Authenticator",
+    "icon_light": "hypr-light.png",
+    "icon_dark": "hypr-light.png"
+  },
+  "d716019a-9f4e-4041-9750-17c78f8ae81a": {
+    "name": "eToken Fusion BIO",
+    "icon_light": "thales-light.png",
+    "icon_dark": "thales-light.png"
+  },
+  "57235694-51a5-4a4d-a81a-f42185df6502": {
+    "name": "SHALO AUTH",
+    "icon_light": "shalo-light.png",
+    "icon_dark": "shalo-light.png"
+  },
+  "24673149-6c86-42e7-98d9-433fb5b73296": {
+    "name": "YubiKey 5 Series with Lightning",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "357f2718-434f-4124-8a58-7e28c5e4a2fc": {
+    "name": "Deepnet SafeKey/Classic (NFC)",
+    "icon_light": "deepnet-light.png",
+    "icon_dark": "deepnet-light.png"
+  },
+  "42df17de-06ba-4177-a2bb-6701be1380d6": {
+    "name": "Feitian BioPass FIDO2 Plus Authenticator",
+    "icon_light": "feitian-light.png",
+    "icon_dark": "feitian-light.png"
+  },
+  "d7a423ad-3e19-4492-9200-78137dccc136": {
+    "name": "VivoKey Apex FIDO2",
+    "icon_light": "vivokey-light.png",
+    "icon_dark": "vivokey-light.png"
+  },
+  "b3315166-f36c-b05f-fea8-66a3dfdad171": {
+    "name": "Ledger Nano Gen5 FIDO2 Authenticator",
+    "icon_light": "ledger-light.png",
+    "icon_dark": "ledger-light.png"
+  },
+  "ba76a271-6eb6-4171-874d-b6428dbe3437": {
+    "name": "ATKey.ProS",
+    "icon_light": "atkey-light.png",
+    "icon_dark": "atkey-light.png"
+  },
+  "97e6a830-c952-4740-95fc-7c78dc97ce47": {
+    "name": "YubiKey Bio Series - Multi-protocol Edition (Enterprise Profile)",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "f573f209-b7fb-b261-671a-d7cf624cc812": {
+    "name": "Excelsecu eSecu FIDO2 PRO+ Security Key",
+    "icon_light": "excelsecu-light.png",
+    "icon_dark": "excelsecu-light.png"
+  },
+  "005b20e1-f146-4b87-8f3a-36848ff60ea6": {
+    "name": "SECORA ID V2 by Infineon Pay Edition M",
+    "icon_light": "secora-light.png",
+    "icon_dark": "secora-light.png"
+  },
+  "6e24d385-004a-16a0-7bfe-efd963845b34": {
+    "name": "Ledger Stax FIDO2 Authenticator",
+    "icon_light": "ledger-light.png",
+    "icon_dark": "ledger-light.png"
+  },
+  "ee882879-721c-4913-9775-3dfcce97072a": {
+    "name": "YubiKey 5 Series",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "8876631b-d4a0-427f-5773-0ec71c9e0279": {
+    "name": "Solo Secp256R1 FIDO2 CTAP2 Authenticator",
+    "icon_light": "solo-light.png",
+    "icon_dark": "solo-light.png"
+  },
+  "fec067a1-f1d0-4c5e-b4c0-cc3237475461": {
+    "name": "KX701 SmartToken FIDO",
+    "icon_light": "keyxentic-light.png",
+    "icon_dark": "keyxentic-light.png"
+  },
+  "30b5035e-d297-4ff1-b00b-addc96ba6a98": {
+    "name": "OneSpan DIGIPASS FX1 BIO",
+    "icon_light": "onespan7-light.png",
+    "icon_dark": "onespan7-light.png"
+  },
+  "b267239b-954f-4041-a01b-ee4f33c145b6": {
+    "name": "authenton1 - CTAP2.1",
+    "icon_light": "authenton1-light.png",
+    "icon_dark": "authenton1-light.png"
+  },
+  "b50d5e0a-7f81-4959-9b12-f45407407503": {
+    "name": "IDPrime 3940 FIDO",
+    "icon_light": "thales-light.png",
+    "icon_dark": "thales-light.png"
+  },
+  "8c97a730-3f7b-41a6-87d6-1e9b62bda6f0": {
+    "name": "FT-JCOS FIDO Fingerprint Card",
+    "icon_light": "feitian-light.png",
+    "icon_dark": "feitian-light.png"
+  },
+  "99bf4610-ec26-4252-b31f-7380ccd59db5": {
+    "name": "ZTPass SmartAuth",
+    "icon_light": "idemia-light.png",
+    "icon_dark": "idemia-light.png"
+  },
+  "a1f52be5-dfab-4364-b51c-2bd496b14a56": {
+    "name": "OCTATCO EzFinger2 FIDO2 AUTHENTICATOR",
+    "icon_light": "octatco-light.png",
+    "icon_dark": "octatco-light.png"
+  },
+  "c3479970-e58a-4f70-836f-853bf42fb063": {
+    "name": "YubiKey 5 Series with Lightning (Enterprise Profile)",
+    "icon_light": "enterprise-light.svg",
+    "icon_dark": "enterprise-light.svg"
+  },
+  "0f00cc22-4640-41e7-9585-384ec73ffe9b": {
+    "name": "Taglio CTAP2.1 BIO",
+    "icon_light": "taglio-light.png",
+    "icon_dark": "taglio-light.png"
+  },
+  "ff4dac45-ede8-4ec2-aced-cf66103f4335": {
+    "name": "YubiKey 5 Series",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "ba86dc56-635f-4141-aef6-00227b1b9af6": {
+    "name": "TruU Windows Authenticator",
+    "icon_light": "truu-light.png",
+    "icon_dark": "truu-light.png"
+  },
+  "3e078ffd-4c54-4586-8baa-a77da113aec5": {
+    "name": "Hideez Key 3 FIDO2",
+    "icon_light": "hideez-light.png",
+    "icon_dark": "hideez-light.png"
+  },
+  "fc5ca237-69a0-4f3c-afe4-1ebc66def6df": {
+    "name": "Clife Key 2",
+    "icon_light": "chipwon-light.png",
+    "icon_dark": "chipwon-light.png"
+  },
+  "ec31b4cc-2acc-4b8e-9c01-bade00ccbe26": {
+    "name": "KeyXentic FIDO2 Secp256R1 FIDO2 CTAP2 Authenticator",
+    "icon_light": "keyxentic-light.png",
+    "icon_dark": "keyxentic-light.png"
+  },
+  "5d629218-d3a5-11ed-afa1-0242ac120002": {
+    "name": "Swissbit iShield Key Pro",
+    "icon_light": "swissbit-light.png",
+    "icon_dark": "swissbit-light.png"
+  },
+  "bb878d7b-cf54-4784-b390-357030497043": {
+    "name": "TruU FIDO2 Authenticator",
+    "icon_light": "truu-light.png",
+    "icon_dark": "truu-light.png"
+  },
+  "d41f5a69-b817-4144-a13c-9ebd6d9254d6": {
+    "name": "ATKey.Card CTAP2.0",
+    "icon_light": "atkey4-light.png",
+    "icon_dark": "atkey4-light.png"
+  },
+  "e86addcd-7711-47e5-b42a-c18257b0bf61": {
+    "name": "IDCore 3121 Fido",
+    "icon_light": "thales-light.png",
+    "icon_dark": "thales-light.png"
+  },
+  "b113a455-cfb6-4c17-8cba-cd952feb7d48": {
+    "name": "eToken FIDO NFC",
+    "icon_light": "thales-light.png",
+    "icon_dark": "thales-light.png"
+  },
+  "95442b2e-f15e-4def-b270-efb106facb4e": {
+    "name": "eWBM eFA310 FIDO2 Authenticator",
+    "icon_light": "ewbm-light.png",
+    "icon_dark": "ewbm-light.png"
+  },
+  "dda9aa35-aaf1-4d3c-b6db-7902fd7dbbbf": {
+    "name": "IDEMIA SOLVO Fly 80 R3 FIDO Card c",
+    "icon_light": "id-one-light.png",
+    "icon_dark": "id-one-light.png"
+  },
+  "cdbdaea2-c415-5073-50f7-c04e968640b6": {
+    "name": "Excelsecu eSecu FIDO2 Security Key",
+    "icon_light": "excelsecu-light.png",
+    "icon_dark": "excelsecu-light.png"
+  },
+  "3aa78eb1-ddd8-46a8-a821-8f8ec57a7bd5": {
+    "name": "YubiKey 5 CCN Series with NFC",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "bc2fe499-0d8e-4ffe-96f3-94a82840cf8c": {
+    "name": "OCTATCO EzQuant FIDO2 AUTHENTICATOR",
+    "icon_light": "octatco-light.png",
+    "icon_dark": "octatco-light.png"
+  },
+  "eb3b131e-59dc-536a-d176-cb7306da10f5": {
+    "name": "ellipticSecure MIRkey USB Authenticator",
+    "icon_light": "ellipticsecure-light.png",
+    "icon_dark": "ellipticsecure-light.png"
+  },
+  "3fd410dc-8ab7-4b86-a1cb-c7174620b2dc": {
+    "name": "IDEMIA SOLVO Fly 80 R1 FIDO Card Draft",
+    "icon_light": "id-one-light.png",
+    "icon_dark": "id-one-light.png"
+  },
+  "a6c5f5d8-2ad0-48b6-8257-e502c8970931": {
+    "name": "eToken FIDO NFC Enterprise",
+    "icon_light": "thales-light.png",
+    "icon_dark": "thales-light.png"
+  },
+  "e400ef8c-711d-4692-af46-7f2cf7da23ad": {
+    "name": "Swissbit iShield Key 2 Enterprise",
+    "icon_light": "swissbit-light.png",
+    "icon_dark": "swissbit-light.png"
+  },
+  "87c13177-85d6-40ac-8c61-fe7ab3de9dfb": {
+    "name": "HID Crescendo Key V3",
+    "icon_light": "hid-light.png",
+    "icon_dark": "hid-light.png"
+  },
+  "1c086528-58d5-f211-823c-356786e36140": {
+    "name": "Atos CardOS FIDO2",
+    "icon_light": "atos-light.png",
+    "icon_dark": "atos-light.png"
+  },
+  "77010bd7-212a-4fc9-b236-d2ca5e9d4084": {
+    "name": "Feitian BioPass FIDO2 Authenticator",
+    "icon_light": "feitian-light.png",
+    "icon_dark": "feitian-light.png"
+  },
+  "d94a29d9-52dd-4247-9c2d-8b818b610389": {
+    "name": "VeriMark Guard Fingerprint Key",
+    "icon_light": "verimark-light.png",
+    "icon_dark": "verimark-light.png"
+  },
+  "7b96457d-e3cd-432b-9ceb-c9fdd7ef7432": {
+    "name": "YubiKey 5 FIPS Series with Lightning",
+    "icon_light": "yubikey-light.png",
+    "icon_dark": "yubikey-light.png"
+  },
+  "7991798a-a7f3-487f-98c0-3faf7a458a04": {
+    "name": "HID Crescendo Key V3",
+    "icon_light": "hid-light.png",
+    "icon_dark": "hid-light.png"
+  },
+  "833b721a-ff5f-4d00-bb2e-bdda3ec01e29": {
+    "name": "Feitian ePass FIDO2 Authenticator",
+    "icon_light": "feitian-light.png",
+    "icon_dark": "feitian-light.png"
+  },
+  "c89674e3-a765-4b07-888a-7c086fbdf04b": {
+    "name": "StarSign FIDO Card",
+    "icon_light": "starsign-light.png",
+    "icon_dark": "starsign-light.png"
+  },
+  "a11a5faa-9f32-4b8c-8c5d-2f7d13e8c942": {
+    "name": "AliasVault",
+    "icon_light": "aliasvault-light.svg",
+    "icon_dark": "aliasvault-light.svg"
+  },
+  "ea9b8d66-4d01-1d21-3ce4-b6b48cb575d4": {
+    "name": "Google Password Manager",
+    "icon_light": "google1-light.svg",
+    "icon_dark": "google1-light.svg"
+  },
+  "adce0002-35bc-c60a-648b-0b25f1f05503": {
+    "name": "Chrome on Mac",
+    "icon_light": "chrome-light.svg",
+    "icon_dark": "chrome-light.svg"
   },
   "dd4ec289-e01d-41c9-bb89-70fa845d4bf2": {
-    "name": "iCloud Keychain (Managed)"
+    "name": "iCloud Keychain (Managed)",
+    "icon_light": "icloud-light.svg",
+    "icon_dark": "icloud-dark.svg"
   },
   "531126d6-e717-415c-9320-3d9aa6981239": {
-    "name": "Dashlane"
+    "name": "Dashlane",
+    "icon_light": "dashlane-light.svg",
+    "icon_dark": "dashlane-dark.svg"
   },
   "bada5566-a7aa-401f-bd96-45619a55120d": {
-    "name": "1Password"
+    "name": "1Password",
+    "icon_light": "1password-light.svg",
+    "icon_dark": "1password-dark.svg"
   },
   "b84e4048-15dc-4dd0-8640-f4f60813c8af": {
-    "name": "NordPass"
+    "name": "NordPass",
+    "icon_light": "nordpass-light.svg",
+    "icon_dark": "nordpass-dark.svg"
   },
   "0ea242b4-43c4-4a1b-8b17-dd6d0b6baec6": {
-    "name": "Keeper"
+    "name": "Keeper",
+    "icon_light": "keeper-light.svg",
+    "icon_dark": "keeper-light.svg"
+  },
+  "891494da-2c90-4d31-a9cd-4eab0aed1309": {
+    "name": "S\u00e9same",
+    "icon_light": "sesame-light.svg",
+    "icon_dark": "sesame-light.svg"
   },
   "f3809540-7f14-49c1-a8b3-8f813b225541": {
-    "name": "Enpass"
+    "name": "Enpass",
+    "icon_light": "enpass-light.svg",
+    "icon_dark": "enpass-dark.svg"
   },
   "b5397666-4885-aa6b-cebf-e52262a439a2": {
     "name": "Chromium Browser"
   },
   "771b48fd-d3d4-4f74-9232-fc157ab0507a": {
-    "name": "Edge on Mac"
-  },
-  "39a5647e-1853-446c-a1f6-a79bae9f5bc7": {
-    "name": "IDmelon"
+    "name": "Edge on Mac",
+    "icon_light": "edge-light.svg",
+    "icon_dark": "edge-light.svg"
   },
   "d548826e-79b4-db40-a3d8-11116f7e8349": {
-    "name": "Bitwarden"
+    "name": "Bitwarden",
+    "icon_light": "bitwarden-light.svg",
+    "icon_dark": "bitwarden-light.svg"
   },
   "fbfc3007-154e-4ecc-8c0b-6e020557d7bd": {
-    "name": "iCloud Keychain"
-  },
-  "53414d53-554e-4700-0000-000000000000": {
-    "name": "Samsung Pass"
+    "name": "Apple Passwords",
+    "icon_light": "apple-light.svg",
+    "icon_dark": "apple-light.svg"
   },
   "66a0ccb3-bd6a-191f-ee06-e375c50b9846": {
-    "name": "Thales Bio iOS SDK"
+    "name": "Thales Bio iOS SDK",
+    "icon_light": "thales3-light.svg",
+    "icon_dark": "thales3-dark.svg"
   },
   "8836336a-f590-0921-301d-46427531eee6": {
-    "name": "Thales Bio Android SDK"
+    "name": "Thales Bio Android SDK",
+    "icon_light": "thales3-light.svg",
+    "icon_dark": "thales3-dark.svg"
   },
   "cd69adb5-3c7a-deb9-3177-6800ea6cb72a": {
-    "name": "Thales PIN Android SDK"
+    "name": "Thales PIN Android SDK",
+    "icon_light": "thales3-light.svg",
+    "icon_dark": "thales3-dark.svg"
   },
   "17290f1e-c212-34d0-1423-365d729f09d9": {
-    "name": "Thales PIN iOS SDK"
+    "name": "Thales PIN iOS SDK",
+    "icon_light": "thales3-light.svg",
+    "icon_dark": "thales3-dark.svg"
   },
-  "0bb43545-fd2c-4185-87dd-feb0b2916ace": {
-    "name": "Security Key NFC by Yubico - Enterprise Edition (5.4)"
+  "50726f74-6f6e-5061-7373-50726f746f6e": {
+    "name": "Proton Pass",
+    "icon_light": "proton-light.svg",
+    "icon_dark": "proton-light.svg"
   },
-  "149a2021-8ef6-4133-96b8-81f8d5b7f1f5": {
-    "name": "Security Key by Yubico with NFC (5.2, 5.4)"
+  "fdb141b2-5d84-443e-8a35-4698c205a502": {
+    "name": "KeePassXC",
+    "icon_light": "keepassxc-light.svg",
+    "icon_dark": "keepassxc-dark.svg"
   },
-  "2fc0579f-8113-47ea-b116-bb5a8db9202a": {
-    "name": "YubiKey 5 Series with NFC (5.2, 5.4)"
+  "eaecdef2-1c31-5634-8639-f1cbd9c00a08": {
+    "name": "KeePassDX",
+    "icon_light": "keepassdx-light.svg",
+    "icon_dark": "keepassdx-dark.svg"
   },
-  "6d44ba9b-f6ec-2e49-b930-0c8fe920cb73": {
-    "name": "Security Key by Yubico with NFC (5.1)"
+  "bfc748bb-3429-4faa-b9f9-7cfa9f3b76d0": {
+    "name": "iPasswords",
+    "icon_light": "ipasswords-light.svg",
+    "icon_dark": "ipasswords-light.svg"
   },
-  "73bb0cd4-e502-49b8-9c6f-b59445bf720b": {"name": "YubiKey 5 FIPS Series (5.4)"},
-  "85203421-48f9-4355-9bc8-8a53846e5083": {"name": "YubiKey 5Ci FIPS (5.4)"},
-  "a4e9fc6d-4cbe-4758-b8ba-37598bb5bbaa": {
-    "name": "Security Key by Yubico with NFC (5.4)"
+  "b35a26b2-8f6e-4697-ab1d-d44db4da28c6": {
+    "name": "Zoho Vault",
+    "icon_light": "zoho-light.svg",
+    "icon_dark": "zoho-light.svg"
   },
-  "b92c3f9a-c014-4056-887f-140a2501163b": {"name": "Security Key by Yubico (5.2)"},
-  "c1f9a0bc-1dd2-404a-b27f-8e29047a43fd": {
-    "name": "YubiKey 5 FIPS Series with NFC (5.4)"
+  "b78a0a55-6ef8-d246-a042-ba0f6d55050c": {
+    "name": "LastPass",
+    "icon_light": "lastpass-light.svg",
+    "icon_dark": "lastpass-dark.svg"
   },
-  "c5ef55ff-ad9a-4b9f-b580-adebafe026d0": {"name": "YubiKey 5Ci (5.2, 5.4)"},
-  "cb69481e-8ff7-4039-93ec-0a2729a154a8": {"name": "YubiKey 5 Series (5.1)"},
-  "d8522d9f-575b-4866-88a9-ba99fa02f35b": {"name": "YubiKey Bio Series (5.5, 5.6)"},
-  "ee882879-721c-4913-9775-3dfcce97072a": {"name": "YubiKey 5 Series (5.2, 5.4)"},
-  "f8a011f3-8c0a-4d15-8006-17111f9edc7d": {"name": "Security Key by Yubico (5.1)"},
-  "fa2b99dc-9e39-4257-8f92-4a30d23c4118": {"name": "YubiKey 5 Series with NFC (5.1)"},
-  "e77e3c64-05e3-428b-8824-0cbeb04b829d": {
-    "name": "Security Key by Yubico with NFC (5.7)"
+  "de503f9c-21a4-4f76-b4b7-558eb55c6f89": {
+    "name": "Devolutions",
+    "icon_light": "devolutions-light.svg",
+    "icon_dark": "devolutions-light.svg"
   },
-  "47ab2fb4-66ac-4184-9ae1-86be814012d5": {
-    "name": "Security Key by Yubico with NFC - Enterprise Edition (5.7)"
+  "22248c4c-7a12-46e2-9a41-44291b373a4d": {
+    "name": "LogMeOnce",
+    "icon_light": "logmeonce-light.svg",
+    "icon_dark": "logmeonce-dark.svg"
   },
-  "a25342c0-3cdc-4414-8e46-f4807fca511c": {"name": "YubiKey 5 Series with NFC (5.7)"},
-  "19083c3d-8383-4b18-bc03-8f1c9ab2fd1b": {"name": "YubiKey 5 Series (5.7)"},
-  "a02167b9-ae71-4ac7-9a07-06432ebb6f1c": {"name": "YubiKey 5Ci (5.7)"},
-  "7d1351a6-e097-4852-b8bf-c9ac5c9ce4a3": {
-    "name": "YubiKey Bio Series - Multi-protocol Edition (5.7)"
+  "a10c6dd9-465e-4226-8198-c7c44b91c555": {
+    "name": "Kaspersky Password Manager",
+    "icon_light": "kaspersky-light.svg",
+    "icon_dark": "kaspersky-light.svg"
   },
-  "30b5035e-d297-4ff1-b00b-addc96ba6a98": {"name": "DIGIPASS FX1 Bio"},
-  "30b5035e-d297-4ff1-010b-addc96ba6a98": {"name": "DIGIPASS FX1a Bio"},
-  "30b5035e-d297-4ff2-b00b-addc96ba6a98": {"name": "DIGIPASS FX2"},
-  "30b5035e-d297-4ff3-b00b-addc96ba6a98": {"name": "DIGIPASS FX3"},
-  "30b5035e-d297-4ff7-b00b-addc96ba6a98": {"name": "DIGIPASS FX7"},
-  "9ff4cc65-6154-4fff-ba09-9e2af7882ad2": {
-    "name": "Security Key by Yubico with NFC - Enterprise Edition (5.7, enterprise profile)"
+  "d350af52-0351-4ba2-acd3-dfeeadc3f764": {
+    "name": "pwSafe",
+    "icon_light": "pwsafe-light.svg",
+    "icon_dark": "pwsafe-light.svg"
   },
-  "1ac71f64-468d-4fe0-bef1-0e5f2f551f18": {
-    "name": "YubiKey 5 Series with NFC (5.7, enterprise profile)"
+  "d3452668-01fd-4c12-926c-83a4204853aa": {
+    "name": "Microsoft Password Manager",
+    "icon_light": "microsoft-light.svg",
+    "icon_dark": "microsoft-light.svg"
   },
-  "20ac7a17-c814-4833-93fe-539f0d5e3389": {
-    "name": "YubiKey 5 Series (5.7, enterprise profile)"
+  "6d212b28-a2c1-4638-b375-5932070f62e9": {
+    "name": "initial",
+    "icon_light": "initial-light.svg",
+    "icon_dark": "initial-light.svg"
   },
-  "b90e7dc1-316e-4fee-a25a-56a666a670fe": {
-    "name": "YubiKey 5Ci (5.7, enterprise profile)"
+  "d49b2120-b865-4191-8cea-be84a52b0485": {
+    "name": "Heimlane Vault",
+    "icon_light": "heimlane-light.svg",
+    "icon_dark": "heimlane-light.svg"
   },
-  "68167692-ff5a-4ac8-9fd7-0be292a1af68": {
-    "name": "YubiKey Bio Series - Multi-protocol Edition (5.7, enterprise profile)"
+  "d9be9d39-e6a6-4c28-a581-32b044d986e4": {
+    "name": "Sticky Password Manager",
+    "icon_light": "sticky-light.svg",
+    "icon_dark": "sticky-light.svg"
+  },
+  "70617373-7761-6c6c-6669-646f32303236": {
+    "name": "Passwall"
+  },
+  "c9cadfc9-89a9-489e-a25a-c7e86a4d5f15": {
+    "name": "Burp Suite Navigation Recorder",
+    "icon_light": "burp-light.svg",
+    "icon_dark": "burp-light.svg"
   }
-}
\ No newline at end of file
+}
diff --git a/services/src/test/java/org/keycloak/authentication/authenticators/browser/WebAuthnMetadataServiceTest.java b/services/src/test/java/org/keycloak/authentication/authenticators/browser/WebAuthnMetadataServiceTest.java
index 902076f759d..e94f4e9651f 100644
--- a/services/src/test/java/org/keycloak/authentication/authenticators/browser/WebAuthnMetadataServiceTest.java
+++ b/services/src/test/java/org/keycloak/authentication/authenticators/browser/WebAuthnMetadataServiceTest.java
@@ -1,25 +1,37 @@
 package org.keycloak.authentication.authenticators.browser;
 
-import org.junit.Assert;
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 /**
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
  */
 public class WebAuthnMetadataServiceTest {
 
-    /**
-     *
-     */
     @Test
     public void testWebAuthnMetadata() {
        WebAuthnMetadataService service = new WebAuthnMetadataService();
-       Assert.assertThat( service.getAuthenticatorProvider(null), nullValue());
-       Assert.assertThat( service.getAuthenticatorProvider("00000000-0000-0000-0000-000000000000"), nullValue());
-       Assert.assertThat( service.getAuthenticatorProvider("ea9b8d66-4d01-1d21-3ce4-b6b48cb575d4"), is("Google Password Manager"));
-       Assert.assertThat( service.getAuthenticatorProvider("d548826e-79b4-db40-a3d8-11116f7e8349"), is("Bitwarden"));
+       assertThat(service.getAuthenticatorProvider(null), nullValue());
+       assertThat(service.getAuthenticatorProvider("00000000-0000-0000-0000-000000000000"), nullValue());
+       assertThat(service.getAuthenticatorProvider("ea9b8d66-4d01-1d21-3ce4-b6b48cb575d4"), is("Google Password Manager"));
+       assertThat(service.getAuthenticatorProvider("d548826e-79b4-db40-a3d8-11116f7e8349"), is("Bitwarden"));
+    }
+
+    @Test
+    public void testWebAuthnMetadataWithIcons() {
+       WebAuthnMetadataService service = new WebAuthnMetadataService();
+
+       assertThat(service.getAuthenticatorMetadata(null), nullValue());
+       assertThat(service.getAuthenticatorMetadata("00000000-0000-0000-0000-000000000000"), nullValue());
+
+       WebAuthnAuthenticatorMetadata google = service.getAuthenticatorMetadata("ea9b8d66-4d01-1d21-3ce4-b6b48cb575d4");
+       assertThat(google, notNullValue());
+       assertThat(google.name(), is("Google Password Manager"));
+       assertThat(google.iconLight(), notNullValue());
+       assertThat(google.iconDark(), notNullValue());
     }
 }
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/1password-dark.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/1password-dark.svg
new file mode 100644
index 00000000000..ff399889848
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/1password-dark.svg
@@ -0,0 +1,3 @@
+<svg width="240" height="240" viewBox="0 0 240 240" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M239.257 120.417C239.257 54.4193 185.755 0.916504 119.757 0.916504C53.7601 0.916504 0.257324 54.4193 0.257324 120.417C0.257324 186.417 53.7601 239.917 119.757 239.917C185.755 239.917 239.257 186.417 239.257 120.417ZM98.0069 54.0276C97.0674 55.8714 97.0674 58.2851 97.0674 63.1126V90.4729C97.0674 91.6788 97.0674 92.2817 97.2196 92.8392C97.3545 93.3331 97.5763 93.799 97.8746 94.215C98.2113 94.6847 98.6792 95.0648 99.6152 95.8251L106.536 101.447C107.664 102.364 108.228 102.822 108.433 103.374C108.613 103.857 108.613 104.39 108.433 104.873C108.228 105.425 107.664 105.883 106.536 106.8L99.6152 112.422C98.6793 113.182 98.2113 113.562 97.8746 114.032C97.5763 114.448 97.3545 114.914 97.2196 115.408C97.0674 115.965 97.0674 116.568 97.0674 117.774V177.719C97.0674 182.547 97.0674 184.961 98.0069 186.805C98.8333 188.426 100.152 189.745 101.774 190.571C103.618 191.511 106.031 191.511 110.859 191.511H128.656C133.483 191.511 135.897 191.511 137.741 190.571C139.363 189.745 140.681 188.426 141.508 186.805C142.447 184.961 142.447 182.547 142.447 177.719V150.359C142.447 149.153 142.447 148.55 142.295 147.993C142.16 147.499 141.938 147.033 141.64 146.617C141.303 146.147 140.835 145.767 139.899 145.007L132.978 139.385C131.85 138.468 131.286 138.01 131.082 137.459C130.902 136.975 130.902 136.443 131.082 135.959C131.286 135.407 131.85 134.949 132.978 134.033L139.899 128.41C140.835 127.65 141.303 127.27 141.64 126.8C141.938 126.384 142.16 125.918 142.295 125.424C142.447 124.867 142.447 124.264 142.447 123.058V63.1126C142.447 58.2851 142.447 55.8714 141.508 54.0276C140.681 52.4057 139.363 51.087 137.741 50.2606C135.897 49.3211 133.483 49.3211 128.656 49.3211H110.859C106.031 49.3211 103.618 49.3211 101.774 50.2606C100.152 51.087 98.8333 52.4057 98.0069 54.0276Z" fill="#FFFEFB"/>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/1password-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/1password-light.svg
new file mode 100644
index 00000000000..dcd5b1ce0cf
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/1password-light.svg
@@ -0,0 +1,3 @@
+<svg width="240" height="240" viewBox="0 0 240 240" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M239.116 120.417C239.116 54.4193 185.613 0.916504 119.616 0.916504C53.619 0.916504 0.116211 54.4193 0.116211 120.417C0.116211 186.417 53.619 239.917 119.616 239.917C185.613 239.917 239.116 186.417 239.116 120.417ZM97.8658 54.0276C96.9263 55.8714 96.9263 58.2851 96.9263 63.1126V90.4729C96.9263 91.6788 96.9263 92.2817 97.0785 92.8392C97.2134 93.3331 97.4352 93.799 97.7335 94.215C98.0702 94.6847 98.5381 95.0648 99.4741 95.8251L106.395 101.447C107.523 102.364 108.087 102.822 108.292 103.374C108.471 103.857 108.471 104.39 108.292 104.873C108.087 105.425 107.523 105.883 106.395 106.8L99.4741 112.422C98.5382 113.182 98.0702 113.562 97.7335 114.032C97.4352 114.448 97.2134 114.914 97.0785 115.408C96.9263 115.965 96.9263 116.568 96.9263 117.774V177.719C96.9263 182.547 96.9263 184.961 97.8658 186.805C98.6922 188.426 100.011 189.745 101.633 190.571C103.477 191.511 105.89 191.511 110.718 191.511H128.515C133.342 191.511 135.756 191.511 137.6 190.571C139.221 189.745 140.54 188.426 141.367 186.805C142.306 184.961 142.306 182.547 142.306 177.719V150.359C142.306 149.153 142.306 148.55 142.154 147.993C142.019 147.499 141.797 147.033 141.499 146.617C141.162 146.147 140.694 145.767 139.758 145.007L132.837 139.385C131.709 138.468 131.145 138.01 130.94 137.459C130.761 136.975 130.761 136.443 130.94 135.959C131.145 135.407 131.709 134.949 132.837 134.033L139.758 128.41C140.694 127.65 141.162 127.27 141.499 126.8C141.797 126.384 142.019 125.918 142.154 125.424C142.306 124.867 142.306 124.264 142.306 123.058V63.1126C142.306 58.2851 142.306 55.8714 141.367 54.0276C140.54 52.4057 139.221 51.087 137.6 50.2606C135.756 49.3211 133.342 49.3211 128.515 49.3211H110.718C105.89 49.3211 103.477 49.3211 101.633 50.2606C100.011 51.087 98.6922 52.4057 97.8658 54.0276Z" fill="#1A285F"/>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/acs-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/acs-light.png
new file mode 100644
index 00000000000..711639ab70a
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/acs-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/aliasvault-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/aliasvault-light.svg
new file mode 100644
index 00000000000..5876600fe70
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/aliasvault-light.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg enable-background="new 0 0 500 500" version="1.1" viewBox="0 0 500 500" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<path d="m459.87 294.95c0.016205 5.4005 0.03241 10.801-0.35022 16.873-1.111 6.3392-1.1941 12.173-2.6351 17.649-10.922 41.508-36.731 69.481-77.351 83.408-7.2157 2.4739-14.972 3.3702-22.479 4.995-23.629 0.042205-47.257 0.11453-70.886 0.12027-46.762 0.011322-93.523-0.01416-140.95-0.43411-8.59-2.0024-16.766-2.8352-24.398-5.3326-21.595-7.0666-39.523-19.656-53.708-37.552-10.227-12.903-17.579-27.17-21.28-43.221-1.475-6.3967-2.4711-12.904-3.6852-19.361-0.051849-5.747-0.1037-11.494 0.26915-17.886 4.159-42.973 27.68-71.638 63.562-92.153 0-0.70761-0.001961-1.6988 3.12e-4 -2.69 0.022484-9.8293-1.3071-19.894 0.35664-29.438 3.2391-18.579 11.08-35.272 23.763-49.773 12.098-13.832 26.457-23.989 43.609-30.029 7.813-2.7512 16.14-4.0417 24.234-5.9948 7.392-0.025734 14.784-0.05146 22.835 0.32253 4.1959 0.95392 7.7946 1.2538 11.258 2.1053 17.16 4.2192 32.287 12.176 45.469 24.104 2.2558 2.0411 4.372 6.6241 9.621 3.868 16.839-8.8419 34.718-11.597 53.603-8.594 16.791 2.6699 31.602 9.4308 44.236 20.636 11.531 10.227 19.84 22.841 25.393 37.236 6.3436 16.445 10.389 33.163 6.0798 49.389 7.9587 8.9321 15.807 16.704 22.421 25.414 9.162 12.065 15.33 25.746 18.144 40.776 0.97046 5.1848 1.9111 10.375 2.8654 15.563m-71.597 71.012c5.5615-5.2284 12.002-9.7986 16.508-15.817 10.474-13.992 14.333-29.916 11.288-47.446-2.2496-12.95-8.1973-24.076-17.243-33.063-12.746-12.663-28.865-18.614-46.786-18.569-69.912 0.17712-139.82 0.56831-209.74 0.96176-15.922 0.089599-29.168 7.4209-39.685 18.296-14.45 14.944-20.408 33.343-16.655 54.368 2.2763 12.754 8.2167 23.748 17.158 32.66 13.299 13.255 30.097 18.653 48.728 18.651 59.321-0.005188 118.64 0.042358 177.96-0.046601 9.5912-0.014374 19.181-0.86588 28.773-0.88855 10.649-0.025146 19.978-3.825 29.687-9.1074z" fill="#EEC170"/>
+<path d="m162.77 293c15.654 4.3883 20.627 22.967 10.304 34.98-5.3104 6.1795-14.817 8.3208-24.278 5.0472-7.0723-2.4471-12.332-10.362-12.876-17.933-1.0451-14.542 11.089-23.176 21.705-23.046 1.5794 0.019287 3.1517 0.61566 5.1461 0.95184z" fill="#EEC170"/>
+<path d="m227.18 293.64c7.8499 2.3973 11.938 8.2143 13.524 15.077 1.8591 8.0439-0.44817 15.706-7.1588 21.121-6.7633 5.4572-14.417 6.8794-22.578 3.1483-8.2972-3.7933-12.836-10.849-12.736-19.438 0.1687-14.497 14.13-25.368 28.948-19.908z" fill="#EEC170"/>
+<path d="m261.57 319.07c-2.495-14.418 4.6853-22.603 14.596-26.108 9.8945-3.4995 23.181 3.4303 26.267 13.779 4.6504 15.591-7.1651 29.064-21.665 28.161-8.5254-0.53088-17.202-6.5094-19.198-15.831z" fill="#EEC170"/>
+<path d="m336.91 333.41c-9.0175-4.2491-15.337-14.349-13.829-21.682 3.0825-14.989 13.341-20.304 23.018-19.585 10.653 0.79141 17.93 7.407 19.765 17.547 1.9588 10.824-4.1171 19.939-13.494 23.703-5.272 2.1162-10.091 1.5086-15.46 0.017883z" fill="#EEC170"/>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/allthenticator-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/allthenticator-light.png
new file mode 100644
index 00000000000..119ec6cb69e
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/allthenticator-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/android-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/android-light.png
new file mode 100644
index 00000000000..d220a9c769e
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/android-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/apple-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/apple-light.svg
new file mode 100644
index 00000000000..bd1715076d6
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/apple-light.svg
@@ -0,0 +1,38 @@
+<svg viewBox="0 0 322 322" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2">
+    <path d="M321.347 72.106C321.347 32.31 289.037 0 249.241 0H72.106C32.31 0 0 32.31 0 72.106v177.135c0 39.796 32.31 72.106 72.106 72.106h177.135c39.796 0 72.106-32.31 72.106-72.106V72.106Z" style="fill:#fff"/>
+    <path d="M126.106 266.574c.775.965.309 2.517.017 2.43l-7.773 7.741c-1.686 1.206-3.365 1.132-5.009.135l-18.424-19.268c-.452-.649-.762-1.328-.833-2.058v-94.735c-22.821-8.67-39.057-30.754-39.057-56.6 0-33.006 26.478-59.876 59.333-60.511-18.551 13.563-30.61 35.488-30.61 60.208 0 28.109 15.593 52.604 38.593 65.301v87.841h.006c-.004.137-.006.275-.006.413 0 3.551 1.699 6.535 3.763 9.103Z" style="fill:#ebebeb"/>
+    <clipPath id="a">
+        <path d="M126.106 266.574c.775.965.309 2.517.017 2.43l-7.773 7.741c-1.686 1.206-3.365 1.132-5.009.135l-18.424-19.268c-.452-.649-.762-1.328-.833-2.058v-94.735c-22.821-8.67-39.057-30.754-39.057-56.6 0-33.006 26.478-59.876 59.333-60.511-18.551 13.563-30.61 35.488-30.61 60.208 0 28.109 15.593 52.604 38.593 65.301v87.841h.006c-.004.137-.006.275-.006.413 0 3.551 1.699 6.535 3.763 9.103Z"/>
+    </clipPath>
+    <g clip-path="url(#a)">
+        <path d="M126.531 277.545V43.603H55.027v233.942h71.504Z" style="fill:url(#b)"/>
+    </g>
+    <path d="M167.618 266.574c.775.965.309 2.517.017 2.43l-7.773 7.741c-1.686 1.206-3.365 1.132-5.009.135l-18.424-19.268c-.452-.649-.762-1.328-.833-2.058v-94.735c-22.82-8.67-39.056-30.754-39.056-56.6 0-33.006 26.477-59.876 59.333-60.511-18.552 13.563-30.611 35.488-30.611 60.208 0 28.109 15.593 52.604 38.593 65.301v87.841h.007c-.005.137-.007.275-.007.413 0 3.551 1.699 6.535 3.763 9.103Z" style="fill:#ebebeb"/>
+    <clipPath id="c">
+        <path d="M167.618 266.574c.775.965.309 2.517.017 2.43l-7.773 7.741c-1.686 1.206-3.365 1.132-5.009.135l-18.424-19.268c-.452-.649-.762-1.328-.833-2.058v-94.735c-22.82-8.67-39.056-30.754-39.056-56.6 0-33.006 26.477-59.876 59.333-60.511-18.552 13.563-30.611 35.488-30.611 60.208 0 28.109 15.593 52.604 38.593 65.301v87.841h.007c-.005.137-.007.275-.007.413 0 3.551 1.699 6.535 3.763 9.103Z"/>
+    </clipPath>
+    <g clip-path="url(#c)">
+        <path d="M168.043 277.545V43.603H96.54v233.942h71.503Z" style="fill:url(#d)"/>
+    </g>
+    <path d="M177.014 160.725c-22.82-8.67-39.056-30.753-39.056-56.599 0-33.404 27.119-60.523 60.523-60.523 33.403 0 60.523 27.119 60.523 60.523 0 28.22-19.357 51.956-45.506 58.642l26.358 26.862c.994 1.581.943 3.037-.059 4.377l-25.881 26.464 18.777 18.979c1.571 2.132 1.323 4.182-.256 6.171l-31.157 31.03c-1.686 1.207-3.364 1.133-5.008.135l-18.424-19.268c-.453-.648-.763-1.327-.834-2.057v-94.736Zm21.662-93.481c8.924 0 16.169 7.245 16.169 16.169s-7.245 16.169-16.169 16.169-16.169-7.245-16.169-16.169 7.245-16.169 16.169-16.169Z" style="fill:none"/>
+    <clipPath id="e">
+        <path d="M177.014 160.725c-22.82-8.67-39.056-30.753-39.056-56.599 0-33.404 27.119-60.523 60.523-60.523 33.403 0 60.523 27.119 60.523 60.523 0 28.22-19.357 51.956-45.506 58.642l26.358 26.862c.994 1.581.943 3.037-.059 4.377l-25.881 26.464 18.777 18.979c1.571 2.132 1.323 4.182-.256 6.171l-31.157 31.03c-1.686 1.207-3.364 1.133-5.008.135l-18.424-19.268c-.453-.648-.763-1.327-.834-2.057v-94.736Zm21.662-93.481c8.924 0 16.169 7.245 16.169 16.169s-7.245 16.169-16.169 16.169-16.169-7.245-16.169-16.169 7.245-16.169 16.169-16.169Z"/>
+    </clipPath>
+    <g clip-path="url(#e)">
+        <path d="M259.004 277.545V43.603H137.958v233.942h121.046Z" style="fill:url(#f)"/>
+    </g>
+    <defs>
+        <linearGradient id="b" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 233.943 -71.5033 0 90.78 43.603)">
+            <stop offset="0" style="stop-color:#ffdd53;stop-opacity:1"/>
+            <stop offset="1" style="stop-color:#ffbf01;stop-opacity:1"/>
+        </linearGradient>
+        <linearGradient id="d" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 233.943 -71.5033 0 132.291 43.603)">
+            <stop offset="0" style="stop-color:#51e376;stop-opacity:1"/>
+            <stop offset="1" style="stop-color:#34c759;stop-opacity:1"/>
+        </linearGradient>
+        <linearGradient id="f" x1="0" y1="0" x2="1" y2="0" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 233.943 -121.046 0 198.481 43.603)">
+            <stop offset="0" style="stop-color:#62ccf8;stop-opacity:1"/>
+            <stop offset="1" style="stop-color:#0079ff;stop-opacity:1"/>
+        </linearGradient>
+    </defs>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/arculus-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/arculus-light.png
new file mode 100644
index 00000000000..352c8fa5188
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/arculus-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/atkey-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/atkey-light.png
new file mode 100644
index 00000000000..8e49f89bd8a
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/atkey-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/atkey1-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/atkey1-light.png
new file mode 100644
index 00000000000..e8999b259cd
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/atkey1-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/atkey2-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/atkey2-light.png
new file mode 100644
index 00000000000..e8999b259cd
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/atkey2-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/atkey4-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/atkey4-light.png
new file mode 100644
index 00000000000..13666ed7013
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/atkey4-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/atlkey-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/atlkey-light.png
new file mode 100644
index 00000000000..bfd6f75d1ec
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/atlkey-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/atos-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/atos-light.png
new file mode 100644
index 00000000000..ce465847683
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/atos-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/authenton1-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/authenton1-light.png
new file mode 100644
index 00000000000..99362a70a7c
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/authenton1-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/bitwarden-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/bitwarden-light.svg
new file mode 100644
index 00000000000..761c97ab74f
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/bitwarden-light.svg
@@ -0,0 +1,11 @@
+<svg width="300" height="300" viewBox="0 0 300 300" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_68_61)">
+<path d="M300 253.125C300 279.023 279.023 300 253.125 300H46.875C20.9766 300 0 279.023 0 253.125V46.875C0 20.9766 20.9766 0 46.875 0H253.125C279.023 0 300 20.9766 300 46.875V253.125Z" fill="#175DDC"/>
+<path d="M243.105 37.6758C241.201 35.7715 238.945 34.834 236.367 34.834H63.6328C61.0254 34.834 58.7988 35.7715 56.8945 37.6758C54.9902 39.5801 54.0527 41.8359 54.0527 44.4141V159.58C54.0527 168.164 55.7227 176.689 59.0625 185.156C62.4023 193.594 66.5625 201.094 71.5137 207.656C76.4648 214.189 82.3535 220.576 89.209 226.787C96.0645 232.998 102.393 238.125 108.164 242.227C113.965 246.328 120 250.195 126.299 253.857C132.598 257.52 137.08 259.98 139.717 261.27C142.354 262.559 144.492 263.584 146.074 264.258C147.275 264.844 148.564 265.166 149.971 265.166C151.377 265.166 152.666 264.873 153.867 264.258C155.479 263.555 157.588 262.559 160.254 261.27C162.891 259.98 167.373 257.49 173.672 253.857C179.971 250.195 186.006 246.328 191.807 242.227C197.607 238.125 203.936 232.969 210.791 226.787C217.646 220.576 223.535 214.219 228.486 207.656C233.438 201.094 237.568 193.623 240.938 185.156C244.277 176.719 245.947 168.193 245.947 159.58V44.4434C245.977 41.8359 245.01 39.5801 243.105 37.6758ZM220.84 160.664C220.84 202.354 150 238.271 150 238.271V59.502H220.84C220.84 59.502 220.84 118.975 220.84 160.664Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_68_61">
+<rect width="300" height="300" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/burp-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/burp-light.svg
new file mode 100644
index 00000000000..2460a71db34
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/burp-light.svg
@@ -0,0 +1,4 @@
+<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <rect x="0.5" y="0.5" width="14" height="14" rx="2.10106" fill="#FF6633"/>
+    <path d="M8.01028 12.5H6.98972V10.9057L8.36534 9.1189H6.98972V6.95141H4.5L6.98972 3.71585V2.5H8.01028V4.09427L6.63678 5.8811H8.01028V8.04859H10.5L8.01028 11.2841V12.5Z" fill="white"/>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/cardos-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/cardos-light.png
new file mode 100644
index 00000000000..a8b2aec8244
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/cardos-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/chipwon-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/chipwon-light.png
new file mode 100644
index 00000000000..3a8d1eabef3
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/chipwon-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/chrome-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/chrome-light.svg
new file mode 100644
index 00000000000..2a61bf86971
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/chrome-light.svg
@@ -0,0 +1,25 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 48 48">
+  <defs>
+    <linearGradient id="a" x1="3.2173" y1="15" x2="44.7812" y2="15" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#d93025"/>
+      <stop offset="1" stop-color="#ea4335"/>
+    </linearGradient>
+    <linearGradient id="b" x1="20.7219" y1="47.6791" x2="41.5039" y2="11.6837" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#fcc934"/>
+      <stop offset="1" stop-color="#fbbc04"/>
+    </linearGradient>
+    <linearGradient id="c" x1="26.5981" y1="46.5015" x2="5.8161" y2="10.506" gradientUnits="userSpaceOnUse">
+      <stop offset="0" stop-color="#1e8e3e"/>
+      <stop offset="1" stop-color="#34a853"/>
+    </linearGradient>
+    
+    <path id="p" d="M13.6086 30.0031 3.218 12.006A23.994 23.994 0 0 0 24.0025 48l10.3906-17.9971-.0067-.0068a11.9852 11.9852 0 0 1-20.7778.007Z"/>
+  </defs>
+  
+  <use xlink:href="#p" fill="url(#a)" transform="rotate(120 24 24)"/>
+  <use xlink:href="#p" fill="url(#b)" transform="rotate(-120 24 24)"/>
+  <use xlink:href="#p" fill="url(#c)"/>
+  
+  <circle cx="24" cy="24" r="12" style="fill:#fff"/>
+  <circle cx="24" cy="24" r="9.5" style="fill:#1a73e8"/>
+</svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/chunghwa-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/chunghwa-light.png
new file mode 100644
index 00000000000..9de4b8b7283
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/chunghwa-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/crayonic-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/crayonic-light.png
new file mode 100644
index 00000000000..f7510ba5069
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/crayonic-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/cryptnox-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/cryptnox-light.png
new file mode 100644
index 00000000000..a6df0316c5e
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/cryptnox-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/dapple-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/dapple-light.png
new file mode 100644
index 00000000000..e9ca8f26082
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/dapple-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/dashlane-dark.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/dashlane-dark.svg
new file mode 100644
index 00000000000..f23ec9e3f26
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/dashlane-dark.svg
@@ -0,0 +1,8 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M257.474 359.209C257.474 356.189 254.454 353.169 250.215 351.959L199.411 333.231C190.895 329.601 181.264 333.831 181.264 339.89V475.779C181.264 478.809 184.283 482.438 187.303 483.648L239.326 502.376C247.195 505.396 257.474 501.166 257.474 494.508V359.209Z" fill="white"/>
+<path d="M352.736 321.104C352.736 318.084 349.717 315.064 345.477 313.854L294.674 295.126C286.157 291.496 276.526 295.726 276.526 301.785V437.674C276.526 440.704 279.546 444.333 282.566 445.543L334.589 464.271C342.458 467.291 352.736 463.061 352.736 456.403V321.104Z" fill="white"/>
+<path d="M257.474 35.3211C257.474 32.3013 254.454 29.2815 250.215 28.0717L199.411 9.34343C190.895 5.71399 181.264 9.94358 181.264 16.0022V151.892C181.264 154.921 184.283 158.551 187.303 159.76L239.326 178.489C247.195 181.509 257.474 177.279 257.474 170.62V35.3211Z" fill="white"/>
+<path d="M352.736 92.4777C352.736 89.4579 349.717 86.4382 345.477 85.2283L294.674 66.5C286.157 62.8706 276.526 67.1002 276.526 73.1588V209.048C276.526 212.078 279.546 215.707 282.566 216.917L334.589 235.645C342.458 238.665 352.736 234.436 352.736 227.777V92.4777Z" fill="white"/>
+<path d="M448 168.687C448 165.667 444.98 162.647 440.741 161.437L389.937 142.709C381.421 139.079 371.79 143.309 371.79 149.368V361.466C371.79 364.495 374.81 368.125 377.829 369.335L429.852 388.063C437.721 391.083 448 386.853 448 380.194V168.687Z" fill="white"/>
+<path d="M162.21 35.3306C162.21 32.3108 159.19 29.2815 154.951 28.0717L104.148 9.34343C95.6787 5.71399 86 9.94358 86 16.0022V475.789C86 478.808 89.0198 482.438 92.0492 483.648L144.063 502.376C151.931 505.396 162.21 501.166 162.21 494.507V35.3306Z" fill="white"/>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/dashlane-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/dashlane-light.svg
new file mode 100644
index 00000000000..49f658ffde4
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/dashlane-light.svg
@@ -0,0 +1,8 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M257.474 359.209C257.474 356.189 254.454 353.169 250.215 351.959L199.411 333.231C190.895 329.601 181.264 333.831 181.264 339.89V475.779C181.264 478.809 184.283 482.438 187.303 483.648L239.326 502.376C247.195 505.396 257.474 501.166 257.474 494.508V359.209Z" fill="#09363F"/>
+<path d="M352.736 321.103C352.736 318.084 349.717 315.064 345.477 313.854L294.674 295.126C286.157 291.496 276.526 295.726 276.526 301.785V437.674C276.526 440.704 279.546 444.333 282.566 445.543L334.589 464.271C342.458 467.291 352.736 463.061 352.736 456.403V321.103Z" fill="#09363F"/>
+<path d="M257.474 35.3211C257.474 32.3013 254.454 29.2815 250.215 28.0717L199.411 9.34343C190.895 5.71399 181.264 9.94358 181.264 16.0022V151.892C181.264 154.921 184.283 158.551 187.303 159.76L239.326 178.489C247.195 181.508 257.474 177.279 257.474 170.62V35.3211Z" fill="#09363F"/>
+<path d="M352.736 92.4777C352.736 89.4579 349.717 86.4382 345.477 85.2283L294.674 66.5C286.157 62.8706 276.526 67.1002 276.526 73.1588V209.048C276.526 212.078 279.546 215.707 282.566 216.917L334.589 235.645C342.458 238.665 352.736 234.436 352.736 227.777V92.4777Z" fill="#09363F"/>
+<path d="M448 168.687C448 165.667 444.98 162.647 440.741 161.437L389.937 142.709C381.421 139.079 371.79 143.309 371.79 149.368V361.466C371.79 364.495 374.81 368.125 377.829 369.335L429.852 388.063C437.721 391.083 448 386.853 448 380.194V168.687Z" fill="#09363F"/>
+<path d="M162.21 35.3306C162.21 32.3108 159.19 29.2815 154.951 28.0717L104.148 9.34343C95.6787 5.71399 86 9.94358 86 16.0022V475.789C86 478.808 89.0198 482.438 92.0492 483.648L144.063 502.376C151.931 505.396 162.21 501.166 162.21 494.507V35.3306Z" fill="#09363F"/>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/deepnet-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/deepnet-light.png
new file mode 100644
index 00000000000..ddc8ef8226a
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/deepnet-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/devolutions-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/devolutions-light.svg
new file mode 100644
index 00000000000..0ea7851ca1f
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/devolutions-light.svg
@@ -0,0 +1,23 @@
+
+<svg xmlns="http://www.w3.org/2000/svg" width="72px" height="72px" viewBox="0 0 72 72">	<defs>
+        <filter id="a" width="200%" height="200%">
+            <feOffset result="offOut" in="SourceAlpha" dy="2.2"/>
+            <feGaussianBlur result="blurOut" in="offOut" stdDeviation="1.5"/>
+            <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.4 0"/>
+            <feMerge>
+                <feMergeNode/>
+                <feMergeNode in="SourceGraphic"/>
+            </feMerge>
+        </filter>
+    </defs>
+<path fill="#ffffff" filter="url(#a)" d="M31.059,5.395c16.89-2.727,32.817,8.772,35.545,25.662c2.727,16.89-8.772,32.817-25.662,35.545
+	C24.051,69.329,8.124,57.83,5.397,40.94C2.67,24.049,14.169,8.122,31.059,5.395z"/>
+<path fill="#0068c3" d="M55.364,17.202c-5.047-5.197-11.802-8.109-19.02-8.2c-7.191-0.09-13.985,2.669-19.149,7.768
+	C11.91,21.989,9,28.955,9,36.392l0.044,1.26c0,1.181,0.961,2.142,2.142,2.142s2.141-0.96,2.142-2.14l0.01-0.913
+	c0-9.945,8.453-20.593,21.035-20.593c13.132,0,21.261,10.712,21.261,20.637c0,5.173-2.063,9.919-5.808,13.363
+	C46.17,53.509,41.26,55.36,36,55.36c-3.13,0-6.219-0.755-8.958-2.186l18.87-8.686c1.267-0.583,2.115-1.81,2.213-3.201
+	s-0.569-2.725-1.754-3.487l-15.706-8.415c-0.554-0.357-1.213-0.477-1.858-0.337c-0.644,0.139-1.195,0.521-1.552,1.075
+	c-0.737,1.144-0.406,2.673,0.721,3.397l8.454,6.923l-18.419,8.478c-1.427,0.657-2.298,2.1-2.218,3.675
+	c0.048,0.949,0.493,1.884,1.253,2.634C22.158,60.269,28.84,63,35.985,63c0.445,0,0.892-0.011,1.341-0.032
+	c14.156-0.673,25.432-12.315,25.671-26.505C63.118,29.236,60.407,22.396,55.364,17.202z"/>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/edge-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/edge-light.svg
new file mode 100644
index 00000000000..3e7e9eeac16
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/edge-light.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 256 256"><defs><style>.cls-1{fill:url(#linear-gradient);}.cls-2{opacity:0.35;fill:url(#radial-gradient);}.cls-2,.cls-4{isolation:isolate;}.cls-3{fill:url(#linear-gradient-2);}.cls-4{opacity:0.41;fill:url(#radial-gradient-2);}.cls-5{fill:url(#radial-gradient-3);}.cls-6{fill:url(#radial-gradient-4);}</style><linearGradient id="linear-gradient" x1="63.33" y1="84.03" x2="241.67" y2="84.03" gradientTransform="matrix(1, 0, 0, -1, 0, 266)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#0c59a4"/><stop offset="1" stop-color="#114a8b"/></linearGradient><radialGradient id="radial-gradient" cx="161.83" cy="68.91" r="95.38" gradientTransform="matrix(1, 0, 0, -0.95, 0, 248.84)" gradientUnits="userSpaceOnUse"><stop offset="0.72" stop-opacity="0"/><stop offset="0.95" stop-opacity="0.53"/><stop offset="1"/></radialGradient><linearGradient id="linear-gradient-2" x1="157.35" y1="161.39" x2="45.96" y2="40.06" gradientTransform="matrix(1, 0, 0, -1, 0, 266)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#1b9de2"/><stop offset="0.16" stop-color="#1595df"/><stop offset="0.67" stop-color="#0680d7"/><stop offset="1" stop-color="#0078d4"/></linearGradient><radialGradient id="radial-gradient-2" cx="-340.29" cy="62.99" r="143.24" gradientTransform="matrix(0.15, -0.99, -0.8, -0.12, 176.64, -125.4)" gradientUnits="userSpaceOnUse"><stop offset="0.76" stop-opacity="0"/><stop offset="0.95" stop-opacity="0.5"/><stop offset="1"/></radialGradient><radialGradient id="radial-gradient-3" cx="113.37" cy="570.21" r="202.43" gradientTransform="matrix(-0.04, 1, 2.13, 0.08, -1179.54, -106.69)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#35c1f1"/><stop offset="0.11" stop-color="#34c1ed"/><stop offset="0.23" stop-color="#2fc2df"/><stop offset="0.31" stop-color="#2bc3d2"/><stop offset="0.67" stop-color="#36c752"/></radialGradient><radialGradient id="radial-gradient-4" cx="376.52" cy="567.97" r="97.34" gradientTransform="matrix(0.28, 0.96, 0.78, -0.23, -303.76, -148.5)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#66eb6e"/><stop offset="1" stop-color="#66eb6e" stop-opacity="0"/></radialGradient></defs><title>Edge_Logo_265x265</title><path class="cls-1" d="M235.68,195.46a93.73,93.73,0,0,1-10.54,4.71,101.87,101.87,0,0,1-35.9,6.46c-47.32,0-88.54-32.55-88.54-74.32A31.48,31.48,0,0,1,117.13,105c-42.8,1.8-53.8,46.4-53.8,72.53,0,73.88,68.09,81.37,82.76,81.37,7.91,0,19.84-2.3,27-4.56l1.31-.44A128.34,128.34,0,0,0,241,201.1,4,4,0,0,0,235.68,195.46Z" transform="translate(-4.63 -4.92)"/><path class="cls-2" d="M235.68,195.46a93.73,93.73,0,0,1-10.54,4.71,101.87,101.87,0,0,1-35.9,6.46c-47.32,0-88.54-32.55-88.54-74.32A31.48,31.48,0,0,1,117.13,105c-42.8,1.8-53.8,46.4-53.8,72.53,0,73.88,68.09,81.37,82.76,81.37,7.91,0,19.84-2.3,27-4.56l1.31-.44A128.34,128.34,0,0,0,241,201.1,4,4,0,0,0,235.68,195.46Z" transform="translate(-4.63 -4.92)"/><path class="cls-3" d="M110.34,246.34A79.2,79.2,0,0,1,87.6,225,80.72,80.72,0,0,1,117.13,105c3.12-1.47,8.45-4.13,15.54-4a32.35,32.35,0,0,1,25.69,13,31.88,31.88,0,0,1,6.36,18.66c0-.21,24.46-79.6-80-79.6-43.9,0-80,41.66-80,78.21a130.15,130.15,0,0,0,12.11,56,128,128,0,0,0,156.38,67.11,75.55,75.55,0,0,1-62.78-8Z" transform="translate(-4.63 -4.92)"/><path class="cls-4" d="M110.34,246.34A79.2,79.2,0,0,1,87.6,225,80.72,80.72,0,0,1,117.13,105c3.12-1.47,8.45-4.13,15.54-4a32.35,32.35,0,0,1,25.69,13,31.88,31.88,0,0,1,6.36,18.66c0-.21,24.46-79.6-80-79.6-43.9,0-80,41.66-80,78.21a130.15,130.15,0,0,0,12.11,56,128,128,0,0,0,156.38,67.11,75.55,75.55,0,0,1-62.78-8Z" transform="translate(-4.63 -4.92)"/><path class="cls-5" d="M156.94,153.78c-.81,1.05-3.3,2.5-3.3,5.66,0,2.61,1.7,5.12,4.72,7.23,14.38,10,41.49,8.68,41.56,8.68A59.56,59.56,0,0,0,230.19,167a61.38,61.38,0,0,0,30.43-52.88c.26-22.41-8-37.31-11.34-43.91C228.09,28.76,182.35,4.92,132.61,4.92a128,128,0,0,0-128,126.2c.48-36.54,36.8-66.05,80-66.05,3.5,0,23.46.34,42,10.07,16.34,8.58,24.9,18.94,30.85,29.21,6.18,10.67,7.28,24.15,7.28,29.52S162,147.2,156.94,153.78Z" transform="translate(-4.63 -4.92)"/><path class="cls-6" d="M156.94,153.78c-.81,1.05-3.3,2.5-3.3,5.66,0,2.61,1.7,5.12,4.72,7.23,14.38,10,41.49,8.68,41.56,8.68A59.56,59.56,0,0,0,230.19,167a61.38,61.38,0,0,0,30.43-52.88c.26-22.41-8-37.31-11.34-43.91C228.09,28.76,182.35,4.92,132.61,4.92a128,128,0,0,0-128,126.2c.48-36.54,36.8-66.05,80-66.05,3.5,0,23.46.34,42,10.07,16.34,8.58,24.9,18.94,30.85,29.21,6.18,10.67,7.28,24.15,7.28,29.52S162,147.2,156.94,153.78Z" transform="translate(-4.63 -4.92)"/></svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/egomet-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/egomet-light.png
new file mode 100644
index 00000000000..f630703b671
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/egomet-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/ellipticsecure-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ellipticsecure-light.png
new file mode 100644
index 00000000000..daf9931998a
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ellipticsecure-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/enpass-dark.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/enpass-dark.svg
new file mode 100644
index 00000000000..8cf8e7f3123
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/enpass-dark.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M256.483 28.0554C313.899 28.0554 371.315 27.8856 428.745 28.1405C440.68 27.9076 452.521 30.2889 463.441 35.1179C474.362 39.9469 484.099 47.1073 491.971 56.0984C504.062 69.6962 511.132 87.0387 512 105.23C512.028 121.933 510.035 138.578 506.063 154.801C498.444 198.706 490.515 242.527 482.726 286.376C476.012 324.134 469.581 361.95 462.513 399.68C457.672 420.969 446.545 440.303 430.58 455.165C414.616 470.027 394.555 479.727 373.011 483.002C367.752 483.629 362.462 483.946 357.166 483.95C290.053 484.017 222.94 484.017 155.828 483.95C130.466 483.9 105.93 474.915 86.5132 458.566C67.0965 442.218 54.0362 419.548 49.618 394.525C36.1804 319.177 22.6297 243.853 8.96597 168.553C6.28034 153.639 3.312 138.811 1.2059 123.784C-2.46105 102.729 2.31093 81.0744 14.4852 63.5244C26.6596 45.9745 45.2529 33.9462 66.2266 30.0525C73.0557 28.7451 79.9959 28.1094 86.9484 28.1546C143.46 27.9941 199.971 27.961 256.483 28.0554ZM210.926 339.643C210.926 354.67 210.926 369.697 210.926 384.738C210.773 388.205 211.343 391.665 212.597 394.899C213.852 398.134 215.764 401.071 218.213 403.525C220.662 405.979 223.593 407.895 226.821 409.152C230.049 410.409 233.503 410.979 236.962 410.826C249.387 410.826 261.812 410.826 274.236 410.826C277.922 411.183 281.642 410.717 285.127 409.462C288.612 408.208 291.777 406.196 294.394 403.57C297.012 400.945 299.017 397.772 300.265 394.278C301.514 390.785 301.975 387.058 301.615 383.364C301.615 353.919 301.616 324.46 301.474 295.015C301.311 293.331 301.67 291.637 302.502 290.165C303.334 288.692 304.599 287.512 306.125 286.786C323.79 276.298 337.551 260.314 345.313 241.266C353.075 222.219 354.413 201.151 349.123 181.272C342.356 156.853 326.286 136.075 304.376 123.414C282.466 110.754 256.469 107.225 231.987 113.586C217.669 116.544 204.289 122.959 193.007 132.274C181.726 141.588 172.884 153.522 167.249 167.038C159.027 188.686 158.548 212.521 165.893 234.484C173.238 256.447 187.954 275.181 207.533 287.495C208.67 288.038 209.613 288.917 210.237 290.013C210.861 291.109 211.136 292.37 211.025 293.627C210.841 309.008 210.926 324.333 210.926 339.671V339.643Z" fill="white"/>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/enpass-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/enpass-light.svg
new file mode 100644
index 00000000000..a69a66c8a0e
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/enpass-light.svg
@@ -0,0 +1,3 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M256.483 28.0554C313.899 28.0554 371.315 27.8856 428.745 28.1405C440.68 27.9076 452.521 30.2889 463.441 35.1179C474.362 39.9469 484.099 47.1073 491.971 56.0984C504.062 69.6962 511.132 87.0387 512 105.23C512.028 121.933 510.035 138.578 506.063 154.801C498.444 198.706 490.515 242.527 482.726 286.376C476.012 324.134 469.581 361.95 462.513 399.68C457.672 420.969 446.545 440.303 430.58 455.165C414.616 470.027 394.555 479.727 373.011 483.002C367.752 483.629 362.462 483.946 357.166 483.95C290.053 484.017 222.94 484.017 155.828 483.95C130.466 483.9 105.93 474.915 86.5132 458.566C67.0965 442.218 54.0362 419.548 49.618 394.525C36.1804 319.177 22.6297 243.853 8.96597 168.553C6.28034 153.639 3.312 138.811 1.2059 123.784C-2.46105 102.729 2.31093 81.0744 14.4852 63.5244C26.6596 45.9745 45.2529 33.9462 66.2266 30.0525C73.0557 28.7451 79.9959 28.1094 86.9484 28.1546C143.46 27.9941 199.971 27.961 256.483 28.0554ZM210.926 339.643C210.926 354.67 210.926 369.697 210.926 384.738C210.773 388.205 211.343 391.665 212.597 394.899C213.852 398.134 215.764 401.071 218.213 403.525C220.662 405.979 223.593 407.895 226.821 409.152C230.049 410.409 233.503 410.979 236.962 410.826C249.387 410.826 261.812 410.826 274.236 410.826C277.922 411.183 281.642 410.717 285.127 409.462C288.612 408.208 291.777 406.196 294.394 403.57C297.012 400.945 299.017 397.772 300.265 394.278C301.514 390.785 301.975 387.058 301.615 383.364C301.615 353.919 301.616 324.46 301.474 295.015C301.311 293.331 301.67 291.637 302.502 290.165C303.334 288.692 304.599 287.512 306.125 286.786C323.79 276.298 337.551 260.314 345.313 241.266C353.075 222.219 354.413 201.151 349.123 181.272C342.356 156.853 326.286 136.075 304.376 123.414C282.466 110.754 256.469 107.225 231.987 113.586C217.669 116.544 204.289 122.959 193.007 132.274C181.726 141.588 172.884 153.522 167.249 167.038C159.027 188.686 158.548 212.521 165.893 234.484C173.238 256.447 187.954 275.181 207.533 287.495C208.67 288.038 209.613 288.917 210.237 290.013C210.861 291.109 211.136 292.37 211.025 293.627C210.841 309.008 210.926 324.333 210.926 339.671V339.643Z" fill="#0D338F"/>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/ensurity-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ensurity-light.png
new file mode 100644
index 00000000000..01189dfb2cc
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ensurity-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/ensurity1-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ensurity1-light.png
new file mode 100644
index 00000000000..b9aae557d8a
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ensurity1-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/ensurity2-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ensurity2-light.png
new file mode 100644
index 00000000000..2b5f482e132
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ensurity2-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/ensurity3-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ensurity3-light.png
new file mode 100644
index 00000000000..22223df9bd9
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ensurity3-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/enterprise-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/enterprise-light.svg
new file mode 100644
index 00000000000..b9716d72a3b
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/enterprise-light.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" width="1000pt" height="1000pt" viewBox="0 0 1000 1000" version="1.2" baseProfile="tiny-ps"><title>YubiKey</title><defs id="defs1"></defs><desc id="logo-desc-v2">YubiKey</desc><g id="#76b93dff"><path fill="#76B93D" d=" M 491.78 0.00 L 511.37 0.00 C 574.24 1.38 636.67 15.16 694.57 39.58 C 717.73 50.60 741.13 61.38 762.77 75.25 C 779.69 84.71 794.83 96.89 809.98 108.88 C 825.12 120.25 839.38 132.80 852.61 146.36 C 856.92 150.72 860.78 155.50 865.23 159.73 C 879.49 173.96 892.14 189.73 903.77 206.16 C 910.61 216.29 918.36 225.81 924.67 236.30 C 934.75 252.39 943.29 269.37 951.53 286.45 C 979.45 343.28 995.28 405.80 999.29 468.92 C 999.90 481.28 1000.86 493.63 1000.62 506.02 C 999.92 530.28 998.27 554.55 994.28 578.51 C 990.71 600.50 985.66 622.25 979.40 643.62 C 974.54 659.88 969.46 676.12 962.49 691.61 C 949.88 720.01 936.37 748.21 918.72 773.87 C 915.53 778.61 911.86 783.01 908.71 787.78 C 898.94 802.36 887.86 816.03 876.17 829.11 C 862.46 844.35 848.22 859.16 832.84 872.74 C 822.70 882.04 811.43 889.96 800.96 898.85 C 784.93 911.66 767.54 922.65 749.80 932.90 C 721.00 949.90 690.64 964.30 658.92 974.98 C 613.06 990.59 564.79 998.98 516.36 1000.00 L 504.47 1000.00 C 511.75 981.42 519.01 962.82 526.11 944.17 C 537.32 919.39 545.95 893.55 556.42 868.47 C 562.86 852.73 568.51 836.67 575.21 821.04 C 582.59 805.63 588.10 789.42 594.54 773.61 C 605.97 746.81 615.42 719.19 627.74 692.77 C 643.77 653.10 659.30 613.22 676.12 573.87 C 692.91 533.90 707.98 493.23 725.31 453.49 C 732.94 435.27 740.06 416.84 747.34 398.48 C 753.89 382.51 760.21 366.44 766.50 350.37 C 774.97 332.55 781.46 313.91 788.79 295.63 C 730.56 295.64 672.33 296.00 614.10 295.47 C 600.44 332.35 588.31 369.78 574.40 406.57 C 559.72 448.61 545.43 490.78 530.66 532.79 C 524.97 546.15 520.39 559.94 515.44 573.59 C 508.03 595.34 499.38 616.64 491.75 638.31 C 487.72 622.08 482.01 606.34 476.44 590.59 C 462.53 549.76 447.48 509.33 431.80 469.15 C 425.09 452.88 419.43 436.21 413.27 419.73 C 404.83 396.70 396.42 373.65 388.53 350.42 C 386.62 344.61 384.02 339.07 381.78 333.39 C 376.47 320.42 371.13 307.43 364.99 294.82 C 306.81 296.76 248.59 295.12 190.40 295.90 C 204.79 334.07 218.81 372.38 233.78 410.33 C 250.79 452.59 266.56 495.33 283.11 537.76 C 293.49 560.74 301.47 584.68 311.01 608.00 C 319.20 628.80 326.75 649.86 335.75 670.32 C 347.17 698.67 358.08 727.21 369.24 755.66 C 377.66 776.87 386.64 797.85 394.94 819.12 C 385.00 843.03 374.52 866.71 364.56 890.62 C 359.78 902.38 354.90 914.11 349.80 925.74 C 343.36 940.74 337.11 955.86 329.50 970.32 C 302.81 960.87 277.35 948.27 252.82 934.20 C 241.07 927.41 229.30 920.61 218.24 912.72 C 144.26 861.18 83.20 790.37 46.19 707.92 C 41.31 698.44 36.89 688.71 33.49 678.59 C -16.51 550.54 -9.90 401.20 52.89 278.72 C 63.95 256.51 75.92 234.61 90.79 214.69 C 106.43 193.02 122.74 171.66 141.97 153.01 C 159.09 134.08 178.85 117.78 199.06 102.26 C 207.27 96.06 215.25 89.53 223.94 83.99 C 253.70 64.41 285.58 48.15 318.48 34.55 C 373.61 12.90 432.58 1.25 491.78 0.00 Z" id="path1"></path></g><metadata></metadata></svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/ess-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ess-light.png
new file mode 100644
index 00000000000..80fd970dad0
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ess-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/ewbm-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ewbm-light.png
new file mode 100644
index 00000000000..8367c4e97f6
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ewbm-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/excelsecu-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/excelsecu-light.png
new file mode 100644
index 00000000000..6801a472a8a
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/excelsecu-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/feitian-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/feitian-light.png
new file mode 100644
index 00000000000..6e800533ca3
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/feitian-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/fido-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/fido-light.png
new file mode 100644
index 00000000000..502983c48de
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/fido-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/fido1-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/fido1-light.png
new file mode 100644
index 00000000000..f32ce4846be
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/fido1-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/foongtone-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/foongtone-light.png
new file mode 100644
index 00000000000..d425076cd26
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/foongtone-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/goldkey-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/goldkey-light.png
new file mode 100644
index 00000000000..74b0675986b
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/goldkey-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/google-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/google-light.png
new file mode 100644
index 00000000000..875a1c652b4
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/google-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/google1-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/google1-light.svg
new file mode 100644
index 00000000000..b13ae8a5eb4
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/google1-light.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 192 192" height="24px" viewBox="0 0 192 192" width="24px"><rect fill="none" height="192" width="192" y="0"/><g><path d="M69.29,106c-3.46,5.97-9.91,10-17.29,10c-11.03,0-20-8.97-20-20s8.97-20,20-20 c7.38,0,13.83,4.03,17.29,10h25.55C90.3,66.54,72.82,52,52,52C27.74,52,8,71.74,8,96s19.74,44,44,44c20.82,0,38.3-14.54,42.84-34 H69.29z" fill="#4285F4"/><rect fill="#FBBC04" height="24" width="44" x="94" y="84"/><path d="M94.32,84H68v0.05c2.5,3.34,4,7.47,4,11.95s-1.5,8.61-4,11.95V108h26.32 c1.08-3.82,1.68-7.84,1.68-12S95.41,87.82,94.32,84z" fill="#EA4335"/><path d="M184,106v26h-16v-8c0-4.42-3.58-8-8-8s-8,3.58-8,8v8h-16v-26H184z" fill="#34A853"/><rect fill="#188038" height="24" width="48" x="136" y="84"/></g></svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/gotrust-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/gotrust-light.png
new file mode 100644
index 00000000000..1c34cc74fe3
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/gotrust-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/gstag-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/gstag-light.png
new file mode 100644
index 00000000000..017c4c83be9
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/gstag-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/heimlane-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/heimlane-light.svg
new file mode 100644
index 00000000000..7e90bbb85a8
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/heimlane-light.svg
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="1023.9999"
+   height="1023.9999"
+   viewBox="0 0 270.93333 270.93333"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1">
+    <rect
+       style="fill:#1a2332;fill-opacity:1;stroke:#ffffff;stroke-width:10.5723;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;paint-order:stroke fill markers"
+       id="rect1-8"
+       width="260"
+       height="260"
+       x="4.7742004"
+       y="5.8167515"
+       ry="60" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.73551;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="path9"
+       cx="189.89941"
+       cy="76.238014"
+       rx="9.259469"
+       ry="9.8423595" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.73551;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="circle9"
+       cx="132.08908"
+       cy="-189.40054"
+       transform="rotate(90)"
+       rx="9.8423595"
+       ry="9.259469" />
+    <circle
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.74178;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="circle10"
+       cx="-2.7947109"
+       cy="-269.53699"
+       r="9.5553598"
+       transform="matrix(-0.68521017,0.7283454,-0.68521093,-0.72834468,0,0)" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.73551;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="circle11"
+       cx="-131.84821"
+       cy="-194.32492"
+       transform="scale(-1)"
+       rx="9.259469"
+       ry="9.8423595" />
+    <circle
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.74178;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="circle12"
+       cx="-191.27057"
+       cy="-75.471619"
+       r="9.5553598"
+       transform="matrix(-0.68521042,-0.72834516,0.68521068,-0.72834492,0,0)" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.73551;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="circle13"
+       cx="-76.21656"
+       cy="78.785728"
+       transform="rotate(-90)"
+       rx="9.8423595"
+       ry="9.259469" />
+    <circle
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.74178;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="circle14"
+       cx="45.708427"
+       cy="149.80536"
+       r="9.5553598"
+       transform="matrix(0.68521084,-0.72834477,0.68521026,0.72834532,0,0)" />
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.73551;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="circle15"
+       cx="78.785728"
+       cy="131.98999"
+       rx="9.259469"
+       ry="9.8423595" />
+    <circle
+       style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:6.74178;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       id="circle16"
+       cx="188.22224"
+       cy="-7.2915931"
+       r="9.5553598"
+       transform="matrix(0.68521027,0.7283453,-0.68521083,0.72834478,0,0)" />
+    <path
+       style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:11.0968;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers"
+       d="M 221.8944,44.132803 H 48.522174 V 227.39621 H 221.8944 Z"
+       id="path16" />
+    <path
+       style="fill:none;stroke:#ffffff;stroke-width:10.5833;stroke-dasharray:none;stroke-opacity:1"
+       d="M 80.057285,76.239981 V 196.23997 H 190.05727 V 76.239981 Z"
+       id="path1" />
+  </g>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/hid-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/hid-light.png
new file mode 100644
index 00000000000..763a54a251e
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/hid-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/hideez-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/hideez-light.png
new file mode 100644
index 00000000000..56fa1984102
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/hideez-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/hyper-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/hyper-light.png
new file mode 100644
index 00000000000..9a077c0fd7f
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/hyper-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/hyper1-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/hyper1-light.png
new file mode 100644
index 00000000000..0f8ffa00641
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/hyper1-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/hypr-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/hypr-light.png
new file mode 100644
index 00000000000..4d8dc8f423f
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/hypr-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/icloud-dark.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/icloud-dark.svg
new file mode 100644
index 00000000000..30f4f117ce3
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/icloud-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" fill="none"><path d="m217.36,90.69c-15.58,9.54-25.17,26.41-25.38,44.68.06,20.67,12.43,39.32,31.46,47.41-3.67,11.84-9.1,23.06-16.11,33.28-10.03,14.44-20.52,28.87-36.47,28.87s-20.06-9.27-38.45-9.27-24.32,9.57-38.9,9.57-24.77-13.37-36.47-29.79c-15.46-22.99-23.95-49.96-24.47-77.66,0-45.59,29.63-69.75,58.81-69.75,15.5,0,28.42,10.18,38.15,10.18s23.71-10.79,41.34-10.79c18.41-.47,35.84,8.24,46.5,23.25Zm-54.86-42.55c7.77-9.14,12.17-20.67,12.46-32.67.01-1.58-.14-3.16-.46-4.71-13.35,1.3-25.69,7.67-34.5,17.78-7.85,8.78-12.41,20-12.92,31.76,0,1.43.16,2.86.46,4.26,1.05.2,2.12.3,3.19.3,12.43-.99,23.91-7.04,31.76-16.73Z" fill="#FFF"/></svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/icloud-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/icloud-light.svg
new file mode 100644
index 00000000000..db821819e5f
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/icloud-light.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" fill="none"><path d="m217.36,90.69c-15.58,9.54-25.17,26.41-25.38,44.68.06,20.67,12.43,39.32,31.46,47.41-3.67,11.84-9.1,23.06-16.11,33.28-10.03,14.44-20.52,28.87-36.47,28.87s-20.06-9.27-38.45-9.27-24.32,9.57-38.9,9.57-24.77-13.37-36.47-29.79c-15.46-22.99-23.95-49.96-24.47-77.66,0-45.59,29.63-69.75,58.81-69.75,15.5,0,28.42,10.18,38.15,10.18s23.71-10.79,41.34-10.79c18.41-.47,35.84,8.24,46.5,23.25Zm-54.86-42.55c7.77-9.14,12.17-20.67,12.46-32.67.01-1.58-.14-3.16-.46-4.71-13.35,1.3-25.69,7.67-34.5,17.78-7.85,8.78-12.41,20-12.92,31.76,0,1.43.16,2.86.46,4.26,1.05.2,2.12.3,3.19.3,12.43-.99,23.91-7.04,31.76-16.73Z" fill="#000"/></svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/id-one-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/id-one-light.png
new file mode 100644
index 00000000000..cb3c34a9671
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/id-one-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/ideem-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ideem-light.png
new file mode 100644
index 00000000000..133098a5086
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ideem-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/idemia-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/idemia-light.png
new file mode 100644
index 00000000000..444bab5f4c1
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/idemia-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/idex-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/idex-light.png
new file mode 100644
index 00000000000..ef6b3c444d7
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/idex-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/idmelon-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/idmelon-light.svg
new file mode 100644
index 00000000000..a4815b1d7fb
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/idmelon-light.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><defs><style>.cls-1{fill:#f15b5c;}.cls-2{fill:#921b1d;}.cls-3{fill:#ee3025;}.cls-4{fill:#bb2026;}</style></defs><path class="cls-1" d="M341.87,100.2l-4.29-1.64c-32.31-11.81-65.36-13.27-76.92-13.4l-.89,0H120.12A23.43,23.43,0,0,0,111.6,87c-.41.21-.81.42-1.17.64l-1.85,1.76,133.35,65.8,103.38-52.89Z"/><line class="cls-2" x1="294.58" y1="137.07" x2="296.99" y2="138.27"/><line class="cls-2" x1="239.53" y1="152.11" x2="241.93" y2="153.31"/><path class="cls-3" d="M106.74,91q-2.62,4.2-2.35,11.26t.26,13.37V423.21q0,5.76-.26,14.41t1.31,12.84a14.55,14.55,0,0,0,1.14,2.19l136-299.56L110.43,87.65A11.24,11.24,0,0,0,106.74,91Z"/><path class="cls-4" d="M361.86,111.53c-2.32-1.55-4.7-3.1-7.13-4.68a93.92,93.92,0,0,0-12-6.32c-.27-.11-.55-.23-.83-.33l-99,52.89L387.63,402.31A164.07,164.07,0,0,0,397,388.12q29.82-51.21,29.82-125a284.83,284.83,0,0,0-7.08-61.25,164.16,164.16,0,0,0-26.53-59.75,134.9,134.9,0,0,0-9.05-11.38A153.2,153.2,0,0,0,361.86,111.53Z"/><path class="cls-2" d="M106.65,452.34a10.07,10.07,0,0,0,7.69,5.19l1.74.2h156c50.27,0,88.64-18.69,115.52-55.42L242.89,153.09Z"/></svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/idmelon1-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/idmelon1-light.png
new file mode 100644
index 00000000000..dca9bb18cf0
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/idmelon1-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/iist-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/iist-light.png
new file mode 100644
index 00000000000..115b97985d6
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/iist-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/initial-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/initial-light.svg
new file mode 100644
index 00000000000..902bf13c795
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/initial-light.svg
@@ -0,0 +1,5 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="1024" height="1024" fill="#577FFF"/>
+<path d="M512 396C556.735 396 593 359.735 593 315C593 270.265 556.735 234 512 234C467.265 234 431 270.265 431 315C431 359.735 467.265 396 512 396Z" stroke="white" stroke-width="16"/>
+<path d="M590 458H434V798H590V458Z" fill="white"/>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/ipasswords-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ipasswords-light.svg
new file mode 100644
index 00000000000..6fe8a4dfe6d
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ipasswords-light.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="100%" height="100%" viewBox="0 0 1080 1080" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+    <g transform="matrix(0.983827,0,0,0.983827,13.661,-0.284699)">
+        <path d="M723.253,493.704C756.288,495.22 782.644,522.52 782.644,555.927L782.644,834.304C782.644,868.683 754.733,896.593 720.355,896.593L351.393,896.593C317.015,896.593 289.104,868.683 289.104,834.304L289.104,555.927C289.104,523.117 314.526,496.198 346.73,493.81L346.73,390.119C346.73,286.215 431.088,201.858 534.992,201.858C638.896,201.858 723.253,286.215 723.253,390.119L723.253,493.704ZM433.328,490.966L636.686,492.116C636.686,492.116 637.142,385.132 637.086,384.489C631.849,324.163 579.118,288.079 534.992,288.535C493.017,288.969 435.92,318.1 433.656,383.797C433.476,389.017 433.328,490.966 433.328,490.966ZM503.296,714.382L492.433,784.455C492.433,784.455 490.376,798.284 492.416,802.664C496.78,812.031 503.822,811.111 503.822,811.111L565.6,810.838C565.6,810.838 572.863,811.472 577.637,802.155C579.88,797.775 577.323,783.74 577.323,783.74L566.649,714.401C590.743,702.649 607.359,677.908 607.359,649.318C607.359,609.377 574.932,576.95 534.992,576.95C495.051,576.95 462.624,609.377 462.624,649.318C462.624,677.893 479.223,702.622 503.296,714.382Z" style="fill:rgb(0,152,248);"/>
+    </g>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/kaspersky-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/kaspersky-light.svg
new file mode 100644
index 00000000000..e0f82e19eac
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/kaspersky-light.svg
@@ -0,0 +1 @@
+<svg width="512" height="512" viewBox="0 0 512 512" fill="none" xmlns="http://www.w3.org/2000/svg"><g clip-path="url(#clip0_7484_8745)"><g clip-path="url(#clip1_7484_8745)"><g clip-path="url(#clip2_7484_8745)"><path d="M281.964 6.96171C265.893 -2.29974 246.107 -2.29974 230.036 6.96171L46.0365 113.002C29.9271 122.286 20 139.466 20 158.06V353.972C20 372.566 29.9271 389.745 46.0365 399.029L230.036 505.07C246.107 514.331 265.893 514.331 281.964 505.07L465.964 399.029C482.073 389.745 492 372.566 492 353.972V158.06C492 139.466 482.073 122.286 465.964 113.002L281.964 6.96171Z" fill="url(#paint0_linear_7484_8745)"/><path fill-rule="evenodd" clip-rule="evenodd" d="M453.98 133.798L269.98 27.7574C261.327 22.7704 250.673 22.7704 242.02 27.7574L58.0196 133.798C49.3453 138.797 44 148.047 44 158.06V353.972C44 363.984 49.3453 373.234 58.0196 378.233L242.02 484.274C250.673 489.261 261.327 489.261 269.98 484.274L453.98 378.233C462.655 373.234 468 363.984 468 353.972V158.06C468 148.047 462.655 138.797 453.98 133.798ZM281.964 6.96171C265.893 -2.29974 246.107 -2.29974 230.036 6.96171L46.0365 113.002C29.9271 122.286 20 139.466 20 158.06V353.972C20 372.566 29.9271 389.745 46.0365 399.029L230.036 505.07C246.107 514.331 265.893 514.331 281.964 505.07L465.964 399.029C482.073 389.745 492 372.566 492 353.972V158.06C492 139.466 482.073 122.286 465.964 113.002L281.964 6.96171Z" fill="black"/></g><path fill-rule="evenodd" clip-rule="evenodd" d="M256 140C242.745 140 232 150.745 232 164C232 177.255 242.745 188 256 188C269.255 188 280 177.255 280 164C280 150.745 269.255 140 256 140ZM248 164C248 159.582 251.582 156 256 156C260.418 156 264 159.582 264 164C264 168.418 260.418 172 256 172C251.582 172 248 168.418 248 164Z" fill="black"/><path fill-rule="evenodd" clip-rule="evenodd" d="M172 192C172 145.608 209.608 108 256 108C302.392 108 340 145.608 340 192C340 227.061 318.519 257.105 288 269.69V386.67C288 392.391 284.946 397.676 279.989 400.533L263.989 409.753C259.044 412.603 252.956 412.603 248.011 409.753L232.011 400.533C227.054 397.676 224 392.391 224 386.67V372C224 369.878 224.843 367.844 226.343 366.343L236 356.686V355.314L226.343 345.657C224.843 344.157 224 342.122 224 340V332C224 329.878 224.843 327.844 226.343 326.343L236 316.686V315.314L226.343 305.657C224.843 304.157 224 302.122 224 300V269.69C193.481 257.105 172 227.061 172 192ZM256 124C218.445 124 188 154.445 188 192C188 229.555 218.445 260 256 260C293.555 260 324 229.555 324 192C324 154.445 293.555 124 256 124ZM256 276C261.471 276 266.82 275.477 272 274.478V386.67L256 395.89L240 386.67V375.314L249.657 365.657C251.157 364.157 252 362.122 252 360V352C252 349.878 251.157 347.844 249.657 346.343L240 336.686V335.314L249.657 325.657C251.157 324.157 252 322.122 252 320V312C252 309.878 251.157 307.844 249.657 306.343L240 296.686V274.478C245.18 275.477 250.529 276 256 276Z" fill="black"/></g></g><defs><linearGradient id="paint0_linear_7484_8745" x1="393.865" y1="63.2796" x2="99.2043" y2="429.998" gradientUnits="userSpaceOnUse"><stop stop-color="#4DFF88"/><stop offset="1" stop-color="#3DE8CA"/></linearGradient><clipPath id="clip0_7484_8745"><rect width="512" height="512" fill="white"/></clipPath><clipPath id="clip1_7484_8745"><rect width="512" height="512" fill="white"/></clipPath><clipPath id="clip2_7484_8745"><rect width="512" height="512" fill="white"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/keepassdx-dark.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/keepassdx-dark.svg
new file mode 100644
index 00000000000..0c95ba006f9
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/keepassdx-dark.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" width="192" height="192">
+  <defs>
+    <linearGradient id="a">
+      <stop offset="0" stop-color="#439447"/>
+      <stop offset="1" stop-color="#42ab46"/>
+    </linearGradient>
+    <linearGradient xlink:href="#a" id="b" x1="0" x2="192" y1="0" y2="192" gradientUnits="userSpaceOnUse"/>
+  </defs>
+  <circle cx="96" cy="96" r="88" fill="url(#b)"/>
+  <path fill="#ffa726" d="M56 56v10l70 70h10v-9L65 56Z"/>
+  <path fill="#fff" d="m83 99-27 28v9h9l10-10h10v-9h9v-7zm25-46L95 79l21 21 25-13-4-29zm19 18c4 0 8 5 7 9s-6 7-10 5c-4-1-6-7-3-11 1-1 3-3 6-3z"/>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/keepassdx-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/keepassdx-light.svg
new file mode 100644
index 00000000000..6a1da82dd39
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/keepassdx-light.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" width="192" height="192">
+  <defs>
+    <linearGradient id="a">
+      <stop offset="0" stop-color="#42ab46"/>
+      <stop offset="1" stop-color="#439447"/>
+    </linearGradient>
+    <linearGradient xlink:href="#a" id="b" x1="0" x2="192" y1="0" y2="192" gradientUnits="userSpaceOnUse"/>
+  </defs>
+  <circle cx="96" cy="96" r="88" fill="url(#b)"/>
+  <path fill="#ffa726" d="M56 56v10l70 70h10v-9L65 56Z"/>
+  <path fill="#fff" d="m83 99-27 28v9h9l10-10h10v-9h9v-7zm25-46L95 79l21 21 25-13-4-29zm19 18c4 0 8 5 7 9s-6 7-10 5c-4-1-6-7-3-11 1-1 3-3 6-3z"/>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/keepassxc-dark.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/keepassxc-dark.svg
new file mode 100644
index 00000000000..80a12953f8c
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/keepassxc-dark.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><g id="c"><rect width="128" height="128" style="fill:none; stroke-width:0px;"/><g id="d"><rect x="57.0112" y="56.5771" width="3.558" height="35.2061" style="fill:#ffffff; stroke-width:0px;"/><path d="m64,28.4885c4.8287,0,8.7679-3.94,8.7679-8.7698,0-.6355-.1271-1.2709-.2542-1.9064-2.7956-.5084-5.5911-.8897-8.5138-.7626-2.7956,0-5.7182.2542-8.5138.7626-.1271.6355-.2542,1.271-.2542,1.9064,0,4.8297,3.9392,8.7698,8.7679,8.7698Z" style="fill:#ffffff; stroke-width:0px;"/><path d="m88.1436,23.6587c.3812,1.6523.5083,3.1775.5083,4.8297,0,9.7865-5.8453,18.3021-14.1049,22.2421l-.6354,10.422,7.4972,7.4988-7.4972,7.4988,4.9558,4.9568-4.9558,4.9568.6354,9.2781-10.5469,10.5491-10.5469-10.5491v-44.6113c-8.3867-3.94-14.1049-12.4556-14.1049-22.2421,0-1.6523.2541-3.1775.5083-4.8297-14.2319,8.5155-22.8728,23.7673-22.8728,40.29,0,26.055,21.0938,47.0261,47.0163,47.0261,26.0496,0,47.0163-21.0982,47.0163-47.0261-.1271-16.5227-8.7679-31.7744-22.8728-40.29Z" style="fill:#ffffff; stroke-width:0px;"/><path d="m64,3.1001C30.4195,3.1001,3.0999,30.4196,3.0999,64s27.3196,60.9,60.9001,60.9,60.8999-27.3198,60.8999-60.9S97.5806,3.1001,64,3.1001Zm0,116.6759c-30.7415,0-55.7514-25.0212-55.7514-55.7759S33.2586,8.2241,64,8.2241s55.7512,25.0209,55.7512,55.7759-25.0097,55.7759-55.7512,55.7759Z" style="fill:#ffffff; stroke-width:0px;"/></g></g></svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/keepassxc-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/keepassxc-light.svg
new file mode 100644
index 00000000000..aad6c5a16be
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/keepassxc-light.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 128 128"><defs><linearGradient id="e" x1="63.9998" y1="-3.314" x2="63.9998" y2="118.486" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#414141"/><stop offset=".196" stop-color="#3e3e3e"/><stop offset="1" stop-color="#3a3a3a"/></linearGradient><radialGradient id="g" cx="302.8014" cy="-375.5301" fx="302.8014" fy="-375.5301" r="207.2339" gradientTransform="translate(-46.999 185.5275) scale(.3539)" gradientUnits="userSpaceOnUse"><stop offset=".6733" stop-color="#fcfcfc" stop-opacity="0"/><stop offset="1" stop-color="#fcfcfc"/></radialGradient><radialGradient id="i" cx="311.1472" cy="-348.2325" fx="311.1472" fy="-348.2325" r="172.3893" gradientTransform="translate(-46.999 185.5275) scale(.3539)" gradientUnits="userSpaceOnUse"><stop offset=".1088" stop-color="#0f0f0d" stop-opacity="0"/><stop offset=".8856" stop-color="#414141" stop-opacity="0"/><stop offset=".9339" stop-color="#1e1e1d" stop-opacity=".6841"/><stop offset=".9874" stop-color="#0f0f0d"/></radialGradient><radialGradient id="n" cx="316.8927" cy="-451.5973" fx="316.8927" fy="-451.5973" r="334.8364" gradientTransform="translate(-46.999 117.9256) scale(.3539 .2026)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#2e6b26"/><stop offset="1" stop-color="#6ab536"/></radialGradient><radialGradient id="p" cx="314.3875" cy="-453.363" fx="314.3875" fy="-453.363" r="65.3925" gradientTransform="translate(-46.999 185.5275) scale(.3539)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#6ab536"/><stop offset="1" stop-color="#2e6b26"/></radialGradient><radialGradient id="r" cx="322.2128" cy="-390.2547" fx="322.2128" fy="-390.2547" r="96.5851" gradientTransform="translate(-44.2199 256.5751) scale(.3356 .5572)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#000"/><stop offset=".7842" stop-color="#4f4f4f" stop-opacity="0"/></radialGradient><radialGradient id="u" cx="312.9946" cy="-473.0178" fx="312.9946" fy="-473.0178" r="223.5101" gradientTransform="translate(-46.999 185.5275) scale(.3539)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#f5f5f5"/><stop offset=".5481" stop-color="#f2f2f2"/></radialGradient></defs><g style="isolation:isolate;"><g id="b"><g id="c"><rect width="128" height="128" style="fill:none; stroke-width:0px;"/><g id="d"><path id="f" d="m63.9999,124.9c-33.5805,0-60.9001-27.3198-60.9001-60.9S30.4194,3.1,63.9999,3.1s60.8999,27.3195,60.8999,60.9-27.3193,60.9-60.8999,60.9Zm0-116.6759c-30.7415,0-55.7515,25.021-55.7515,55.7759s25.01,55.7759,55.7515,55.7759,55.7512-25.0212,55.7512-55.7759S94.7414,8.2241,63.9999,8.2241Z" style="fill:url(#e); stroke-width:0px;"/><path id="h" d="m63.9999,3.1238C30.4325,3.1238,3.1236,30.4327,3.1236,64s27.3089,60.8762,60.8763,60.8762,60.8761-27.3091,60.8761-60.8762S97.5674,3.1238,63.9999,3.1238Z" style="fill:url(#g); mix-blend-mode:lighten; opacity:.32; stroke-width:0px;"/><path id="j" d="m63.9999,124.9c-33.5805,0-60.9001-27.3198-60.9001-60.9S30.4194,3.1,63.9999,3.1s60.8999,27.3195,60.8999,60.9-27.3193,60.9-60.8999,60.9Zm0-116.6759c-30.7415,0-55.7515,25.021-55.7515,55.7759s25.01,55.7759,55.7515,55.7759,55.7512-25.0212,55.7512-55.7759S94.7414,8.2241,63.9999,8.2241Z" style="fill:url(#i); opacity:.44; stroke-width:0px;"/><path id="k" d="m63.9999,8.5504c-30.9783,0-56.1809,25.2025-56.1809,56.1808s25.2025,56.1808,56.1809,56.1808,56.1807-25.2028,56.1807-56.1808S94.9783,8.5504,63.9999,8.5504Z" style="fill:rgba(15,15,13,.35); stroke-width:0px;"/><path id="l" d="m63.9999,124.9c-33.5805,0-60.9001-27.3198-60.9001-60.9S30.4194,3.1,63.9999,3.1s60.8999,27.3195,60.8999,60.9-27.3193,60.9-60.8999,60.9Zm0-120.4966C30.4195,4.4034,3.0998,31.3596,3.0998,64.4932s27.3197,60.0898,60.9001,60.0898,60.8999-26.9565,60.8999-60.0898S97.5804,4.4034,64,4.4034Z" style="fill:#0f0f0d; opacity:.35; stroke-width:0px;"/></g><g id="m"><path id="o" d="m63.9999,8.2241c-30.7551,0-55.776,25.0209-55.776,55.7759s25.0209,55.7759,55.776,55.7759,55.7758-25.0211,55.7758-55.7759S94.755,8.2241,63.9999,8.2241Z" style="fill:url(#n); stroke-width:0px;"/><path id="q" d="m63.9998,12.8613c-9.1608,0-16.6136,7.4528-16.6136,16.6135s7.4528,16.6135,16.6136,16.6135,16.6135-7.4528,16.6135-16.6135-7.4527-16.6135-16.6135-16.6135Z" style="fill:url(#p); mix-blend-mode:lighten; opacity:.7; stroke-width:0px;"/><path id="s" d="m34.6871,16.3645c-.0027.0191-.0054.0378-.0081.0569-.0725.0136-.0736-.0037.0081-.0569Zm42.1177,35.8001l-.7714,13.7822,9.1023,9.9165-9.1023,9.9165,6.0168,6.5549-6.0168,6.5549.7714,13.6696h-25.61v-60.3946c-10.1823-5.2104-17.1248-16.4714-17.1248-29.4132,0-2.1659.3032-4.1671.609-6.33,1.1046-.2082,18.9673-7.6947,18.9673-7.6947-.1483.8092,20.8551.8092,20.7068,0,0,0,17.2577,7.4257,18.9891,7.7899.438,2.1264.5873,4.101.5873,6.2348,0,12.9418-7.0968,24.2029-17.1248,29.4133Zm16.5077-35.8001c.0108.0511.0194.1011.0299.1521.1896.0399.196-.0035-.0299-.1521Z" style="fill:url(#r); mix-blend-mode:multiply; opacity:.3; stroke-width:0px;"/><path id="t" d="m34.1161,100.4319c-9.8977-8.6081-16.164-21.2969-16.164-35.4968,0-16.5227,8.6409-31.7744,22.8728-40.29-.2541,1.6523-.5083,3.1774-.5083,4.8297,0,9.7865,5.7182,18.302,14.1049,22.2421v44.6113l10.5469,10.5491,10.5469-10.5491-.6354-9.2781,4.9558-4.9568-4.9558-4.9568,7.4972-7.4988-7.4972-7.4988.6354-10.422c8.2596-3.94,14.1049-12.4556,14.1049-22.2421,0-1.6523-.1271-3.1774-.5083-4.8297,5.1643,3.1178,9.5922,7.1416,13.1419,11.7972-8.5841-11.7889-22.5293-19.4587-38.2766-19.4587-26.0911,0-47.2421,21.05-47.2421,47.0165,0,14.693,6.7736,27.8101,17.3809,36.4318Zm27.4214-7.6624h-3.558v-35.2061h3.558v35.2061Zm-5.0828-73.9708c2.7956-.5084,5.7182-.7626,8.5138-.7626,2.9226-.1271,5.7182.2542,8.5138.7626.1271.6355.2542,1.271.2542,1.9064,0,4.8297-3.9392,8.7698-8.7679,8.7698s-8.7679-3.94-8.7679-8.7698c0-.6355.1271-1.2709.2542-1.9064Z" style="fill:#0f0f0d; mix-blend-mode:multiply; opacity:.2; stroke-width:0px;"/><path id="v" d="m63.9999,8.2241c-30.7415,0-55.7514,25.0209-55.7514,55.7759s25.01,55.7759,55.7514,55.7759,55.7512-25.0212,55.7512-55.7759S94.7414,8.2241,63.9999,8.2241Zm-8.5138,9.5882c2.7956-.5084,5.7182-.7626,8.5138-.7626,2.9226-.1271,5.7182.2542,8.5138.7626.1271.6355.2542,1.271.2542,1.9064,0,4.8297-3.9392,8.7698-8.7679,8.7698s-8.7679-3.94-8.7679-8.7698c0-.6355.1271-1.2709.2542-1.9064Zm5.0828,38.7648v35.2061h-3.558v-35.2061h3.558Zm3.4309,54.3978c-25.9225,0-47.0163-20.9711-47.0163-47.0261,0-16.5227,8.6409-31.7744,22.8728-40.29-.2541,1.6523-.5083,3.1774-.5083,4.8297,0,9.7865,5.7182,18.302,14.1049,22.2421v44.6113l10.5469,10.5491,10.5469-10.5491-.6354-9.2781,4.9558-4.9568-4.9558-4.9568,7.4972-7.4988-7.4972-7.4988.6354-10.422c8.2596-3.94,14.1049-12.4556,14.1049-22.2421,0-1.6523-.1271-3.1774-.5083-4.8297,14.1049,8.5156,22.7457,23.7673,22.8728,40.29,0,25.9279-20.9668,47.0261-47.0163,47.0261Z" style="fill:url(#u); stroke-width:0px;"/></g></g></g></g></svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/keeper-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/keeper-light.svg
new file mode 100644
index 00000000000..450cef168c5
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/keeper-light.svg
@@ -0,0 +1,18 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_6034_33627)">
+<circle cx="12" cy="12" r="12" fill="white"/>
+<path d="M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12Z" fill="black"/>
+<path d="M10.1218 3.27325H11.6666V9.51527H14.8575L18.696 6.46317L19.6607 7.66821L15.3989 11.0564H10.1218V3.27325Z" fill="#FFC700"/>
+<path d="M13.1438 3.48366L14.6887 3.87694V6.03492L16.4173 4.61811L17.7008 5.56097L14.407 8.26013L13.1438 8.25341V3.48366Z" fill="#FFC700"/>
+<path d="M4.0387 15.0849L5.58354 16.3958V7.81427L4.0387 9.22772V15.0849Z" fill="#FFC700"/>
+<path d="M8.61257 18.2411L7.06604 19.5806V4.49485L8.61257 5.83434V18.2411Z" fill="#FFC700"/>
+<path d="M14.6887 18.1174L16.4173 19.5342L17.7008 18.5897L14.407 15.8922L13.1438 15.8989V20.6687L14.6887 20.2754V18.1174Z" fill="#FFC700"/>
+<path d="M18.696 17.4786L14.8575 14.4248H11.6666V20.6668H10.1218V12.8853H15.3989L19.6607 16.2735L18.696 17.4786Z" fill="#FFC700"/>
+<path d="M16.7376 11.9706L19.8981 14.5706L20.883 13.3823L19.1661 11.9706L20.883 10.5588L19.8981 9.37056L16.7376 11.9706Z" fill="#FFC700"/>
+</g>
+<defs>
+<clipPath id="clip0_6034_33627">
+<rect width="24" height="24" fill="white"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/key-id-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/key-id-light.png
new file mode 100644
index 00000000000..9f214041314
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/key-id-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/keyvault-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/keyvault-light.png
new file mode 100644
index 00000000000..ae854f0b31e
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/keyvault-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/keyxentic-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/keyxentic-light.png
new file mode 100644
index 00000000000..45d900cf0ec
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/keyxentic-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/konai-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/konai-light.png
new file mode 100644
index 00000000000..857225020d6
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/konai-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/kqc-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/kqc-light.png
new file mode 100644
index 00000000000..7931c8b9964
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/kqc-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/lastpass-dark.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/lastpass-dark.svg
new file mode 100644
index 00000000000..764d273f583
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/lastpass-dark.svg
@@ -0,0 +1,13 @@
+<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="50" height="50" rx="7.84782" fill="url(#paint0_linear_284_5743)"/>
+<path d="M39.3518 17.6383C38.905 17.6383 38.5668 17.9747 38.5668 18.4287V31.5604C38.5668 32.0108 38.9014 32.3509 39.3518 32.3509C39.8022 32.3509 40.1368 32.0144 40.1368 31.5604V18.4287C40.1368 17.9784 39.8022 17.6383 39.3518 17.6383Z" fill="white"/>
+<path d="M21.8918 22.5449C20.3814 22.5449 19.0954 23.7857 19.0954 25.3069C19.0954 26.8281 20.3272 28.1232 21.8375 28.1232C23.3478 28.1232 24.6339 26.8824 24.6339 25.3612C24.6339 23.84 23.4021 22.5449 21.8918 22.5449Z" fill="white"/>
+<path d="M31.0694 22.5449C29.5591 22.5449 28.2731 23.7857 28.2731 25.3069C28.2731 26.8281 29.5048 28.1232 31.0152 28.1232C32.5255 28.1232 33.8115 26.8824 33.8115 25.3612C33.8658 23.84 32.634 22.5449 31.0694 22.5449Z" fill="white"/>
+<path d="M12.6596 22.5449C11.1493 22.5449 9.86328 23.7857 9.86328 25.3069C9.86328 26.8281 11.0951 28.1232 12.6054 28.1232C14.1157 28.1232 15.4017 26.8824 15.4017 25.3612C15.4017 23.84 14.17 22.5449 12.6596 22.5449Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_284_5743" x1="25" y1="0" x2="25" y2="50" gradientUnits="userSpaceOnUse">
+<stop stop-color="#3C3D3D"/>
+<stop offset="1" stop-color="#262626"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/lastpass-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/lastpass-light.svg
new file mode 100644
index 00000000000..aac8009ea32
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/lastpass-light.svg
@@ -0,0 +1,13 @@
+<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="50" height="50" rx="7.84782" fill="url(#paint0_linear_284_5774)"/>
+<path d="M39.3517 17.6384C38.9049 17.6384 38.5667 17.9749 38.5667 18.4289V31.5605C38.5667 32.0108 38.9013 32.3509 39.3517 32.3509C39.8021 32.3509 40.1367 32.0145 40.1367 31.5605V18.4289C40.1367 17.9785 39.8021 17.6384 39.3517 17.6384Z" fill="white"/>
+<path d="M21.8918 22.545C20.3814 22.545 19.0954 23.7859 19.0954 25.307C19.0954 26.8282 20.3272 28.1233 21.8375 28.1233C23.3478 28.1233 24.6338 26.8825 24.6338 25.3613C24.6338 23.8401 23.4021 22.545 21.8918 22.545Z" fill="white"/>
+<path d="M31.0694 22.545C29.5591 22.545 28.273 23.7859 28.273 25.307C28.273 26.8282 29.5048 28.1233 31.0151 28.1233C32.5254 28.1233 33.8115 26.8825 33.8115 25.3613C33.8657 23.8401 32.634 22.545 31.0694 22.545Z" fill="white"/>
+<path d="M12.6597 22.545C11.1494 22.545 9.86339 23.7859 9.86339 25.307C9.86339 26.8282 11.0952 28.1233 12.6055 28.1233C14.1158 28.1233 15.4018 26.8825 15.4018 25.3613C15.4018 23.8401 14.17 22.545 12.6597 22.545Z" fill="white"/>
+<defs>
+<linearGradient id="paint0_linear_284_5774" x1="25" y1="0" x2="25" y2="50" gradientUnits="userSpaceOnUse">
+<stop stop-color="#ED194A"/>
+<stop offset="1" stop-color="#C30833"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/ledger-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ledger-light.png
new file mode 100644
index 00000000000..c424a76ea4a
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ledger-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/logmeonce-dark.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/logmeonce-dark.svg
new file mode 100644
index 00000000000..3535740492f
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/logmeonce-dark.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.1" viewBox="0 0 2048 2048" width="128" height="128" xmlns="http://www.w3.org/2000/svg">
+<path d="M 0 0 L -5 1 L -15 4 L -38 11 L -57 18 L -76 29 L -90 38 L -109 52 L -116 59 L -127 68 L -140 81 L -148 88 L -149 91 L -151 91 L -161 101 L -169 108 L -169 110 L -171 110 L -180 119 L -188 126 L -201 137 L -212 146 L -226 157 L -239 167 L -250 175 L -270 188 L -291 202 L -309 212 L -330 224 L -353 235 L -386 250 L -407 259 L -449 273 L -472 281 L -502 289 L -551 298 L -615 309 L -647 316 L -681 324 L -698 330 L -714 338 L -735 351 L -745 358 L -756 367 L -764 375 L -766 379 L -768 379 L -773 385 L -781 395 L -791 410 L -801 428 L -810 447 L -816 465 L -822 500 L -827 545 L -830 592 L -832 653 L -832 712 L -831 742 L -828 794 L -822 866 L -816 928 L -812 957 L -800 1020 L -789 1072 L -783 1098 L -765 1162 L -751 1207 L -744 1225 L -734 1254 L -720 1290 L -704 1328 L -689 1361 L -668 1403 L -653 1431 L -639 1456 L -620 1488 L -607 1509 L -594 1529 L -584 1544 L -571 1563 L -558 1581 L -544 1600 L -533 1615 L -520 1632 L -507 1648 L -479 1682 L -470 1693 L -460 1704 L -449 1716 L -442 1724 L -432 1734 L -425 1742 L -368 1799 L -351 1815 L -335 1830 L -327 1837 L -314 1849 L -288 1871 L -271 1885 L -261 1893 L -244 1907 L -228 1919 L -215 1929 L -196 1943 L -184 1952 L -168 1963 L -148 1977 L -133 1987 L -112 2000 L -88 2013 L -72 2021 L -52 2030 L -32 2037 L 12 2048 L 60 2048 L 61 2047 L 73 2044 L 100 2037 L 121 2029 L 149 2015 L 167 2005 L 186 1994 L 210 1979 L 231 1965 L 266 1941 L 284 1928 L 295 1920 L 306 1911 L 324 1898 L 338 1887 L 349 1877 L 358 1870 L 369 1860 L 380 1851 L 380 1849 L 382 1849 L 385 1846 L 396 1837 L 403 1830 L 411 1823 L 418 1816 L 426 1809 L 475 1760 L 477 1756 L 479 1756 L 487 1747 L 503 1730 L 510 1722 L 519 1712 L 526 1704 L 538 1691 L 547 1680 L 558 1667 L 566 1656 L 579 1640 L 590 1626 L 606 1605 L 621 1583 L 631 1569 L 645 1549 L 655 1533 L 670 1510 L 685 1485 L 696 1467 L 706 1449 L 730 1405 L 745 1374 L 762 1338 L 774 1310 L 792 1267 L 811 1216 L 827 1166 L 842 1117 L 858 1051 L 870 996 L 875 967 L 881 917 L 886 882 L 891 846 L 894 812 L 896 774 L 896 655 L 895 630 L 892 593 L 888 559 L 877 470 L 872 445 L 865 426 L 857 411 L 847 395 L 834 378 L 814 358 L 800 347 L 785 337 L 766 327 L 750 321 L 727 315 L 693 308 L 650 301 L 597 292 L 570 286 L 548 280 L 515 270 L 487 261 L 459 250 L 438 241 L 414 230 L 382 213 L 358 199 L 347 192 L 330 180 L 312 167 L 300 157 L 286 146 L 271 133 L 263 126 L 251 115 L 240 106 L 228 95 L 200 71 L 189 62 L 174 50 L 158 38 L 142 27 L 127 19 L 115 14 L 95 8 L 71 0 L 0 0 z M 30 622 L 51 623 L 79 627 L 100 633 L 121 641 L 141 652 L 157 663 L 172 676 L 186 690 L 186 692 L 188 692 L 206 716 L 216 734 L 221 745 L 226 758 L 233 784 L 236 798 L 237 808 L 237 840 L 233 865 L 226 891 L 219 909 L 209 928 L 195 949 L 186 959 L 179 967 L 166 980 L 155 989 L 142 998 L 126 1007 L 113 1012 L 114 1024 L 122 1060 L 137 1123 L 156 1208 L 170 1271 L 174 1296 L 176 1310 L 176 1335 L 173 1349 L 166 1359 L 157 1367 L 146 1372 L 140 1374 L 119 1376 L 51 1376 L -32 1377 L -64 1377 L -78 1374 L -85 1370 L -98 1359 L -106 1349 L -110 1341 L -112 1333 L -112 1318 L -107 1288 L -100 1256 L -85 1196 L -69 1124 L -57 1072 L -50 1036 L -47 1011 L -53 1009 L -69 1001 L -81 994 L -93 985 L -103 976 L -111 969 L -120 960 L -131 946 L -142 929 L -152 910 L -160 890 L -166 870 L -169 853 L -170 844 L -170 814 L -167 794 L -161 767 L -154 746 L -137 713 L -126 698 L -119 690 L -108 678 L -93 665 L -77 653 L -56 641 L -38 633 L -16 627 L 3 624 L 30 622 z " transform="translate(991)" style="fill:#ffffff" />
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/logmeonce-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/logmeonce-light.svg
new file mode 100644
index 00000000000..f48c5b8f02f
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/logmeonce-light.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 2048 2048" width="128" height="128" xmlns="http://www.w3.org/2000/svg">
+<path transform="translate(991)" d="m0 0h71l24 8 20 6 12 5 15 8 16 11 16 12 15 12 11 9 28 24 12 11 11 9 12 11 8 7 15 13 14 11 12 10 18 13 17 12 11 7 24 14 32 17 24 11 21 9 28 11 28 9 33 10 22 6 27 6 53 9 43 7 34 7 23 6 16 6 19 10 15 10 14 11 20 20 13 17 10 16 8 15 7 19 5 25 11 89 4 34 3 37 1 25v119l-2 38-3 34-5 36-5 35-6 50-5 29-12 55-16 66-15 49-16 50-19 51-18 43-12 28-17 36-15 31-24 44-10 18-11 18-15 25-15 23-10 16-14 20-10 14-15 22-16 21-11 14-13 16-8 11-11 13-9 11-12 13-7 8-9 10-7 8-16 17-8 9h-2l-2 4-49 49-8 7-7 7-8 7-7 7-11 9-3 3h-2v2l-11 9-11 10-9 7-11 10-14 11-18 13-11 9-11 8-18 13-35 24-21 14-24 15-19 11-18 10-28 14-21 8-27 7-12 3-1 1h-48l-44-11-20-7-20-9-16-8-24-13-21-13-15-10-20-14-16-11-12-9-19-14-13-10-16-12-17-14-10-8-17-14-26-22-13-12-8-7-16-15-17-16-57-57-7-8-10-10-7-8-11-12-10-11-9-11-28-34-13-16-13-17-11-15-14-19-13-18-13-19-10-15-13-20-13-21-19-32-14-25-15-28-21-42-15-33-16-38-14-36-10-29-7-18-14-45-18-64-6-26-11-52-12-63-4-29-6-62-6-72-3-52-1-30v-59l2-61 3-47 5-45 6-35 6-18 9-19 10-18 10-15 8-10 5-6h2l2-4 8-8 11-9 10-7 21-13 16-8 17-6 34-8 32-7 64-11 49-9 30-8 23-8 42-14 21-9 33-15 23-11 21-12 18-10 21-14 20-13 11-8 13-10 14-11 11-9 13-11 8-7 9-9h2v-2l8-7 10-10h2l1-3 8-7 13-13 11-9 7-7 19-14 14-9 19-11 19-7 23-7 10-3z" fill="#F18429"/>
+<path transform="translate(1021,622)" d="m0 0 21 1 28 4 21 6 21 8 20 11 16 11 15 13 14 14v2h2l18 24 10 18 5 11 5 13 7 26 3 14 1 10v32l-4 25-7 26-7 18-10 19-14 21-9 10-7 8-13 13-11 9-13 9-16 9-13 5 1 12 8 36 15 63 19 85 14 63 4 25 2 14v25l-3 14-7 10-9 8-11 5-6 2-21 2h-68l-83 1h-32l-14-3-7-4-13-11-8-10-4-8-2-8v-15l5-30 7-32 15-60 16-72 12-52 7-36 3-25-6-2-16-8-12-7-12-9-10-9-8-7-9-9-11-14-11-17-10-19-8-20-6-20-3-17-1-9v-30l3-20 6-27 7-21 17-33 11-15 7-8 11-12 15-13 16-12 21-12 18-8 22-6 19-3z" fill="#FEFFFE"/>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/mettlesemi-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/mettlesemi-light.png
new file mode 100644
index 00000000000..02d90d60c24
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/mettlesemi-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/microsoft-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/microsoft-light.svg
new file mode 100644
index 00000000000..f2e2b2becd3
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/microsoft-light.svg
@@ -0,0 +1,14 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 23V24C15 24.5523 14.5523 25 14 25H12V26C12 27.1046 11.1046 28 10 28H6C4.89543 28 4 27.1046 4 26V23.4142C4 22.8838 4.21071 22.3751 4.58579 22L12.3244 14.2614C12.1131 13.5434 12 12.7842 12 12C12 7.58172 15.5817 4 20 4C24.4183 4 28 7.58172 28 12C28 16.4183 24.4183 20 20 20H18V22C18 22.5523 17.5523 23 17 23H15ZM22 12C23.1046 12 24 11.1046 24 10C24 8.89543 23.1046 8 22 8C20.8954 8 20 8.89543 20 10C20 11.1046 20.8954 12 22 12Z" fill="url(#paint0_linear_32_137)"/>
+<path d="M25.4004 6.09863C26.9978 7.56126 28 9.66341 28 12C28 16.4183 24.4183 20 20 20H18V22C18 22.5523 17.5523 23 17 23H15V24C15 24.5523 14.5523 25 14 25H12V26C12 27.1046 11.1046 28 10 28H6C5.3196 28 4.72066 27.6588 4.35938 27.1396L20.3584 11.1396C20.7196 11.659 21.3194 12 22 12C23.1046 12 24 11.1046 24 10C24 9.3194 23.659 8.71965 23.1396 8.3584L25.4004 6.09863Z" fill="url(#paint1_radial_32_137)"/>
+<defs>
+<linearGradient id="paint0_linear_32_137" x1="9.33333" y1="8" x2="26.6667" y2="24" gradientUnits="userSpaceOnUse">
+<stop stop-color="#29C3FF"/>
+<stop offset="1" stop-color="#2052CB"/>
+</linearGradient>
+<radialGradient id="paint1_radial_32_137" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(4.86778 20.8826) rotate(51.7901) scale(17.2157 18.5001)">
+<stop stop-color="#236FD9"/>
+<stop offset="0.767782" stop-color="#236FD9" stop-opacity="0"/>
+</radialGradient>
+</defs>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/neowave-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/neowave-light.png
new file mode 100644
index 00000000000..c6a43fdc915
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/neowave-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/nitrokey-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/nitrokey-light.png
new file mode 100644
index 00000000000..5488c47d6f1
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/nitrokey-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/nordpass-dark.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/nordpass-dark.svg
new file mode 100644
index 00000000000..8b303ea6cdd
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/nordpass-dark.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M7.6134 70C2.82435 63.352 0 55.1722 0 46.3273C0 24.0552 17.9086 6 40 6C62.0914 6 80 24.0552 80 46.3273C80 55.1721 77.1757 63.3518 72.3867 69.9999L53.1747 38.5466L51.3195 41.7046L53.2018 50.4877L40 27.7147L31.8334 41.6161L33.7346 50.4877L26.8147 38.5646L7.6134 70Z" fill="white"/>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/nordpass-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/nordpass-light.svg
new file mode 100644
index 00000000000..dce77b77e53
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/nordpass-light.svg
@@ -0,0 +1,3 @@
+<svg viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+  <path fill-rule="evenodd" clip-rule="evenodd" d="M7.6134 70C2.82435 63.352 0 55.1722 0 46.3273C0 24.0552 17.9086 6 40 6C62.0914 6 80 24.0552 80 46.3273C80 55.1721 77.1757 63.3518 72.3867 69.9999L53.1747 38.5466L51.3195 41.7046L53.2018 50.4877L40 27.7147L31.8334 41.6161L33.7346 50.4877L26.8147 38.5646L7.6134 70Z" fill="#0CAAAB"/>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/nxp-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/nxp-light.png
new file mode 100644
index 00000000000..0f2b10a7d8c
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/nxp-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/nymi-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/nymi-light.png
new file mode 100644
index 00000000000..1abafe4d816
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/nymi-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/octatco-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/octatco-light.png
new file mode 100644
index 00000000000..c9eae1bc0bf
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/octatco-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/onekey-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/onekey-light.png
new file mode 100644
index 00000000000..8c24418f38c
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/onekey-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan-light.png
new file mode 100644
index 00000000000..717e0a7e459
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan1-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan1-light.png
new file mode 100644
index 00000000000..d934d9145ba
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan1-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan2-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan2-light.png
new file mode 100644
index 00000000000..31d00e3da58
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan2-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan3-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan3-light.png
new file mode 100644
index 00000000000..2effb9cab6c
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan3-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan4-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan4-light.png
new file mode 100644
index 00000000000..31d00e3da58
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan4-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan5-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan5-light.png
new file mode 100644
index 00000000000..2effb9cab6c
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan5-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan7-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan7-light.png
new file mode 100644
index 00000000000..f94573cd42e
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/onespan7-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/onlykey-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/onlykey-light.png
new file mode 100644
index 00000000000..d527f749c1e
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/onlykey-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/opensk-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/opensk-light.png
new file mode 100644
index 00000000000..719ad415be3
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/opensk-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/pone-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/pone-light.png
new file mode 100644
index 00000000000..cf961760c53
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/pone-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/precision-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/precision-light.png
new file mode 100644
index 00000000000..01ac45de8d3
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/precision-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/precision1-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/precision1-light.png
new file mode 100644
index 00000000000..f5e09a76d56
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/precision1-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/precision2-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/precision2-light.png
new file mode 100644
index 00000000000..f5e09a76d56
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/precision2-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/proton-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/proton-light.svg
new file mode 100644
index 00000000000..08d95f2785b
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/proton-light.svg
@@ -0,0 +1,36 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M353.274 214.391C408.835 158.832 436.614 131.052 468.648 120.644C496.825 111.489 527.175 111.489 555.352 120.644C587.386 131.052 615.165 158.832 670.726 214.391L809.608 353.274C865.169 408.835 892.948 436.614 903.356 468.648C912.512 496.825 912.512 527.175 903.356 555.352C892.948 587.386 865.169 615.165 809.608 670.726L670.726 809.608C615.165 865.169 587.386 892.948 555.352 903.356C527.175 912.512 496.825 912.512 468.648 903.356C436.614 892.948 408.835 865.169 353.274 809.608L327.162 780.336C311.361 762.621 303.462 753.763 297.827 743.688C292.833 734.754 289.166 725.137 286.947 715.144C284.444 703.878 284.444 692.008 284.444 668.271V355.729C284.444 331.992 284.444 320.122 286.947 308.855C289.166 298.863 292.833 289.246 297.827 280.311C303.462 270.237 311.361 261.38 327.162 243.665L353.274 214.391Z" fill="url(#paint0_radial_12155_41873)"/>
+<path d="M353.274 214.391C408.835 158.832 436.614 131.052 468.648 120.644C496.825 111.489 527.175 111.489 555.352 120.644C587.386 131.052 615.165 158.832 670.726 214.391L809.608 353.274C865.169 408.835 892.948 436.614 903.356 468.648C912.512 496.825 912.512 527.175 903.356 555.352C892.948 587.386 865.169 615.165 809.608 670.726L670.726 809.608C615.165 865.169 587.386 892.948 555.352 903.356C527.175 912.512 496.825 912.512 468.648 903.356C436.614 892.948 408.835 865.169 353.274 809.608L327.162 780.336C311.361 762.621 303.462 753.763 297.827 743.688C292.833 734.754 289.166 725.137 286.947 715.144C284.444 703.878 284.444 692.008 284.444 668.271V355.729C284.444 331.992 284.444 320.122 286.947 308.855C289.166 298.863 292.833 289.246 297.827 280.311C303.462 270.237 311.361 261.38 327.162 243.665L353.274 214.391Z" fill="url(#paint1_linear_12155_41873)"/>
+<path d="M343.356 224.303C371.135 196.524 385.024 182.634 401.041 177.43C415.13 172.852 430.305 172.852 444.393 177.43C460.41 182.634 474.3 196.524 502.079 224.303L710.406 432.629C738.185 460.408 752.074 474.3 757.279 490.314C761.856 504.403 761.856 519.581 757.279 533.669C752.074 549.686 738.185 563.576 710.406 591.354L502.079 799.681C474.3 827.46 460.41 841.35 444.393 846.555C430.305 851.132 415.13 851.132 401.041 846.555C385.024 841.35 371.135 827.46 343.356 799.681L214.391 670.717C158.832 615.157 131.052 587.378 120.644 555.346C111.489 527.167 111.489 496.816 120.644 468.639C131.052 436.605 158.832 408.826 214.391 353.266L343.356 224.303Z" fill="url(#paint2_radial_12155_41873)"/>
+<defs>
+<radialGradient id="paint0_radial_12155_41873" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(354.145 925.744) rotate(-58.142) scale(664.835 1039.67)">
+<stop stop-color="#FFD580"/>
+<stop offset="0.09375" stop-color="#F6C592"/>
+<stop offset="0.205" stop-color="#EBB6A2"/>
+<stop offset="0.324466" stop-color="#DFA5AF"/>
+<stop offset="0.42875" stop-color="#D397BE"/>
+<stop offset="0.53375" stop-color="#C486CB"/>
+<stop offset="0.64875" stop-color="#B578D9"/>
+<stop offset="0.77125" stop-color="#A166E5"/>
+<stop offset="0.89125" stop-color="#8B57F2"/>
+<stop offset="1" stop-color="#704CFF"/>
+</radialGradient>
+<linearGradient id="paint1_linear_12155_41873" x1="326.713" y1="-44.3649" x2="481.598" y2="901.077" gradientUnits="userSpaceOnUse">
+<stop stop-color="#6D4AFF"/>
+<stop offset="0.392009" stop-color="#B39FFB" stop-opacity="0.978022"/>
+<stop offset="1" stop-color="#FFE8DB" stop-opacity="0.8"/>
+</linearGradient>
+<radialGradient id="paint2_radial_12155_41873" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(295.746 844.786) rotate(-58.142) scale(534.758 836.255)">
+<stop stop-color="#FFD580"/>
+<stop offset="0.09375" stop-color="#F6C592"/>
+<stop offset="0.205" stop-color="#EBB6A2"/>
+<stop offset="0.324466" stop-color="#DFA5AF"/>
+<stop offset="0.42875" stop-color="#D397BE"/>
+<stop offset="0.53375" stop-color="#C486CB"/>
+<stop offset="0.64875" stop-color="#B578D9"/>
+<stop offset="0.77125" stop-color="#A166E5"/>
+<stop offset="0.89125" stop-color="#8B57F2"/>
+<stop offset="1" stop-color="#704CFF"/>
+</radialGradient>
+</defs>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/pwsafe-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/pwsafe-light.svg
new file mode 100644
index 00000000000..094897da943
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/pwsafe-light.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?><svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" version="1.1" id="svg2" width="177.77733" height="177.77733" viewBox="0 0 177.77733 177.77733" style="zoom: 1;"><defs id="defs6"><clipPath clipPathUnits="userSpaceOnUse" id="clipPath16"><path d="M 0,132.333 H 133.333 V 0 H 0 Z" id="path14"></path></clipPath></defs><g id="g8" transform="matrix(1.3333333,0,0,-1.3333333,0,176.444)"><g id="g10"><g id="g12" clip-path="url(#clipPath16)"><g id="g18" transform="translate(113.1494,84.6616)"><path d="M0,0 c-9.621,16.264 -23.704,29.888 -37.254,40.433 c-1.042,0.812 -2.082,1.605 -3.114,2.38 c-1.811,1.355 -3.603,2.654 -5.365,3.896 c-0.518,-0.356 -1.038,-0.718 -1.561,-1.084 c-12.852,-9.012 -27.292,-21.098 -38.564,-35.836 c-2.943,-3.848 -5.67,-7.876 -8.096,-12.078 c-7.45,-12.902 -12.065,-27.441 -14.885,-41.388 c-1.582,-7.824 -2.599,-15.462 -3.235,-22.521 c18.152,-8.633 42.345,-17.26 66.54,-17.26 c23.257,0 46.514,7.972 64.407,16.259 c-1.6,20.036 -6.225,45.304 -18.322,66.257 C0.368,-0.626 0.186,-0.313 0,0 " id="path20" style="fill:#263248;fill-opacity:1;fill-rule:nonzero;stroke:none"></path></g><g id="g22" transform="translate(97.1611,74.4946)"><path d="M0,0 c-6.414,10.842 -15.803,19.925 -24.835,26.955 c-0.696,0.542 -1.388,1.069 -2.077,1.587 c-1.206,0.903 -2.401,1.769 -3.576,2.597 c-0.346,-0.238 -0.694,-0.479 -1.041,-0.723 c-8.569,-6.008 -18.196,-14.065 -25.71,-23.89 c-1.962,-2.566 -3.78,-5.251 -5.397,-8.052 c-4.967,-8.601 -8.043,-18.294 -9.924,-27.593 c-1.055,-5.216 -1.732,-10.308 -2.156,-15.013 c12.102,-5.755 28.231,-11.506 44.361,-11.506 c15.503,-0.001 31.008,5.314 42.937,10.839 C11.516,-31.442 8.433,-14.597 0.367,-0.627 C0.246,-0.418 0.124,-0.209 0,0 " id="path24" style="fill:#7f89a1;fill-opacity:1;fill-rule:nonzero;stroke:none"></path></g><g id="g26" transform="translate(81.6289,65.3379)"><path d="M0,0.75005 c-3.208,5.421 -7.902,9.962 -12.42,13.478 c-0.347,0.27 -0.693,0.534 -1.038,0.793 c-0.604,0.452 -1.2,0.885 -1.787,1.299 c-0.173,-0.12 -0.348,-0.24 -0.521,-0.362 c-4.284,-3.004 -9.097,-7.032 -12.855,-11.945 c-0.981,-1.283 -1.89,-2.626 -2.698,-4.027 c-2.483,-4.299 -4.022,-9.147 -4.962,-13.796 c-0.527,-2.608 -0.867,-5.154 -1.078,-7.506 c6.05,-2.878 14.115,-5.753 22.18,-5.753 c7.752,0 15.504,2.657 21.469,5.42 C5.758,-14.971951 4.215,-6.54795 0.182,0.43605 C0.122,0.54205 0.061,0.64605 0,0.75005 " id="path28" style="fill:#f7971d;fill-opacity:1;fill-rule:nonzero;stroke:none"></path></g></g></g></g></svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/rsa-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/rsa-light.png
new file mode 100644
index 00000000000..f09ffa6505f
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/rsa-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/samsung-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/samsung-light.svg
new file mode 100644
index 00000000000..399033941d8
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/samsung-light.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg version="1.1" width="52px" height="52px" viewBox="0 0 52.0 52.0" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><clipPath id="i0"><path d="M360,0 L360,800 L0,800 L0,0 L360,0 Z"></path></clipPath><clipPath id="i1"><path d="M26,0 C33.9910278,0 41.1395833,0.975 45.9087778,5.77777778 C49.7101944,9.60591667 52,15.8650556 52,26 C52,36.1349444 49.7098333,42.3944444 45.9080556,46.2225833 C41.1388611,51.0246389 33.9903056,52 26,52 C18.0089722,52 10.8607778,51.0246389 6.09158333,46.2225833 C2.29016667,42.3944444 0,36.1349444 0,26 C0,15.8650556 2.28980556,9.60555556 6.09086111,5.77777778 C10.8600556,0.975 18.0086111,0 26,0 Z"></path></clipPath><linearGradient id="i2" x1="26px" y1="52px" x2="26px" y2="0.195921148px" gradientUnits="userSpaceOnUse"><stop stop-color="#2929B2" offset="0%"></stop><stop stop-color="#1A40CC" offset="100%"></stop></linearGradient><clipPath id="i3"><path d="M37.1944444,0 L37.1944444,5.72222222 L0,5.72222222 L0,0 L37.1944444,0 Z"></path></clipPath><clipPath id="i4"><path d="M1.88342213,0 C2.62075987,0 3.64356402,0.181610871 3.64356402,1.32111819 L3.64356402,1.68911562 L2.34279339,1.68911562 L2.34279339,1.36490659 C2.34279339,1.07957573 2.16319664,0.889153371 1.8581768,0.889153371 C1.52931788,0.889153371 1.41648398,1.07527088 1.38085927,1.24215109 C1.36679688,1.30026657 1.36090408,1.41172184 1.38614941,1.51725793 C1.53460802,2.1304973 3.51244902,2.45611887 3.73255883,3.55553727 C3.75371937,3.6670598 3.80079488,3.96113488 3.73804986,4.41300963 C3.61182321,5.28965203 2.8380572,5.61217949 1.89581043,5.61217949 C0.915729136,5.61217949 0,5.25998892 0,4.0888006 L0,3.68824773 L1.39940823,3.68824773 L1.40121625,4.19231879 C1.40121625,4.4786586 1.59608073,4.66928275 1.92185932,4.66928275 C2.2707404,4.66928275 2.38839569,4.49150589 2.43118552,4.31541061 C2.45622996,4.21639905 2.47149769,4.05463085 2.42100703,3.92864671 C2.15134406,3.25096911 0.297921677,2.94128895 0.0721199473,1.87032292 C0.0173436085,1.60564189 0.0238390912,1.39907634 0.0617405677,1.16426021 C0.200221581,0.308873007 0.957112727,0 1.88342213,0 Z M18.8411186,0.0296631089 C19.5704877,0.0296631089 20.5778901,0.206969129 20.5778901,1.33564706 L20.5778901,1.70075217 L19.2921864,1.70075217 L19.2921864,1.38044441 C19.2921864,1.0974005 19.115603,0.90879425 18.8144001,0.90879425 C18.4912331,0.90879425 18.3790688,1.09161586 18.34177,1.25937049 C18.3297835,1.31681334 18.3230871,1.42665428 18.3462566,1.53017248 C18.4943134,2.13641647 20.4503912,2.46311425 20.6660144,3.54921452 C20.6896526,3.65905547 20.7340496,3.95070907 20.6751885,4.3984135 C20.5517743,5.26510093 19.7824949,5.58480333 18.8510962,5.58480333 C17.8785818,5.58480333 16.9756428,5.23543783 16.9756428,4.07750037 L16.9756428,3.67788919 L18.3595154,3.67788919 L18.3599172,4.18061498 C18.3599172,4.46305352 18.5551834,4.65044903 18.8797567,4.65044903 C19.2257583,4.65044903 19.3424761,4.47516091 19.3823865,4.30088174 C19.4063595,4.20556966 19.4198192,4.04380146 19.3728107,3.9169429 C19.1064289,3.24726963 17.2711537,2.94007821 17.0477627,1.8811523 C16.9901069,1.6193636 16.9990801,1.41421058 17.0353074,1.18309393 C17.1723153,0.333827686 17.92251,0.0296631089 18.8411186,0.0296631089 Z M23.2364845,0.166880211 L23.2362291,4.11137366 C23.2372063,4.15798462 23.2408818,4.20406745 23.2496764,4.24115194 C23.2751226,4.37123913 23.3877556,4.62159308 23.7469491,4.62159308 C24.1108301,4.62159308 24.2205836,4.37123913 24.2481057,4.24115194 C24.2596905,4.1855252 24.2617663,4.10965222 24.2596905,4.04211988 L24.2596905,0.166880211 L25.5786083,0.166880211 L25.5786083,3.92185312 C25.5843002,4.01864499 25.5747244,4.21639905 25.5674253,4.26819178 C25.4747475,5.24667079 24.707477,5.56435529 23.7469491,5.56435529 C22.7882962,5.56435529 22.020557,5.24667079 21.9295532,4.26819178 C21.9238613,4.21639905 21.9162944,4.01864499 21.9179685,3.92185312 L21.9179685,0.166880211 L23.2364845,0.166880211 Z M34.6297621,0.0259636282 C35.5539956,0.0259636282 36.3600382,0.336854534 36.4587427,1.31950387 C36.465573,1.39119692 36.4683814,1.46511378 36.4693607,1.52618022 L36.469004,1.65575402 L36.4687203,1.66617884 L36.4687203,1.83803654 L35.1553605,1.83803654 L35.15515,1.53355556 C35.1544471,1.49873362 35.15149,1.40564123 35.1394901,1.34526571 C35.1166555,1.2313217 35.0170804,0.966035306 34.6181774,0.966035306 C34.2381582,0.966035306 34.1255921,1.21759999 34.0996772,1.34526571 C34.0817978,1.41542132 34.0761059,1.50811012 34.0761059,1.5927946 L34.0761059,3.98689672 C34.0761059,4.05463085 34.0801907,4.12761151 34.0897665,4.18613057 C34.1125342,4.327518 34.2438501,4.5682533 34.6209899,4.5682533 C35.0004064,4.5682533 35.134133,4.327518 35.1553605,4.18613057 C35.1669452,4.12761151 35.1706282,4.05463085 35.1689541,3.98689672 L35.1689541,3.22890676 L34.6344496,3.22890676 L34.6344496,2.46493036 L36.4791667,2.46493036 L36.4791667,3.86851334 C36.4770908,3.96443078 36.4754837,4.03868945 36.460015,4.21397757 C36.3728282,5.16958707 35.5539956,5.50832497 34.6260791,5.50832497 C33.7038545,5.50832497 32.87933,5.16958707 32.7936164,4.21397757 C32.775938,4.03868945 32.7728576,3.96443078 32.7728576,3.86851334 L32.7728576,1.66617884 C32.7728576,1.5702614 32.788728,1.40909857 32.7991074,1.31950387 C32.9141511,0.339746855 33.7038545,0.0259636282 34.6297621,0.0259636282 Z M12.1447447,0.166880211 L12.8022616,4.26159998 L13.4601804,0.166880211 L15.5852746,0.166880211 L15.7019255,5.40521036 L14.395262,5.40521036 L14.3598382,0.555931054 L13.4622562,5.40521036 L12.1398563,5.40521036 L11.2430779,0.555931054 L11.207788,5.40521036 L9.9044058,5.40521036 L10.0172397,0.166880211 L12.1447447,0.166880211 Z M7.9012525,0.166880211 L8.86325358,5.40521036 L7.4643141,5.40521036 L6.75382883,0.555931054 L6.02586602,5.40521036 L4.61714983,5.40521036 L5.58316873,0.166880211 L7.9012525,0.166880211 Z M28.304836,5.35059257 L27.0246233,5.35059257 L27.0246233,0.166880211 L28.9598753,0.166880211 L30.1879903,4.38435547 L30.1168748,0.166880211 L31.4054581,0.166880211 L31.4054581,5.35059257 L29.5494241,5.35059257 L28.23,0.999 L28.304836,5.35059257 Z"></path></clipPath><clipPath id="i5"><path d="M24.3352966,2.47006432 C25.3096502,2.47006432 26.121323,2.65660564 26.7692768,3.02897356 C27.4172305,3.40169883 27.9295017,3.90843367 28.3060902,4.55025015 L26.3954573,5.48259937 C26.1960869,5.1463247 25.9191836,4.88009236 25.5647473,4.68461708 C25.2103111,4.48914179 24.8004942,4.39122547 24.3352966,4.39122547 C23.8036422,4.39122547 23.4104395,4.49485953 23.1556885,4.70212766 C22.9005913,4.90939579 22.7735619,5.14954093 22.7735619,5.42220573 C22.7735619,5.73846831 22.9618562,5.96503381 23.3384447,6.10083017 C23.714687,6.23734125 24.2688398,6.38207158 24.9998646,6.53466381 C25.3986054,6.6111386 25.799769,6.71155644 26.204394,6.83734675 C26.6086729,6.9627797 26.9769543,7.13181043 27.3092383,7.34479631 C27.6415222,7.55742482 27.9101185,7.82973226 28.1150269,8.1627907 C28.3199354,8.49549178 28.4223896,8.91252955 28.4223896,9.41426137 C28.4223896,9.75232283 28.3448567,10.1043213 28.1897908,10.469542 C28.0343788,10.8347628 27.7938191,11.1731816 27.4670731,11.4837264 C27.1403272,11.794986 26.7277413,12.0483534 26.2293153,12.2445434 C25.7308893,12.4410908 25.1327782,12.5390071 24.4349818,12.5390071 C23.3605969,12.5390071 22.4689682,12.332811 21.7600957,11.9200616 C21.0512233,11.5069548 20.5029547,10.9105228 20.11529,10.1300511 L22.1920649,9.16518225 C22.4246637,9.60473363 22.7403335,9.94243774 23.1390743,10.1786519 C23.5378151,10.4145088 24.0030126,10.5320798 24.534667,10.5320798 C25.0884736,10.5320798 25.5038286,10.417725 25.7807319,10.1890153 C26.0572891,9.95994832 26.1960869,9.68764088 26.1960869,9.37102095 C26.1960869,9.19662983 26.1323992,9.05511573 26.0050236,8.94576392 C25.8776481,8.83712683 25.7115061,8.74135466 25.5065976,8.65987685 C25.3013431,8.57804167 25.0607833,8.51014349 24.78388,8.45511023 C24.5069767,8.40079169 24.2189972,8.3407554 23.9199416,8.27535873 C23.4987025,8.18816318 23.0864626,8.08488647 22.6821838,7.9648139 C22.277905,7.84509869 21.9151616,7.67856947 21.5939538,7.46629831 C21.2727459,7.25331244 21.0124568,6.98064764 20.8130864,6.64830392 C20.613716,6.3159602 20.5140308,5.89892243 20.5140308,5.39754797 C20.5140308,5.01553137 20.6054089,4.64780912 20.7881651,4.2936665 C20.9709213,3.93916653 21.2284414,3.62612018 21.5607254,3.35309803 C21.8930093,3.08079059 22.294173,2.86566056 22.7652548,2.7073506 C23.2359904,2.54904063 23.7593377,2.47006432 24.3352966,2.47006432 Z M33.1073515,2.47006432 C34.081705,2.47006432 34.8933779,2.65660564 35.5413316,3.02897356 C36.1892854,3.40169883 36.7015565,3.90843367 37.0781451,4.55025015 L35.1675122,5.48259937 C34.9681418,5.1463247 34.6912384,4.88009236 34.3368022,4.68461708 C33.9823659,4.48914179 33.572549,4.39122547 33.1073515,4.39122547 C32.5756971,4.39122547 32.1824944,4.49485953 31.9277433,4.70212766 C31.6726461,4.90939579 31.5456167,5.14954093 31.5456167,5.42220573 C31.5456167,5.73846831 31.733911,5.96503381 32.1104995,6.10083017 C32.4867419,6.23734125 33.0408947,6.38207158 33.7719194,6.53466381 C34.1706602,6.6111386 34.5718239,6.71155644 34.9764489,6.83734675 C35.3807277,6.9627797 35.7490091,7.13181043 36.0812931,7.34479631 C36.4135771,7.55742482 36.6821733,7.82973226 36.8870818,8.1627907 C37.0919902,8.49549178 37.1944444,8.91252955 37.1944444,9.41426137 C37.1944444,9.75232283 37.1169115,10.1043213 36.9618457,10.469542 C36.8064337,10.8347628 36.5658739,11.1731816 36.239128,11.4837264 C35.9123821,11.794986 35.4997961,12.0483534 35.0013702,12.2445434 C34.5029442,12.4410908 33.904833,12.5390071 33.2070367,12.5390071 C32.1326518,12.5390071 31.2410231,12.332811 30.5321506,11.9200616 C29.8232781,11.5069548 29.2750095,10.9105228 28.8873449,10.1300511 L30.9641198,9.16518225 C31.1967186,9.60473363 31.5123883,9.94243774 31.9111291,10.1786519 C32.3098699,10.4145088 32.7750675,10.5320798 33.3067218,10.5320798 C33.8605285,10.5320798 34.2758835,10.417725 34.5527868,10.1890153 C34.829344,9.95994832 34.9681418,9.68764088 34.9681418,9.37102095 C34.9681418,9.19662983 34.904454,9.05511573 34.7770785,8.94576392 C34.6497029,8.83712683 34.483561,8.74135466 34.2786525,8.65987685 C34.0733979,8.57804167 33.8328382,8.51014349 33.5559348,8.45511023 C33.2790315,8.40079169 32.9910521,8.3407554 32.6919965,8.27535873 C32.2707573,8.18816318 31.8585175,8.08488647 31.4542386,7.9648139 C31.0499598,7.84509869 30.6872165,7.67856947 30.3660086,7.46629831 C30.0448008,7.25331244 29.7845116,6.98064764 29.5851412,6.64830392 C29.3857709,6.3159602 29.2860857,5.89892243 29.2860857,5.39754797 C29.2860857,5.01553137 29.3774638,4.64780912 29.5602199,4.2936665 C29.7429761,3.93916653 30.0004962,3.62612018 30.3327802,3.35309803 C30.6650642,3.08079059 31.0662279,2.86566056 31.5373096,2.7073506 C32.0080453,2.54904063 32.5313926,2.47006432 33.1073515,2.47006432 Z M13.7732057,2.47002859 C14.4156214,2.47002859 15.0081945,2.59010116 15.550925,2.82953159 C16.0933094,3.06967673 16.5422389,3.39666007 16.8966751,3.81083897 L16.8966751,2.48718181 L19.139592,2.48718181 L19.139592,12.5218181 L16.8966751,12.5218181 L16.8966751,11.0959563 C16.5422389,11.5440843 16.0881174,11.8967975 15.5343108,12.1537385 C14.9805042,12.4106795 14.382393,12.5389714 13.7399773,12.5389714 C13.1529423,12.5389714 12.5742143,12.4264033 12.0037935,12.2005525 C11.4333726,11.9743444 10.9211015,11.646289 10.4669801,11.2163863 C10.0128586,10.7864836 9.64700011,10.260094 9.37044292,9.63757491 C9.0935396,9.01469844 8.95508794,8.30641322 8.95508794,7.51307658 C8.95508794,6.70830447 9.09042444,5.99501622 9.36213582,5.3717824 C9.63350107,4.74890593 9.99347539,4.22287371 10.4420588,3.79297103 C10.8906421,3.36271098 11.4056823,3.03501292 11.9871793,2.80951949 C12.5686763,2.58331134 13.1640184,2.47002859 13.7732057,2.47002859 Z M4.15354978,0 C4.78488935,0 5.36638632,0.117213701 5.89804069,0.351998461 C6.42969506,0.586425862 6.88900844,0.903403156 7.27701922,1.30400242 C7.66468386,1.70424432 7.96893138,2.175958 8.19080017,2.71914344 C8.41232282,3.26197152 8.52308415,3.84232228 8.52308415,4.46019572 C8.52308415,5.07735444 8.41232282,5.66056408 8.19080017,6.20946726 C7.96893138,6.75837044 7.66468386,7.23294299 7.27701922,7.63354225 C6.88900844,8.03378416 6.42692603,8.35111881 5.88973359,8.58518885 C5.35219502,8.81961625 4.76827515,8.93682995 4.13693558,8.93682995 L2.25953108,8.93682995 L2.25953108,12.5218539 L0,12.5218539 L0,0 L4.15354978,0 Z M14.1054897,4.58023256 C13.6956728,4.58023256 13.3107771,4.65563527 12.9508028,4.80572599 C12.5908285,4.9558167 12.2779278,5.16022596 12.0121006,5.41752433 C11.7462734,5.67553741 11.5385959,5.98179394 11.3890681,6.33629391 C11.2395403,6.69079389 11.1647764,7.07173841 11.1647764,7.48019957 C11.1647764,7.88830337 11.2395403,8.27246413 11.3890681,8.63196712 C11.5385959,8.99147012 11.7462734,9.30272967 12.0121006,9.5664605 C12.2779278,9.82947661 12.5908285,10.03603 12.9508028,10.1868354 C13.3107771,10.3369262 13.6956728,10.4119715 14.1054897,10.4119715 C14.5263827,10.4119715 14.9137012,10.3369262 15.2684836,10.1868354 C15.6229199,10.03603 15.9271674,9.82661774 16.1822646,9.55788389 C16.4370156,9.28950739 16.639155,8.97789048 16.7886828,8.62374787 C16.9382106,8.26960526 17.0129745,7.88830337 17.0129745,7.48019957 C17.0129745,7.08281654 16.9382106,6.70687503 16.7886828,6.35237506 C16.639155,5.99787509 16.4370156,5.68911705 16.1822646,5.42610094 C15.9271674,5.16272747 15.6229199,4.9558167 15.2684836,4.80572599 C14.9137012,4.65563527 14.5263827,4.58023256 14.1054897,4.58023256 Z M3.98740779,2.16130628 L2.25953108,2.16130628 L2.25953108,6.77552367 L3.98740779,6.77552367 C4.31969177,6.77552367 4.62428542,6.71548738 4.90118874,6.59541481 C5.17774593,6.47534224 5.41622892,6.30952774 5.6155993,6.09832866 C5.81496969,5.88677222 5.97003555,5.64055198 6.08079688,5.36038265 C6.19121208,5.08057067 6.24693887,4.78003189 6.24693887,4.46019572 C6.24693887,4.13964484 6.19121208,3.83946341 6.08079688,3.55929408 C5.97003555,3.27912475 5.81496969,3.03612073 5.6155993,2.83028204 C5.41622892,2.62444334 5.17774593,2.46148771 4.90118874,2.34141514 C4.62428542,2.22134257 4.31969177,2.16130628 3.98740779,2.16130628 Z"></path></clipPath></defs><g transform="translate(-233.0 -160.0)"><g clip-path="url(#i0)"><g transform="translate(233.0 160.0)"><g transform="translate(-0.00018055555555207548 0.0)"><g clip-path="url(#i1)"><polygon points="0,0 52,0 52,52 0,52 0,0" stroke="none" fill="url(#i2)"></polygon></g></g><g transform="translate(7.583333333333332 14.80555555555555)"><g clip-path="url(#i3)"><g clip-path="url(#i4)"><polygon points="0,0 36.4791667,0 36.4791667,5.61217949 0,5.61217949 0,0" stroke="none" fill="#FFFFFF"></polygon></g></g></g><g transform="translate(7.583333333333371 24.43208025547733)"><g clip-path="url(#i5)"><polygon points="0,0 37.1944444,0 37.1944444,12.5390071 0,12.5390071 0,0" stroke="none" fill="#FFFFFF"></polygon></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/secora-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/secora-light.png
new file mode 100644
index 00000000000..7853293c027
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/secora-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/secora1-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/secora1-light.png
new file mode 100644
index 00000000000..c511d33a45c
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/secora1-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/securitag-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/securitag-light.png
new file mode 100644
index 00000000000..01eb9d7feb7
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/securitag-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/sentry-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/sentry-light.png
new file mode 100644
index 00000000000..43679057172
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/sentry-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/sesame-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/sesame-light.svg
new file mode 100644
index 00000000000..55424277f1e
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/sesame-light.svg
@@ -0,0 +1,11 @@
+<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="1024" height="1024" rx="176" fill="url(#paint0_linear_202_3)"/>
+<path d="M769.175 452.118L370.579 451.678C339.658 451.685 310.006 463.963 288.144 485.812C266.282 507.662 254 537.294 254 568.19V798.71C254 807.537 257.509 816.004 263.755 822.247C270.002 828.49 278.474 831.998 287.308 832H652.94C683.864 831.998 713.52 819.722 735.386 797.872C757.252 776.022 769.536 746.388 769.536 715.488L770 459.631V423.853C769.788 376.523 755.149 330.382 728.034 291.575C700.919 252.767 662.614 223.136 618.222 206.627C573.83 190.118 525.458 187.516 479.548 199.167C433.639 210.817 392.372 236.168 361.243 271.842" stroke="white" stroke-width="32" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M512.001 692C539.615 692 562.001 669.614 562.001 642C562.001 614.386 539.615 592 512.001 592C484.387 592 462.001 614.386 462.001 642C462.001 669.614 484.387 692 512.001 692Z" stroke="white" stroke-width="32"/>
+<defs>
+<linearGradient id="paint0_linear_202_3" x1="0" y1="0" x2="1024" y2="1024" gradientUnits="userSpaceOnUse">
+<stop stop-color="#006DE6"/>
+<stop offset="1" stop-color="#00A6FF"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/shalo-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/shalo-light.png
new file mode 100644
index 00000000000..1dd81821588
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/shalo-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/sherlocked-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/sherlocked-light.svg
new file mode 100644
index 00000000000..9459ac5d242
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/sherlocked-light.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="1024px" height="1024px" viewBox="0 0 1024 1024" enable-background="new 0 0 1024 1024" xml:space="preserve">
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="511.9995" y1="0" x2="511.9995" y2="1024.0005">
+	<stop  offset="0" style="stop-color:#50B6FC"/>
+	<stop  offset="1" style="stop-color:#5091F9"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" width="1024" height="1024"/>
+<g>
+	<path fill="#FFFFFF" d="M289.66,474.826c6.887-15.649,25.21-22.769,40.845-15.87c15.627,6.872,22.755,25.203,15.87,40.837
+		c-0.199,0.441-0.426,0.818-0.641,1.259l38.354,16.887c0.207-0.427,0.441-0.818,0.641-1.259
+		c16.204-36.783-0.541-79.896-37.324-96.094c-36.797-16.197-79.911,0.548-96.101,37.331c-0.191,0.435-0.32,0.882-0.505,1.309"/>
+	<path fill="#FFFFFF" d="M513.822,410.622h-0.009v41.754h0.009c86.29,0,156.484,69.917,156.484,155.859
+		c0,85.943-70.194,155.853-156.484,155.853c-86.286,0-156.494-69.909-156.494-155.853c0-12.789-0.229-15.741,1.665-29.114
+		l-30.9-8.003l-1.863-27.172c-8.167,21.616-10.812,39.855-10.812,64.289c0,108.962,89.008,197.601,198.405,197.601
+		c109.395,0,198.402-88.639,198.402-197.601C712.225,499.274,623.217,410.622,513.822,410.622z"/>
+	<path fill="#FFFFFF" d="M593.361,427.203L593.361,427.203l-16.907,38.17l0,0c78.893,34.948,114.757,127.313,79.945,205.887
+		c-34.805,78.573-127.313,114.075-206.2,79.121c-78.886-34.926-114.751-127.307-79.945-205.873
+		c5.186-11.701,6.686-15.123,13.834-26.568l-25.536-19.206l9.297-25.607c-16.225,16.453-26.027,32.074-35.916,54.402
+		c-44.129,99.622,1.338,216.734,101.365,261.015c100.013,44.323,217.303-0.683,261.421-100.305
+		C738.855,588.609,693.388,471.504,593.361,427.203z"/>
+	<g>
+		<path fill="#FFFFFF" d="M515.329,514.497c-17.086,0-30.993-13.907-30.993-30.979c0-17.086,13.209-31.143,30.295-31.143
+			c0.477,0,1.622,0.007,2.099,0.021v-41.705c-0.477-0.014-0.932-0.071-1.401-0.071c-40.19,0-72.897,32.7-72.897,72.897
+			s32.707,72.904,72.897,72.904c0.47,0,0.925-0.063,1.401-0.079"/>
+		<path fill="#FFFFFF" d="M512.413,514.532h-0.008v41.912h0.008c28.126,0,50.995,22.884,50.995,50.994
+			c0,28.127-22.868,50.995-50.995,50.995c-17.3,0-32.6-8.677-41.826-21.894l-26.028,34.292
+			c16.965,18.161,41.094,29.534,67.854,29.534c51.236,0,92.914-41.697,92.914-92.928
+			C605.326,556.223,563.648,514.532,512.413,514.532z"/>
+	</g>
+	<path fill="#FFFFFF" d="M635.949,330.199c-32.955-14.519-67.136-22.599-101.137-24.882l-18.146,41.193
+		c34.286,0.292,69.069,7.363,102.388,22.044C750.559,426.463,810.409,580.551,752.5,712.047
+		c-57.916,131.475-212.005,191.348-343.493,133.432c-131.489-57.91-191.352-211.998-133.438-343.479
+		c5.221-11.887,11.274-23.168,17.996-33.853l-38.66-17.036c-6.509,10.833-12.484,22.122-17.706,33.994
+		c-67.22,152.644,2.27,331.515,154.914,398.742c152.643,67.235,331.515-2.276,398.728-154.913
+		C858.083,576.283,788.592,397.427,635.949,330.199z"/>
+	<path fill="#FFFFFF" d="M514.02,112.61c-96.868,0-178.116,67.903-198.816,158.577h43.32
+		c19.683-67.327,81.902-116.665,155.496-116.665c82.209,0,150.247,61.516,160.661,140.928c15.108,7.825,29.584,16.723,43.334,26.583
+		v-5.441C718.015,204.123,626.51,112.61,514.02,112.61z"/>
+	<path fill="#FFFFFF" d="M510.691,304.555c-36.022,0.398-70.465,7.17-102.389,19.113l0.491,45.02
+		c31.348-13.906,65.934-21.823,102.346-22.229c143.681-1.593,261.853,114.012,263.447,257.679
+		c1.58,143.666-114.004,261.832-257.671,263.434c-143.667,1.594-261.847-114.006-263.44-257.672
+		c-0.142-12.996,0.697-25.764,2.404-38.263l-42.239,0.478c-1.448,12.54-2.223,25.286-2.073,38.248
+		c1.838,166.791,139.025,300.963,305.811,299.119c166.778-1.863,300.962-139.035,299.119-305.813
+		C814.648,436.876,677.455,302.698,510.691,304.555z"/>
+	<g>
+		<path opacity="0.55" fill="#FFFFFF" d="M465.585,325.198c1.586-3.058,3.03-6.195,4.233-9.439h-4.233V325.198z"/>
+		<path fill="#FFFFFF" d="M411.354,337.198v-14.504c-5.206,2.604-11.061,4.09-17.256,4.09c-21.418,0-38.461-17.42-38.461-38.832
+			c0-8.415,1.743-14.276,4.552-22.108l-10.399-0.42v-44.821c-21.922,14.44-36.441,39.194-36.441,67.349
+			c0,44.537,36.222,80.75,80.75,80.75c25.984,0,49.089-12.37,63.834-31.504H411.354z"/>
+	</g>
+</g>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/smartdisplayer-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/smartdisplayer-light.png
new file mode 100644
index 00000000000..dd5a5b6dff2
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/smartdisplayer-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/solo-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/solo-light.png
new file mode 100644
index 00000000000..fd13fc23d1a
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/solo-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/starsign-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/starsign-light.png
new file mode 100644
index 00000000000..3e27e386532
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/starsign-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/sticky-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/sticky-light.svg
new file mode 100644
index 00000000000..4b2f5f457ef
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/sticky-light.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 108 108"
+   width="108"
+   height="108"
+   version="1.1"
+   id="svg5"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <title>Sticky Password Manager</title>
+  <defs
+     id="defs5" />
+  <circle
+     style="fill:#ffffff;stroke-width:1.76201"
+     id="path6"
+     cx="54"
+     cy="54"
+     r="54" />
+  <g
+     id="g6"
+     transform="matrix(1.3433243,0,0,1.3433243,-18.540607,-18.527594)">
+    <path
+       d="m 64.35,53.11 -9.5,-9.5 c -0.48,-0.48 -1.26,-0.48 -1.75,0 l -9.5,9.5 c -0.48,0.48 -0.48,1.26 0,1.74 l 9.5,9.5 c 0.24,0.24 0.56,0.36 0.87,0.36 0.31,0 0.63,-0.12 0.87,-0.36 l 9.5,-9.5 c 0.23,-0.23 0.36,-0.54 0.36,-0.87 0,-0.33 -0.13,-0.64 -0.36,-0.87 z"
+       fill="#000000"
+       fill-rule="evenodd"
+       stroke="#000000"
+       stroke-width="3.62"
+       stroke-opacity="0"
+       id="path1" />
+    <path
+       d="m 50.11,67.34 -9.5,-9.5 c -0.48,-0.48 -1.26,-0.48 -1.74,0 l -9.49,9.5 c -0.48,0.48 -0.48,1.26 0,1.75 l 9.49,9.5 c 0.24,0.24 0.56,0.36 0.87,0.36 0.31,0 0.63,-0.12 0.87,-0.36 l 9.5,-9.5 c 0.23,-0.24 0.36,-0.54 0.36,-0.87 0,-0.33 -0.13,-0.64 -0.36,-0.87"
+       fill="#00a9e0"
+       fill-rule="evenodd"
+       stroke="#000000"
+       stroke-width="3.62"
+       stroke-opacity="0"
+       id="path2" />
+    <path
+       d="m 78.57,38.88 -9.5,-9.49 c -0.48,-0.48 -1.27,-0.48 -1.74,0 l -9.5,9.5 c -0.48,0.48 -0.48,1.26 0,1.74 l 9.5,9.5 c 0.24,0.24 0.55,0.36 0.87,0.36 0.31,0 0.63,-0.12 0.87,-0.36 l 9.5,-9.5 c 0.23,-0.24 0.36,-0.54 0.36,-0.87 0,-0.33 -0.13,-0.64 -0.36,-0.87"
+       fill="#d61818"
+       fill-rule="evenodd"
+       stroke="#000000"
+       stroke-width="3.62"
+       stroke-opacity="0"
+       id="path3" />
+    <path
+       d="m 50.1,38.86 -9.5,-9.5 c -0.48,-0.48 -1.27,-0.48 -1.74,0 l -9.5,9.5 c -0.48,0.48 -0.48,1.26 0,1.75 l 9.5,9.5 c 0.24,0.24 0.55,0.36 0.87,0.36 0.32,0 0.63,-0.12 0.87,-0.36 l 9.49,-9.5 c 0.23,-0.23 0.37,-0.54 0.37,-0.88 0,-0.33 -0.13,-0.64 -0.37,-0.87"
+       fill="#7ab800"
+       fill-rule="evenodd"
+       stroke="#000000"
+       stroke-width="3.62"
+       stroke-opacity="0"
+       id="path4" />
+    <path
+       d="m 78.64,67.39 -9.5,-9.49 c -0.48,-0.48 -1.27,-0.48 -1.75,0 l -9.49,9.49 c -0.48,0.48 -0.48,1.26 0,1.75 l 9.49,9.5 c 0.24,0.24 0.55,0.36 0.87,0.36 0.32,0 0.63,-0.12 0.87,-0.36 l 9.5,-9.5 c 0.23,-0.23 0.36,-0.54 0.36,-0.87 0,-0.33 -0.13,-0.64 -0.36,-0.88"
+       fill="#0046ad"
+       fill-rule="evenodd"
+       stroke="#000000"
+       stroke-width="3.62"
+       stroke-opacity="0"
+       id="path5" />
+  </g>
+</svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/swissbit-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/swissbit-light.png
new file mode 100644
index 00000000000..ac23d8ea257
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/swissbit-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/t-shield-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/t-shield-light.png
new file mode 100644
index 00000000000..5a405a301f3
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/t-shield-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/taglio-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/taglio-light.png
new file mode 100644
index 00000000000..4d7417e40b9
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/taglio-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/thales-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/thales-light.png
new file mode 100644
index 00000000000..da6aaa1f29a
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/thales-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/thales1-dark.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/thales1-dark.svg
new file mode 100644
index 00000000000..367d2b49bf0
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/thales1-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 77.6 77.6" style="enable-background:new 0 0 77.6 77.6;"><g><path fill="#FFF" d="M77.6,55.1c-4.9,1.4-11.4,1.9-16.2,2l-22.7-45.8h-1.3l-22.6,45.8c-4.8-0.1-10.5-0.6-15.4-2l28.7-53.7h20.5 L77.6,55.1z"></path><path fill="#FFF" d="M47.7,41.4c0,5.3-4.3,9.5-9.6,9.5c-5.3,0-9.5-4.3-9.5-9.5c0-5.3,4.3-9.5,9.5-9.5 C43.4,31.9,47.7,36.1,47.7,41.4"></path></g></svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/thales1-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/thales1-light.svg
new file mode 100644
index 00000000000..baab67dba79
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/thales1-light.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 77.6 77.6" style="enable-background:new 0 0 77.6 77.6;"><g><path fill="#2C2F73" d="M77.6,55.1c-4.9,1.4-11.4,1.9-16.2,2l-22.7-45.8h-1.3l-22.6,45.8c-4.8-0.1-10.5-0.6-15.4-2l28.7-53.7h20.5 L77.6,55.1z"></path><path fill="#5EBFD4" d="M47.7,41.4c0,5.3-4.3,9.5-9.6,9.5c-5.3,0-9.5-4.3-9.5-9.5c0-5.3,4.3-9.5,9.5-9.5 C43.4,31.9,47.7,36.1,47.7,41.4"></path></g></svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/thales3-dark.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/thales3-dark.svg
new file mode 100644
index 00000000000..367d2b49bf0
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/thales3-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 77.6 77.6" style="enable-background:new 0 0 77.6 77.6;"><g><path fill="#FFF" d="M77.6,55.1c-4.9,1.4-11.4,1.9-16.2,2l-22.7-45.8h-1.3l-22.6,45.8c-4.8-0.1-10.5-0.6-15.4-2l28.7-53.7h20.5 L77.6,55.1z"></path><path fill="#FFF" d="M47.7,41.4c0,5.3-4.3,9.5-9.6,9.5c-5.3,0-9.5-4.3-9.5-9.5c0-5.3,4.3-9.5,9.5-9.5 C43.4,31.9,47.7,36.1,47.7,41.4"></path></g></svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/thales3-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/thales3-light.svg
new file mode 100644
index 00000000000..baab67dba79
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/thales3-light.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 77.6 77.6" style="enable-background:new 0 0 77.6 77.6;"><g><path fill="#2C2F73" d="M77.6,55.1c-4.9,1.4-11.4,1.9-16.2,2l-22.7-45.8h-1.3l-22.6,45.8c-4.8-0.1-10.5-0.6-15.4-2l28.7-53.7h20.5 L77.6,55.1z"></path><path fill="#5EBFD4" d="M47.7,41.4c0,5.3-4.3,9.5-9.6,9.5c-5.3,0-9.5-4.3-9.5-9.5c0-5.3,4.3-9.5,9.5-9.5 C43.4,31.9,47.7,36.1,47.7,41.4"></path></g></svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/thetis-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/thetis-light.png
new file mode 100644
index 00000000000..65bbff0e831
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/thetis-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/token-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/token-light.png
new file mode 100644
index 00000000000..db5ddd7c03b
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/token-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/token2-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/token2-light.png
new file mode 100644
index 00000000000..4f3f0df2915
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/token2-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/toothpic-dark.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/toothpic-dark.svg
new file mode 100644
index 00000000000..0c4d14840c9
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/toothpic-dark.svg
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   viewBox="0 0 666.66669 666.66669"
+   height="666.66669"
+   width="666.66669"
+   xml:space="preserve"
+   id="svg2"
+   version="1.1"
+   sodipodi:docname="logoQuadrato_03.svg"
+   inkscape:export-filename="logoQuadrato_fondo_trasparente.svg"
+   inkscape:export-xdpi="480.54"
+   inkscape:export-ydpi="480.54"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     showgrid="false" /><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6"><clipPath
+       id="clipPath20"
+       clipPathUnits="userSpaceOnUse"><path
+         id="path18"
+         d="M 0,500 H 500 V 0 H 0 Z" /></clipPath></defs><g
+     transform="matrix(1.3333333,0,0,-1.3333333,0,666.66667)"
+     id="g10"><g
+       id="g14"><g
+         clip-path="url(#clipPath20)"
+         id="g16"><g
+           transform="translate(271.2935,160.3877)"
+           id="g22"><path
+             id="path24"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -1.609,22.325 8.191,35.961 27.969,45.722 38.251,18.878 60.677,49.906 65.954,92.756 5.869,47.664 -19.012,94.411 -62.555,117.173 -43.086,22.523 -96.23,15.726 -131.639,-16.836 -62.664,-57.627 -49.157,-155.027 27.378,-192.975 20.369,-10.1 29.516,-24.409 28.827,-47.051 l -0.665,-90.957 c -0.154,-5.219 -0.106,-15.163 -9.273,-15.163 -10.151,0 -9.377,9.863 -9.54,15.055 l -0.2,89.462 c 0.529,15.969 -4.733,25.222 -19.548,32.457 -54.064,26.399 -81.765,81.218 -74.085,143.239 6.547,52.882 50.489,99.204 105.937,111.678 C 14.723,299.442 82.008,262.771 105.332,199.118 129.124,134.186 102.615,62.173 41.647,31.314 23.795,22.279 17.162,11.385 18.236,-8.143 l 0.322,-82.005 c -0.04,-7.051 1.517,-17.418 -8.73,-17.113 -10.808,0.322 -9.425,10.388 -9.563,17.791 z" /></g><g
+           transform="translate(353.7485,312.6514)"
+           id="g26"><path
+             id="path28"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -1.877,-44.525 -21.488,-76.549 -60.95,-95.686 -6.669,-3.234 -14.311,-8.589 -20.382,0.667 -3.59,11.012 4.853,13.02 11.947,16.465 33.823,16.422 53.209,49.665 50.034,85.561 -2.976,33.636 -27.851,64.073 -60.433,73.944 -42.422,12.853 -86.942,-8.274 -104.044,-49.373 -16.916,-40.655 0.188,-87.587 39.473,-108.165 3.501,-1.835 7.268,-3.688 10.525,-5.194 4.814,-2.226 9.273,-6.641 6.214,-13.097 -3.773,-5.949 -10.158,-4.928 -13.83,-3.573 -34.05,12.558 -56.148,37.094 -65.057,71.953 -14.43,56.456 20.322,113.536 76.31,127.514 C -73.479,115.175 -16.533,80.27 -2.776,22.613 -0.949,14.958 -0.808,6.9 0,0" /></g><g
+           transform="translate(302.3062,312.1279)"
+           id="g30"><path
+             id="path32"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -0.127,30.031 -24.61,54.313 -54.134,53.687 -28.701,-0.609 -53.155,-25.097 -53.515,-53.591 -0.367,-28.98 24.858,-54.236 54.151,-54.22 C -23.44,-54.107 0.128,-30.263 0,0 m -52.069,72.649 c 39.811,-0.438 72.627,-34.097 72.046,-73.896 -0.592,-40.524 -34.503,-73.024 -75.363,-72.226 -39.888,0.78 -71.077,33.778 -70.68,74.781 0.389,40.156 33.202,71.792 73.997,71.341" /></g><g
+           transform="translate(239.5879,212.7441)"
+           id="g34"><path
+             id="path36"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0.214,5.411 -1.726,15.9 9.05,15.9 10.048,0 9.444,-10.235 9.519,-15.42 l -0.015,-181.282 c -0.077,-5.364 0.544,-15.175 -9.095,-15.149 -9.831,-0.56 -10.001,8.323 -9.952,16.165 z" /></g><g
+           transform="translate(179.6133,474.2949)"
+           id="g38"><path
+             id="path40"
+             style="fill:none;stroke:#ffffff;stroke-width:17.902;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+             d="M 0,0 C -47.839,0 -84.575,-35.961 -84.575,-82.561" /></g><g
+           transform="translate(406.3682,391.7344)"
+           id="g42"><path
+             id="path44"
+             style="fill:none;stroke:#ffffff;stroke-width:17.902;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+             d="M 0,0 C 0,53.184 -40.61,82.561 -84.575,82.561" /></g><g
+           transform="translate(321.793,24.8623)"
+           id="g46"><path
+             id="path48"
+             style="fill:none;stroke:#ffffff;stroke-width:17.902;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+             d="M 0,0 C 47.839,0 84.575,35.962 84.575,82.561" /></g><g
+           transform="translate(95.0386,107.4229)"
+           id="g50"><path
+             id="path52"
+             style="fill:none;stroke:#ffffff;stroke-width:17.902;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+             d="M 0,0 C 0,-53.183 40.61,-82.561 84.575,-82.561" /></g><g
+           transform="translate(272.5391,311.7549)"
+           id="g54"><path
+             id="path56"
+             style="fill:#f68712;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0,-13.019 -10.553,-23.572 -23.572,-23.572 -13.019,0 -23.573,10.553 -23.573,23.572 0,13.019 10.554,23.572 23.573,23.572 C -10.553,23.572 0,13.019 0,0" /></g><g
+           transform="translate(248.9668,288.1826)"
+           id="g58"><path
+             id="path60"
+             style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -13.019,0 -23.572,10.554 -23.572,23.572 0,13.019 10.553,23.573 23.572,23.573 13.019,0 23.572,-10.554 23.572,-23.573 C 23.572,10.554 13.019,0 0,0 M 1.402,64.451 C -22.017,64.884 -40.659,47.335 -41.213,24.336 -41.76,1.626 -23.248,-17.143 -0.132,-17.313 23.614,-17.489 41.229,-0.094 41.225,23.53 41.222,46.62 24.28,64.029 1.402,64.451" /></g></g></g></g></svg>
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/toothpic-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/toothpic-light.svg
new file mode 100644
index 00000000000..1117024037c
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/toothpic-light.svg
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   viewBox="0 0 666.66669 666.66669"
+   height="666.66669"
+   width="666.66669"
+   xml:space="preserve"
+   id="svg2"
+   version="1.1"><metadata
+     id="metadata8"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs6"><clipPath
+       id="clipPath18"
+       clipPathUnits="userSpaceOnUse"><path
+         id="path16"
+         d="M 0,500 H 500 V 0 H 0 Z" /></clipPath></defs><g
+     transform="matrix(1.3333333,0,0,-1.3333333,0,666.66667)"
+     id="g10"><g
+       id="g12"><g
+         clip-path="url(#clipPath18)"
+         id="g14"><g
+           transform="translate(271.9302,161.9868)"
+           id="g20"><path
+             id="path22"
+             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -1.609,22.325 8.191,35.961 27.969,45.722 38.251,18.878 60.677,49.906 65.954,92.756 5.87,47.664 -19.012,94.411 -62.555,117.173 -43.086,22.523 -96.23,15.726 -131.639,-16.836 -62.664,-57.626 -49.156,-155.026 27.378,-192.975 20.369,-10.099 29.516,-24.409 28.827,-47.051 l -0.665,-90.956 c -0.154,-5.22 -0.105,-15.164 -9.272,-15.164 -10.152,0 -9.378,9.864 -9.541,15.055 l -0.2,89.461 c 0.529,15.971 -4.733,25.223 -19.548,32.458 -54.064,26.399 -81.764,81.218 -74.085,143.239 6.547,52.882 50.489,99.204 105.937,111.678 C 14.723,299.443 82.008,262.772 105.332,199.118 129.124,134.186 102.615,62.173 41.647,31.314 23.796,22.279 17.162,11.385 18.236,-8.142 l 0.322,-82.006 c -0.04,-7.051 1.518,-17.418 -8.73,-17.113 -10.808,0.322 -9.425,10.388 -9.563,17.791 z" /></g><g
+           transform="translate(354.3853,314.251)"
+           id="g24"><path
+             id="path26"
+             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -1.877,-44.525 -21.488,-76.549 -60.95,-95.686 -6.669,-3.234 -14.311,-8.59 -20.382,0.667 -3.59,11.012 4.853,13.019 11.948,16.465 33.822,16.422 53.208,49.665 50.033,85.561 -2.976,33.635 -27.851,64.073 -60.433,73.944 -42.422,12.852 -86.942,-8.275 -104.044,-49.374 -16.916,-40.654 0.188,-87.586 39.473,-108.164 3.501,-1.835 7.268,-3.689 10.525,-5.195 4.814,-2.225 9.273,-6.64 6.214,-13.096 -3.773,-5.949 -10.158,-4.928 -13.83,-3.574 -34.05,12.559 -56.148,37.094 -65.057,71.953 -14.43,56.457 20.322,113.537 76.31,127.515 C -73.479,115.174 -16.533,80.27 -2.776,22.613 -0.949,14.958 -0.808,6.9 0,0" /></g><g
+           transform="translate(302.9429,313.7275)"
+           id="g28"><path
+             id="path30"
+             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="M 0,0 C -0.126,30.031 -24.61,54.312 -54.134,53.687 -82.835,53.078 -107.289,28.589 -107.649,0.095 -108.016,-28.884 -82.791,-54.14 -53.497,-54.124 -23.44,-54.107 0.128,-30.263 0,0 m -52.069,72.649 c 39.811,-0.439 72.627,-34.098 72.046,-73.897 -0.592,-40.524 -34.503,-73.023 -75.363,-72.225 -39.888,0.779 -71.077,33.777 -70.68,74.78 0.389,40.156 33.202,71.793 73.997,71.342" /></g><g
+           transform="translate(240.2246,214.3433)"
+           id="g32"><path
+             id="path34"
+             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0.214,5.411 -1.726,15.9 9.05,15.9 10.049,0 9.444,-10.235 9.519,-15.42 l -0.014,-181.282 c -0.077,-5.364 0.544,-15.174 -9.096,-15.149 -9.831,-0.56 -10.001,8.324 -9.952,16.165 z" /></g><g
+           transform="translate(180.2505,475.8945)"
+           id="g36"><path
+             id="path38"
+             style="fill:none;stroke:#231f20;stroke-width:17.90200043;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+             d="M 0,0 C -47.839,0 -84.575,-35.961 -84.575,-82.561" /></g><g
+           transform="translate(407.0049,393.334)"
+           id="g40"><path
+             id="path42"
+             style="fill:none;stroke:#231f20;stroke-width:17.90200043;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+             d="M 0,0 C 0,53.183 -40.61,82.561 -84.575,82.561" /></g><g
+           transform="translate(322.4302,26.4619)"
+           id="g44"><path
+             id="path46"
+             style="fill:none;stroke:#231f20;stroke-width:17.90200043;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+             d="M 0,0 C 47.839,0 84.575,35.961 84.575,82.561" /></g><g
+           transform="translate(95.6753,109.0225)"
+           id="g48"><path
+             id="path50"
+             style="fill:none;stroke:#231f20;stroke-width:17.90200043;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1"
+             d="M 0,0 C 0,-53.183 40.61,-82.561 84.575,-82.561" /></g><g
+           transform="translate(273.1763,313.354)"
+           id="g52"><path
+             id="path54"
+             style="fill:#f68712;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c 0,-13.019 -10.554,-23.572 -23.572,-23.572 -13.019,0 -23.573,10.553 -23.573,23.572 0,13.019 10.554,23.572 23.573,23.572 C -10.554,23.572 0,13.019 0,0" /></g><g
+           transform="translate(249.6035,289.7817)"
+           id="g56"><path
+             id="path58"
+             style="fill:#231f20;fill-opacity:1;fill-rule:nonzero;stroke:none"
+             d="m 0,0 c -13.019,0 -23.572,10.554 -23.572,23.572 0,13.019 10.553,23.573 23.572,23.573 13.019,0 23.573,-10.554 23.573,-23.573 C 23.573,10.554 13.019,0 0,0 M 1.402,64.452 C -22.017,64.884 -40.659,47.335 -41.213,24.336 -41.76,1.626 -23.248,-17.143 -0.132,-17.313 23.614,-17.489 41.229,-0.094 41.225,23.53 41.222,46.621 24.28,64.029 1.402,64.452" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/truu-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/truu-light.png
new file mode 100644
index 00000000000..729e072b151
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/truu-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/utrust-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/utrust-light.png
new file mode 100644
index 00000000000..d22d32f66da
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/utrust-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/valmido-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/valmido-light.png
new file mode 100644
index 00000000000..4d763d1801c
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/valmido-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/veridium-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/veridium-light.png
new file mode 100644
index 00000000000..a2604ff4041
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/veridium-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/verimark-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/verimark-light.png
new file mode 100644
index 00000000000..7b1c861a222
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/verimark-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/verimark1-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/verimark1-light.png
new file mode 100644
index 00000000000..27da03b2ae1
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/verimark1-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/verocard-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/verocard-light.png
new file mode 100644
index 00000000000..3c557f24582
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/verocard-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/vincss-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/vincss-light.png
new file mode 100644
index 00000000000..d8dad417d06
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/vincss-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/vivokey-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/vivokey-light.png
new file mode 100644
index 00000000000..2a2385d0be5
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/vivokey-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/webcomm-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/webcomm-light.png
new file mode 100644
index 00000000000..b24d4d14fef
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/webcomm-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/windows-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/windows-light.svg
new file mode 100644
index 00000000000..960a7af56e4
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/windows-light.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><defs><style>.cls-1{fill:#0078d4;stroke-width:0px;}</style></defs><rect class="cls-1" x="24.25" y="24.25" width="98.35" height="98.35"/><rect class="cls-1" x="133.4" y="24.25" width="98.35" height="98.35"/><rect class="cls-1" x="24.25" y="133.4" width="98.35" height="98.35"/><rect class="cls-1" x="133.4" y="133.4" width="98.35" height="98.35"/></svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/winmagic-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/winmagic-light.png
new file mode 100644
index 00000000000..07c8c1d82d4
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/winmagic-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/yubikey-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/yubikey-light.png
new file mode 100644
index 00000000000..d1c1b3a87b9
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/yubikey-light.png differ
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/zoho-light.svg b/themes/src/main/resources/theme/base/login/resources/img/passkeys/zoho-light.svg
new file mode 100644
index 00000000000..ccf3e05d528
--- /dev/null
+++ b/themes/src/main/resources/theme/base/login/resources/img/passkeys/zoho-light.svg
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs>
+    <style>
+      .cls-1 {
+        fill: #226eb3;
+      }
+
+      .cls-2 {
+        fill: #fff;
+      }
+
+      .cls-3 {
+        opacity: .9;
+      }
+
+      .cls-4 {
+        fill: #e42528;
+      }
+    </style>
+  </defs>
+  <path class="cls-2" d="M26.1,3.62H5.9c-1.24,0-2.25,1.01-2.25,2.25v16.94c0,1.24,1.01,2.25,2.25,2.25h.1c.3.07.67.29.67.91v2.11c0,.15.12.27.27.27h2.75c.15,0,.27-.12.27-.27v-1.23s.07-1.56,1.75-1.79h8.58c1.68.23,1.75,1.79,1.75,1.79v1.23c0,.15.12.27.27.27h2.75c.15,0,.27-.12.27-.27v-2.11c0-.62.37-.83.67-.91h.09c1.24,0,2.25-1.01,2.25-2.25V5.87c0-1.24-1.01-2.25-2.25-2.25Z"/>
+  <g>
+    <g class="cls-3">
+      <path class="cls-1" d="M25.06,30h-2.75c-1.06,0-1.92-.86-1.92-1.92v-1.13c0-.15-.12-.27-.27-.27h-8.24c-.15,0-.27.12-.27.27v1.13c0,1.06-.86,1.92-1.92,1.92h-2.75c-1.06,0-1.92-.86-1.92-1.92v-1.49c-1.72-.38-3.02-1.92-3.02-3.76V5.84c0-2.12,1.72-3.84,3.84-3.84h20.31c2.12,0,3.84,1.72,3.84,3.84v16.99c0,1.84-1.3,3.38-3.02,3.76v1.49c0,1.06-.86,1.92-1.92,1.92ZM11.88,25.03h8.24c1.06,0,1.92.86,1.92,1.92v1.13c0,.15.12.27.27.27h2.75c.15,0,.27-.12.27-.27v-2.22c0-.46.37-.82.82-.82,1.21,0,2.2-.99,2.2-2.2V5.84c0-1.21-.99-2.2-2.2-2.2H5.84c-1.21,0-2.2.99-2.2,2.2v16.99c0,1.21.99,2.2,2.2,2.2.46,0,.82.37.82.82v2.22c0,.15.12.27.27.27h2.75c.15,0,.27-.12.27-.27v-1.13c0-1.06.86-1.92,1.92-1.92Z"/>
+    </g>
+    <g class="cls-3">
+      <path class="cls-4" d="M10.77,19.25c-.17,0-.34-.05-.48-.16-.37-.27-.45-.78-.18-1.15l2.67-3.68c.27-.37.78-.45,1.15-.18.37.27.45.78.18,1.15l-2.67,3.68c-.16.22-.41.34-.67.34Z"/>
+    </g>
+    <g class="cls-3">
+      <path class="cls-4" d="M16.12,19.25c-.26,0-.51-.12-.67-.34l-2.67-3.68c-.27-.37-.19-.88.18-1.15.37-.27.88-.19,1.15.18l2.67,3.68c.27.37.19.88-.18,1.15-.15.11-.32.16-.48.16Z"/>
+    </g>
+    <g class="cls-3">
+      <path class="cls-4" d="M13.44,15.57c-.46,0-.82-.37-.82-.82v-4.51c0-.46.37-.82.82-.82s.82.37.82.82v4.51c0,.46-.37.82-.82.82Z"/>
+    </g>
+    <g class="cls-3">
+      <path class="cls-4" d="M13.44,15.58c-.35,0-.67-.22-.78-.57-.14-.43.1-.9.53-1.04l4.32-1.39c.43-.14.9.1,1.04.53.14.43-.1.9-.53,1.04l-4.32,1.39c-.09.03-.17.04-.26.04Z"/>
+    </g>
+    <g class="cls-3">
+      <path class="cls-4" d="M13.44,15.58c-.09,0-.17-.01-.25-.04l-4.32-1.39c-.43-.14-.67-.6-.53-1.04.14-.43.6-.67,1.04-.53l4.32,1.39c.43.14.67.6.53,1.04-.11.35-.43.57-.78.57Z"/>
+    </g>
+    <g class="cls-3">
+      <path class="cls-1" d="M22.85,19.23c-.46,0-.82-.37-.82-.82v-8.15c0-.46.37-.82.82-.82s.82.37.82.82v8.15c0,.46-.37.82-.82.82Z"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/base/login/resources/img/passkeys/ztpass-light.png b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ztpass-light.png
new file mode 100644
index 00000000000..c12293c80ba
Binary files /dev/null and b/themes/src/main/resources/theme/base/login/resources/img/passkeys/ztpass-light.png differ
diff --git a/themes/src/main/resources/theme/keycloak.v2/login/resources/css/styles.css b/themes/src/main/resources/theme/keycloak.v2/login/resources/css/styles.css
index cd19326865a..60d67b259fa 100644
--- a/themes/src/main/resources/theme/keycloak.v2/login/resources/css/styles.css
+++ b/themes/src/main/resources/theme/keycloak.v2/login/resources/css/styles.css
@@ -137,4 +137,8 @@ hr {
     div.pf-v5-c-login__main-header {
         grid-template-columns: 70% 30%;
     }
+}
+
+#kc-form-webauthn {
+    gap: 0.875rem;
 }
\ No newline at end of file
diff --git a/themes/src/main/resources/theme/keycloak.v2/login/theme.properties b/themes/src/main/resources/theme/keycloak.v2/login/theme.properties
index b0dcf94498b..ecc296ab33a 100644
--- a/themes/src/main/resources/theme/keycloak.v2/login/theme.properties
+++ b/themes/src/main/resources/theme/keycloak.v2/login/theme.properties
@@ -83,6 +83,7 @@ kcSelectAuthListItemBodyClass=pf-v5-c-data-list__cell pf-m-no-fill pf-v5-u-pt-md
 kcSelectAuthListItemIconClass=pf-v5-c-data-list__cell pf-m-icon pf-v5-u-display-flex pf-v5-u-pt-0 pf-v5-u-align-items-center 
 kcSelectAuthListItemFillClass=pf-v5-c-data-list__item-action
 kcSelectAuthListItemDescriptionClass=pf-v5-c-data-list__cell pf-m-no-fill select-auth-box-desc
+kcSelectAuthListItemSubtitleClass=pf-v5-u-color-200 pf-v5-u-font-size-sm
 kcSelectAuthListItemArrowIconClass=fa fa-angle-right fa-lg
 
 kcRecoveryCodesWarning=pf-v5-c-alert pf-m-warning pf-m-inline pf-v5-u-mb-md kc-recovery-codes-warning
@@ -107,7 +108,7 @@ kcAuthenticatorWebAuthnClass=fa fa-key list-view-pf-icon-lg
 kcAuthenticatorWebAuthnPasswordlessClass=fa fa-key list-view-pf-icon-lg
 
 kcContentWrapperClass=pf-v5-u-mb-md-on-md
-kcWebAuthnDefaultIcon=pf-v5-c-icon pf-m-lg
+kcWebAuthnDefaultIcon=pf-v5-c-icon pf-m-xl
 kcMarginTopClass=pf-v5-u-mt-md-on-md
 
 kcLoginOTPListClass=pf-v5-c-tile
diff --git a/themes/src/main/resources/theme/keycloak.v2/login/webauthn-authenticate.ftl b/themes/src/main/resources/theme/keycloak.v2/login/webauthn-authenticate.ftl
index 13d3ae38ff5..6cd2c02ebcd 100644
--- a/themes/src/main/resources/theme/keycloak.v2/login/webauthn-authenticate.ftl
+++ b/themes/src/main/resources/theme/keycloak.v2/login/webauthn-authenticate.ftl
@@ -36,35 +36,44 @@
                                     <div id="kc-webauthn-authenticator-item-${authenticator?index}" class="${properties.kcSelectAuthListItemClass!}">
                                         <div class="${properties.kcSelectAuthListItemIconClass!}">
                                             <div class="${properties.kcWebAuthnDefaultIcon!}">
+                                            <#if authenticator.iconLight?? || authenticator.iconDark??>
+                                                <picture>
+                                                    <#if authenticator.iconDark??>
+                                                        <source srcset="${url.resourcesPath}/img/passkeys/${authenticator.iconDark}" media="(prefers-color-scheme: dark)">
+                                                    </#if>
+                                                    <img src="${url.resourcesPath}/img/passkeys/${authenticator.iconLight!authenticator.iconDark!''}" alt="" width="40" height="40">
+                                                </picture>
+                                            <#else>
                                             <#switch authenticator.transports.iconClass>
                                                 <#case "kcWebAuthnBLE">
                                                     <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg"
-                                                         viewBox="0 0 217.499 217.499" xml:space="preserve"><path
+                                                         viewBox="0 0 217.499 217.499" xml:space="preserve" width="40" height="40"><path
                                                                 d="m123.264 108.749 45.597-44.488a8.997 8.997 0 0 0 0-12.882l-50.038-48.82A9 9 0 0 0 103.538 9v80.504l-42.331-41.3a9 9 0 1 0-12.57 12.883l48.851 47.663-48.851 47.663a9 9 0 1 0 12.57 12.883l42.331-41.3V208.5a9 9 0 0 0 15.285 6.441l50.038-48.82a8.997 8.997 0 0 0 0-12.882l-45.597-44.49zm-1.725-78.395 28.15 27.465-28.15 27.465v-54.93zm0 156.789v-54.93l28.15 27.465-28.15 27.465z"
                                                                 fill="currentColor"/></svg>
                                                     <#break>
                                                 <#case "kcWebAuthnNFC">
                                                     <svg aria-hidden="true" viewBox="0 0 24 24"
-                                                         xmlns="http://www.w3.org/2000/svg">
+                                                         xmlns="http://www.w3.org/2000/svg" width="40" height="40">
                                                         <path d="M12 19a1 1 0 1 0 0 2v-2Zm.01 2a1 1 0 1 0 0-2v2Zm2.68-3.96a1 1 0 0 0 1.347-1.48l-1.346 1.48Zm3.364-3.7a1 1 0 0 0 1.346-1.48l-1.346 1.48Zm-10.09 2.22a1 1 0 0 0 1.346 1.48l-1.346-1.48ZM4.6 11.86a1 1 0 1 0 1.345 1.48l-1.345-1.48ZM12 21h.01v-2H12v2Zm0-5c1.036 0 1.979.393 2.69 1.04l1.345-1.48A5.982 5.982 0 0 0 12 14v2Zm0-5c2.331 0 4.454.886 6.053 2.34l1.346-1.48A10.964 10.964 0 0 0 12 9v2ZM9.31 17.04A3.982 3.982 0 0 1 12 16v-2a5.982 5.982 0 0 0-4.036 1.56l1.346 1.48Zm-3.364-3.7A8.964 8.964 0 0 1 12 11V9a10.964 10.964 0 0 0-7.4 2.86l1.346 1.48Z"
                                                               fill="currentColor"/>
                                                     </svg>
                                                     <#break>
                                                 <#case "kcWebAuthnUSB">
                                                     <svg aria-hidden="true" viewBox="0 0 24 24"
-                                                         xmlns="http://www.w3.org/2000/svg">
+                                                         xmlns="http://www.w3.org/2000/svg" width="40" height="40">
                                                         <path d="M12 1.25a.75.75 0 0 1 .624.334l2 3a.75.75 0 1 1-1.248.832l-.626-.939v10.515c.121-.062.248-.115.38-.16l3.265-1.088c.51-.17.855-.647.855-1.185v-1.85a1.195 1.195 0 0 1-.634-.325 1.239 1.239 0 0 1-.341-.735 4.845 4.845 0 0 1-.025-.615v-.068c0-.206 0-.427.025-.615.03-.219.105-.5.341-.735.236-.236.516-.311.735-.341.188-.025.41-.025.615-.025h.069c.205 0 .426 0 .614.025.219.03.5.105.735.341.236.236.311.516.341.735.025.188.025.41.025.615v.068c0 .206 0 .427-.025.615-.03.219-.105.5-.341.735-.2.2-.434.285-.634.324v1.85a2.75 2.75 0 0 1-1.88 2.61l-3.265 1.088a1.25 1.25 0 0 0-.855 1.186v.703a2 2 0 1 1-1.5 0v-3.704a1.25 1.25 0 0 0-.855-1.185L7.13 12.167a2.75 2.75 0 0 1-1.88-2.609V7.582a1.75 1.75 0 1 1 1.5 0v1.976c0 .539.344 1.016.855 1.186l3.265 1.089c.132.044.259.097.38.159V4.477l-.626.939a.75.75 0 1 1-1.248-.832l2-3A.75.75 0 0 1 12 1.25Z"
                                                               fill="currentColor"/>
                                                     </svg>
                                                     <#break>
                                                 <#default>
                                                     <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg"
-                                                         viewBox="0 0 512 512">
+                                                         viewBox="0 0 512 512" width="40" height="40">
                                                         <path d="M336 352a176 176 0 1 0-167.7-122.3L7 391a24 24 0 0 0-7 17v80a24 24 0 0 0 24 24h80a24 24 0 0 0 24-24v-40h40a24 24 0 0 0 24-24v-40h40a24 24 0 0 0 17-7l33.3-33.3c16.9 5.4 35 8.3 53.7 8.3zm40-256a40 40 0 1 1 0 80 40 40 0 1 1 0-80z"
                                                               fill="currentColor"/>
                                                     </svg>
                                                     <#break>
                                             </#switch>
+                                            </#if>
                                             </div>
                                         </div>
                                         <div class="${properties.kcSelectAuthListItemBodyClass!}">
@@ -73,8 +82,14 @@
                                                 ${authenticator.label}
                                             </div>
 
-                                            <#if authenticator.transports?? && authenticator.transports.displayNameProperties?has_content>
-                                                <div id="kc-webauthn-authenticator-transport-${authenticator?index}">
+                                            <#if authenticator.authenticatorProvider?? && authenticator.authenticatorProvider?has_content>
+                                                <div id="kc-webauthn-authenticator-label-subtext-${authenticator?index}"
+                                                    class="${properties.kcSelectAuthListItemSubtitleClass!}">
+                                                    ${authenticator.authenticatorProvider}
+                                                </div>
+                                            <#elseif authenticator.transports?? && authenticator.transports.displayNameProperties?has_content>
+                                                <div id="kc-webauthn-authenticator-transport-${authenticator?index}"
+                                                    class="${properties.kcSelectAuthListItemSubtitleClass!}">
                                                     <#list authenticator.transports.displayNameProperties as nameProperty>
                                                         <span>${msg(nameProperty)}</span>
                                                         <#if nameProperty?has_next>
@@ -84,12 +99,14 @@
                                                 </div>
                                             </#if>
 
-                                            <span id="kc-webauthn-authenticator-createdlabel-${authenticator?index}">
-                                                <i>${msg('webauthn-createdAt-label')}</i>
-                                            </span>
-                                            <span id="kc-webauthn-authenticator-created-${authenticator?index}">
-                                                <i>${authenticator.createdAt}</i>
-                                            </span>
+                                            <div class="${properties.kcSelectAuthListItemSubtitleClass!}">
+                                                <span id="kc-webauthn-authenticator-createdlabel-${authenticator?index}">
+                                                    ${msg('webauthn-createdAt-label')}
+                                                </span>
+                                                <span id="kc-webauthn-authenticator-created-${authenticator?index}">
+                                                    ${authenticator.createdAt}
+                                                </span>
+                                            </div>
                                         </div>
                                         <div class="${properties.kcSelectAuthListItemFillClass!}"></div>
                                     </div>