diff --git a/core/embed/rust/src/ui/model_tr/component/homescreen.rs b/core/embed/rust/src/ui/model_tr/component/homescreen.rs
index 8f6ddb605c..6750ffe6eb 100644
--- a/core/embed/rust/src/ui/model_tr/component/homescreen.rs
+++ b/core/embed/rust/src/ui/model_tr/component/homescreen.rs
@@ -232,17 +232,6 @@ impl Homescreen {
         rect_fill(AREA.split_top(NOTIFICATION_HEIGHT).0, theme::BG);
     }
 
-    fn paint_warning_icons_in_top_corners(&self) {
-        let warning_icon = theme::ICON_WARNING;
-        warning_icon.draw(AREA.top_left(), Alignment2D::TOP_LEFT, theme::FG, theme::BG);
-        warning_icon.draw(
-            AREA.top_right(),
-            Alignment2D::TOP_RIGHT,
-            theme::FG,
-            theme::BG,
-        );
-    }
-
     fn event_usb(&mut self, ctx: &mut EventCtx, event: Event) {
         if let Event::USB(USBEvent::Connected(_)) = event {
             ctx.request_paint();
diff --git a/core/embed/rust/src/ui/model_tr/res/arrow_down_o.toif b/core/embed/rust/src/ui/model_tr/res/arrow_down_o.toif
new file mode 100644
index 0000000000..790976e6c4
Binary files /dev/null and b/core/embed/rust/src/ui/model_tr/res/arrow_down_o.toif differ
diff --git a/core/embed/rust/src/ui/model_tr/res/arrow_up_o.toif b/core/embed/rust/src/ui/model_tr/res/arrow_up_o.toif
new file mode 100644
index 0000000000..03930d53c6
Binary files /dev/null and b/core/embed/rust/src/ui/model_tr/res/arrow_up_o.toif differ
diff --git a/core/embed/rust/src/ui/model_tr/res/cancel_o.toif b/core/embed/rust/src/ui/model_tr/res/cancel_o.toif
new file mode 100644
index 0000000000..6b7971a365
Binary files /dev/null and b/core/embed/rust/src/ui/model_tr/res/cancel_o.toif differ
diff --git a/core/embed/rust/src/ui/model_tr/res/delete_o.toif b/core/embed/rust/src/ui/model_tr/res/delete_o.toif
new file mode 100644
index 0000000000..763945b55f
Binary files /dev/null and b/core/embed/rust/src/ui/model_tr/res/delete_o.toif differ
diff --git a/core/embed/rust/src/ui/model_tr/res/next_page_o.toif b/core/embed/rust/src/ui/model_tr/res/next_page_o.toif
new file mode 100644
index 0000000000..2efb606dc0
Binary files /dev/null and b/core/embed/rust/src/ui/model_tr/res/next_page_o.toif differ
diff --git a/core/embed/rust/src/ui/model_tr/res/warning_o.toif b/core/embed/rust/src/ui/model_tr/res/warning_o.toif
new file mode 100644
index 0000000000..f6fd6c78c0
Binary files /dev/null and b/core/embed/rust/src/ui/model_tr/res/warning_o.toif differ
diff --git a/core/embed/rust/src/ui/model_tr/theme/mod.rs b/core/embed/rust/src/ui/model_tr/theme/mod.rs
index ba3c7b419e..df9be8f458 100644
--- a/core/embed/rust/src/ui/model_tr/theme/mod.rs
+++ b/core/embed/rust/src/ui/model_tr/theme/mod.rs
@@ -71,49 +71,68 @@ include_icon!(ICON_ARROW_LEFT, "model_tr/res/arrow_left.toif"); // 4*7
 include_icon!(ICON_ARROW_LEFT_BIG, "model_tr/res/arrow_left_big.toif"); // 8*7
 include_icon!(ICON_ARROW_RIGHT, "model_tr/res/arrow_right.toif"); // 4*7
 include_icon!(ICON_ARROW_RIGHT_FAT, "model_tr/res/arrow_right_fat.toif"); // 4*8
+#[cfg(not(feature = "new_rendering"))]
 include_icon!(
     ICON_ARROW_UP,
     "model_tr/res/arrow_up.toif",
     empty_right_col = true
 ); // 8*4
+#[cfg(feature = "new_rendering")]
+include_icon!(ICON_ARROW_UP, "model_tr/res/arrow_up_o.toif"); // 8*4
+#[cfg(not(feature = "new_rendering"))]
 include_icon!(
     ICON_ARROW_DOWN,
     "model_tr/res/arrow_down.toif",
     empty_right_col = true
 ); // 8*4
+#[cfg(feature = "new_rendering")]
+include_icon!(ICON_ARROW_DOWN, "model_tr/res/arrow_down_o.toif"); // 7*4
 include_icon!(ICON_ARROW_BACK_UP, "model_tr/res/arrow_back_up.toif"); // 8*8
 include_icon!(ICON_BIN, "model_tr/res/bin.toif"); // 10*10
+#[cfg(not(feature = "new_rendering"))]
 include_icon!(
     ICON_CANCEL,
     "model_tr/res/cancel.toif",
     empty_right_col = true
 ); // 7*7
+#[cfg(feature = "new_rendering")]
+include_icon!(ICON_CANCEL, "model_tr/res/cancel_o.toif"); // 7*7
 include_icon!(ICON_COINJOIN, "model_tr/res/coinjoin.toif"); // 12*12
+#[cfg(not(feature = "new_rendering"))]
 include_icon!(
     ICON_DELETE,
     "model_tr/res/delete.toif",
     empty_right_col = true
 ); // 9*7
+#[cfg(feature = "new_rendering")]
+include_icon!(ICON_DELETE, "model_tr/res/delete_o.toif"); // 9*7
 include_icon!(ICON_DEVICE_NAME, "model_tr/res/device_name.toif"); // 116*18
 include_icon!(ICON_EYE, "model_tr/res/eye_round.toif"); // 12*7
 include_icon!(ICON_LOCK, "model_tr/res/lock.toif"); // 10*10
 include_icon!(ICON_LOCK_SMALL, "model_tr/res/lock_small.toif"); // 6*7
 include_icon!(ICON_LOGO, "model_tr/res/logo_22_33.toif"); // 22*33
 include_icon!(ICON_LOGO_EMPTY, "model_tr/res/logo_22_33_empty.toif");
+#[cfg(not(feature = "new_rendering"))]
 include_icon!(
     ICON_NEXT_PAGE,
     "model_tr/res/next_page.toif",
     empty_right_col = true
 ); // 10*8
+#[cfg(feature = "new_rendering")]
+include_icon!(ICON_NEXT_PAGE, "model_tr/res/next_page_o.toif"); // 9*8
 include_icon!(ICON_PREV_PAGE, "model_tr/res/prev_page.toif"); // 8*10
 include_icon!(ICON_SPACE, "model_tr/res/space.toif"); // 12*3
 include_icon!(ICON_TICK, "model_tr/res/tick.toif"); // 8*6
 include_icon!(ICON_TICK_FAT, "model_tr/res/tick_fat.toif"); // 8*6
+#[cfg(not(feature = "new_rendering"))]
 include_icon!(
     ICON_WARNING,
     "model_tr/res/warning.toif",
     empty_right_col = true
 ); // 12*12
+#[cfg(feature = "new_rendering")]
+include_icon!(ICON_WARNING, "model_tr/res/warning_o.toif"); // 11*12
+
 include_icon!(ICON_WARN_TITLE, "model_tr/res/bld_header_warn.toif");
 
 // checklist settings