Make default icons the same on mobile and extension #13264 (#13408)

3 years ago · 5095071083
parent 2cd242252f
commit 5095071083
61 changed files with 242 additions and 378 deletions
--- a/app/_locales/am/messages.json
+++ b/app/_locales/am/messages.json
@ -133,9 +133,6 @@
    "message": "መለያን በ$1እይ",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Blockies Identicon ተጠቀም"
-  },
  "browserNotSupported": {
    "message": "ማሰሺያዎት አልተደገፈም..."
  },
--- a/app/_locales/ar/messages.json
+++ b/app/_locales/ar/messages.json
@ -147,9 +147,6 @@
    "message": "عرض الحساب في $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "استخدم خدمة تكتلات Blockies Identicon"
-  },
  "browserNotSupported": {
    "message": "متصفحك غير مدعوم..."
  },
--- a/app/_locales/bg/messages.json
+++ b/app/_locales/bg/messages.json
@ -139,9 +139,6 @@
    "message": "Преглед на акаунт на $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Използване на Blockies Identicon"
-  },
  "browserNotSupported": {
    "message": "Браузърът ви не се поддържа ..."
  },
--- a/app/_locales/bn/messages.json
+++ b/app/_locales/bn/messages.json
@ -139,9 +139,6 @@
    "message": "$1 এ অ্যাকাউন্ট দেখুন",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "ব্লকিজ আইডেন্টিকন ব্যবহার করুন"
-  },
  "browserNotSupported": {
    "message": "আপনার ব্রাউজার সমর্থিত নয়..."
  },
--- a/app/_locales/ca/messages.json
+++ b/app/_locales/ca/messages.json
@ -139,9 +139,6 @@
    "message": "Veure compte a $1 ",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Fer servir els Identicon Blockies"
-  },
  "browserNotSupported": {
    "message": "El teu navegador no és suportat..."
  },
--- a/app/_locales/cs/messages.json
+++ b/app/_locales/cs/messages.json
@ -51,9 +51,6 @@
  "balance": {
    "message": "Zůstatek:"
  },
-  "blockiesIdenticon": {
-    "message": "Použít Blockies Identicon"
-  },
  "cancel": {
    "message": "Zrušit"
  },
--- a/app/_locales/da/messages.json
+++ b/app/_locales/da/messages.json
@ -139,9 +139,6 @@
    "message": "Se konto på $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Brug Blockies Identicon"
-  },
  "browserNotSupported": {
    "message": "Din browser er ikke understøttet..."
  },
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@ -362,9 +362,6 @@
    "message": "Konto bei $1 anzeigen",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Blockies Identicon verwenden"
-  },
  "browserNotSupported": {
    "message": "Ihr Browser wird nicht unterstützt …"
  },
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@ -362,9 +362,6 @@
    "message": "Προβολή λογαριασμού με $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Χρήση Αναπαράστασης Μπλοκ"
-  },
  "browserNotSupported": {
    "message": "Το Πρόγραμμα Περιήγησής σας δεν υποστηρίζεται..."
  },
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@ -67,6 +67,9 @@
  "accountDetails": {
    "message": "Account details"
  },
+  "accountIdenticon": {
+    "message": "Account Identicon"
+  },
  "accountName": {
    "message": "Account Name"
  },
@ -371,8 +374,8 @@
    "message": "View account at $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Use Blockies Identicon"
+  "blockies": {
+    "message": "Blockies"
  },
  "browserNotSupported": {
    "message": "Your Browser is not supported..."
@ -1534,6 +1537,12 @@
  "ipfsGatewayDescription": {
    "message": "Enter the URL of the IPFS CID gateway to use for ENS content resolution."
  },
+  "jazzAndBlockies": {
+    "message": "Jazzicons and Blockies are two different styles of unique icons that help you identify an account at a glance."
+  },
+  "jazzicons": {
+    "message": "Jazzicons"
+  },
  "jsDeliver": {
    "message": "jsDeliver"
  },
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@ -233,9 +233,6 @@
    "message": "Ver cuenta en $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Usar Blockies Identicon"
-  },
  "browserNotSupported": {
    "message": "El explorador no es compatible…"
  },
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@ -362,9 +362,6 @@
    "message": "Ver cuenta en $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Usar Blockies Identicon"
-  },
  "browserNotSupported": {
    "message": "El explorador no es compatible..."
  },
--- a/app/_locales/et/messages.json
+++ b/app/_locales/et/messages.json
@ -139,9 +139,6 @@
    "message": "Vaata kontot $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Kasuta Blockies Identiconi"
-  },
  "browserNotSupported": {
    "message": "Teie lehitsejat ei toetata..."
  },
--- a/app/_locales/fa/messages.json
+++ b/app/_locales/fa/messages.json
@ -139,9 +139,6 @@
    "message": "مشاهده حساب در 1$1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "استفاده شناسا بلوک ها"
