diff --git a/common/defs/fido/aws.json b/common/defs/fido/aws.json
new file mode 100644
index 000000000..9fedfb030
--- /dev/null
+++ b/common/defs/fido/aws.json
@@ -0,0 +1,4 @@
+{
+  "label": "Amazon Web Services",
+  "u2f": ["968978a29953de52d3ef0f0c71b7b7b6b1af9f08e257896a8d8126918530293b"]
+}
diff --git a/common/defs/fido/aws.png b/common/defs/fido/aws.png
new file mode 100644
index 000000000..1e0e6ed52
Binary files /dev/null and b/common/defs/fido/aws.png differ
diff --git a/common/defs/fido/tutanota.json b/common/defs/fido/tutanota.json
new file mode 100644
index 000000000..2837d8263
--- /dev/null
+++ b/common/defs/fido/tutanota.json
@@ -0,0 +1,4 @@
+{
+  "label": "Tutanota",
+  "u2f": ["fabeece3982fad9ddcc98f91bd2e75afc7d1f4ca544929b2d0d04212dffa30fa"]
+}
diff --git a/common/defs/fido/tutanota.png b/common/defs/fido/tutanota.png
new file mode 100644
index 000000000..d0757cc80
Binary files /dev/null and b/common/defs/fido/tutanota.png differ
diff --git a/core/src/apps/webauthn/knownapps.py b/core/src/apps/webauthn/knownapps.py
index 1f05ca031..68fe7111a 100644
--- a/core/src/apps/webauthn/knownapps.py
+++ b/core/src/apps/webauthn/knownapps.py
@@ -25,6 +25,14 @@ class FIDOApp:
 def by_rp_id_hash(rp_id_hash: bytes) -> Optional[FIDOApp]:
     if False:
         raise RuntimeError  # if false
+    elif rp_id_hash == b"\x96\x89\x78\xa2\x99\x53\xde\x52\xd3\xef\x0f\x0c\x71\xb7\xb7\xb6\xb1\xaf\x9f\x08\xe2\x57\x89\x6a\x8d\x81\x26\x91\x85\x30\x29\x3b":
+        # U2F key for Amazon Web Services
+        return FIDOApp(
+            label="Amazon Web Services",
+            icon="apps/webauthn/res/icon_aws.toif",
+            use_sign_count=None,
+            use_self_attestation=None,
+        )
     elif rp_id_hash == b"\xc3\x40\x8c\x04\x47\x88\xae\xa5\xb3\xdf\x30\x89\x52\xfd\x8c\xa3\xc7\x0e\x21\xfe\xf4\xf6\xc1\xc2\x37\x4c\xaa\x1d\xf9\xb2\x8d\xdd":
         # WebAuthn key for Binance
         return FIDOApp(
@@ -233,6 +241,14 @@ def by_rp_id_hash(rp_id_hash: bytes) -> Optional[FIDOApp]:
             use_sign_count=None,
             use_self_attestation=None,
         )
+    elif rp_id_hash == b"\xfa\xbe\xec\xe3\x98\x2f\xad\x9d\xdc\xc9\x8f\x91\xbd\x2e\x75\xaf\xc7\xd1\xf4\xca\x54\x49\x29\xb2\xd0\xd0\x42\x12\xdf\xfa\x30\xfa":
+        # U2F key for Tutanota
+        return FIDOApp(
+            label="Tutanota",
+            icon="apps/webauthn/res/icon_tutanota.toif",
+            use_sign_count=None,
+            use_self_attestation=None,
+        )
     elif rp_id_hash == b"\x1b\x3c\x16\xdd\x2f\x7c\x46\xe2\xb4\xc2\x89\xdc\x16\x74\x6b\xcc\x60\xdf\xcf\x0f\xb8\x18\xe1\x32\x15\x52\x6e\x14\x08\xe7\xf4\x68":
         # U2F key for u2f.bin.coffee
         return FIDOApp(
diff --git a/core/src/apps/webauthn/res/icon_aws.toif b/core/src/apps/webauthn/res/icon_aws.toif
new file mode 100644
index 000000000..1a787bdc0
Binary files /dev/null and b/core/src/apps/webauthn/res/icon_aws.toif differ
diff --git a/core/src/apps/webauthn/res/icon_tutanota.toif b/core/src/apps/webauthn/res/icon_tutanota.toif
new file mode 100644
index 000000000..3043d22d6
Binary files /dev/null and b/core/src/apps/webauthn/res/icon_tutanota.toif differ