diff --git a/core/embed/rust/src/ui/model_mercury/res/arrow-right16.toif b/core/embed/rust/src/ui/model_mercury/res/arrow-right16.toif deleted file mode 100644 index 027edec0a2..0000000000 Binary files a/core/embed/rust/src/ui/model_mercury/res/arrow-right16.toif and /dev/null differ diff --git a/core/embed/rust/src/ui/model_mercury/res/asterisk16.png b/core/embed/rust/src/ui/model_mercury/res/asterisk16.png new file mode 100644 index 0000000000..aef8b22dd3 Binary files /dev/null and b/core/embed/rust/src/ui/model_mercury/res/asterisk16.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/asterisk16.toif b/core/embed/rust/src/ui/model_mercury/res/asterisk16.toif new file mode 100644 index 0000000000..47f7b4dc20 Binary files /dev/null and b/core/embed/rust/src/ui/model_mercury/res/asterisk16.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/autofill30.png b/core/embed/rust/src/ui/model_mercury/res/autofill30.png index 67c67a7b7a..ccb3762cc2 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/autofill30.png and b/core/embed/rust/src/ui/model_mercury/res/autofill30.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/autofill30.toif b/core/embed/rust/src/ui/model_mercury/res/autofill30.toif index 712fb68e25..ba4ccc5bf5 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/autofill30.toif and b/core/embed/rust/src/ui/model_mercury/res/autofill30.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/bullet_checkmark20.png b/core/embed/rust/src/ui/model_mercury/res/bullet_checkmark20.png index 0681bec6f3..ef74a5c652 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/bullet_checkmark20.png and b/core/embed/rust/src/ui/model_mercury/res/bullet_checkmark20.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/bullet_checkmark20.toif b/core/embed/rust/src/ui/model_mercury/res/bullet_checkmark20.toif index 3544814d68..0c75c1a801 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/bullet_checkmark20.toif and b/core/embed/rust/src/ui/model_mercury/res/bullet_checkmark20.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/cancel24.png b/core/embed/rust/src/ui/model_mercury/res/cancel24.png index 0ab5220ca0..5d3b1e5000 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/cancel24.png and b/core/embed/rust/src/ui/model_mercury/res/cancel24.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/cancel24.toif b/core/embed/rust/src/ui/model_mercury/res/cancel24.toif index 5344dea592..684d02cca8 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/cancel24.toif and b/core/embed/rust/src/ui/model_mercury/res/cancel24.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/caret-up24.toif b/core/embed/rust/src/ui/model_mercury/res/caret-up24.toif deleted file mode 100644 index 047c14a6d9..0000000000 Binary files a/core/embed/rust/src/ui/model_mercury/res/caret-up24.toif and /dev/null differ diff --git a/core/embed/rust/src/ui/model_mercury/res/check16.toif b/core/embed/rust/src/ui/model_mercury/res/check16.toif deleted file mode 100644 index a22d339fe9..0000000000 Binary files a/core/embed/rust/src/ui/model_mercury/res/check16.toif and /dev/null differ diff --git a/core/embed/rust/src/ui/model_mercury/res/chevron_left24.png b/core/embed/rust/src/ui/model_mercury/res/chevron_left24.png new file mode 100644 index 0000000000..d5b16ca78a Binary files /dev/null and b/core/embed/rust/src/ui/model_mercury/res/chevron_left24.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/chevron_left24.toif b/core/embed/rust/src/ui/model_mercury/res/chevron_left24.toif new file mode 100644 index 0000000000..f64ef96a33 Binary files /dev/null and b/core/embed/rust/src/ui/model_mercury/res/chevron_left24.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/chevron_right24.png b/core/embed/rust/src/ui/model_mercury/res/chevron_right24.png index efe01e1160..1b8d0620dc 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/chevron_right24.png and b/core/embed/rust/src/ui/model_mercury/res/chevron_right24.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/chevron_right24.toif b/core/embed/rust/src/ui/model_mercury/res/chevron_right24.toif index 8333079d6f..630cf0cd5e 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/chevron_right24.toif and b/core/embed/rust/src/ui/model_mercury/res/chevron_right24.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/close30.png b/core/embed/rust/src/ui/model_mercury/res/close30.png index 0e5b188bf9..34fe6065ea 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/close30.png and b/core/embed/rust/src/ui/model_mercury/res/close30.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/close30.toif b/core/embed/rust/src/ui/model_mercury/res/close30.toif index b9e2f3c4fb..6153a145a3 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/close30.toif and b/core/embed/rust/src/ui/model_mercury/res/close30.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/confirm_input30.png b/core/embed/rust/src/ui/model_mercury/res/confirm_input30.png index dc7148c8c6..ea9af5c523 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/confirm_input30.png and b/core/embed/rust/src/ui/model_mercury/res/confirm_input30.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/confirm_input30.toif b/core/embed/rust/src/ui/model_mercury/res/confirm_input30.toif index a34c5e9522..ce9b9cb46b 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/confirm_input30.toif and b/core/embed/rust/src/ui/model_mercury/res/confirm_input30.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/delete30.png b/core/embed/rust/src/ui/model_mercury/res/delete30.png index 9e30374a88..f3527c63a3 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/delete30.png and b/core/embed/rust/src/ui/model_mercury/res/delete30.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/delete30.toif b/core/embed/rust/src/ui/model_mercury/res/delete30.toif index eea1cf0df2..8133b643e4 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/delete30.toif and b/core/embed/rust/src/ui/model_mercury/res/delete30.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/download24.png b/core/embed/rust/src/ui/model_mercury/res/download24.png index 9a9233e4d6..e444f63b11 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/download24.png and b/core/embed/rust/src/ui/model_mercury/res/download24.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/download24.toif b/core/embed/rust/src/ui/model_mercury/res/download24.toif index c1fc80f850..6ffc83b78b 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/download24.toif and b/core/embed/rust/src/ui/model_mercury/res/download24.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/exclamation_mark24.png b/core/embed/rust/src/ui/model_mercury/res/exclamation_mark24.png deleted file mode 100644 index 5627767ba8..0000000000 Binary files a/core/embed/rust/src/ui/model_mercury/res/exclamation_mark24.png and /dev/null differ diff --git a/core/embed/rust/src/ui/model_mercury/res/exclamation_mark24.toif b/core/embed/rust/src/ui/model_mercury/res/exclamation_mark24.toif deleted file mode 100644 index 8e9f460369..0000000000 Binary files a/core/embed/rust/src/ui/model_mercury/res/exclamation_mark24.toif and /dev/null differ diff --git a/core/embed/rust/src/ui/model_mercury/res/factory_reset24.png b/core/embed/rust/src/ui/model_mercury/res/factory_reset24.png new file mode 100644 index 0000000000..c485d8d1e2 Binary files /dev/null and b/core/embed/rust/src/ui/model_mercury/res/factory_reset24.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/factory_reset24.toif b/core/embed/rust/src/ui/model_mercury/res/factory_reset24.toif new file mode 100644 index 0000000000..bafc423742 Binary files /dev/null and b/core/embed/rust/src/ui/model_mercury/res/factory_reset24.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/fire24.png b/core/embed/rust/src/ui/model_mercury/res/fire24.png deleted file mode 100644 index c075d37fba..0000000000 Binary files a/core/embed/rust/src/ui/model_mercury/res/fire24.png and /dev/null differ diff --git a/core/embed/rust/src/ui/model_mercury/res/foreslash12.png b/core/embed/rust/src/ui/model_mercury/res/foreslash12.png new file mode 100644 index 0000000000..ab0d67a233 Binary files /dev/null and b/core/embed/rust/src/ui/model_mercury/res/foreslash12.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/foreslash12.toif b/core/embed/rust/src/ui/model_mercury/res/foreslash12.toif new file mode 100644 index 0000000000..262f907c09 Binary files /dev/null and b/core/embed/rust/src/ui/model_mercury/res/foreslash12.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/key20.png b/core/embed/rust/src/ui/model_mercury/res/key20.png new file mode 100644 index 0000000000..c4488a3f01 Binary files /dev/null and b/core/embed/rust/src/ui/model_mercury/res/key20.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/key30.toif b/core/embed/rust/src/ui/model_mercury/res/key20.toif similarity index 100% rename from core/embed/rust/src/ui/model_mercury/res/key30.toif rename to core/embed/rust/src/ui/model_mercury/res/key20.toif diff --git a/core/embed/rust/src/ui/model_mercury/res/key30.png b/core/embed/rust/src/ui/model_mercury/res/key30.png deleted file mode 100644 index 7cd4b5ae83..0000000000 Binary files a/core/embed/rust/src/ui/model_mercury/res/key30.png and /dev/null differ diff --git a/core/embed/rust/src/ui/model_mercury/res/lock24.toif b/core/embed/rust/src/ui/model_mercury/res/lock24.toif deleted file mode 100644 index 16b4c4600f..0000000000 Binary files a/core/embed/rust/src/ui/model_mercury/res/lock24.toif and /dev/null differ diff --git a/core/embed/rust/src/ui/model_mercury/res/menu30.png b/core/embed/rust/src/ui/model_mercury/res/menu30.png index 8c48673a9c..3f31f62983 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/menu30.png and b/core/embed/rust/src/ui/model_mercury/res/menu30.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/menu30.toif b/core/embed/rust/src/ui/model_mercury/res/menu30.toif index 48c9706ec7..12091aa0d2 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/menu30.toif and b/core/embed/rust/src/ui/model_mercury/res/menu30.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/minus40.png b/core/embed/rust/src/ui/model_mercury/res/minus40.png index d17c01f1e2..b68c6e0083 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/minus40.png and b/core/embed/rust/src/ui/model_mercury/res/minus40.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/minus40.toif b/core/embed/rust/src/ui/model_mercury/res/minus40.toif index b284565c85..ed01fecd51 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/minus40.toif and b/core/embed/rust/src/ui/model_mercury/res/minus40.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/page_down20.png b/core/embed/rust/src/ui/model_mercury/res/page_down20.png index 740ce632c5..c7f4f2c0d2 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/page_down20.png and b/core/embed/rust/src/ui/model_mercury/res/page_down20.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/page_down20.toif b/core/embed/rust/src/ui/model_mercury/res/page_down20.toif index 4beae7db0b..1676ecfcac 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/page_down20.toif and b/core/embed/rust/src/ui/model_mercury/res/page_down20.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/page_up20.png b/core/embed/rust/src/ui/model_mercury/res/page_up20.png index d8b1695bf8..263d02d51b 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/page_up20.png and b/core/embed/rust/src/ui/model_mercury/res/page_up20.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/page_up20.toif b/core/embed/rust/src/ui/model_mercury/res/page_up20.toif index 8b48f18f1e..dc5ee50e9a 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/page_up20.toif and b/core/embed/rust/src/ui/model_mercury/res/page_up20.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/pin_bullet6.png b/core/embed/rust/src/ui/model_mercury/res/pin_bullet6.png new file mode 100644 index 0000000000..10cf50f834 Binary files /dev/null and b/core/embed/rust/src/ui/model_mercury/res/pin_bullet6.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/pin_bullet6.toif b/core/embed/rust/src/ui/model_mercury/res/pin_bullet6.toif new file mode 100644 index 0000000000..cacb72a49d Binary files /dev/null and b/core/embed/rust/src/ui/model_mercury/res/pin_bullet6.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/plus40.png b/core/embed/rust/src/ui/model_mercury/res/plus40.png index 78d98a4946..a1ab4661d1 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/plus40.png and b/core/embed/rust/src/ui/model_mercury/res/plus40.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/plus40.toif b/core/embed/rust/src/ui/model_mercury/res/plus40.toif index 098b5a73d5..23962cc601 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/plus40.toif and b/core/embed/rust/src/ui/model_mercury/res/plus40.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/qr_code24.png b/core/embed/rust/src/ui/model_mercury/res/qr_code24.png index 44e5c765c1..7c50b2477f 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/qr_code24.png and b/core/embed/rust/src/ui/model_mercury/res/qr_code24.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/qr_code24.toif b/core/embed/rust/src/ui/model_mercury/res/qr_code24.toif index bbb31eedbb..20a32a2367 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/qr_code24.toif and b/core/embed/rust/src/ui/model_mercury/res/qr_code24.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/reboot24.png b/core/embed/rust/src/ui/model_mercury/res/reboot24.png index 0532dcc52f..a027bb28d5 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/reboot24.png and b/core/embed/rust/src/ui/model_mercury/res/reboot24.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/reboot24.toif b/core/embed/rust/src/ui/model_mercury/res/reboot24.toif index feeb9c49c1..5827994082 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/reboot24.toif and b/core/embed/rust/src/ui/model_mercury/res/reboot24.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/sign30.png b/core/embed/rust/src/ui/model_mercury/res/sign30.png index bfdeb622af..a868c83826 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/sign30.png and b/core/embed/rust/src/ui/model_mercury/res/sign30.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/sign30.toif b/core/embed/rust/src/ui/model_mercury/res/sign30.toif index 96ab6097b7..924200b0fe 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/sign30.toif and b/core/embed/rust/src/ui/model_mercury/res/sign30.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/simple_checkmark24.png b/core/embed/rust/src/ui/model_mercury/res/simple_checkmark24.png new file mode 100644 index 0000000000..021704452e Binary files /dev/null and b/core/embed/rust/src/ui/model_mercury/res/simple_checkmark24.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/simple_checkmark24.toif b/core/embed/rust/src/ui/model_mercury/res/simple_checkmark24.toif new file mode 100644 index 0000000000..f29dacefff Binary files /dev/null and b/core/embed/rust/src/ui/model_mercury/res/simple_checkmark24.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/simple_checkmark30.png b/core/embed/rust/src/ui/model_mercury/res/simple_checkmark30.png index 50ff2f99dc..4e3eca2620 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/simple_checkmark30.png and b/core/embed/rust/src/ui/model_mercury/res/simple_checkmark30.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/simple_checkmark30.toif b/core/embed/rust/src/ui/model_mercury/res/simple_checkmark30.toif index 1e4001c284..c3a4544fd9 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/simple_checkmark30.toif and b/core/embed/rust/src/ui/model_mercury/res/simple_checkmark30.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/special_chars_group.png b/core/embed/rust/src/ui/model_mercury/res/special_chars_group.png new file mode 100644 index 0000000000..ab0faec5a3 Binary files /dev/null and b/core/embed/rust/src/ui/model_mercury/res/special_chars_group.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/special_chars_group.toif b/core/embed/rust/src/ui/model_mercury/res/special_chars_group.toif new file mode 100644 index 0000000000..0250298f41 Binary files /dev/null and b/core/embed/rust/src/ui/model_mercury/res/special_chars_group.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/res/warning24.png b/core/embed/rust/src/ui/model_mercury/res/warning24.png index 2283b0d718..bf4bc3955a 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/warning24.png and b/core/embed/rust/src/ui/model_mercury/res/warning24.png differ diff --git a/core/embed/rust/src/ui/model_mercury/res/warning24.toif b/core/embed/rust/src/ui/model_mercury/res/warning24.toif index e3f78be046..e8007c993e 100644 Binary files a/core/embed/rust/src/ui/model_mercury/res/warning24.toif and b/core/embed/rust/src/ui/model_mercury/res/warning24.toif differ diff --git a/core/embed/rust/src/ui/model_mercury/theme/mod.rs b/core/embed/rust/src/ui/model_mercury/theme/mod.rs index 38ae732175..c69d1c1977 100644 --- a/core/embed/rust/src/ui/model_mercury/theme/mod.rs +++ b/core/embed/rust/src/ui/model_mercury/theme/mod.rs @@ -63,7 +63,7 @@ pub const RADIUS: u8 = 0; // Full-size QR code. pub const QR_SIDE_MAX: u32 = 140; -// UI icons (greyscale). +// UI icons (white color). // 20x20 include_icon!( @@ -77,14 +77,14 @@ include_icon!(ICON_PAGE_UP, "model_mercury/res/page_up20.toif"); include_icon!(ICON_CANCEL, "model_mercury/res/cancel24.toif"); include_icon!(ICON_CHEVRON_RIGHT, "model_mercury/res/chevron_right24.toif"); include_icon!(ICON_DOWNLOAD, "model_mercury/res/download24.toif"); -include_icon!( - ICON_EXCLAMATION_MARK, - "model_mercury/res/exclamation_mark24.toif" -); -include_icon!(ICON_FIRE, "model_mercury/res/fire24.toif"); +include_icon!(ICON_KEY, "model_mercury/res/key20.toif"); include_icon!(ICON_QR_CODE, "model_mercury/res/qr_code24.toif"); include_icon!(ICON_REBOOT, "model_mercury/res/reboot24.toif"); include_icon!(ICON_WARNING, "model_mercury/res/warning24.toif"); +include_icon!( + ICON_SIMPLE_CHECKMARK24, + "model_mercury/res/simple_checkmark24.toif" +); // 30x30 include_icon!(ICON_AUTOFILL, "model_mercury/res/autofill30.toif"); @@ -92,7 +92,6 @@ include_icon!(ICON_CLOSE, "model_mercury/res/close30.toif"); include_icon!(ICON_CONFIRM_INPUT, "model_mercury/res/confirm_input30.toif"); include_icon!(ICON_DELETE, "model_mercury/res/delete30.toif"); include_icon!(ICON_MENU, "model_mercury/res/menu30.toif"); -include_icon!(ICON_KEY, "model_mercury/res/key30.toif"); include_icon!( ICON_SIMPLE_CHECKMARK, "model_mercury/res/simple_checkmark30.toif" @@ -124,6 +123,21 @@ include_icon!( include_icon!(DOT_SMALL, "model_mercury/res/scroll-small.toif"); include_icon!(ICON_PIN_BULLET, "model_mercury/res/pin_bullet6.toif"); +// Text arrows. +include_icon!(ICON_PAGE_NEXT, "model_mercury/res/page-next.toif"); +include_icon!(ICON_PAGE_PREV, "model_mercury/res/page-prev.toif"); + +// Large, three-color icons. +pub const WARN_COLOR: Color = ORANGE_LIGHT; +pub const INFO_COLOR: Color = GREY_LIGHT; +pub const SUCCESS_COLOR: Color = GREEN; +pub const ERROR_COLOR: Color = ORANGE_DIMMED; +include_icon!(IMAGE_FG_SUCCESS, "model_mercury/res/fg-check48.toif"); +include_icon!(IMAGE_BG_CIRCLE, "model_mercury/res/circle48.toif"); + +// Welcome screen. +include_icon!(ICON_LOGO, "model_mercury/res/lock_full.toif"); + // TODO remove TT icons: // Button icons. @@ -150,29 +164,16 @@ include_icon!(ICON_LOCK_BIG, "model_tt/res/lock24.toif"); include_icon!(ICON_COINJOIN, "model_tt/res/coinjoin16.toif"); include_icon!(ICON_MAGIC, "model_tt/res/magic.toif"); -// Text arrows. -include_icon!(ICON_PAGE_NEXT, "model_tt/res/page-next.toif"); -include_icon!(ICON_PAGE_PREV, "model_tt/res/page-prev.toif"); - -// Large, three-color icons. -pub const WARN_COLOR: Color = YELLOW; -pub const INFO_COLOR: Color = BLUE; -pub const SUCCESS_COLOR: Color = GREEN; -pub const ERROR_COLOR: Color = RED; include_icon!(IMAGE_FG_WARN, "model_tt/res/fg-warning48.toif"); -include_icon!(IMAGE_FG_SUCCESS, "model_tt/res/fg-check48.toif"); include_icon!(IMAGE_FG_ERROR, "model_tt/res/fg-error48.toif"); include_icon!(IMAGE_FG_INFO, "model_tt/res/fg-info48.toif"); include_icon!(IMAGE_FG_USER, "model_tt/res/fg-user48.toif"); -include_icon!(IMAGE_BG_CIRCLE, "model_tt/res/circle48.toif"); include_icon!(IMAGE_BG_OCTAGON, "model_tt/res/octagon48.toif"); // Non-square button backgrounds. include_icon!(IMAGE_BG_BACK_BTN, "model_tt/res/bg-back40.toif"); include_icon!(IMAGE_BG_BACK_BTN_TALL, "model_tt/res/bg-back52.toif"); -// Welcome screen. -include_icon!(ICON_LOGO, "model_tt/res/lock_full.toif"); include_icon!(ICON_LOGO_EMPTY, "model_tt/res/lock_empty.toif"); // Default homescreen @@ -252,7 +253,7 @@ pub const fn button_default() -> ButtonStyleSheet { font: Font::DEMIBOLD, text_color: GREY_LIGHT, button_color: BG, - icon_color: GREY_LIGHT, + icon_color: GREY, background_color: BG, }, active: &ButtonStyle {