-  },
  "browserNotSupported": {
    "message": "مرورگر شما پشتیبانی نمیشود"
  },
--- a/app/_locales/fi/messages.json
+++ b/app/_locales/fi/messages.json
@ -139,9 +139,6 @@
    "message": "Näytä tili kohteessa $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Käytä Blockies Identiconia"
-  },
  "browserNotSupported": {
    "message": "Selaintasi ei tueta..."
  },
--- a/app/_locales/fil/messages.json
+++ b/app/_locales/fil/messages.json
@ -124,9 +124,6 @@
    "message": "Tingnan ang account sa $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Gumamit ng Blockies Identicon"
-  },
  "browserNotSupported": {
    "message": "Hindi sinusuportahan ang iyong Browser..."
  },
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@ -362,9 +362,6 @@
    "message": "Afficher le compte à $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Utiliser les Identicon Blockies"
-  },
  "browserNotSupported": {
    "message": "Votre navigateur internet n’est pas supporté..."
  },
--- a/app/_locales/he/messages.json
+++ b/app/_locales/he/messages.json
@ -139,9 +139,6 @@
    "message": "הצג חשבון ב- $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "השתמש ב- Blockies Identicon"
-  },
  "browserNotSupported": {
    "message": "הדפדפן שלך אינו נתמך..."
  },
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@ -362,9 +362,6 @@
    "message": "$1 पर खाता देखें",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "ब्लॉकीज़ आइडेंटिकॉन का उपयोग करें"
-  },
  "browserNotSupported": {
    "message": "आपका ब्राउज़र समर्थित नहीं है..."
  },
--- a/app/_locales/hn/messages.json
+++ b/app/_locales/hn/messages.json
@ -45,9 +45,6 @@
  "balance": {
    "message": "उपलब्ध बैलेंस।"
  },
-  "blockiesIdenticon": {
-    "message": "ब्लॉकीज पहचान का उपयोग करें"
-  },
  "cancel": {
    "message": "रद्द करें"
  },
--- a/app/_locales/hr/messages.json
+++ b/app/_locales/hr/messages.json
@ -139,9 +139,6 @@
    "message": "Prikaži račun u $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Upotrijebi identifikaciju blokovima"
-  },
  "browserNotSupported": {
    "message": "Vaš se preglednik ne podržava..."
  },
--- a/app/_locales/ht/messages.json
+++ b/app/_locales/ht/messages.json
@ -78,9 +78,6 @@
  "balance": {
    "message": "Balans"
  },
-  "blockiesIdenticon": {
-    "message": "Itilize Blockies Identicon"
-  },
  "browserNotSupported": {
    "message": "Navigatè ou a pa sipòte..."
  },
--- a/app/_locales/hu/messages.json
+++ b/app/_locales/hu/messages.json
@ -139,9 +139,6 @@
    "message": "Tekintse meg a fiókot a(z) $1-en",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Blockies identikon használata"
-  },
  "browserNotSupported": {
    "message": "Az ön böngészője nem támogatott..."
  },
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@ -362,9 +362,6 @@
    "message": "Lihat akun di $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Gunakan Blockies Identicon"
-  },
  "browserNotSupported": {
    "message": "Peramban Anda tidak didukung..."
  },
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@ -197,9 +197,6 @@
    "message": "Visualizza account su $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Usa le icone Blockie"
-  },
  "browserNotSupported": {
    "message": "Il tuo Browser non è supportato..."
  },
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@ -362,9 +362,6 @@
    "message": "$1のアカウントを表示",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Blockiesアイデンティコンの使用"
-  },
  "browserNotSupported": {
    "message": "ご使用のブラウザはサポートされていません..."
  },
--- a/app/_locales/kn/messages.json
+++ b/app/_locales/kn/messages.json
@ -139,9 +139,6 @@
    "message": " $1 ನಲ್ಲಿ ಖಾತೆಯನ್ನು ವೀಕ್ಷಿಸಿ",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "ಬ್ಲಾಕೀಸ್ ಐಡೆಂಟಿಕಾನ್ ಬಳಸಿ"
-  },
  "browserNotSupported": {
    "message": "ನಿಮ್ಮ ಬ್ರೌಸರ್ ಬೆಂಬಲಿಸುತ್ತಿಲ್ಲ..."
  },
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@ -362,9 +362,6 @@
    "message": "$1의 계정 보기",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Blockies 아이덴티콘 사용"
-  },
  "browserNotSupported": {
    "message": "지원되지 않는 브라우저입니다..."
  },
--- a/app/_locales/lt/messages.json
+++ b/app/_locales/lt/messages.json
@ -139,9 +139,6 @@
    "message": "Peržiūrėti paskyrą $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "„Blockies Identicon“ naudojimas"
