diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00002.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00002.png
index 39c6eb0..aedc03d 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00002.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00002.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00003.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00003.png
index 3106ba8..719efad 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00003.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00003.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00004.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00004.png
index 6fd0c4c..796998e 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00004.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering/00004.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00007.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00007.png
index e96f427..d8be849 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00007.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00007.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00008.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00008.png
index 131edd1..fe77757 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00008.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00008.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00009.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00009.png
index 4127432..97fe3ff 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00009.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00009.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00010.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00010.png
index 64ae31d..e1e50fd 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00010.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00010.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00011.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00011.png
index cbaa889..462b9d6 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00011.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00011.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00012.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00012.png
index 8b981d4..cbaa889 100644
Binary files a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00012.png and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00012.png differ
diff --git a/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00013.png b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00013.png
new file mode 100644
index 0000000..8b981d4
Binary files /dev/null and b/tests/ragger/snapshots/flex/test_eip712_advanced_filtering_verbose/00013.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00002.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00002.png
index 40d12d2..9379125 100644
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00002.png and b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00002.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00003.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00003.png
index 13f8255..953bdd2 100644
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00003.png and b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00003.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00004.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00004.png
index b79b3d7..5e15c3b 100644
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00004.png and b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering/00004.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00007.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00007.png
index 2191773..17f59fd 100644
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00007.png and b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00007.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00008.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00008.png
index 394eff6..b8ab040 100644
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00008.png and b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00008.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00009.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00009.png
index 139d265..2f7c574 100644
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00009.png and b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00009.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00010.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00010.png
index aa7c74d..1415c12 100644
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00010.png and b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00010.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00011.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00011.png
index 53ae651..6a53a25 100644
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00011.png and b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00011.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00012.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00012.png
index 6578872..53ae651 100644
Binary files a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00012.png and b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00012.png differ
diff --git a/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00013.png b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00013.png
new file mode 100644
index 0000000..6578872
Binary files /dev/null and b/tests/ragger/snapshots/nanosp/test_eip712_advanced_filtering_verbose/00013.png differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00002.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00002.png
index 40d12d2..9379125 100644
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00002.png and b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00002.png differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00003.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00003.png
index 13f8255..953bdd2 100644
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00003.png and b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00003.png differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00004.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00004.png
index b79b3d7..5e15c3b 100644
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00004.png and b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering/00004.png differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00007.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00007.png
index 2191773..17f59fd 100644
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00007.png and b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00007.png differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00008.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00008.png
index 394eff6..b8ab040 100644
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00008.png and b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00008.png differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00009.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00009.png
index 139d265..2f7c574 100644
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00009.png and b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00009.png differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00010.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00010.png
index aa7c74d..1415c12 100644
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00010.png and b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00010.png differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00011.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00011.png
index 53ae651..6a53a25 100644
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00011.png and b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00011.png differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00012.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00012.png
index 6578872..53ae651 100644
Binary files a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00012.png and b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00012.png differ
diff --git a/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00013.png b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00013.png
new file mode 100644
index 0000000..6578872
Binary files /dev/null and b/tests/ragger/snapshots/nanox/test_eip712_advanced_filtering_verbose/00013.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00002.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00002.png
index 146f386..c6131c1 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00002.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00002.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00003.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00003.png
index 8a15d01..2607184 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00003.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00003.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00004.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00004.png
index f30df56..0a05535 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00004.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering/00004.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00007.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00007.png
index dcd3cfa..669fb2f 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00007.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00007.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00008.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00008.png
index 4d7644b..fea8a29 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00008.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00008.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00009.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00009.png
index bc1ee08..beaa1ad 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00009.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00009.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00010.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00010.png
index 5415585..71d64db 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00010.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00010.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00011.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00011.png
index 9c2fa5d..e9f9b92 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00011.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00011.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00012.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00012.png
index 54aba60..9c2fa5d 100644
Binary files a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00012.png and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00012.png differ
diff --git a/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00013.png b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00013.png
new file mode 100644
index 0000000..54aba60
Binary files /dev/null and b/tests/ragger/snapshots/stax/test_eip712_advanced_filtering_verbose/00013.png differ
diff --git a/tests/ragger/test_eip712.py b/tests/ragger/test_eip712.py
index 74a1233..26a3500 100644
--- a/tests/ragger/test_eip712.py
+++ b/tests/ragger/test_eip712.py
@@ -204,10 +204,11 @@ def test_eip712_advanced_filtering(firmware: Firmware,
             "version": "1"
         },
         "message": {
-            "from": "0xaAaAaAaaAaAaAaaAaAAAAAAAAaaaAaAaAaaAaaAa",
-            "to": "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045",
-            "amount": 117,
-            "token": "0x6B175474E89094C44Da98b954EedeAC495271d0F"
+            "with": "0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045",
+            "value_recv": 10000000000000000,
+            "token_send": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
+            "value_send": 24500000000000000000,
+            "token_recv": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
         },
         "primaryType": "Transfer",
         "types": {
@@ -218,10 +219,11 @@ def test_eip712_advanced_filtering(firmware: Firmware,
                 {"name": "verifyingContract", "type": "address"}
             ],
             "Transfer": [
-                {"name": "from", "type": "address"},
-                {"name": "to", "type": "address"},
-                {"name": "amount", "type": "uint256"},
-                {"name": "token", "type": "address"}
+                {"name": "with", "type": "address"},
+                {"name": "value_recv", "type": "uint256"},
+                {"name": "token_send", "type": "address"},
+                {"name": "value_send", "type": "uint256"},
+                {"name": "token_recv", "type": "address"},
             ]
         }
     }
@@ -232,10 +234,43 @@ def test_eip712_advanced_filtering(firmware: Firmware,
     else:
         filters = {
             "name": "Advanced Filtering",
+            "tokens": [
+                {
+                    "addr": "0x6b175474e89094c44da98b954eedeac495271d0f",
+                    "ticker": "DAI",
+                    "decimals": 18,
+                    "chain_id": 1,
+                },
+                {
+                    "addr": "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+                    "ticker": "WETH",
+                    "decimals": 18,
+                    "chain_id": 1,
+                },
+            ],
             "fields": {
-                "amount": "Amount",
-                "token": "Token",
-                "to": "To",
+                "value_send": {
+                    "type": "amount_join_value",
+                    "name": "Send",
+                    "token": 0,
+                },
+                "token_send": {
+                    "type": "amount_join_token",
+                    "token": 0,
+                },
+                "value_recv": {
+                    "type": "amount_join_value",
+                    "name": "Receive",
+                    "token": 1,
+                },
+                "token_recv": {
+                    "type": "amount_join_token",
+                    "token": 1,
+                },
+                "with": {
+                    "type": "raw",
+                    "name": "With",
+                },
             }
         }