diff --git a/tests/speculos/test_eip191.py b/tests/speculos/old_test_eip191.py
similarity index 100%
rename from tests/speculos/test_eip191.py
rename to tests/speculos/old_test_eip191.py
diff --git a/tests/zemu/snapshots/nanos_eip191_nonascii/00001.png b/tests/zemu/snapshots/nanos_eip191_nonascii/00001.png
index ad00cb8..51efae0 100644
Binary files a/tests/zemu/snapshots/nanos_eip191_nonascii/00001.png and b/tests/zemu/snapshots/nanos_eip191_nonascii/00001.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_nonascii/00002.png b/tests/zemu/snapshots/nanos_eip191_nonascii/00002.png
index b435297..b4e4df5 100644
Binary files a/tests/zemu/snapshots/nanos_eip191_nonascii/00002.png and b/tests/zemu/snapshots/nanos_eip191_nonascii/00002.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_nonascii/00003.png b/tests/zemu/snapshots/nanos_eip191_nonascii/00003.png
index fcd68b2..d95e831 100644
Binary files a/tests/zemu/snapshots/nanos_eip191_nonascii/00003.png and b/tests/zemu/snapshots/nanos_eip191_nonascii/00003.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_nonascii/00004.png b/tests/zemu/snapshots/nanos_eip191_nonascii/00004.png
index 251c562..e8c4c8e 100644
Binary files a/tests/zemu/snapshots/nanos_eip191_nonascii/00004.png and b/tests/zemu/snapshots/nanos_eip191_nonascii/00004.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_nonascii/00005.png b/tests/zemu/snapshots/nanos_eip191_nonascii/00005.png
index f5c2d67..a259c69 100644
Binary files a/tests/zemu/snapshots/nanos_eip191_nonascii/00005.png and b/tests/zemu/snapshots/nanos_eip191_nonascii/00005.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_nonascii/00006.png b/tests/zemu/snapshots/nanos_eip191_nonascii/00006.png
index d55782f..4ce22f6 100644
Binary files a/tests/zemu/snapshots/nanos_eip191_nonascii/00006.png and b/tests/zemu/snapshots/nanos_eip191_nonascii/00006.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_nonascii/00008.png b/tests/zemu/snapshots/nanos_eip191_nonascii/00008.png
index ce795f3..d55782f 100644
Binary files a/tests/zemu/snapshots/nanos_eip191_nonascii/00008.png and b/tests/zemu/snapshots/nanos_eip191_nonascii/00008.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_nonascii/00009.png b/tests/zemu/snapshots/nanos_eip191_nonascii/00009.png
new file mode 100644
index 0000000..f5c2d67
Binary files /dev/null and b/tests/zemu/snapshots/nanos_eip191_nonascii/00009.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_nonascii/00010.png b/tests/zemu/snapshots/nanos_eip191_nonascii/00010.png
new file mode 100644
index 0000000..ce795f3
Binary files /dev/null and b/tests/zemu/snapshots/nanos_eip191_nonascii/00010.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_opensea/00002.png b/tests/zemu/snapshots/nanos_eip191_opensea/00002.png
index 0676953..1fd8170 100644
Binary files a/tests/zemu/snapshots/nanos_eip191_opensea/00002.png and b/tests/zemu/snapshots/nanos_eip191_opensea/00002.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_opensea/00005.png b/tests/zemu/snapshots/nanos_eip191_opensea/00005.png
index 228f924..b1bddfe 100644
Binary files a/tests/zemu/snapshots/nanos_eip191_opensea/00005.png and b/tests/zemu/snapshots/nanos_eip191_opensea/00005.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_opensea/00006.png b/tests/zemu/snapshots/nanos_eip191_opensea/00006.png
index f5c2d67..6b52a09 100644
Binary files a/tests/zemu/snapshots/nanos_eip191_opensea/00006.png and b/tests/zemu/snapshots/nanos_eip191_opensea/00006.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_opensea/00007.png b/tests/zemu/snapshots/nanos_eip191_opensea/00007.png
index d55782f..56b7f7b 100644
Binary files a/tests/zemu/snapshots/nanos_eip191_opensea/00007.png and b/tests/zemu/snapshots/nanos_eip191_opensea/00007.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_opensea/00008.png b/tests/zemu/snapshots/nanos_eip191_opensea/00008.png
index f5c2d67..d5c4fde 100644
Binary files a/tests/zemu/snapshots/nanos_eip191_opensea/00008.png and b/tests/zemu/snapshots/nanos_eip191_opensea/00008.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_opensea/00009.png b/tests/zemu/snapshots/nanos_eip191_opensea/00009.png
index ce795f3..407da90 100644
Binary files a/tests/zemu/snapshots/nanos_eip191_opensea/00009.png and b/tests/zemu/snapshots/nanos_eip191_opensea/00009.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_opensea/00010.png b/tests/zemu/snapshots/nanos_eip191_opensea/00010.png
new file mode 100644
index 0000000..481c8dc
Binary files /dev/null and b/tests/zemu/snapshots/nanos_eip191_opensea/00010.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_opensea/00011.png b/tests/zemu/snapshots/nanos_eip191_opensea/00011.png
new file mode 100644
index 0000000..ff9dba9
Binary files /dev/null and b/tests/zemu/snapshots/nanos_eip191_opensea/00011.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_opensea/00012.png b/tests/zemu/snapshots/nanos_eip191_opensea/00012.png
new file mode 100644
index 0000000..e179c29
Binary files /dev/null and b/tests/zemu/snapshots/nanos_eip191_opensea/00012.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_opensea/00013.png b/tests/zemu/snapshots/nanos_eip191_opensea/00013.png
new file mode 100644
index 0000000..6b52a09
Binary files /dev/null and b/tests/zemu/snapshots/nanos_eip191_opensea/00013.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_opensea/00014.png b/tests/zemu/snapshots/nanos_eip191_opensea/00014.png
new file mode 100644
index 0000000..f5c2d67
Binary files /dev/null and b/tests/zemu/snapshots/nanos_eip191_opensea/00014.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_opensea/00015.png b/tests/zemu/snapshots/nanos_eip191_opensea/00015.png
new file mode 100644
index 0000000..d55782f
Binary files /dev/null and b/tests/zemu/snapshots/nanos_eip191_opensea/00015.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_opensea/00016.png b/tests/zemu/snapshots/nanos_eip191_opensea/00016.png
new file mode 100644
index 0000000..f5c2d67
Binary files /dev/null and b/tests/zemu/snapshots/nanos_eip191_opensea/00016.png differ
diff --git a/tests/zemu/snapshots/nanos_eip191_opensea/00017.png b/tests/zemu/snapshots/nanos_eip191_opensea/00017.png
new file mode 100644
index 0000000..ce795f3
Binary files /dev/null and b/tests/zemu/snapshots/nanos_eip191_opensea/00017.png differ
diff --git a/tests/zemu/snapshots/nanox_eip191_nonascii/00001.png b/tests/zemu/snapshots/nanox_eip191_nonascii/00001.png
index 93eda35..6a5f8e8 100644
Binary files a/tests/zemu/snapshots/nanox_eip191_nonascii/00001.png and b/tests/zemu/snapshots/nanox_eip191_nonascii/00001.png differ
diff --git a/tests/zemu/snapshots/nanox_eip191_nonascii/00002.png b/tests/zemu/snapshots/nanox_eip191_nonascii/00002.png
index 873634e..78d7d1d 100644
Binary files a/tests/zemu/snapshots/nanox_eip191_nonascii/00002.png and b/tests/zemu/snapshots/nanox_eip191_nonascii/00002.png differ
diff --git a/tests/zemu/snapshots/nanox_eip191_opensea/00001.png b/tests/zemu/snapshots/nanox_eip191_opensea/00001.png
index 802fad5..4f59a8d 100644
Binary files a/tests/zemu/snapshots/nanox_eip191_opensea/00001.png and b/tests/zemu/snapshots/nanox_eip191_opensea/00001.png differ
diff --git a/tests/zemu/snapshots/nanox_eip191_opensea/00002.png b/tests/zemu/snapshots/nanox_eip191_opensea/00002.png
index a3ba739..c094bc6 100644
Binary files a/tests/zemu/snapshots/nanox_eip191_opensea/00002.png and b/tests/zemu/snapshots/nanox_eip191_opensea/00002.png differ
diff --git a/tests/zemu/snapshots/nanox_eip191_opensea/00003.png b/tests/zemu/snapshots/nanox_eip191_opensea/00003.png
index 4601bca..9a3efb7 100644
Binary files a/tests/zemu/snapshots/nanox_eip191_opensea/00003.png and b/tests/zemu/snapshots/nanox_eip191_opensea/00003.png differ
diff --git a/tests/zemu/snapshots/nanox_eip191_opensea/00004.png b/tests/zemu/snapshots/nanox_eip191_opensea/00004.png
index eab9f1d..657edb5 100644
Binary files a/tests/zemu/snapshots/nanox_eip191_opensea/00004.png and b/tests/zemu/snapshots/nanox_eip191_opensea/00004.png differ
diff --git a/tests/zemu/snapshots/nanox_eip191_opensea/00005.png b/tests/zemu/snapshots/nanox_eip191_opensea/00005.png
index 0b4bdbd..1f135ae 100644
Binary files a/tests/zemu/snapshots/nanox_eip191_opensea/00005.png and b/tests/zemu/snapshots/nanox_eip191_opensea/00005.png differ
diff --git a/tests/zemu/snapshots/nanox_eip191_opensea/00006.png b/tests/zemu/snapshots/nanox_eip191_opensea/00006.png
index c9da92b..fd32ace 100644
Binary files a/tests/zemu/snapshots/nanox_eip191_opensea/00006.png and b/tests/zemu/snapshots/nanox_eip191_opensea/00006.png differ
diff --git a/tests/zemu/snapshots/nanox_eip191_opensea/00007.png b/tests/zemu/snapshots/nanox_eip191_opensea/00007.png
index 121cfd5..f29ed00 100644
Binary files a/tests/zemu/snapshots/nanox_eip191_opensea/00007.png and b/tests/zemu/snapshots/nanox_eip191_opensea/00007.png differ
diff --git a/tests/zemu/snapshots/nanox_eip191_opensea/00008.png b/tests/zemu/snapshots/nanox_eip191_opensea/00008.png
index c9da92b..8af3d9c 100644
Binary files a/tests/zemu/snapshots/nanox_eip191_opensea/00008.png and b/tests/zemu/snapshots/nanox_eip191_opensea/00008.png differ
diff --git a/tests/zemu/snapshots/nanox_eip191_opensea/00009.png b/tests/zemu/snapshots/nanox_eip191_opensea/00009.png
index a58590b..c9da92b 100644
Binary files a/tests/zemu/snapshots/nanox_eip191_opensea/00009.png and b/tests/zemu/snapshots/nanox_eip191_opensea/00009.png differ
diff --git a/tests/zemu/snapshots/nanox_eip191_opensea/00010.png b/tests/zemu/snapshots/nanox_eip191_opensea/00010.png
new file mode 100644
index 0000000..121cfd5
Binary files /dev/null and b/tests/zemu/snapshots/nanox_eip191_opensea/00010.png differ
diff --git a/tests/zemu/snapshots/nanox_eip191_opensea/00011.png b/tests/zemu/snapshots/nanox_eip191_opensea/00011.png
new file mode 100644
index 0000000..c9da92b
Binary files /dev/null and b/tests/zemu/snapshots/nanox_eip191_opensea/00011.png differ
diff --git a/tests/zemu/snapshots/nanox_eip191_opensea/00012.png b/tests/zemu/snapshots/nanox_eip191_opensea/00012.png
new file mode 100644
index 0000000..a58590b
Binary files /dev/null and b/tests/zemu/snapshots/nanox_eip191_opensea/00012.png differ
diff --git a/tests/zemu/src/eip191.test.js b/tests/zemu/src/eip191.test.js
index 2223256..c54b013 100644
--- a/tests/zemu/src/eip191.test.js
+++ b/tests/zemu/src/eip191.test.js
@@ -34,7 +34,7 @@ nano_models.forEach(function(model) {
 
         await waitForAppScreen(sim);
 
-        const rclicks = (model.letter == 'S') ? 6 : 4;
+        const rclicks = (model.letter == 'S') ? 8 : 4;
         await sim.navigateAndCompareSnapshots('.', model.name + '_eip191_nonascii', [rclicks, -1, 0]);
 
         await expect(tx).resolves.toEqual({
@@ -54,7 +54,14 @@ nano_models.forEach(function(model) {
 
         await waitForAppScreen(sim);
 
-        await sim.navigateAndCompareSnapshots('.', model.name + '_eip191_opensea', [7, -1, 0]);
+        if (model.letter == 'S')
+        {
+            await sim.navigateAndCompareSnapshots('.', model.name + '_eip191_opensea', [1, 5, 1, 6, 0, 1, -1, 0]);
+        }
+        else
+        {
+            await sim.navigateAndCompareSnapshots('.', model.name + '_eip191_opensea', [1, 5, 1, 2, 1, -1, 0]);
+        }
 
         await expect(tx).resolves.toEqual({
             "v": 28,