-  },
  "browserNotSupported": {
    "message": "Jūsų naršyklė neatpažįstama..."
  },
--- a/app/_locales/lv/messages.json
+++ b/app/_locales/lv/messages.json
@ -139,9 +139,6 @@
    "message": "Skatīt kontu $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Izmantot blok indentifikatoru"
-  },
  "browserNotSupported": {
    "message": "Jūsu pārlūkprogramma netiek atbalstīta..."
  },
--- a/app/_locales/ms/messages.json
+++ b/app/_locales/ms/messages.json
@ -139,9 +139,6 @@
    "message": "Lihat akaun pada $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Gunakan Identicon Blockies"
-  },
  "browserNotSupported": {
    "message": "Pelayar anda tidak disokong..."
  },
--- a/app/_locales/nl/messages.json
+++ b/app/_locales/nl/messages.json
@ -45,9 +45,6 @@
  "balance": {
    "message": "Balans:"
  },
-  "blockiesIdenticon": {
-    "message": "Gebruik Blockies Identicon"
-  },
  "cancel": {
    "message": "Annuleer"
  },
--- a/app/_locales/no/messages.json
+++ b/app/_locales/no/messages.json
@ -139,9 +139,6 @@
    "message": "Se konto på $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Bruk Blockies Identicon"
-  },
  "browserNotSupported": {
    "message": "Nettleseren din støttes ikke ..."
  },
--- a/app/_locales/ph/messages.json
+++ b/app/_locales/ph/messages.json
@ -233,9 +233,6 @@
    "message": "Tingnan ang account sa $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Gumamit ng Blockies Identicon"
-  },
  "browserNotSupported": {
    "message": "Hindi sinusuportahan ang iyong Browser..."
  },
--- a/app/_locales/pl/messages.json
+++ b/app/_locales/pl/messages.json
@ -139,9 +139,6 @@
    "message": "Wyświetl konto w $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Użyj Blockies Identicon"
-  },
  "browserNotSupported": {
    "message": "Twoja przeglądarka nie jest obsługiwana..."
  },
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@ -45,9 +45,6 @@
  "balance": {
    "message": "Saldo:"
  },
-  "blockiesIdenticon": {
-    "message": "Usar Blockies Identicon"
-  },
  "cancel": {
    "message": "Cancelar"
  },
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@ -362,9 +362,6 @@
    "message": "Exibir conta em $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Usar identicon de Blockies"
-  },
  "browserNotSupported": {
    "message": "Seu navegador não é compatível..."
  },
--- a/app/_locales/ro/messages.json
+++ b/app/_locales/ro/messages.json
@ -139,9 +139,6 @@
    "message": "Vizualizare cont la $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Folosește Blockies Identicon"
-  },
  "browserNotSupported": {
    "message": "Browserul dvs. nu este compatibil..."
  },
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@ -362,9 +362,6 @@
    "message": "Посмотреть счет в $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Использовать идентикон Blockies"
-  },
  "browserNotSupported": {
    "message": "Ваш браузер не поддерживается..."
  },
--- a/app/_locales/sk/messages.json
+++ b/app/_locales/sk/messages.json
@ -133,9 +133,6 @@
    "message": "Zobraziť účet na $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Použít Blockies Identicon"
-  },
  "browserNotSupported": {
    "message": "Váš prehliadač nie je podporovaný..."
  },
--- a/app/_locales/sl/messages.json
+++ b/app/_locales/sl/messages.json
@ -139,9 +139,6 @@
    "message": "Ogled računa na  $1 ",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Uporabi identifikacijo Blockies"
-  },
  "browserNotSupported": {
    "message": "Vaš brskalnik ni podptrt ..."
  },
--- a/app/_locales/sr/messages.json
+++ b/app/_locales/sr/messages.json
@ -139,9 +139,6 @@
    "message": "Pogledajte nalog za $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Koristite „Blockies Identicon”"
-  },
  "browserNotSupported": {
    "message": "Vaš pregledač nije podržan..."
  },
--- a/app/_locales/sv/messages.json
+++ b/app/_locales/sv/messages.json
@ -139,9 +139,6 @@
    "message": "Visa konto på $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Använd Blockies Identicon"
-  },
  "browserNotSupported": {
    "message": "Din webbläsare stöds inte..."
  },
--- a/app/_locales/sw/messages.json
+++ b/app/_locales/sw/messages.json
@ -136,9 +136,6 @@
    "message": "Tazama akaunti kwenye $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Tumia Blockies Identicon"
-  },
  "browserNotSupported": {
    "message": "Kivinjari chaku hakiwezeshwi..."
  },
--- a/app/_locales/ta/messages.json
+++ b/app/_locales/ta/messages.json
@ -60,9 +60,6 @@
  "basic": {
    "message": "அடிப்படை"
  },
-  "blockiesIdenticon": {
-    "message": "ப்ளாக்கிஸ் ஐடென்டிகோன் பயன்பாட்டு"
-  },
  "cancel": {
    "message": "ரத்து செய்"
  },
--- a/app/_locales/th/messages.json
+++ b/app/_locales/th/messages.json
@ -54,9 +54,6 @@
  "balance": {
    "message": "ยอดคงเหลือ:"
  },
-  "blockiesIdenticon": {
-    "message": "ใช้งาน Blockies Identicon"
-  },
  "cancel": {
    "message": "ยกเลิก"
  },
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@ -362,9 +362,6 @@
    "message": "Tingnan ang account sa $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Gumamit ng Blockies Identicon"
-  },
  "browserNotSupported": {
    "message": "Hindi sinusuportahan ang iyong Browser..."
  },
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@ -362,9 +362,6 @@
    "message": "Hesabı şurada görüntüleyin: $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Blockies Identicon kullan"
-  },
  "browserNotSupported": {
    "message": "Tarayıcınız desteklenmiyor..."
  },
--- a/app/_locales/uk/messages.json
+++ b/app/_locales/uk/messages.json
@ -139,9 +139,6 @@
    "message": "Переглянути обліковий запис на $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Викоритовувати Blockies Identicon"
-  },
  "browserNotSupported": {
    "message": "Ваш браузер не підтримується..."
  },
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@ -362,9 +362,6 @@
    "message": "Xem tài khoản tại $1",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "Dùng biểu tượng nhận dạng kiểu Blockies"
-  },
  "browserNotSupported": {
    "message": "Trình duyệt của bạn không được hỗ trợ..."
  },
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@ -362,9 +362,6 @@
    "message": "通过 $1 查看账户",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "使用 Blockies Identicon 图标头像"
-  },
  "browserNotSupported": {
    "message": "您的浏览器不支持该功能……"
  },
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@ -139,9 +139,6 @@
    "message": "在 $1 觀看帳號 ",
    "description": "$1 replaced by URL for custom block explorer"
  },
-  "blockiesIdenticon": {
-    "message": "使用像素風格代表圖案"
-  },
  "browserNotSupported": {
    "message": "您的瀏覽器尚未支援..."
  },
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
@ -1052,16 +1052,6 @@
        "buffer-equal": true
      }
    },
-    "are-we-there-yet": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "util.inherits": true
-      },
-      "packages": {
-        "delegates": true,
-        "readable-stream": true
-      }
-    },
    "arr-diff": {
      "packages": {
        "arr-flatten": true,
@ -1470,7 +1460,6 @@
        "anymatch": true,
        "async-each": true,
        "braces": true,
-        "fsevents": true,
        "glob-parent": true,
        "inherits": true,
        "is-binary-path": true,
@ -1737,16 +1726,6 @@
        "through2": true
      }
    },
-    "detect-libc": {
-      "builtin": {
-        "child_process.spawnSync": true,
-        "fs.readdirSync": true,
-        "os.platform": true
-      },
-      "globals": {
-        "process.env": true
-      }
-    },
    "detective": {
      "packages": {
        "acorn-node": true,
@ -2450,45 +2429,6 @@
        "process.version": true
      }
    },
-    "fsevents": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "fs.stat": true,
-        "path.join": true,
-        "util.inherits": true
-      },
-      "globals": {
-        "__dirname": true,
-        "process.nextTick": true,
-        "process.platform": true,
-        "setImmediate": true
-      },
-      "native": true,
-      "packages": {
-        "node-pre-gyp": true
-      }
-    },
-    "gauge": {
-      "builtin": {
-        "util.format": true
-      },
-      "globals": {
-        "clearInterval": true,
-        "process": true,
-        "setImmediate": true,
-        "setInterval": true
-      },
-      "packages": {
-        "aproba": true,
-        "console-control-strings": true,
-        "has-unicode": true,
-        "object-assign": true,
-        "signal-exit": true,
-        "string-width": true,
-        "strip-ansi": true,
-        "wide-align": true
-      }
-    },
    "get-assigned-identifiers": {
      "builtin": {
        "assert.equal": true
@ -2867,16 +2807,6 @@
        "process.argv": true
      }
    },
-    "has-unicode": {
-      "builtin": {
-        "os.type": true
-      },
-      "globals": {
-        "process.env.LANG": true,
-        "process.env.LC_ALL": true,
-        "process.env.LC_CTYPE": true
-      }
-    },
    "has-value": {
      "packages": {
        "get-value": true,
@ -3048,11 +2978,6 @@
        "is-plain-object": true
      }
    },
-    "is-fullwidth-code-point": {
-      "packages": {
-        "number-is-nan": true
-      }
-    },
    "is-glob": {
      "packages": {
        "is-extglob": true
@ -3583,56 +3508,6 @@
        "setTimeout": true
      }
    },
-    "node-pre-gyp": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "fs.existsSync": true,
-        "fs.readFileSync": true,
-        "fs.renameSync": true,
-        "path.dirname": true,
-        "path.existsSync": true,
-        "path.join": true,
-        "path.resolve": true,
-        "url.parse": true,
-        "url.resolve": true,
-        "util.inherits": true
-      },
-      "globals": {
-        "__dirname": true,
-        "console.log": true,
-        "process.arch": true,
-        "process.cwd": true,
-        "process.env": true,
-        "process.platform": true,
-        "process.version.substr": true,
-        "process.versions": true
-      },
-      "packages": {
-        "detect-libc": true,
-        "nopt": true,
-        "npmlog": true,
-        "rimraf": true,
-        "semver": true
-      }
-    },
-    "nopt": {
-      "builtin": {
-        "path": true,
-        "stream.Stream": true,
-        "url": true
-      },
-      "globals": {
-        "console": true,
-        "process.argv": true,
-        "process.env.DEBUG_NOPT": true,
-        "process.env.NOPT_DEBUG": true,
-        "process.platform": true
-      },
-      "packages": {
-        "abbrev": true,
-        "osenv": true
-      }
-    },
    "normalize-package-data": {
      "builtin": {
        "url.parse": true,
@ -3660,22 +3535,6 @@
        "once": true
      }
    },
-    "npmlog": {
-      "builtin": {
-        "events.EventEmitter": true,
-        "util": true
-      },
-      "globals": {
-        "process.nextTick": true,
-        "process.stderr": true
-      },
-      "packages": {
-        "are-we-there-yet": true,
-        "console-control-strings": true,
-        "gauge": true,
-        "set-blocking": true
-      }
-    },
    "object-copy": {
      "packages": {
        "copy-descriptor": true,
@ -3757,54 +3616,6 @@
        "readable-stream": true
      }
    },
-    "os-homedir": {
-      "builtin": {
-        "os.homedir": true
-      },
-      "globals": {
-        "process.env": true,
-        "process.getuid": true,
-        "process.platform": true
-      }
-    },
-    "os-tmpdir": {
-      "globals": {
-        "process.env.SystemRoot": true,
-        "process.env.TEMP": true,
-        "process.env.TMP": true,
-        "process.env.TMPDIR": true,
-        "process.env.windir": true,
-        "process.platform": true
-      }
-    },
-    "osenv": {
-      "builtin": {
-        "child_process.exec": true,
-        "path": true
-      },
-      "globals": {
-        "process.env.COMPUTERNAME": true,
-        "process.env.ComSpec": true,
-        "process.env.EDITOR": true,
-        "process.env.HOSTNAME": true,
-        "process.env.PATH": true,
-        "process.env.PROMPT": true,
-        "process.env.PS1": true,
-        "process.env.Path": true,
-        "process.env.SHELL": true,
-        "process.env.USER": true,
-        "process.env.USERDOMAIN": true,
-        "process.env.USERNAME": true,
-        "process.env.VISUAL": true,
-        "process.env.path": true,
-        "process.nextTick": true,
-        "process.platform": true
-      },
-      "packages": {
-        "os-homedir": true,
-        "os-tmpdir": true
-      }
-    },
    "p-limit": {
      "packages": {
        "p-try": true
@ -4514,12 +4325,6 @@
        "lru-cache": true
      }
    },
-    "set-blocking": {
-      "globals": {
-        "process.stderr": true,
-        "process.stdout": true
-      }
-    },
    "set-value": {
      "packages": {
        "extend-shallow": true,
@ -4783,7 +4588,6 @@
    },
    "string-width": {
      "packages": {
-        "code-point-at": true,
        "emoji-regex": true,
        "is-fullwidth-code-point": true,
        "strip-ansi": true
@ -5436,11 +5240,6 @@
        "isexe": true
      }
    },
-    "wide-align": {
-      "packages": {
-        "string-width": true
-      }
-    },
    "write": {
      "builtin": {
        "fs.createWriteStream": true,
--- a/package.json
+++ b/package.json
@ -310,6 +310,7 @@
    "history": "^5.0.0",
    "improved-yarn-audit": "^3.0.0",
    "jest": "^26.6.3",
+    "jest-canvas-mock": "^2.3.1",
    "jsdom": "^11.2.0",
    "koa": "^2.7.0",
    "lavamoat": "^5.3.5",
--- a/test/e2e/tests/threebox.spec.js
+++ b/test/e2e/tests/threebox.spec.js
@ -1,4 +1,3 @@
-const { strict: assert } = require('assert');
 const { convertToHexValue, withFixtures, largeDelayMs } = require('../helpers');
 const ThreeboxMockServer = require('../mock-3box/threebox-mock-server');

@ -83,11 +82,6 @@ describe('Threebox', function () {
        await driver.clickElement('.account-menu__icon');
        await driver.clickElement({ text: 'Settings', tag: 'div' });

-        // finds the blockies toggle turned on
-        const toggleLabel = await driver.findElement('.toggle-button__status');
-        const toggleLabelText = await toggleLabel.getText();
-        assert.equal(toggleLabelText, 'ON');
-
        // finds the restored address in the contact list
        await driver.clickElement({ text: 'Contacts', tag: 'div' });
        await driver.findElement({ text: 'Test User Name 11', tag: 'div' });
--- a/ui/components/ui/identicon/blockieIdenticon/blockieIdenticon.component.js
+++ b/ui/components/ui/identicon/blockieIdenticon/blockieIdenticon.component.js
@ -2,7 +2,7 @@ import React, { useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
 import { renderIcon } from '@download/blockies';

-const BlockieIdenticon = ({ address, diameter, alt }) => {
+const BlockieIdenticon = ({ address, diameter, alt = '', borderRadius }) => {
  const [dataUrl, setDataUrl] = useState(null);
  const canvasRef = useRef(null);

@ -19,7 +19,15 @@ const BlockieIdenticon = ({ address, diameter, alt }) => {
  return (
    <>
      <canvas ref={canvasRef} style={{ display: 'none' }} />
-      <img src={dataUrl} height={diameter} width={diameter} alt={alt || ''} />
+      <img
+        src={dataUrl}
+        height={diameter}
+        width={diameter}
+        style={{
+          borderRadius,
+        }}
+        alt={alt}
+      />
    </>
  );
 };
@ -28,6 +36,7 @@ BlockieIdenticon.propTypes = {
  address: PropTypes.string.isRequired,
  diameter: PropTypes.number.isRequired,
  alt: PropTypes.string,
+  borderRadius: PropTypes.string,
 };

 export default BlockieIdenticon;
--- a/ui/pages/settings/index.scss
+++ b/ui/pages/settings/index.scss
@ -205,6 +205,39 @@
    & .dialog {
      margin-top: 10px;
    }
+
+    &__identicon {
+      display: flex;
+      flex-direction: row;
+      align-items: baseline;
+
+      &__item {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: space-between;
+
+        &__icon {
+          &--active {
+            height: 40px;
+            width: 40px;
+            border-radius: 40px;
+            border: 2px solid #037dd6;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+          }
+        }
+      }
+    }
+
+    &__description {
+      @include H6;
+
+      margin-top: 8px;
+      margin-bottom: 12px;
+      color: var(--dusty-gray);
+    }
  }

  &__content-label {
--- a/ui/pages/settings/settings-tab/settings-tab.component.js
+++ b/ui/pages/settings/settings-tab/settings-tab.component.js
@ -1,9 +1,14 @@
 import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
+import classnames from 'classnames';
 import availableCurrencies from '../../../helpers/constants/available-conversions.json';
+import { TYPOGRAPHY, COLORS } from '../../../helpers/constants/design-system';
 import Dropdown from '../../../components/ui/dropdown';
 import ToggleButton from '../../../components/ui/toggle-button';
 import locales from '../../../../app/_locales/index.json';
+import Jazzicon from '../../../components/ui/jazzicon';
+import BlockieIdenticon from '../../../components/ui/identicon/blockieIdenticon';
+import Typography from '../../../components/ui/typography';

 const sortedCurrencies = availableCurrencies.sort((a, b) => {
  return a.name.toLocaleLowerCase().localeCompare(b.name.toLocaleLowerCase());
@ -43,6 +48,9 @@ export default class SettingsTab extends PureComponent {
    hideZeroBalanceTokens: PropTypes.bool,
    setHideZeroBalanceTokens: PropTypes.func,
    lastFetchedConversionDate: PropTypes.number,
+    selectedAddress: PropTypes.string,
+    useTokenDetection: PropTypes.bool,
+    tokenList: PropTypes.object,
  };

  renderCurrentConversion() {
@ -136,21 +144,85 @@ export default class SettingsTab extends PureComponent {

  renderBlockieOptIn() {
    const { t } = this.context;
-    const { useBlockie, setUseBlockie } = this.props;
+    const {
+      useBlockie,
+      setUseBlockie,
+      selectedAddress,
+      useTokenDetection,
+      tokenList,
+    } = this.props;
+
+    const getIconStyles = () => ({
+      display: 'block',
+      borderRadius: '16px',
+      width: '32px',
+      height: '32px',
+    });

    return (
      <div className="settings-page__content-row" id="blockie-optin">
        <div className="settings-page__content-item">
-          <span>{this.context.t('blockiesIdenticon')}</span>
-        </div>
-        <div className="settings-page__content-item">
-          <div className="settings-page__content-item-col">
-            <ToggleButton
-              value={useBlockie}
-              onToggle={(value) => setUseBlockie(!value)}
-              offLabel={t('off')}
-              onLabel={t('on')}
-            />
+          <Typography variant={TYPOGRAPHY.H5} color={COLORS.BLACK}>
+            {t('accountIdenticon')}
+          </Typography>
+          <span className="settings-page__content-item__description">
+            {t('jazzAndBlockies')}
+          </span>
+          <div className="settings-page__content-item__identicon">
+            <div className="settings-page__content-item__identicon__item">
+              <div
+                data-test-id="jazz_icon"
+                className={classnames(
+                  'settings-page__content-item__identicon__item__icon',
+                  {
+                    'settings-page__content-item__identicon__item__icon--active': !useBlockie,
+                  },
+                )}
+                onClick={() => setUseBlockie(false)}
+              >
+                <Jazzicon
+                  id="jazzicon"
+                  address={selectedAddress}
+                  diameter={32}
+                  useTokenDetection={useTokenDetection}
+                  tokenList={tokenList}
+                  style={getIconStyles()}
+                />
+              </div>
+              <Typography
+                color={COLORS.BLACK}
+                variant={TYPOGRAPHY.H7}
+                margin={[0, 12, 0, 3]}
+              >
+                {t('jazzicons')}
+              </Typography>
+            </div>
+            <div className="settings-page__content-item__identicon__item">
+              <div
+                data-test-id="blockie_icon"
+                className={classnames(
+                  'settings-page__content-item__identicon__item__icon',
+                  {
+                    'settings-page__content-item__identicon__item__icon--active': useBlockie,
+                  },
+                )}
+                onClick={() => setUseBlockie(true)}
+              >
+                <BlockieIdenticon
+                  id="blockies"
+                  address={selectedAddress}
+                  diameter={32}
+                  borderRadius="50%"
+                />
+              </div>
+              <Typography
+                color={COLORS.BLACK}
+                variant={TYPOGRAPHY.H7}
+                margin={[0, 0, 0, 3]}
+              >
+                {t('blockies')}
+              </Typography>
+            </div>
          </div>
        </div>
      </div>
--- a/ui/pages/settings/settings-tab/settings-tab.container.js
+++ b/ui/pages/settings/settings-tab/settings-tab.container.js
@ -20,6 +20,9 @@ const mapStateToProps = (state, ownProps) => {
    nativeCurrency,
    useBlockie,
    currentLocale,
+    selectedAddress,
+    useTokenDetection,
+    tokenList,
  } = metamask;
  const {
    useNativeCurrencyAsPrimaryCurrency,
@ -37,6 +40,9 @@ const mapStateToProps = (state, ownProps) => {
    useNativeCurrencyAsPrimaryCurrency,
    hideZeroBalanceTokens,
    lastFetchedConversionDate,
+    selectedAddress,
+    useTokenDetection,
+    tokenList,
  };
 };

--- a/ui/pages/settings/settings-tab/settings-tab.container.test.js
+++ b/ui/pages/settings/settings-tab/settings-tab.container.test.js
@ -2,6 +2,7 @@ import React from 'react';
 import sinon from 'sinon';
 import { mount } from 'enzyme';
 import SettingsTab from './settings-tab.container';
+import 'jest-canvas-mock';

 describe('Settings Tab', () => {
  let wrapper;
@ -20,6 +21,72 @@ describe('Settings Tab', () => {
    conversionDate: 1,
    nativeCurrency: 'eth',
    useNativeCurrencyAsPrimaryCurrency: true,
+    selectedAddress: '0x5CfE73b6021E818B776b421B1c4Db2474086a7e1',
+    tokenList: {
+      '0x6b175474e89094c44da98b954eedeac495271d0f': {
+        address: '0x6b175474e89094c44da98b954eedeac495271d0f',
+        symbol: 'META',
+        decimals: 18,
+        image: 'metamark.svg',
+        unlisted: false,
+      },
+      '0xB8c77482e45F1F44dE1745F52C74426C631bDD52': {
+        address: '0xB8c77482e45F1F44dE1745F52C74426C631bDD52',
+        symbol: '0X',
+        decimals: 18,
+        image: '0x.svg',
+        unlisted: false,
+      },
+      '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984': {
+        address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
+        symbol: 'AST',
+        decimals: 18,
+        image: 'ast.png',
+        unlisted: false,
+      },
+      '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2': {
+        address: '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2',
+        symbol: 'BAT',
+        decimals: 18,
+        image: 'BAT_icon.svg',
+        unlisted: false,
+      },
+      '0xe83cccfabd4ed148903bf36d4283ee7c8b3494d1': {
+        address: '0xe83cccfabd4ed148903bf36d4283ee7c8b3494d1',
+        symbol: 'CVL',
+        decimals: 18,
+        image: 'CVL_token.svg',
+        unlisted: false,
+      },
+      '0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e': {
+        address: '0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e',
+        symbol: 'GLA',
+        decimals: 18,
+        image: 'gladius.svg',
+        unlisted: false,
+      },
+      '0x467Bccd9d29f223BcE8043b84E8C8B282827790F': {
+        address: '0x467Bccd9d29f223BcE8043b84E8C8B282827790F',
+        symbol: 'GNO',
+        decimals: 18,
+        image: 'gnosis.svg',
+        unlisted: false,
+      },
+      '0xff20817765cb7f73d4bde2e66e067e58d11095c2': {
+        address: '0xff20817765cb7f73d4bde2e66e067e58d11095c2',
+        symbol: 'OMG',
+        decimals: 18,
+        image: 'omg.jpg',
+        unlisted: false,
+      },
+      '0x8e870d67f660d95d5be530380d0ec0bd388289e1': {
+        address: '0x8e870d67f660d95d5be530380d0ec0bd388289e1',
+        symbol: 'WED',
+        decimals: 18,
+        image: 'wed.png',
+        unlisted: false,
+      },
+    },
  };
  beforeEach(() => {
    wrapper = mount(<SettingsTab.WrappedComponent {...props} />, {
@ -52,13 +119,20 @@ describe('Settings Tab', () => {
    ).toStrictEqual(true);
  });

-  it('toggles blockies', () => {
-    const toggleBlockies = wrapper.find('#blockie-optin input');
+  it('clicks jazzicon', () => {
+    const toggleBlockies = wrapper.find('#jazzicon');

    toggleBlockies.simulate('click');
    expect(props.setUseBlockie.calledOnce).toStrictEqual(true);
  });

+  it('clicks blockies icon', () => {
+    const toggleBlockies = wrapper.find('#blockies');
+
+    toggleBlockies.simulate('click');
+    expect(props.setUseBlockie.calledOnce).toStrictEqual(false);
+  });
+
  it('toggles hiding zero balance', () => {
    const toggleBlockies = wrapper.find('#toggle-zero-balance input');

--- a/yarn.lock
+++ b/yarn.lock
@ -8161,7 +8161,7 @@ color-name@1.1.3:
  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=

-color-name@^1.0.0, color-name@~1.1.4:
+color-name@^1.0.0, color-name@^1.1.4, color-name@~1.1.4:
  version "1.1.4"
  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
@ -8902,6 +8902,11 @@ cssesc@^3.0.0:
  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==

+cssfontparser@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/cssfontparser/-/cssfontparser-1.2.1.tgz#f4022fc8f9700c68029d542084afbaf425a3f3e3"
+  integrity sha1-9AIvyPlwDGgCnVQghK+69CWj8+M=
+
 cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0", cssom@~0.3.6:
  version "0.3.8"
  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
@ -15952,6 +15957,14 @@ jed@1.1.1:
  resolved "https://registry.yarnpkg.com/jed/-/jed-1.1.1.tgz#7a549bbd9ffe1585b0cd0a191e203055bee574b4"
  integrity sha1-elSbvZ/+FYWwzQoZHiAwVb7ldLQ=

+jest-canvas-mock@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/jest-canvas-mock/-/jest-canvas-mock-2.3.1.tgz#9535d14bc18ccf1493be36ac37dd349928387826"
+  integrity sha512-5FnSZPrX3Q2ZfsbYNE3wqKR3+XorN8qFzDzB5o0golWgt6EOX1+emBnpOc9IAQ+NXFj8Nzm3h7ZdE/9H0ylBcg==
+  dependencies:
+    cssfontparser "^1.2.1"
+    moo-color "^1.0.2"
+
 jest-changed-files@^26.6.2:
  version "26.6.2"
  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0"
@ -19060,6 +19073,13 @@ module-not-found-error@^1.0.1:
  resolved "https://registry.yarnpkg.com/module-not-found-error/-/module-not-found-error-1.0.1.tgz#cf8b4ff4f29640674d6cdd02b0e3bc523c2bbdc0"
  integrity sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA=

+moo-color@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/moo-color/-/moo-color-1.0.2.tgz#837c40758d2d58763825d1359a84e330531eca64"
+  integrity sha512-5iXz5n9LWQzx/C2WesGFfpE6RLamzdHwsn3KpfzShwbfIqs7stnoEpaNErf/7+3mbxwZ4s8Foq7I0tPxw7BWHg==
+  dependencies:
+    color-name "^1.1.4"
+
 moo@^0.4.3:
  version "0.4.3"
  resolved "https://registry.yarnpkg.com/moo/-/moo-0.4.3.tgz#3f847a26f31cf625a956a87f2b10fbc013bfd10e"