diff --git a/core/embed/rust/src/ui/constant.rs b/core/embed/rust/src/ui/constant.rs
index c47ea35064..3237db67aa 100644
--- a/core/embed/rust/src/ui/constant.rs
+++ b/core/embed/rust/src/ui/constant.rs
@@ -9,5 +9,5 @@
 pub use super::model_mercury::constant::*;
 #[cfg(all(feature = "model_tr", not(feature = "model_tt")))]
 pub use super::model_tr::constant::*;
-#[cfg(all(feature = "model_tt", not(feature = "model_mercury")))]
+#[cfg(feature = "model_tt")]
 pub use super::model_tt::constant::*;
diff --git a/core/embed/rust/src/ui/model_mercury/component/address_details.rs b/core/embed/rust/src/ui/model_mercury/component/address_details.rs
index 01c08df034..f79276dfd6 100644
--- a/core/embed/rust/src/ui/model_mercury/component/address_details.rs
+++ b/core/embed/rust/src/ui/model_mercury/component/address_details.rs
@@ -2,8 +2,7 @@ use heapless::Vec;
 
 use crate::{
     error::Error,
-    micropython::buffer::StrBuffer,
-    strutil::StringType,
+    strutil::TString,
     translations::TR,
     ui::{
         component::{
@@ -19,58 +18,57 @@ use super::{theme, Frame, FrameMsg};
 
 const MAX_XPUBS: usize = 16;
 
-pub struct AddressDetails<T> {
-    qr_code: Frame<Qr, T>,
-    details: Frame<Paragraphs<ParagraphVecShort<StrBuffer>>, T>,
-    xpub_view: Frame<Paragraphs<Paragraph<T>>, T>,
-    xpubs: Vec<(T, T), MAX_XPUBS>,
+pub struct AddressDetails {
+    qr_code: Frame<Qr>,
+    details: Frame<Paragraphs<ParagraphVecShort<'static>>>,
+    xpub_view: Frame<Paragraphs<Paragraph<'static>>>,
+    xpubs: Vec<(TString<'static>, TString<'static>), MAX_XPUBS>,
     xpub_page_count: Vec<u8, MAX_XPUBS>,
     current_page: usize,
 }
 
-impl<T> AddressDetails<T>
-where
-    T: StringType,
-{
+impl AddressDetails {
     pub fn new(
-        qr_title: T,
-        qr_address: T,
+        qr_title: TString<'static>,
+        qr_address: TString<'static>,
         case_sensitive: bool,
-        details_title: T,
-        account: Option<StrBuffer>,
-        path: Option<StrBuffer>,
-    ) -> Result<Self, Error>
-    where
-        T: From<&'static str>,
-    {
+        details_title: TString<'static>,
+        account: Option<TString<'static>>,
+        path: Option<TString<'static>>,
+    ) -> Result<Self, Error> {
         let mut para = ParagraphVecShort::new();
         if let Some(a) = account {
             para.add(Paragraph::new(
                 &theme::TEXT_NORMAL,
-                TR::words__account_colon.try_into()?,
+                TR::words__account_colon,
             ));
             para.add(Paragraph::new(&theme::TEXT_MONO, a));
         }
         if let Some(p) = path {
             para.add(Paragraph::new(
                 &theme::TEXT_NORMAL,
-                TR::address_details__derivation_path.try_into()?,
+                TR::address_details__derivation_path,
             ));
             para.add(Paragraph::new(&theme::TEXT_MONO, p));
         }
         let result = Self {
             qr_code: Frame::left_aligned(
                 qr_title,
-                Qr::new(qr_address, case_sensitive)?.with_border(7),
+                qr_address
+                    .map(|s| Qr::new(s, case_sensitive))?
+                    .with_border(7),
+            )
+            .with_cancel_button()
+            .with_border(theme::borders_horizontal_scroll()),
+            details: Frame::left_aligned(
+                details_title,
+                para.into_paragraphs(),
             )
             .with_cancel_button()
             .with_border(theme::borders_horizontal_scroll()),
-            details: Frame::left_aligned(details_title, para.into_paragraphs())
-                .with_cancel_button()
-                .with_border(theme::borders_horizontal_scroll()),
             xpub_view: Frame::left_aligned(
                 " \n ".into(),
-                Paragraph::new(&theme::TEXT_MONO, "".into()).into_paragraphs(),
+                Paragraph::new(&theme::TEXT_MONO, "").into_paragraphs(),
             )
             .with_cancel_button()
             .with_border(theme::borders_horizontal_scroll()),
@@ -81,24 +79,24 @@ where
         Ok(result)
     }
 
-    pub fn add_xpub(&mut self, title: T, xpub: T) -> Result<(), Error> {
+    pub fn add_xpub(
+        &mut self,
+        title: TString<'static>,
+        xpub: TString<'static>,
+    ) -> Result<(), Error> {
         self.xpubs
             .push((title, xpub))
             .map_err(|_| Error::OutOfRange)
     }
 
-    fn switch_xpub(&mut self, i: usize, page: usize) -> usize
-    where
-        T: Clone,
-    {
+    fn switch_xpub(&mut self, i: usize, page: usize) -> usize {
         // Context is needed for updating child so that it can request repaint. In this
         // case the parent component that handles paging always requests complete
         // repaint after page change so we can use a dummy context here.
         let mut dummy_ctx = EventCtx::new();
-        self.xpub_view
-            .update_title(&mut dummy_ctx, self.xpubs[i].0.clone());
+        self.xpub_view.update_title(&mut dummy_ctx, self.xpubs[i].0);
         self.xpub_view.update_content(&mut dummy_ctx, |p| {
-            p.inner_mut().update(self.xpubs[i].1.clone());
+            p.inner_mut().update(self.xpubs[i].1);
             let npages = p.page_count();
             p.change_page(page);
             npages
@@ -123,10 +121,7 @@ where
     }
 }
 
-impl<T> Paginate for AddressDetails<T>
-where
-    T: StringType + Clone,
-{
+impl Paginate for AddressDetails {
     fn page_count(&mut self) -> usize {
         let total_xpub_pages: u8 = self.xpub_page_count.iter().copied().sum();
         2usize.saturating_add(total_xpub_pages.into())
@@ -142,10 +137,7 @@ where
     }
 }
 
-impl<T> Component for AddressDetails<T>
-where
-    T: StringType + Clone,
-{
+impl Component for AddressDetails {
     type Msg = ();
 
     fn place(&mut self, bounds: Rect) -> Rect {
@@ -201,10 +193,7 @@ where
 }
 
 #[cfg(feature = "ui_debug")]
-impl<T> crate::trace::Trace for AddressDetails<T>
-where
-    T: StringType,
-{
+impl crate::trace::Trace for AddressDetails {
     fn trace(&self, t: &mut dyn crate::trace::Tracer) {
         t.component("AddressDetails");
         match self.current_page {
diff --git a/core/embed/rust/src/ui/model_mercury/component/button.rs b/core/embed/rust/src/ui/model_mercury/component/button.rs
index dbb513aa0a..037aa38294 100644
--- a/core/embed/rust/src/ui/model_mercury/component/button.rs
+++ b/core/embed/rust/src/ui/model_mercury/component/button.rs
@@ -32,7 +32,7 @@ pub struct Button {
     long_timer: Option<TimerToken>,
 }
 
-impl<T> Button<T> {
+impl Button {
     /// Offsets the baseline of the button text
     /// -x/+x => left/right
     /// -y/+y => up/down
@@ -58,8 +58,8 @@ impl<T> Button<T> {
         Self::new(ButtonContent::Icon(icon))
     }
 
-    pub const fn with_icon_and_text(content: IconText<T>) -> Self {
-        Self::new(ButtonContent::IconAndText::<T>(content))
+    pub const fn with_icon_and_text(content: IconText) -> Self {
+        Self::new(ButtonContent::IconAndText(content))
     }
 
     pub const fn with_icon_blend(bg: Icon, fg: Icon, fg_offset: Offset) -> Self {
@@ -204,15 +204,16 @@ impl<T> Button<T> {
         match &self.content {
             ButtonContent::Empty => {}
             ButtonContent::Text(text) => {
-                let text = text.as_ref();
                 let start_of_baseline = self.area.center() + Self::BASELINE_OFFSET;
-                display::text_left(
-                    start_of_baseline,
-                    text,
-                    style.font,
-                    style.text_color,
-                    style.button_color,
-                );
+                text.map(|text| {
+                    display::text_left(
+                        start_of_baseline,
+                        text,
+                        style.font,
+                        style.text_color,
+                        style.button_color,
+                    );
+                });
             }
             ButtonContent::Icon(icon) => {
                 icon.draw(
@@ -238,12 +239,13 @@ impl<T> Button<T> {
         match &self.content {
             ButtonContent::Empty => {}
             ButtonContent::Text(text) => {
-                let text = text.as_ref();
                 let start_of_baseline = self.area.left_center() + Self::BASELINE_OFFSET;
-                shape::Text::new(start_of_baseline, text)
-                    .with_font(style.font)
-                    .with_fg(style.text_color)
-                    .render(target);
+                text.map(|text| {
+                    shape::Text::new(start_of_baseline, text)
+                        .with_font(style.font)
+                        .with_fg(style.text_color)
+                        .render(target);
+                });
             }
             ButtonContent::Icon(icon) => {
                 shape::ToifImage::new(self.area.center(), icon.toif)
@@ -376,7 +378,7 @@ impl crate::trace::Trace for Button {
             ButtonContent::Text(text) => t.string("text", *text),
             ButtonContent::Icon(_) => t.bool("icon", true),
             ButtonContent::IconAndText(content) => {
-                t.string("text", content.text.as_ref().into());
+                t.string("text", content.text.into());
                 t.bool("icon", true);
             }
             ButtonContent::IconBlend(_, _, _) => t.bool("icon", true),
@@ -397,7 +399,7 @@ pub enum ButtonContent {
     Empty,
     Text(TString<'static>),
     Icon(Icon),
-    IconAndText(IconText<T>),
+    IconAndText(IconText),
     IconBlend(Icon, Icon, Offset),
 }
 
@@ -419,18 +421,15 @@ pub struct ButtonStyle {
     pub border_width: i16,
 }
 
-impl<T> Button<T> {
+impl Button {
     pub fn cancel_confirm(
-        left: Button<T>,
-        right: Button<T>,
+        left: Button,
+        right: Button,
         left_is_small: bool,
     ) -> CancelConfirm<
-        T,
         impl Fn(ButtonMsg) -> Option<CancelConfirmMsg>,
         impl Fn(ButtonMsg) -> Option<CancelConfirmMsg>,
     >
-    where
-        T: AsRef<str>,
     {
         let width = if left_is_small {
             theme::BUTTON_WIDTH
@@ -450,21 +449,18 @@ impl<T> Button<T> {
     }
 
     pub fn cancel_confirm_text(
-        left: Option<T>,
-        right: Option<T>,
+        left: Option<TString<'static>>,
+        right: Option<TString<'static>>,
     ) -> CancelConfirm<
-        T,
         impl Fn(ButtonMsg) -> Option<CancelConfirmMsg>,
         impl Fn(ButtonMsg) -> Option<CancelConfirmMsg>,
     >
-    where
-        T: AsRef<str>,
     {
         let left_is_small: bool;
 
         let left = if let Some(verb) = left {
-            left_is_small = verb.as_ref().len() <= 4;
-            if verb.as_ref() == "^" {
+            left_is_small = verb.len() <= 4;
+            if verb == "^".into() {
                 Button::with_icon(theme::ICON_UP)
             } else {
                 Button::with_text(verb)
@@ -482,16 +478,13 @@ impl<T> Button<T> {
     }
 
     pub fn cancel_info_confirm(
-        confirm: T,
-        info: T,
+        confirm: TString<'static>,
+        info: TString<'static>,
     ) -> CancelInfoConfirm<
-        T,
         impl Fn(ButtonMsg) -> Option<CancelInfoConfirmMsg>,
         impl Fn(ButtonMsg) -> Option<CancelInfoConfirmMsg>,
         impl Fn(ButtonMsg) -> Option<CancelInfoConfirmMsg>,
     >
-    where
-        T: AsRef<str>,
     {
         let right = Button::with_text(confirm)
             .styled(theme::button_confirm())
@@ -522,11 +515,10 @@ pub enum CancelConfirmMsg {
     Confirmed,
 }
 
-type CancelInfoConfirm<T, F0, F1, F2> = FixedHeightBar<
-    Split<MsgMap<Button<T>, F0>, Split<MsgMap<Button<T>, F1>, MsgMap<Button<T>, F2>>>,
->;
+type CancelInfoConfirm<F0, F1, F2> =
+    FixedHeightBar<Split<MsgMap<Button, F0>, Split<MsgMap<Button, F1>, MsgMap<Button, F2>>>>;
 
-type CancelConfirm<T, F0, F1> = FixedHeightBar<Split<MsgMap<Button<T>, F0>, MsgMap<Button<T>, F1>>>;
+type CancelConfirm<F0, F1> = FixedHeightBar<Split<MsgMap<Button, F0>, MsgMap<Button, F1>>>;
 
 #[derive(Clone, Copy)]
 pub enum CancelInfoConfirmMsg {
@@ -536,25 +528,23 @@ pub enum CancelInfoConfirmMsg {
 }
 
 #[derive(PartialEq, Eq)]
-pub struct IconText<T> {
-    text: T,
+pub struct IconText {
+    text: &'static str,
     icon: Icon,
 }
 
-impl<T> IconText<T>
-where
-    T: AsRef<str>,
-{
+impl IconText {
     const ICON_SPACE: i16 = 46;
     const ICON_MARGIN: i16 = 4;
     const TEXT_MARGIN: i16 = 6;
 
-    pub fn new(text: T, icon: Icon) -> Self {
+    pub fn new(text: &'static str, icon: Icon) -> Self {
         Self { text, icon }
     }
 
     pub fn paint(&self, area: Rect, style: &ButtonStyle, baseline_offset: Offset) {
-        let width = style.font.text_width(self.text.as_ref());
+        let width = style.font.text_width(self.text);
+        let height = style.font.text_height();
 
         let mut use_icon = false;
         let mut use_text = false;
@@ -563,7 +553,8 @@ where
             area.top_left().x + ((Self::ICON_SPACE + Self::ICON_MARGIN) / 2),
             area.center().y,
         );
-        let mut text_pos = area.left_center() + baseline_offset;
+        let mut text_pos =
+            area.center() + Offset::new(-width / 2, height / 2) + baseline_offset;
 
         if area.width() > (Self::ICON_SPACE + Self::TEXT_MARGIN + width) {
             //display both icon and text
@@ -581,7 +572,7 @@ where
         if use_text {
             display::text_left(
                 text_pos,
-                self.text.as_ref(),
+                self.text,
                 style.font,
                 style.text_color,
                 style.button_color,
@@ -629,7 +620,7 @@ where
         }
 
         if use_text {
-            shape::Text::new(text_pos, self.text.as_ref())
+            shape::Text::new(text_pos, self.text)
                 .with_fg(style.text_color)
                 .render(target);
         }
diff --git a/core/embed/rust/src/ui/model_mercury/component/coinjoin_progress.rs b/core/embed/rust/src/ui/model_mercury/component/coinjoin_progress.rs
index 506b3d5633..eabb074037 100644
--- a/core/embed/rust/src/ui/model_mercury/component/coinjoin_progress.rs
+++ b/core/embed/rust/src/ui/model_mercury/component/coinjoin_progress.rs
@@ -3,15 +3,15 @@ use core::mem;
 use crate::{
     error::Error,
     maybe_trace::MaybeTrace,
-    micropython::buffer::StrBuffer,
+    strutil::TString,
     translations::TR,
     ui::{
         component::{
             base::Never, Bar, Child, Component, ComponentExt, Empty, Event, EventCtx, Label, Split,
         },
-        constant,
         display::loader::{loader_circular_uncompress, LoaderDimensions},
         geometry::{Insets, Offset, Rect},
+        model_mercury::constant,
         shape,
         shape::Renderer,
         util::animation_disabled,
@@ -27,49 +27,43 @@ const LOADER_INNER: i16 = 28;
 const LOADER_OFFSET: i16 = -34;
 const LOADER_SPEED: u16 = 5;
 
-pub struct CoinJoinProgress<T, U> {
+pub struct CoinJoinProgress<U> {
     value: u16,
     indeterminate: bool,
-    content: Child<Frame<Split<Empty, U>, StrBuffer>>,
+    content: Child<Frame<Split<Empty, U>>>,
     // Label is not a child since circular loader paints large black rectangle which overlaps it.
     // To work around this, draw label every time loader is drawn.
-    label: Label<T>,
+    label: Label<'static>,
 }
 
-impl<T, U> CoinJoinProgress<T, U>
-where
-    T: AsRef<str>,
-{
+impl<U> CoinJoinProgress<U> {
     pub fn new(
-        text: T,
+        text: TString<'static>,
         indeterminate: bool,
-    ) -> Result<CoinJoinProgress<T, impl Component<Msg = Never> + MaybeTrace>, Error>
-    where
-        T: AsRef<str>,
-    {
+    ) -> Result<CoinJoinProgress<impl Component<Msg = Never> + MaybeTrace>, Error> {
         let style = theme::label_coinjoin_progress();
-        let label = Label::centered(
-            TryInto::<StrBuffer>::try_into(TR::coinjoin__title_do_not_disconnect)?,
-            style,
-        )
-        .vertically_centered();
+        let label = Label::centered(TR::coinjoin__title_do_not_disconnect.into(), style)
+            .vertically_centered();
         let bg = Bar::new(style.background_color, theme::BG, 2);
         let inner = (bg, label);
         CoinJoinProgress::with_background(text, inner, indeterminate)
     }
 }
 
-impl<T, U> CoinJoinProgress<T, U>
+impl<U> CoinJoinProgress<U>
 where
-    T: AsRef<str>,
     U: Component<Msg = Never>,
 {
-    pub fn with_background(text: T, inner: U, indeterminate: bool) -> Result<Self, Error> {
+    pub fn with_background(
+        text: TString<'static>,
+        inner: U,
+        indeterminate: bool,
+    ) -> Result<Self, Error> {
         Ok(Self {
             value: 0,
             indeterminate,
             content: Frame::centered(
-                TR::coinjoin__title_progress.try_into()?,
+                TR::coinjoin__title_progress.into(),
                 Split::bottom(RECTANGLE_HEIGHT, 0, Empty, inner),
             )
             .into_child(),
@@ -78,9 +72,8 @@ where
     }
 }
 
-impl<T, U> Component for CoinJoinProgress<T, U>
+impl<U> Component for CoinJoinProgress<U>
 where
-    T: AsRef<str>,
     U: Component<Msg = Never>,
 {
     type Msg = Never;
@@ -167,9 +160,8 @@ where
 }
 
 #[cfg(feature = "ui_debug")]
-impl<T, U> crate::trace::Trace for CoinJoinProgress<T, U>
+impl<U> crate::trace::Trace for CoinJoinProgress<U>
 where
-    T: AsRef<str>,
     U: Component + crate::trace::Trace,
 {
     fn trace(&self, t: &mut dyn crate::trace::Tracer) {
diff --git a/core/embed/rust/src/ui/model_mercury/component/dialog.rs b/core/embed/rust/src/ui/model_mercury/component/dialog.rs
index 49c344ca85..c66d37a91f 100644
--- a/core/embed/rust/src/ui/model_mercury/component/dialog.rs
+++ b/core/embed/rust/src/ui/model_mercury/component/dialog.rs
@@ -1,5 +1,5 @@
 use crate::{
-    strutil::StringType,
+    strutil::TString,
     ui::{
         component::{
             image::BlendedImage,
@@ -97,18 +97,17 @@ where
     }
 }
 
-pub struct IconDialog<T, U> {
+pub struct IconDialog<U> {
     image: Child<BlendedImage>,
-    paragraphs: Paragraphs<ParagraphVecShort<T>>,
+    paragraphs: Paragraphs<ParagraphVecShort<'static>>,
     controls: Child<U>,
 }
 
-impl<T, U> IconDialog<T, U>
+impl<U> IconDialog<U>
 where
-    T: StringType,
     U: Component,
 {
-    pub fn new(icon: BlendedImage, title: T, controls: U) -> Self {
+    pub fn new(icon: BlendedImage, title: impl Into<TString<'static>>, controls: U) -> Self {
         Self {
             image: Child::new(icon),
             paragraphs: Paragraphs::new(ParagraphVecShort::from_iter([Paragraph::new(
@@ -125,26 +124,26 @@ where
         }
     }
 
-    pub fn with_paragraph(mut self, para: Paragraph<T>) -> Self {
-        if !para.content().as_ref().is_empty() {
+    pub fn with_paragraph(mut self, para: Paragraph<'static>) -> Self {
+        if !para.content().is_empty() {
             self.paragraphs.inner_mut().add(para);
         }
         self
     }
 
-    pub fn with_text(self, style: &'static TextStyle, text: T) -> Self {
+    pub fn with_text(self, style: &'static TextStyle, text: impl Into<TString<'static>>) -> Self {
         self.with_paragraph(Paragraph::new(style, text).centered())
     }
 
-    pub fn with_description(self, description: T) -> Self {
+    pub fn with_description(self, description: impl Into<TString<'static>>) -> Self {
         self.with_text(&theme::TEXT_NORMAL_OFF_WHITE, description)
     }
 
-    pub fn with_value(self, value: T) -> Self {
+    pub fn with_value(self, value: impl Into<TString<'static>>) -> Self {
         self.with_text(&theme::TEXT_MONO, value)
     }
 
-    pub fn new_shares(lines: [T; 4], controls: U) -> Self {
+    pub fn new_shares(lines: [impl Into<TString<'static>>; 4], controls: U) -> Self {
         let [l0, l1, l2, l3] = lines;
         Self {
             image: Child::new(BlendedImage::new(
@@ -171,9 +170,8 @@ where
     pub const VALUE_SPACE: i16 = 5;
 }
 
-impl<T, U> Component for IconDialog<T, U>
+impl<U> Component for IconDialog<U>
 where
-    T: StringType,
     U: Component,
 {
     type Msg = DialogMsg<Never, U::Msg>;
@@ -219,9 +217,8 @@ where
 }
 
 #[cfg(feature = "ui_debug")]
-impl<T, U> crate::trace::Trace for IconDialog<T, U>
+impl<U> crate::trace::Trace for IconDialog<U>
 where
-    T: StringType,
     U: crate::trace::Trace,
 {
     fn trace(&self, t: &mut dyn crate::trace::Tracer) {
diff --git a/core/embed/rust/src/ui/model_mercury/component/fido.rs b/core/embed/rust/src/ui/model_mercury/component/fido.rs
index 4da615068e..93c279ec9b 100644
--- a/core/embed/rust/src/ui/model_mercury/component/fido.rs
+++ b/core/embed/rust/src/ui/model_mercury/component/fido.rs
@@ -1,14 +1,17 @@
-use crate::ui::{
-    component::{image::Image, Child, Component, Event, EventCtx, Label},
-    display,
-    geometry::{Insets, Rect},
-    model_mercury::component::{
-        fido_icons::get_fido_icon_data,
-        swipe::{Swipe, SwipeDirection},
-        theme, ScrollBar,
+use crate::{
+    strutil::TString,
+    ui::{
+        component::{image::Image, Child, Component, Event, EventCtx, Label},
+        display,
+        geometry::{Insets, Rect},
+        model_mercury::component::{
+            fido_icons::get_fido_icon_data,
+            swipe::{Swipe, SwipeDirection},
+            theme, ScrollBar,
+        },
+        shape,
+        shape::Renderer,
     },
-    shape,
-    shape::Renderer,
 };
 
 use super::CancelConfirmMsg;
@@ -25,10 +28,10 @@ pub enum FidoMsg {
     Cancelled,
 }
 
-pub struct FidoConfirm<F: Fn(usize) -> T, T, U> {
+pub struct FidoConfirm<F: Fn(usize) -> TString<'static>, U> {
     page_swipe: Swipe,
-    app_name: Label<T>,
-    account_name: Label<T>,
+    app_name: Label<'static>,
+    account_name: Label<'static>,
     icon: Child<Image>,
     /// Function/closure that will return appropriate page on demand.
     get_account: F,
@@ -37,20 +40,19 @@ pub struct FidoConfirm<F: Fn(usize) -> T, T, U> {
     controls: U,
 }
 
-impl<F, T, U> FidoConfirm<F, T, U>
+impl<F, U> FidoConfirm<F, U>
 where
-    F: Fn(usize) -> T,
-    T: AsRef<str> + From<&'static str>,
+    F: Fn(usize) -> TString<'static>,
     U: Component<Msg = CancelConfirmMsg>,
 {
     pub fn new(
-        app_name: T,
+        app_name: TString<'static>,
         get_account: F,
         page_count: usize,
-        icon_name: Option<T>,
+        icon_name: Option<TString<'static>>,
         controls: U,
     ) -> Self {
-        let icon_data = get_fido_icon_data(icon_name.as_ref());
+        let icon_data = get_fido_icon_data(icon_name);
 
         // Preparing scrollbar and setting its page-count.
         let mut scrollbar = ScrollBar::horizontal();
@@ -118,10 +120,9 @@ where
     }
 }
 
-impl<F, T, U> Component for FidoConfirm<F, T, U>
+impl<F, U> Component for FidoConfirm<F, U>
 where
-    F: Fn(usize) -> T,
-    T: AsRef<str> + From<&'static str>,
+    F: Fn(usize) -> TString<'static>,
     U: Component<Msg = CancelConfirmMsg>,
 {
     type Msg = FidoMsg;
@@ -200,8 +201,8 @@ where
         // Account name is optional.
         // Showing it only if it differs from app name.
         // (Dummy requests usually have some text as both app_name and account_name.)
-        let account_name = self.account_name.text().as_ref();
-        let app_name = self.app_name.text().as_ref();
+        let account_name = self.account_name.text();
+        let app_name = self.app_name.text();
         if !account_name.is_empty() && account_name != app_name {
             self.account_name.paint();
         }
@@ -230,8 +231,8 @@ where
         // Account name is optional.
         // Showing it only if it differs from app name.
         // (Dummy requests usually have some text as both app_name and account_name.)
-        let account_name = self.account_name.text().as_ref();
-        let app_name = self.app_name.text().as_ref();
+        let account_name = self.account_name.text();
+        let app_name = self.app_name.text();
         if !account_name.is_empty() && account_name != app_name {
             self.account_name.render(target);
         }
@@ -251,9 +252,9 @@ where
 }
 
 #[cfg(feature = "ui_debug")]
-impl<F, T, U> crate::trace::Trace for FidoConfirm<F, T, U>
+impl<F, T> crate::trace::Trace for FidoConfirm<F, T>
 where
-    F: Fn(usize) -> T,
+    F: Fn(usize) -> TString<'static>,
 {
     fn trace(&self, t: &mut dyn crate::trace::Tracer) {
         t.component("FidoConfirm");
diff --git a/core/embed/rust/src/ui/model_mercury/component/fido_icons.rs b/core/embed/rust/src/ui/model_mercury/component/fido_icons.rs
index 5a3d675757..730232cf4d 100644
--- a/core/embed/rust/src/ui/model_mercury/component/fido_icons.rs
+++ b/core/embed/rust/src/ui/model_mercury/component/fido_icons.rs
@@ -3,6 +3,9 @@
 //! do not edit manually!
 
 
+use crate::strutil::TString;
+
+
 const ICON_APPLE: &[u8] = include_res!("model_mercury/res/fido/icon_apple.toif");
 const ICON_AWS: &[u8] = include_res!("model_mercury/res/fido/icon_aws.toif");
 const ICON_BINANCE: &[u8] = include_res!("model_mercury/res/fido/icon_binance.toif");
@@ -39,9 +42,9 @@ const ICON_WEBAUTHN: &[u8] = include_res!("model_mercury/res/fido/icon_webauthn.
 /// Translates icon name into its data.
 /// Returns default `ICON_WEBAUTHN` when the icon is not found or name not
 /// supplied.
-pub fn get_fido_icon_data<T: AsRef<str>>(icon_name: Option<T>) -> &'static [u8] {
+pub fn get_fido_icon_data(icon_name: Option<TString<'static>>) -> &'static [u8] {
     if let Some(icon_name) = icon_name {
-        match icon_name.as_ref() {
+        icon_name.map(|c| match c {
             "apple" => ICON_APPLE,
             "aws" => ICON_AWS,
             "binance" => ICON_BINANCE,
@@ -73,7 +76,7 @@ pub fn get_fido_icon_data<T: AsRef<str>>(icon_name: Option<T>) -> &'static [u8]
             "stripe" => ICON_STRIPE,
             "tutanota" => ICON_TUTANOTA,
             _ => ICON_WEBAUTHN,
-        }
+        })
     } else {
         ICON_WEBAUTHN
     }
diff --git a/core/embed/rust/src/ui/model_mercury/component/fido_icons.rs.mako b/core/embed/rust/src/ui/model_mercury/component/fido_icons.rs.mako
index 068360df56..5b832e9a27 100644
--- a/core/embed/rust/src/ui/model_mercury/component/fido_icons.rs.mako
+++ b/core/embed/rust/src/ui/model_mercury/component/fido_icons.rs.mako
@@ -2,6 +2,9 @@
 //! (by running `make templates` in `core`)
 //! do not edit manually!
 
+
+use crate::strutil::TString;
+
 <%
 icons: list[tuple[str, str]] = []
 for app in fido:
@@ -21,14 +24,14 @@ const ICON_WEBAUTHN: &[u8] = include_res!("model_mercury/res/fido/icon_webauthn.
 /// Translates icon name into its data.
 /// Returns default `ICON_WEBAUTHN` when the icon is not found or name not
 /// supplied.
-pub fn get_fido_icon_data<T: AsRef<str>>(icon_name: Option<T>) -> &'static [u8] {
+pub fn get_fido_icon_data(icon_name: Option<TString<'static>>) -> &'static [u8] {
     if let Some(icon_name) = icon_name {
-        match icon_name.as_ref() {
+        icon_name.map(|c| match c {
 % for icon_name, var_name in icons:
             "${icon_name}" => ICON_${var_name},
 % endfor
             _ => ICON_WEBAUTHN,
-        }
+        })
     } else {
         ICON_WEBAUTHN
     }
diff --git a/core/embed/rust/src/ui/model_mercury/component/frame.rs b/core/embed/rust/src/ui/model_mercury/component/frame.rs
index aa8adf7062..bd74351e01 100644
--- a/core/embed/rust/src/ui/model_mercury/component/frame.rs
+++ b/core/embed/rust/src/ui/model_mercury/component/frame.rs
@@ -62,7 +62,7 @@ where
         self
     }
 
-    pub fn with_subtitle(mut self, subtitle: U) -> Self {
+    pub fn with_subtitle(mut self, subtitle: TString<'static>) -> Self {
         let style = theme::TEXT_SUB;
         self.title = Child::new(self.title.into_inner().top_aligned());
         self.subtitle = Some(Child::new(Label::new(
diff --git a/core/embed/rust/src/ui/model_mercury/component/homescreen/mod.rs b/core/embed/rust/src/ui/model_mercury/component/homescreen/mod.rs
index da7418633a..62e95cc0f2 100644
--- a/core/embed/rust/src/ui/model_mercury/component/homescreen/mod.rs
+++ b/core/embed/rust/src/ui/model_mercury/component/homescreen/mod.rs
@@ -288,6 +288,13 @@ impl Component for Homescreen {
             }
 
             self.label.map(|t| {
+                let r = Rect::new(Point::new(6, 198), Point::new(234, 233));
+                shape::Bar::new(r)
+                    .with_bg(Color::black())
+                    .with_alpha(89)
+                    .with_radius(3)
+                    .render(target);
+
                 let style = theme::TEXT_DEMIBOLD;
                 let pos = Point::new(self.pad.area.center().x, LABEL_Y);
                 shape::Text::new(pos, t)
@@ -355,15 +362,15 @@ impl crate::trace::Trace for Homescreen {
     }
 }
 
-pub struct Lockscreen {
-    label: TString<'static>,
+pub struct Lockscreen<'a> {
+    label: TString<'a>,
     custom_image: Option<Gc<[u8]>>,
     bootscreen: bool,
     coinjoin_authorized: bool,
 }
 
-impl Lockscreen {
-    pub fn new(label: TString<'static>, bootscreen: bool, coinjoin_authorized: bool) -> Self {
+impl<'a> Lockscreen<'a> {
+    pub fn new(label: TString<'a>, bootscreen: bool, coinjoin_authorized: bool) -> Self {
         Lockscreen {
             label,
             custom_image: get_user_custom_image().ok(),
@@ -373,7 +380,7 @@ impl Lockscreen {
     }
 }
 
-impl Component for Lockscreen {
+impl Component for Lockscreen<'_> {
     type Msg = HomescreenMsg;
 
     fn place(&mut self, bounds: Rect) -> Rect {
@@ -470,7 +477,7 @@ impl Component for Lockscreen {
             shape::JpegImage::new(center, img_data)
                 .with_align(Alignment2D::CENTER)
                 .with_blur(4)
-                .with_dim(130)
+                .with_dim(140)
                 .render(target);
         } else if is_image_toif(img_data) {
             shape::ToifImage::new(center, unwrap!(Toif::new(img_data)))
@@ -591,7 +598,7 @@ fn is_image_toif(buffer: &[u8]) -> bool {
 }
 
 #[cfg(feature = "ui_debug")]
-impl crate::trace::Trace for Lockscreen {
+impl crate::trace::Trace for Lockscreen<'_> {
     fn trace(&self, t: &mut dyn crate::trace::Tracer) {
         t.component("Lockscreen");
     }
diff --git a/core/embed/rust/src/ui/model_mercury/component/keyboard/bip39.rs b/core/embed/rust/src/ui/model_mercury/component/keyboard/bip39.rs
index d4716494c7..8697af3683 100644
--- a/core/embed/rust/src/ui/model_mercury/component/keyboard/bip39.rs
+++ b/core/embed/rust/src/ui/model_mercury/component/keyboard/bip39.rs
@@ -23,9 +23,9 @@ use heapless::String;
 const MAX_LENGTH: usize = 8;
 
 pub struct Bip39Input {
-    button: Button<&'static str>,
+    button: Button<>,
     // used only to keep track of suggestion text color
-    button_suggestion: Button<&'static str>,
+    button_suggestion: Button<>,
     textbox: TextBox<MAX_LENGTH>,
     multi_tap: MultiTapKeyboard,
     options_num: Option<usize>,
@@ -228,7 +228,7 @@ impl Bip39Input {
         // Styling the input to reflect already filled word
         Self {
             button: Button::with_icon(theme::ICON_LIST_CHECK).styled(theme::button_pin_confirm()),
-            textbox: TextBox::new(String::from(word)),
+            textbox: TextBox::new(unwrap!(String::try_from(word))),
             multi_tap: MultiTapKeyboard::new(),
             options_num: bip39::options_num(word),
             suggested_word: bip39::complete_word(word),
@@ -310,7 +310,7 @@ impl Bip39Input {
             // Disabled button.
             self.button.disable(ctx);
             self.button.set_stylesheet(ctx, theme::button_pin());
-            self.button.set_content(ctx, ButtonContent::Text(""));
+            self.button.set_content(ctx, ButtonContent::Text("".into()));
         }
     }
 }
diff --git a/core/embed/rust/src/ui/model_mercury/component/keyboard/mnemonic.rs b/core/embed/rust/src/ui/model_mercury/component/keyboard/mnemonic.rs
index ed8bd2c84c..def0f6897b 100644
--- a/core/embed/rust/src/ui/model_mercury/component/keyboard/mnemonic.rs
+++ b/core/embed/rust/src/ui/model_mercury/component/keyboard/mnemonic.rs
@@ -1,11 +1,14 @@
-use crate::ui::{
-    component::{maybe::paint_overlapping, Child, Component, Event, EventCtx, Label, Maybe},
-    geometry::{Alignment2D, Grid, Offset, Rect},
-    model_mercury::{
-        component::{Button, ButtonMsg, Swipe, SwipeDirection},
-        theme,
+use crate::{
+    strutil::TString,
+    ui::{
+        component::{maybe::paint_overlapping, Child, Component, Event, EventCtx, Label, Maybe},
+        geometry::{Alignment2D, Grid, Offset, Rect},
+        model_mercury::{
+            component::{Button, ButtonMsg, Swipe, SwipeDirection},
+            theme,
+        },
+        shape::Renderer,
     },
-    shape::Renderer,
 };
 
 pub const MNEMONIC_KEY_COUNT: usize = 9;
@@ -15,27 +18,26 @@ pub enum MnemonicKeyboardMsg {
     Previous,
 }
 
-pub struct MnemonicKeyboard<T, U> {
+pub struct MnemonicKeyboard<T> {
     /// Initial prompt, displayed on empty input.
-    prompt: Child<Maybe<Label<U>>>,
+    prompt: Child<Maybe<Label<'static>>>,
     /// Backspace button.
-    back: Child<Maybe<Button<&'static str>>>,
+    back: Child<Maybe<Button>>,
     /// Input area, acting as the auto-complete and confirm button.
     input: Child<Maybe<T>>,
     /// Key buttons.
-    keys: [Child<Button<&'static str>>; MNEMONIC_KEY_COUNT],
+    keys: [Child<Button>; MNEMONIC_KEY_COUNT],
     /// Swipe controller - allowing for going to the previous word.
     swipe: Swipe,
     /// Whether going back is allowed (is not on the very first word).
     can_go_back: bool,
 }
 
-impl<T, U> MnemonicKeyboard<T, U>
+impl<T> MnemonicKeyboard<T>
 where
     T: MnemonicInput,
-    U: AsRef<str>,
 {
-    pub fn new(input: T, prompt: U, can_go_back: bool) -> Self {
+    pub fn new(input: T, prompt: TString<'static>, can_go_back: bool) -> Self {
         // Input might be already pre-filled
         let prompt_visible = input.is_empty();
 
@@ -58,7 +60,7 @@ where
             )),
             input: Child::new(Maybe::new(theme::BG, input, !prompt_visible)),
             keys: T::keys()
-                .map(|t| Button::with_text(t).styled(theme::button_pin()))
+                .map(|t| Button::with_text(t.into()).styled(theme::button_pin()))
                 .map(Child::new),
             swipe: Swipe::new().right(),
             can_go_back,
@@ -100,10 +102,9 @@ where
     }
 }
 
-impl<T, U> Component for MnemonicKeyboard<T, U>
+impl<T> Component for MnemonicKeyboard<T>
 where
     T: MnemonicInput,
-    U: AsRef<str>,
 {
     type Msg = MnemonicKeyboardMsg;
 
@@ -221,10 +222,9 @@ pub enum MnemonicInputMsg {
 }
 
 #[cfg(feature = "ui_debug")]
-impl<T, U> crate::trace::Trace for MnemonicKeyboard<T, U>
+impl<T> crate::trace::Trace for MnemonicKeyboard<T>
 where
     T: MnemonicInput + crate::trace::Trace,
-    U: AsRef<str>,
 {
     fn trace(&self, t: &mut dyn crate::trace::Tracer) {
         t.component("MnemonicKeyboard");
diff --git a/core/embed/rust/src/ui/model_mercury/component/keyboard/passphrase.rs b/core/embed/rust/src/ui/model_mercury/component/keyboard/passphrase.rs
index bbb9f55b3f..304f13339b 100644
--- a/core/embed/rust/src/ui/model_mercury/component/keyboard/passphrase.rs
+++ b/core/embed/rust/src/ui/model_mercury/component/keyboard/passphrase.rs
@@ -1,18 +1,21 @@
-use crate::ui::{
-    component::{
-        base::ComponentExt, text::common::TextBox, Child, Component, Event, EventCtx, Never,
+use crate::{
+    strutil::TString,
+    ui::{
+        component::{
+            base::ComponentExt, text::common::TextBox, Child, Component, Event, EventCtx, Never,
+        },
+        display,
+        geometry::{Grid, Offset, Rect},
+        model_mercury::component::{
+            button::{Button, ButtonContent, ButtonMsg},
+            keyboard::common::{paint_pending_marker, render_pending_marker, MultiTapKeyboard},
+            swipe::{Swipe, SwipeDirection},
+            theme, ScrollBar,
+        },
+        shape,
+        shape::Renderer,
+        util::long_line_content_with_ellipsis,
     },
-    display,
-    geometry::{Grid, Offset, Rect},
-    model_mercury::component::{
-        button::{Button, ButtonContent, ButtonMsg},
-        keyboard::common::{paint_pending_marker, render_pending_marker, MultiTapKeyboard},
-        swipe::{Swipe, SwipeDirection},
-        theme, ScrollBar,
-    },
-    shape,
-    shape::Renderer,
-    util::long_line_content_with_ellipsis,
 };
 
 use core::cell::Cell;
@@ -25,9 +28,9 @@ pub enum PassphraseKeyboardMsg {
 pub struct PassphraseKeyboard {
     page_swipe: Swipe,
     input: Child<Input>,
-    back: Child<Button<&'static str>>,
-    confirm: Child<Button<&'static str>>,
-    keys: [Child<Button<&'static str>>; KEY_COUNT],
+    back: Child<Button>,
+    confirm: Child<Button>,
+    keys: [Child<Button>; KEY_COUNT],
     scrollbar: ScrollBar,
     fade: Cell<bool>,
 }
@@ -71,20 +74,20 @@ impl PassphraseKeyboard {
         }
     }
 
-    fn key_text(content: &ButtonContent<&'static str>) -> &'static str {
+    fn key_text(content: &ButtonContent) -> TString<'static> {
         match content {
-            ButtonContent::Text(text) => text,
-            ButtonContent::Icon(_) => " ",
-            ButtonContent::IconAndText(_) => " ",
-            ButtonContent::Empty => "",
-            ButtonContent::IconBlend(_, _, _) => "",
+            ButtonContent::Text(text) => *text,
+            ButtonContent::Icon(_) => " ".into(),
+            ButtonContent::IconAndText(_) => " ".into(),
+            ButtonContent::Empty => "".into(),
+            ButtonContent::IconBlend(_, _, _) => "".into(),
         }
     }
 
-    fn key_content(text: &'static str) -> ButtonContent<&'static str> {
+    fn key_content(text: &'static str) -> ButtonContent {
         match text {
             " " => ButtonContent::Icon(theme::ICON_SPACE),
-            t => ButtonContent::Text(t),
+            t => ButtonContent::Text(t.into()),
         }
     }
 
@@ -274,7 +277,7 @@ impl Component for PassphraseKeyboard {
                 // character in textbox. If not, let's just append the first character.
                 let text = Self::key_text(btn.inner().content());
                 self.input.mutate(ctx, |ctx, i| {
-                    let edit = i.multi_tap.click_key(ctx, key, text);
+                    let edit = text.map(|c| i.multi_tap.click_key(ctx, key, c));
                     i.textbox.apply(ctx, edit);
                 });
                 self.after_edit(ctx);
diff --git a/core/embed/rust/src/ui/model_mercury/component/keyboard/pin.rs b/core/embed/rust/src/ui/model_mercury/component/keyboard/pin.rs
index d8846a28e0..b3be2deb62 100644
--- a/core/embed/rust/src/ui/model_mercury/component/keyboard/pin.rs
+++ b/core/embed/rust/src/ui/model_mercury/component/keyboard/pin.rs
@@ -2,6 +2,7 @@ use core::mem;
 use heapless::String;
 
 use crate::{
+    strutil::TString,
     time::Duration,
     trezorhal::random,
     ui::{
@@ -41,32 +42,29 @@ const HEADER_PADDING: Insets = Insets::new(
     HEADER_PADDING_SIDE,
 );
 
-pub struct PinKeyboard<T> {
+pub struct PinKeyboard<'a> {
     allow_cancel: bool,
-    major_prompt: Child<Label<T>>,
-    minor_prompt: Child<Label<T>>,
-    major_warning: Option<Child<Label<T>>>,
+    major_prompt: Child<Label<'a>>,
+    minor_prompt: Child<Label<'a>>,
+    major_warning: Option<Child<Label<'a>>>,
     textbox: Child<PinDots>,
     textbox_pad: Pad,
-    erase_btn: Child<Maybe<Button<&'static str>>>,
-    cancel_btn: Child<Maybe<Button<&'static str>>>,
-    confirm_btn: Child<Button<&'static str>>,
-    digit_btns: [Child<Button<&'static str>>; DIGIT_COUNT],
+    erase_btn: Child<Maybe<Button>>,
+    cancel_btn: Child<Maybe<Button>>,
+    confirm_btn: Child<Button>,
+    digit_btns: [Child<Button>; DIGIT_COUNT],
     warning_timer: Option<TimerToken>,
 }
 
-impl<T> PinKeyboard<T>
-where
-    T: AsRef<str>,
-{
+impl<'a> PinKeyboard<'a> {
     // Label position fine-tuning.
     const MAJOR_OFF: Offset = Offset::y(11);
     const MINOR_OFF: Offset = Offset::y(11);
 
     pub fn new(
-        major_prompt: T,
-        minor_prompt: T,
-        major_warning: Option<T>,
+        major_prompt: TString<'a>,
+        minor_prompt: TString<'a>,
+        major_warning: Option<TString<'a>>,
         allow_cancel: bool,
     ) -> Self {
         // Control buttons.
@@ -104,12 +102,12 @@ where
         }
     }
 
-    fn generate_digit_buttons() -> [Child<Button<&'static str>>; DIGIT_COUNT] {
+    fn generate_digit_buttons() -> [Child<Button>; DIGIT_COUNT] {
         // Generate a random sequence of digits from 0 to 9.
         let mut digits = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
         random::shuffle(&mut digits);
         digits
-            .map(Button::with_text)
+            .map(|c| Button::with_text(c.into()))
             .map(|b| b.styled(theme::button_pin()))
             .map(Child::new)
     }
@@ -148,10 +146,7 @@ where
     }
 }
 
-impl<T> Component for PinKeyboard<T>
-where
-    T: AsRef<str>,
-{
+impl Component for PinKeyboard<'_> {
     type Msg = PinKeyboardMsg;
 
     fn place(&mut self, bounds: Rect) -> Rect {
@@ -240,7 +235,9 @@ where
         for btn in &mut self.digit_btns {
             if let Some(Clicked) = btn.event(ctx, event) {
                 if let ButtonContent::Text(text) = btn.inner().content() {
-                    self.textbox.mutate(ctx, |ctx, t| t.push(ctx, text));
+                    text.map(|text| {
+                        self.textbox.mutate(ctx, |ctx, t| t.push(ctx, text));
+                    });
                     self.pin_modified(ctx);
                     return None;
                 }
@@ -551,10 +548,7 @@ impl Component for PinDots {
 }
 
 #[cfg(feature = "ui_debug")]
-impl<T> crate::trace::Trace for PinKeyboard<T>
-where
-    T: AsRef<str>,
-{
+impl crate::trace::Trace for PinKeyboard<'_> {
     fn trace(&self, t: &mut dyn crate::trace::Tracer) {
         t.component("PinKeyboard");
         // So that debuglink knows the locations of the buttons
@@ -562,7 +556,9 @@ where
         for btn in self.digit_btns.iter() {
             let btn_content = btn.inner().content();
             if let ButtonContent::Text(text) = btn_content {
-                unwrap!(digits_order.push_str(text));
+                text.map(|text| {
+                    unwrap!(digits_order.push_str(text));
+                });
             }
         }
         t.string("digits_order", digits_order.as_str().into());
diff --git a/core/embed/rust/src/ui/model_mercury/component/keyboard/slip39.rs b/core/embed/rust/src/ui/model_mercury/component/keyboard/slip39.rs
index d4d14bfb92..2aba48275a 100644
--- a/core/embed/rust/src/ui/model_mercury/component/keyboard/slip39.rs
+++ b/core/embed/rust/src/ui/model_mercury/component/keyboard/slip39.rs
@@ -30,7 +30,7 @@ use crate::{
 const MAX_LENGTH: usize = 8;
 
 pub struct Slip39Input {
-    button: Button<&'static str>,
+    button: Button,
     textbox: TextBox<MAX_LENGTH>,
     multi_tap: MultiTapKeyboard,
     final_word: Option<&'static str>,
@@ -360,7 +360,7 @@ impl Slip39Input {
         } else {
             // Disabled button.
             self.button.disable(ctx);
-            self.button.set_content(ctx, ButtonContent::Text(""));
+            self.button.set_content(ctx, ButtonContent::Text("".into()));
         }
     }
 
diff --git a/core/embed/rust/src/ui/model_mercury/component/keyboard/word_count.rs b/core/embed/rust/src/ui/model_mercury/component/keyboard/word_count.rs
index a2af6c54ef..bdccf58bf9 100644
--- a/core/embed/rust/src/ui/model_mercury/component/keyboard/word_count.rs
+++ b/core/embed/rust/src/ui/model_mercury/component/keyboard/word_count.rs
@@ -13,7 +13,7 @@ const LABELS: [&str; 5] = ["12", "18", "20", "24", "33"];
 const CELLS: [(usize, usize); 5] = [(0, 0), (0, 2), (0, 4), (1, 0), (1, 2)];
 
 pub struct SelectWordCount {
-    button: [Button<&'static str>; NUMBERS.len()],
+    button: [Button; NUMBERS.len()],
 }
 
 pub enum SelectWordCountMsg {
@@ -23,7 +23,7 @@ pub enum SelectWordCountMsg {
 impl SelectWordCount {
     pub fn new() -> Self {
         SelectWordCount {
-            button: LABELS.map(|t| Button::with_text(t).styled(theme::button_pin())),
+            button: LABELS.map(|t| Button::with_text(t.into()).styled(theme::button_pin())),
         }
     }
 }
diff --git a/core/embed/rust/src/ui/model_mercury/component/number_input.rs b/core/embed/rust/src/ui/model_mercury/component/number_input.rs
index 891bb8ab2b..c39ac6ba2e 100644
--- a/core/embed/rust/src/ui/model_mercury/component/number_input.rs
+++ b/core/embed/rust/src/ui/model_mercury/component/number_input.rs
@@ -1,7 +1,6 @@
 use crate::{
     error::Error,
-    micropython::buffer::StrBuffer,
-    strutil::{self, StringType},
+    strutil::{self, StringType, TString},
     translations::TR,
     ui::{
         component::{
@@ -23,23 +22,22 @@ pub enum NumberInputDialogMsg {
     InfoRequested,
 }
 
-pub struct NumberInputDialog<T, F>
+pub struct NumberInputDialog<F>
 where
-    F: Fn(u32) -> T,
+    F: Fn(u32) -> TString<'static>,
 {
     area: Rect,
     description_func: F,
     input: Child<NumberInput>,
-    paragraphs: Child<Paragraphs<Paragraph<T>>>,
+    paragraphs: Child<Paragraphs<Paragraph<'static>>>,
     paragraphs_pad: Pad,
-    info_button: Child<Button<StrBuffer>>,
-    confirm_button: Child<Button<StrBuffer>>,
+    info_button: Child<Button>,
+    confirm_button: Child<Button>,
 }
 
-impl<T, F> NumberInputDialog<T, F>
+impl<F> NumberInputDialog<F>
 where
-    F: Fn(u32) -> T,
-    T: StringType,
+    F: Fn(u32) -> TString<'static>,
 {
     pub fn new(min: u32, max: u32, init_value: u32, description_func: F) -> Result<Self, Error> {
         let text = description_func(init_value);
@@ -49,8 +47,8 @@ where
             input: NumberInput::new(min, max, init_value).into_child(),
             paragraphs: Paragraphs::new(Paragraph::new(&theme::TEXT_NORMAL, text)).into_child(),
             paragraphs_pad: Pad::with_background(theme::BG),
-            info_button: Button::with_text(TR::buttons__info.try_into()?).into_child(),
-            confirm_button: Button::with_text(TR::buttons__continue.try_into()?)
+            info_button: Button::with_text(TR::buttons__info.into()).into_child(),
+            confirm_button: Button::with_text(TR::buttons__continue.into())
                 .styled(theme::button_confirm())
                 .into_child(),
         })
@@ -73,10 +71,9 @@ where
     }
 }
 
-impl<T, F> Component for NumberInputDialog<T, F>
+impl<F> Component for NumberInputDialog<F>
 where
-    T: StringType,
-    F: Fn(u32) -> T,
+    F: Fn(u32) -> TString<'static>,
 {
     type Msg = NumberInputDialogMsg;
 
@@ -143,10 +140,9 @@ where
 }
 
 #[cfg(feature = "ui_debug")]
-impl<T, F> crate::trace::Trace for NumberInputDialog<T, F>
+impl<F> crate::trace::Trace for NumberInputDialog<F>
 where
-    T: StringType,
-    F: Fn(u32) -> T,
+    F: Fn(u32) -> TString<'static>,
 {
     fn trace(&self, t: &mut dyn crate::trace::Tracer) {
         t.component("NumberInputDialog");
@@ -163,8 +159,8 @@ pub enum NumberInputMsg {
 
 pub struct NumberInput {
     area: Rect,
-    dec: Child<Button<&'static str>>,
-    inc: Child<Button<&'static str>>,
+    dec: Child<Button>,
+    inc: Child<Button>,
     min: u32,
     max: u32,
     value: u32,
@@ -172,10 +168,10 @@ pub struct NumberInput {
 
 impl NumberInput {
     pub fn new(min: u32, max: u32, value: u32) -> Self {
-        let dec = Button::with_text("-")
+        let dec = Button::with_text("-".into())
             .styled(theme::button_counter())
             .into_child();
-        let inc = Button::with_text("+")
+        let inc = Button::with_text("+".into())
             .styled(theme::button_counter())
             .into_child();
         let value = value.clamp(min, max);
@@ -226,7 +222,7 @@ impl Component for NumberInput {
         let mut buf = [0u8; 10];
         if let Some(text) = strutil::format_i64(self.value as i64, &mut buf) {
             let digit_font = Font::DEMIBOLD;
-            let y_offset = digit_font.text_height() / 2 + Button::<&str>::BASELINE_OFFSET.y;
+            let y_offset = digit_font.text_height() / 2 + Button::BASELINE_OFFSET.y;
             display::rect_fill(self.area, theme::BG);
             display::text_center(
                 self.area.center() + Offset::y(y_offset),
@@ -245,7 +241,7 @@ impl Component for NumberInput {
 
         if let Some(text) = strutil::format_i64(self.value as i64, &mut buf) {
             let digit_font = Font::DEMIBOLD;
-            let y_offset = digit_font.text_height() / 2 + Button::<&str>::BASELINE_OFFSET.y;
+            let y_offset = digit_font.text_height() / 2 + Button::BASELINE_OFFSET.y;
 
             shape::Bar::new(self.area).with_bg(theme::BG).render(target);
             shape::Text::new(self.area.center() + Offset::y(y_offset), text)
diff --git a/core/embed/rust/src/ui/model_mercury/component/page.rs b/core/embed/rust/src/ui/model_mercury/component/page.rs
index 5fda83a5f2..e6dfec4706 100644
--- a/core/embed/rust/src/ui/model_mercury/component/page.rs
+++ b/core/embed/rust/src/ui/model_mercury/component/page.rs
@@ -1,6 +1,6 @@
 use crate::{
     error::Error,
-    micropython::buffer::StrBuffer,
+    strutil::TString,
     time::Instant,
     translations::TR,
     ui::{
@@ -22,7 +22,7 @@ use core::cell::Cell;
 
 /// Allows pagination of inner component. Shows scroll bar, confirm & cancel
 /// buttons. Optionally handles hold-to-confirm with loader.
-pub struct ButtonPage<T, U> {
+pub struct ButtonPage<T> {
     /// Inner component.
     content: T,
     /// Cleared when page changes.
@@ -32,10 +32,10 @@ pub struct ButtonPage<T, U> {
     scrollbar: ScrollBar,
     /// Hold-to-confirm mode whenever this is `Some(loader)`.
     loader: Option<Loader>,
-    button_cancel: Option<Button<U>>,
-    button_confirm: Button<U>,
-    button_prev: Button<&'static str>,
-    button_next: Button<&'static str>,
+    button_cancel: Option<Button>,
+    button_confirm: Button,
+    button_prev: Button,
+    button_next: Button,
     /// Show cancel button instead of back button.
     cancel_from_any_page: bool,
     /// Whether to pass-through left swipe to parent component.
@@ -46,24 +46,23 @@ pub struct ButtonPage<T, U> {
     fade: Cell<Option<u16>>,
 }
 
-impl<T> ButtonPage<T, StrBuffer>
+impl<T> ButtonPage<T>
 where
     T: Paginate,
     T: Component,
 {
     pub fn with_hold(mut self) -> Result<Self, Error> {
-        self.button_confirm = Button::with_text(TR::buttons__hold_to_confirm.try_into()?)
-            .styled(theme::button_confirm());
+        self.button_confirm =
+            Button::with_text(TR::buttons__hold_to_confirm.into()).styled(theme::button_confirm());
         self.loader = Some(Loader::new());
         Ok(self)
     }
 }
 
-impl<T, U> ButtonPage<T, U>
+impl<T> ButtonPage<T>
 where
     T: Paginate,
     T: Component,
-    U: AsRef<str> + From<&'static str>,
 {
     pub fn new(content: T, background: Color) -> Self {
         Self {
@@ -88,13 +87,17 @@ where
         self
     }
 
-    pub fn with_cancel_confirm(mut self, left: Option<U>, right: Option<U>) -> Self {
+    pub fn with_cancel_confirm(
+        mut self,
+        left: Option<TString<'static>>,
+        right: Option<TString<'static>>,
+    ) -> Self {
         let cancel = match left {
-            Some(verb) => match verb.as_ref() {
+            Some(verb) => verb.map(|s| match s {
                 "^" => Button::with_icon(theme::ICON_UP),
                 "<" => Button::with_icon(theme::ICON_BACK),
                 _ => Button::with_text(verb),
-            },
+            }),
             _ => Button::with_icon(theme::ICON_CANCEL),
         };
         let confirm = match right {
@@ -285,11 +288,10 @@ enum HandleResult<T> {
     Continue,
 }
 
-impl<T, U> Component for ButtonPage<T, U>
+impl<T> Component for ButtonPage<T>
 where
     T: Paginate,
     T: Component,
-    U: AsRef<str> + From<&'static str>,
 {
     type Msg = PageMsg<T::Msg>;
 
@@ -297,7 +299,7 @@ where
         let small_left_button = match (&self.button_cancel, &self.button_confirm) {
             (None, _) => true,
             (Some(cancel), confirm) => match (cancel.content(), confirm.content()) {
-                (ButtonContent::Text(t), _) => t.as_ref().len() <= 4,
+                (ButtonContent::Text(t), _) => t.len() <= 4,
                 (ButtonContent::Icon(_), ButtonContent::Icon(_)) => false,
                 _ => true,
             },
@@ -455,7 +457,7 @@ where
 }
 
 #[cfg(feature = "ui_debug")]
-impl<T, U> crate::trace::Trace for ButtonPage<T, U>
+impl<T> crate::trace::Trace for ButtonPage<T>
 where
     T: crate::trace::Trace,
 {
@@ -532,12 +534,6 @@ mod tests {
 
     const SCREEN: Rect = constant::screen().inset(theme::borders());
 
-    impl SkipPrefix for &str {
-        fn skip_prefix(&self, chars: usize) -> Self {
-            &self[chars..]
-        }
-    }
-
     fn swipe(component: &mut impl Component, points: &[(i16, i16)]) {
         let last = points.len().saturating_sub(1);
         let mut first = true;
@@ -567,10 +563,7 @@ mod tests {
 
     #[test]
     fn paragraphs_empty() {
-        let mut page = ButtonPage::<_, &'static str>::new(
-            Paragraphs::<[Paragraph<&'static str>; 0]>::new([]),
-            theme::BG,
-        );
+        let mut page = ButtonPage::new(Paragraphs::<[Paragraph<'static>; 0]>::new([]), theme::BG);
         page.place(SCREEN);
 
         let expected = serde_json::json!({
@@ -593,7 +586,7 @@ mod tests {
 
     #[test]
     fn paragraphs_single() {
-        let mut page = ButtonPage::<_, &'static str>::new(
+        let mut page = ButtonPage::new(
             Paragraphs::new([
                 Paragraph::new(
                     &theme::TEXT_NORMAL,
@@ -631,7 +624,7 @@ mod tests {
 
     #[test]
     fn paragraphs_one_long() {
-        let mut page = ButtonPage::<_, &'static str>::new(
+        let mut page = ButtonPage::new(
             Paragraphs::new(
                 Paragraph::new(
                     &theme::TEXT_BOLD,
@@ -689,7 +682,7 @@ mod tests {
 
     #[test]
     fn paragraphs_three_long() {
-        let mut page = ButtonPage::<_, &'static str>::new(
+        let mut page = ButtonPage::new(
             Paragraphs::new([
                 Paragraph::new(
                     &theme::TEXT_BOLD,
@@ -789,7 +782,7 @@ mod tests {
 
     #[test]
     fn paragraphs_hard_break() {
-        let mut page = ButtonPage::<_, &'static str>::new(
+        let mut page = ButtonPage::new(
             Paragraphs::new([
                 Paragraph::new(&theme::TEXT_NORMAL, "Short one.").break_after(),
                 Paragraph::new(&theme::TEXT_NORMAL, "Short two.").break_after(),
diff --git a/core/embed/rust/src/ui/model_mercury/component/progress.rs b/core/embed/rust/src/ui/model_mercury/component/progress.rs
index 91e27b2383..6943792738 100644
--- a/core/embed/rust/src/ui/model_mercury/component/progress.rs
+++ b/core/embed/rust/src/ui/model_mercury/component/progress.rs
@@ -1,8 +1,7 @@
 use core::mem;
 
 use crate::{
-    error::Error,
-    strutil::StringType,
+    strutil::TString,
     ui::{
         component::{
             base::ComponentExt,
@@ -21,27 +20,22 @@ use crate::{
 
 use super::theme;
 
-pub struct Progress<T> {
-    title: Child<Label<T>>,
+pub struct Progress {
+    title: Child<Label<'static>>,
     value: u16,
     loader_y_offset: i16,
     indeterminate: bool,
-    description: Child<Paragraphs<Paragraph<T>>>,
+    description: Child<Paragraphs<Paragraph<'static>>>,
     description_pad: Pad,
-    update_description: fn(&str) -> Result<T, Error>,
 }
 
-impl<T> Progress<T>
-where
-    T: StringType,
-{
+impl Progress {
     const AREA: Rect = constant::screen().inset(theme::borders());
 
     pub fn new(
-        title: T,
+        title: TString<'static>,
         indeterminate: bool,
-        description: T,
-        update_description: fn(&str) -> Result<T, Error>,
+        description: TString<'static>,
     ) -> Self {
         Self {
             title: Label::centered(title, theme::label_progress()).into_child(),
@@ -53,15 +47,11 @@ where
             )
             .into_child(),
             description_pad: Pad::with_background(theme::BG),
-            update_description,
         }
     }
 }
 
-impl<T> Component for Progress<T>
-where
-    T: StringType,
-{
+impl Component for Progress {
     type Msg = Never;
 
     fn place(&mut self, _bounds: Rect) -> Rect {
@@ -70,10 +60,7 @@ where
             .inner()
             .inner()
             .content()
-            .as_ref()
-            .chars()
-            .filter(|c| *c == '\n')
-            .count() as i16;
+            .map(|t| t.chars().filter(|c| *c == '\n').count() as i16);
         let (title, rest) = Self::AREA.split_top(self.title.inner().max_size().y);
         let (loader, description) =
             rest.split_bottom(Font::NORMAL.line_height() * description_lines);
@@ -92,8 +79,7 @@ where
                     ctx.request_paint();
                 }
                 self.description.mutate(ctx, |ctx, para| {
-                    if para.inner_mut().content().as_ref() != new_description {
-                        let new_description = unwrap!((self.update_description)(new_description));
+                    if para.inner_mut().content() != &new_description {
                         para.inner_mut().update(new_description);
                         para.change_page(0); // Recompute bounding box.
                         ctx.request_paint();
@@ -172,10 +158,7 @@ where
 }
 
 #[cfg(feature = "ui_debug")]
-impl<T> crate::trace::Trace for Progress<T>
-where
-    T: StringType,
-{
+impl crate::trace::Trace for Progress {
     fn trace(&self, t: &mut dyn crate::trace::Tracer) {
         t.component("Progress");
     }
diff --git a/core/embed/rust/src/ui/model_mercury/component/vertical_menu.rs b/core/embed/rust/src/ui/model_mercury/component/vertical_menu.rs
index 575819b702..5045f3187c 100644
--- a/core/embed/rust/src/ui/model_mercury/component/vertical_menu.rs
+++ b/core/embed/rust/src/ui/model_mercury/component/vertical_menu.rs
@@ -1,12 +1,16 @@
 use heapless::Vec;
 
 use super::theme;
-use crate::ui::{
-    component::{base::Component, Event, EventCtx},
-    display::Icon,
-    geometry::Rect,
-    model_mercury::component::button::{Button, ButtonMsg, IconText},
-    shape::{Bar, Renderer},
+use crate::{
+    micropython::buffer::StrBuffer,
+    strutil::TString,
+    ui::{
+        component::{base::Component, Event, EventCtx},
+        display::Icon,
+        geometry::Rect,
+        model_mercury::component::button::{Button, ButtonMsg, IconText},
+        shape::{Bar, Renderer},
+    },
 };
 
 pub enum VerticalMenuChoiceMsg {
@@ -27,39 +31,37 @@ const MENU_BUTTON_HEIGHT: i16 = 64;
 /// Fixed height of a separator.
 const MENU_SEP_HEIGHT: i16 = 2;
 
-type VerticalMenuButtons<T> = Vec<Button<T>, N_ITEMS>;
+type VerticalMenuButtons = Vec<Button, N_ITEMS>;
 type AreasForSeparators = Vec<Rect, N_SEPS>;
 
-pub struct VerticalMenu<T> {
+pub struct VerticalMenu {
     area: Rect,
     /// buttons placed vertically from top to bottom
-    buttons: VerticalMenuButtons<T>,
+    buttons: VerticalMenuButtons,
     /// areas for visual separators between buttons
     areas_sep: AreasForSeparators,
 }
 
-impl<T> VerticalMenu<T>
-where
-    T: AsRef<str>,
-{
-    fn new(buttons: VerticalMenuButtons<T>) -> Self {
+impl VerticalMenu {
+    fn new(buttons: VerticalMenuButtons) -> Self {
         Self {
             area: Rect::zero(),
             buttons,
             areas_sep: AreasForSeparators::new(),
         }
     }
-    pub fn select_word(words: [T; 3]) -> Self {
+    pub fn select_word(words: [StrBuffer; 3]) -> Self {
         let mut buttons_vec = VerticalMenuButtons::new();
         for word in words {
-            let button = Button::with_text(word).styled(theme::button_vertical_menu());
+            let button = Button::with_text(word.into()).styled(theme::button_vertical_menu());
             unwrap!(buttons_vec.push(button));
         }
         Self::new(buttons_vec)
     }
 
-    pub fn context_menu(options: [(T, Icon); 3]) -> Self {
+    pub fn context_menu(options: [(&'static str, Icon); 3]) -> Self {
         // TODO: this is just POC
+        // FIXME: args should be TString when IconText has TString
         let mut buttons_vec = VerticalMenuButtons::new();
         for opt in options {
             let button_theme;
@@ -79,10 +81,7 @@ where
     }
 }
 
-impl<T> Component for VerticalMenu<T>
-where
-    T: AsRef<str>,
-{
+impl Component for VerticalMenu {
     type Msg = VerticalMenuChoiceMsg;
 
     fn place(&mut self, bounds: Rect) -> Rect {
@@ -141,10 +140,7 @@ where
 }
 
 #[cfg(feature = "ui_debug")]
-impl<T> crate::trace::Trace for VerticalMenu<T>
-where
-    T: AsRef<str>,
-{
+impl crate::trace::Trace for VerticalMenu {
     fn trace(&self, t: &mut dyn crate::trace::Tracer) {
         t.component("VerticalMenu");
         t.in_list("buttons", &|button_list| {
diff --git a/core/embed/rust/src/ui/model_mercury/layout.rs b/core/embed/rust/src/ui/model_mercury/layout.rs
index 3f34816dc4..1012d24b3b 100644
--- a/core/embed/rust/src/ui/model_mercury/layout.rs
+++ b/core/embed/rust/src/ui/model_mercury/layout.rs
@@ -14,7 +14,7 @@ use crate::{
         qstr::Qstr,
         util,
     },
-    strutil::{StringType, TString},
+    strutil::TString,
     translations::TR,
     trezorhal::model,
     ui::{
@@ -112,10 +112,9 @@ impl TryFrom<VerticalMenuChoiceMsg> for Obj {
     }
 }
 
-impl<F, T, U> ComponentMsgObj for FidoConfirm<F, T, U>
+impl<F, U> ComponentMsgObj for FidoConfirm<F, U>
 where
-    F: Fn(usize) -> T,
-    T: StringType,
+    F: Fn(usize) -> TString<'static>,
     U: Component<Msg = CancelConfirmMsg>,
 {
     fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
@@ -140,9 +139,8 @@ where
     }
 }
 
-impl<T, U> ComponentMsgObj for IconDialog<T, U>
+impl<U> ComponentMsgObj for IconDialog<U>
 where
-    T: StringType,
     U: Component,
     <U as Component>::Msg: TryInto<Obj, Error = Error>,
 {
@@ -154,10 +152,7 @@ where
     }
 }
 
-impl<T> ComponentMsgObj for PinKeyboard<T>
-where
-    T: AsRef<str>,
-{
+impl ComponentMsgObj for PinKeyboard<'_> {
     fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
         match msg {
             PinKeyboardMsg::Confirmed => self.pin().try_into(),
@@ -175,10 +170,9 @@ impl ComponentMsgObj for PassphraseKeyboard {
     }
 }
 
-impl<T, U> ComponentMsgObj for MnemonicKeyboard<T, U>
+impl<T> ComponentMsgObj for MnemonicKeyboard<T>
 where
     T: MnemonicInput,
-    U: AsRef<str>,
 {
     fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
         match msg {
@@ -194,10 +188,9 @@ where
     }
 }
 
-impl<T, U> ComponentMsgObj for Frame<T, U>
+impl<T> ComponentMsgObj for Frame<T>
 where
     T: ComponentMsgObj,
-    U: AsRef<str>,
 {
     fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
         match msg {
@@ -216,10 +209,7 @@ impl ComponentMsgObj for ShareWords<'_> {
     }
 }
 
-impl<T> ComponentMsgObj for VerticalMenu<T>
-where
-    T: AsRef<str>,
-{
+impl ComponentMsgObj for VerticalMenu {
     fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
         match msg {
             VerticalMenuChoiceMsg::Selected(i) => i.try_into(),
@@ -227,10 +217,9 @@ where
     }
 }
 
-impl<T, U> ComponentMsgObj for ButtonPage<T, U>
+impl<T> ComponentMsgObj for ButtonPage<T>
 where
     T: Component + Paginate,
-    U: AsRef<str> + From<&'static str>,
 {
     fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
         match msg {
@@ -252,37 +241,33 @@ impl ComponentMsgObj for Jpeg {
 // Clippy/compiler complains about conflicting implementations
 // TODO move the common impls to a common module
 #[cfg(not(feature = "clippy"))]
-impl<T> ComponentMsgObj for Paragraphs<T>
+impl<'a, T> ComponentMsgObj for Paragraphs<T>
 where
-    T: ParagraphSource,
+    T: ParagraphSource<'a>,
 {
     fn msg_try_into_obj(&self, _msg: Self::Msg) -> Result<Obj, Error> {
         unreachable!()
     }
 }
 
-impl<T> ComponentMsgObj for FormattedText<T>
+impl ComponentMsgObj for FormattedText {
+    fn msg_try_into_obj(&self, _msg: Self::Msg) -> Result<Obj, Error> {
+        unreachable!()
+    }
+}
+
+impl<'a, T> ComponentMsgObj for Checklist<T>
 where
-    T: StringType + Clone,
+    T: ParagraphSource<'a>,
 {
     fn msg_try_into_obj(&self, _msg: Self::Msg) -> Result<Obj, Error> {
         unreachable!()
     }
 }
 
-impl<T> ComponentMsgObj for Checklist<T>
+impl<F> ComponentMsgObj for NumberInputDialog<F>
 where
-    T: ParagraphSource,
-{
-    fn msg_try_into_obj(&self, _msg: Self::Msg) -> Result<Obj, Error> {
-        unreachable!()
-    }
-}
-
-impl<T, F> ComponentMsgObj for NumberInputDialog<T, F>
-where
-    T: StringType,
-    F: Fn(u32) -> T,
+    F: Fn(u32) -> TString<'static>,
 {
     fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
         let value = self.value().try_into()?;
@@ -302,10 +287,7 @@ where
     }
 }
 
-impl<T> ComponentMsgObj for Progress<T>
-where
-    T: StringType,
-{
+impl ComponentMsgObj for Progress {
     fn msg_try_into_obj(&self, _msg: Self::Msg) -> Result<Obj, Error> {
         unreachable!()
     }
@@ -319,7 +301,7 @@ impl ComponentMsgObj for Homescreen {
     }
 }
 
-impl ComponentMsgObj for Lockscreen {
+impl ComponentMsgObj for Lockscreen<'_> {
     fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
         match msg {
             HomescreenMsg::Dismissed => Ok(CANCELLED.as_obj()),
@@ -327,10 +309,9 @@ impl ComponentMsgObj for Lockscreen {
     }
 }
 
-impl<T, S> ComponentMsgObj for (GridPlaced<Paragraphs<T>>, GridPlaced<FormattedText<S>>)
+impl<'a, T> ComponentMsgObj for (GridPlaced<Paragraphs<T>>, GridPlaced<FormattedText>)
 where
-    T: ParagraphSource,
-    S: StringType + Clone,
+    T: ParagraphSource<'a>,
 {
     fn msg_try_into_obj(&self, _msg: Self::Msg) -> Result<Obj, Error> {
         unreachable!()
@@ -367,18 +348,14 @@ where
     }
 }
 
-impl<T> ComponentMsgObj for AddressDetails<T>
-where
-    T: StringType + Clone,
-{
+impl ComponentMsgObj for AddressDetails {
     fn msg_try_into_obj(&self, _msg: Self::Msg) -> Result<Obj, Error> {
         Ok(CANCELLED.as_obj())
     }
 }
 
-impl<T, U> ComponentMsgObj for CoinJoinProgress<T, U>
+impl<U> ComponentMsgObj for CoinJoinProgress<U>
 where
-    T: AsRef<str>,
     U: Component<Msg = Never>,
 {
     fn msg_try_into_obj(&self, _msg: Self::Msg) -> Result<Obj, Error> {
@@ -386,10 +363,7 @@ where
     }
 }
 
-impl<T> ComponentMsgObj for super::component::bl_confirm::Confirm<T>
-where
-    T: AsRef<str>,
-{
+impl ComponentMsgObj for super::component::bl_confirm::Confirm<'_> {
     fn msg_try_into_obj(&self, msg: Self::Msg) -> Result<Obj, Error> {
         match msg {
             super::component::bl_confirm::ConfirmMsg::Cancel => Ok(CANCELLED.as_obj()),
@@ -400,15 +374,15 @@ where
 
 extern "C" fn new_confirm_action(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
-        let action: Option<StrBuffer> = kwargs.get(Qstr::MP_QSTR_action)?.try_into_option()?;
-        let description: Option<StrBuffer> =
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let action: Option<TString> = kwargs.get(Qstr::MP_QSTR_action)?.try_into_option()?;
+        let description: Option<TString> =
             kwargs.get(Qstr::MP_QSTR_description)?.try_into_option()?;
-        let verb: Option<StrBuffer> = kwargs
+        let verb: Option<TString> = kwargs
             .get(Qstr::MP_QSTR_verb)
             .unwrap_or_else(|_| Obj::const_none())
             .try_into_option()?;
-        let verb_cancel: Option<StrBuffer> = kwargs
+        let verb_cancel: Option<TString> = kwargs
             .get(Qstr::MP_QSTR_verb_cancel)
             .unwrap_or_else(|_| Obj::const_none())
             .try_into_option()?;
@@ -417,8 +391,8 @@ extern "C" fn new_confirm_action(n_args: usize, args: *const Obj, kwargs: *mut M
         let hold_danger: bool = kwargs.get_or(Qstr::MP_QSTR_hold_danger, false)?;
 
         let paragraphs = {
-            let action = action.unwrap_or_default();
-            let description = description.unwrap_or_default();
+            let action = action.unwrap_or("".into());
+            let description = description.unwrap_or("".into());
             let mut paragraphs = ParagraphVecShort::new();
             if !reverse {
                 paragraphs
@@ -448,8 +422,8 @@ extern "C" fn new_confirm_action(n_args: usize, args: *const Obj, kwargs: *mut M
 
 extern "C" fn new_confirm_emphasized(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
-        let verb: Option<StrBuffer> = kwargs
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let verb: Option<TString> = kwargs
             .get(Qstr::MP_QSTR_verb)
             .unwrap_or_else(|_| Obj::const_none())
             .try_into_option()?;
@@ -458,10 +432,10 @@ extern "C" fn new_confirm_emphasized(n_args: usize, args: *const Obj, kwargs: *m
         let mut ops = OpTextLayout::new(theme::TEXT_NORMAL);
         for item in IterBuf::new().try_iterate(items)? {
             if item.is_str() {
-                ops = ops.text_normal(item.try_into()?)
+                ops = ops.text_normal(TString::try_from(item)?)
             } else {
                 let [emphasis, text]: [Obj; 2] = util::iter_into_array(item)?;
-                let text: StrBuffer = text.try_into()?;
+                let text: TString = text.try_into()?;
                 if emphasis.try_into()? {
                     ops = ops.text_demibold(text);
                 } else {
@@ -481,13 +455,13 @@ extern "C" fn new_confirm_emphasized(n_args: usize, args: *const Obj, kwargs: *m
 }
 
 struct ConfirmBlobParams {
-    title: StrBuffer,
-    subtitle: Option<StrBuffer>,
+    title: TString<'static>,
+    subtitle: Option<TString<'static>>,
     data: Obj,
-    description: Option<StrBuffer>,
-    extra: Option<StrBuffer>,
-    verb: Option<StrBuffer>,
-    verb_cancel: Option<StrBuffer>,
+    description: Option<TString<'static>>,
+    extra: Option<TString<'static>>,
+    verb: Option<TString<'static>>,
+    verb_cancel: Option<TString<'static>>,
     info_button: bool,
     hold: bool,
     chunkify: bool,
@@ -496,11 +470,11 @@ struct ConfirmBlobParams {
 
 impl ConfirmBlobParams {
     fn new(
-        title: StrBuffer,
+        title: TString<'static>,
         data: Obj,
-        description: Option<StrBuffer>,
-        verb: Option<StrBuffer>,
-        verb_cancel: Option<StrBuffer>,
+        description: Option<TString<'static>>,
+        verb: Option<TString<'static>>,
+        verb_cancel: Option<TString<'static>>,
         hold: bool,
     ) -> Self {
         Self {
@@ -518,12 +492,12 @@ impl ConfirmBlobParams {
         }
     }
 
-    fn with_extra(mut self, extra: Option<StrBuffer>) -> Self {
+    fn with_extra(mut self, extra: Option<TString<'static>>) -> Self {
         self.extra = extra;
         self
     }
 
-    fn with_subtitle(mut self, subtitle: Option<StrBuffer>) -> Self {
+    fn with_subtitle(mut self, subtitle: Option<TString<'static>>) -> Self {
         self.subtitle = subtitle;
         self
     }
@@ -545,13 +519,13 @@ impl ConfirmBlobParams {
 
     fn into_layout(self) -> Result<Obj, Error> {
         let paragraphs = ConfirmBlob {
-            description: self.description.unwrap_or_else(StrBuffer::empty),
-            extra: self.extra.unwrap_or_else(StrBuffer::empty),
+            description: self.description.unwrap_or("".into()),
+            extra: self.extra.unwrap_or("".into()),
             data: self.data.try_into()?,
             description_font: &theme::TEXT_NORMAL,
             extra_font: &theme::TEXT_DEMIBOLD,
             data_font: if self.chunkify {
-                let data: StrBuffer = self.data.try_into()?;
+                let data: TString = self.data.try_into()?;
                 theme::get_chunkified_text_style(data.len())
             } else if self.text_mono {
                 &theme::TEXT_MONO
@@ -582,16 +556,16 @@ impl ConfirmBlobParams {
 
 extern "C" fn new_confirm_blob(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
         let data: Obj = kwargs.get(Qstr::MP_QSTR_data)?;
-        let description: Option<StrBuffer> =
+        let description: Option<TString> =
             kwargs.get(Qstr::MP_QSTR_description)?.try_into_option()?;
-        let extra: Option<StrBuffer> = kwargs.get(Qstr::MP_QSTR_extra)?.try_into_option()?;
-        let verb: Option<StrBuffer> = kwargs
+        let extra: Option<TString> = kwargs.get(Qstr::MP_QSTR_extra)?.try_into_option()?;
+        let verb: Option<TString> = kwargs
             .get(Qstr::MP_QSTR_verb)
             .unwrap_or_else(|_| Obj::const_none())
             .try_into_option()?;
-        let verb_cancel: Option<StrBuffer> = kwargs
+        let verb_cancel: Option<TString> = kwargs
             .get(Qstr::MP_QSTR_verb_cancel)
             .unwrap_or_else(|_| Obj::const_none())
             .try_into_option()?;
@@ -608,25 +582,24 @@ extern "C" fn new_confirm_blob(n_args: usize, args: *const Obj, kwargs: *mut Map
 
 extern "C" fn new_confirm_address(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
-        let description: Option<StrBuffer> =
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let description: Option<TString> =
             kwargs.get(Qstr::MP_QSTR_description)?.try_into_option()?;
-        let verb: StrBuffer =
-            kwargs.get_or(Qstr::MP_QSTR_verb, TR::buttons__confirm.try_into()?)?;
-        let extra: Option<StrBuffer> = kwargs.get(Qstr::MP_QSTR_extra)?.try_into_option()?;
+        let verb: TString = kwargs.get_or(Qstr::MP_QSTR_verb, TR::buttons__confirm.try_into()?)?;
+        let extra: Option<TString> = kwargs.get(Qstr::MP_QSTR_extra)?.try_into_option()?;
         let data: Obj = kwargs.get(Qstr::MP_QSTR_data)?;
         let chunkify: bool = kwargs.get_or(Qstr::MP_QSTR_chunkify, false)?;
 
         let data_style = if chunkify {
-            let address: StrBuffer = data.try_into()?;
+            let address: TString = data.try_into()?;
             theme::get_chunkified_text_style(address.len())
         } else {
             &theme::TEXT_MONO
         };
 
         let paragraphs = ConfirmBlob {
-            description: description.unwrap_or_else(StrBuffer::empty),
-            extra: extra.unwrap_or_else(StrBuffer::empty),
+            description: description.unwrap_or("".into()),
+            extra: extra.unwrap_or("".into()),
             data: data.try_into()?,
             description_font: &theme::TEXT_NORMAL,
             extra_font: &theme::TEXT_DEMIBOLD,
@@ -650,7 +623,7 @@ extern "C" fn new_confirm_address(n_args: usize, args: *const Obj, kwargs: *mut
 
 extern "C" fn new_confirm_properties(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
         let hold: bool = kwargs.get_or(Qstr::MP_QSTR_hold, false)?;
         let items: Obj = kwargs.get(Qstr::MP_QSTR_items)?;
 
@@ -660,11 +633,11 @@ extern "C" fn new_confirm_properties(n_args: usize, args: *const Obj, kwargs: *m
             &theme::TEXT_MONO,
             &theme::TEXT_MONO,
         )?;
-        let page: ButtonPage<_, StrBuffer> = if hold {
+        let page = if hold {
             ButtonPage::new(paragraphs.into_paragraphs(), theme::BG).with_hold()?
         } else {
             ButtonPage::new(paragraphs.into_paragraphs(), theme::BG)
-                .with_cancel_confirm(None, Some(TR::buttons__confirm.try_into()?))
+                .with_cancel_confirm(None, Some(TR::buttons__confirm.into()))
         };
         let obj = LayoutObj::new(Frame::left_aligned(title, page))?;
         Ok(obj.into())
@@ -674,7 +647,7 @@ extern "C" fn new_confirm_properties(n_args: usize, args: *const Obj, kwargs: *m
 
 extern "C" fn new_confirm_homescreen(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
         let image: Obj = kwargs.get(Qstr::MP_QSTR_image)?;
 
         let mut jpeg = unwrap!(ImageBuffer::from_object(image));
@@ -689,8 +662,7 @@ extern "C" fn new_confirm_homescreen(n_args: usize, args: *const Obj, kwargs: *m
             return Err(value_error!("Invalid image."));
         };
 
-        let tr_change: StrBuffer = TR::buttons__change.try_into()?;
-        let buttons = Button::cancel_confirm_text(None, Some(tr_change));
+        let buttons = Button::cancel_confirm_text(None, Some(TR::buttons__change.into()));
         let obj = LayoutObj::new(Frame::centered(
             title,
             Dialog::new(Jpeg::new(jpeg, 1), buttons),
@@ -703,14 +675,13 @@ extern "C" fn new_confirm_homescreen(n_args: usize, args: *const Obj, kwargs: *m
 
 extern "C" fn new_confirm_reset_device(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
-        let button: StrBuffer = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let button: TString = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
 
-        let par_array: [Paragraph<StrBuffer>; 3] = [
-            Paragraph::new(&theme::TEXT_NORMAL, TR::reset__by_continuing.try_into()?)
-                .with_bottom_padding(17), // simulating a carriage return
-            Paragraph::new(&theme::TEXT_NORMAL, TR::reset__more_info_at.try_into()?),
-            Paragraph::new(&theme::TEXT_DEMIBOLD, TR::reset__tos_link.try_into()?),
+        let par_array: [Paragraph<'static>; 3] = [
+            Paragraph::new(&theme::TEXT_NORMAL, TR::reset__by_continuing).with_bottom_padding(17), /* simulating a carriage return */
+            Paragraph::new(&theme::TEXT_NORMAL, TR::reset__more_info_at),
+            Paragraph::new(&theme::TEXT_DEMIBOLD, TR::reset__tos_link),
         ];
         let paragraphs = Paragraphs::new(par_array);
         let buttons = Button::cancel_confirm(
@@ -726,12 +697,12 @@ extern "C" fn new_confirm_reset_device(n_args: usize, args: *const Obj, kwargs:
 
 extern "C" fn new_show_address_details(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let qr_title: StrBuffer = kwargs.get(Qstr::MP_QSTR_qr_title)?.try_into()?;
-        let details_title: StrBuffer = kwargs.get(Qstr::MP_QSTR_details_title)?.try_into()?;
-        let address: StrBuffer = kwargs.get(Qstr::MP_QSTR_address)?.try_into()?;
+        let qr_title: TString = kwargs.get(Qstr::MP_QSTR_qr_title)?.try_into()?;
+        let details_title: TString = kwargs.get(Qstr::MP_QSTR_details_title)?.try_into()?;
+        let address: TString = kwargs.get(Qstr::MP_QSTR_address)?.try_into()?;
         let case_sensitive: bool = kwargs.get(Qstr::MP_QSTR_case_sensitive)?.try_into()?;
-        let account: Option<StrBuffer> = kwargs.get(Qstr::MP_QSTR_account)?.try_into_option()?;
-        let path: Option<StrBuffer> = kwargs.get(Qstr::MP_QSTR_path)?.try_into_option()?;
+        let account: Option<TString> = kwargs.get(Qstr::MP_QSTR_account)?.try_into_option()?;
+        let path: Option<TString> = kwargs.get(Qstr::MP_QSTR_path)?.try_into_option()?;
 
         let xpubs: Obj = kwargs.get(Qstr::MP_QSTR_xpubs)?;
 
@@ -745,7 +716,7 @@ extern "C" fn new_show_address_details(n_args: usize, args: *const Obj, kwargs:
         )?;
 
         for i in IterBuf::new().try_iterate(xpubs)? {
-            let [xtitle, text]: [StrBuffer; 2] = util::iter_into_array(i)?;
+            let [xtitle, text]: [TString; 2] = util::iter_into_array(i)?;
             ad.add_xpub(xtitle, text)?;
         }
 
@@ -758,7 +729,7 @@ extern "C" fn new_show_address_details(n_args: usize, args: *const Obj, kwargs:
 
 extern "C" fn new_show_info_with_cancel(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
         let items: Obj = kwargs.get(Qstr::MP_QSTR_items)?;
         let horizontal: bool = kwargs.get_or(Qstr::MP_QSTR_horizontal, false)?;
         let chunkify: bool = kwargs.get_or(Qstr::MP_QSTR_chunkify, false)?;
@@ -767,8 +738,8 @@ extern "C" fn new_show_info_with_cancel(n_args: usize, args: *const Obj, kwargs:
 
         for para in IterBuf::new().try_iterate(items)? {
             let [key, value]: [Obj; 2] = util::iter_into_array(para)?;
-            let key: StrBuffer = key.try_into()?;
-            let value: StrBuffer = value.try_into()?;
+            let key: TString = key.try_into()?;
+            let value: TString = value.try_into()?;
             paragraphs.add(Paragraph::new(&theme::TEXT_NORMAL, key).no_break());
             if chunkify {
                 paragraphs.add(Paragraph::new(
@@ -800,18 +771,18 @@ extern "C" fn new_show_info_with_cancel(n_args: usize, args: *const Obj, kwargs:
 
 extern "C" fn new_confirm_value(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
-        let subtitle: Option<StrBuffer> = kwargs.get(Qstr::MP_QSTR_subtitle)?.try_into_option()?;
-        let description: Option<StrBuffer> =
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let subtitle: Option<TString> = kwargs.get(Qstr::MP_QSTR_subtitle)?.try_into_option()?;
+        let description: Option<TString> =
             kwargs.get(Qstr::MP_QSTR_description)?.try_into_option()?;
         let value: Obj = kwargs.get(Qstr::MP_QSTR_value)?;
         let info_button: bool = kwargs.get_or(Qstr::MP_QSTR_info_button, false)?;
 
-        let verb: Option<StrBuffer> = kwargs
+        let verb: Option<TString> = kwargs
             .get(Qstr::MP_QSTR_verb)
             .unwrap_or_else(|_| Obj::const_none())
             .try_into_option()?;
-        let verb_cancel: Option<StrBuffer> = kwargs
+        let verb_cancel: Option<TString> = kwargs
             .get(Qstr::MP_QSTR_verb_cancel)
             .unwrap_or_else(|_| Obj::const_none())
             .try_into_option()?;
@@ -831,7 +802,7 @@ extern "C" fn new_confirm_value(n_args: usize, args: *const Obj, kwargs: *mut Ma
 
 extern "C" fn new_confirm_total(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
         let items: Obj = kwargs.get(Qstr::MP_QSTR_items)?;
         let info_button: bool = kwargs.get_or(Qstr::MP_QSTR_info_button, false)?;
         let cancel_arrow: bool = kwargs.get_or(Qstr::MP_QSTR_cancel_arrow, false)?;
@@ -839,12 +810,11 @@ extern "C" fn new_confirm_total(n_args: usize, args: *const Obj, kwargs: *mut Ma
         let mut paragraphs = ParagraphVecShort::new();
 
         for pair in IterBuf::new().try_iterate(items)? {
-            let [label, value]: [StrBuffer; 2] = util::iter_into_array(pair)?;
+            let [label, value]: [TString; 2] = util::iter_into_array(pair)?;
             paragraphs.add(Paragraph::new(&theme::TEXT_NORMAL, label).no_break());
             paragraphs.add(Paragraph::new(&theme::TEXT_MONO, value));
         }
-        let mut page: ButtonPage<_, StrBuffer> =
-            ButtonPage::new(paragraphs.into_paragraphs(), theme::BG).with_hold()?;
+        let mut page = ButtonPage::new(paragraphs.into_paragraphs(), theme::BG).with_hold()?;
         if cancel_arrow {
             page = page.with_cancel_arrow()
         }
@@ -864,30 +834,26 @@ extern "C" fn new_confirm_total(n_args: usize, args: *const Obj, kwargs: *mut Ma
 extern "C" fn new_confirm_modify_output(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
         let sign: i32 = kwargs.get(Qstr::MP_QSTR_sign)?.try_into()?;
-        let amount_change: StrBuffer = kwargs.get(Qstr::MP_QSTR_amount_change)?.try_into()?;
-        let amount_new: StrBuffer = kwargs.get(Qstr::MP_QSTR_amount_new)?.try_into()?;
+        let amount_change: TString = kwargs.get(Qstr::MP_QSTR_amount_change)?.try_into()?;
+        let amount_new: TString = kwargs.get(Qstr::MP_QSTR_amount_new)?.try_into()?;
 
         let description = if sign < 0 {
-            TR::modify_amount__decrease_amount.try_into()?
+            TR::modify_amount__decrease_amount
         } else {
-            TR::modify_amount__increase_amount.try_into()?
+            TR::modify_amount__increase_amount
         };
 
         let paragraphs = Paragraphs::new([
             Paragraph::new(&theme::TEXT_NORMAL, description),
             Paragraph::new(&theme::TEXT_MONO, amount_change),
-            Paragraph::new(
-                &theme::TEXT_NORMAL,
-                TR::modify_amount__new_amount.try_into()?,
-            ),
+            Paragraph::new(&theme::TEXT_NORMAL, TR::modify_amount__new_amount),
             Paragraph::new(&theme::TEXT_MONO, amount_new),
         ]);
 
-        let tr_title: StrBuffer = TR::modify_amount__title.try_into()?;
         let obj = LayoutObj::new(Frame::left_aligned(
-            tr_title,
-            ButtonPage::<_, StrBuffer>::new(paragraphs, theme::BG)
-                .with_cancel_confirm(Some("^".into()), Some(TR::buttons__continue.try_into()?)),
+            TR::modify_amount__title.into(),
+            ButtonPage::new(paragraphs, theme::BG)
+                .with_cancel_confirm(Some("^".into()), Some(TR::buttons__continue.into())),
         ))?;
         Ok(obj.into())
     };
@@ -896,26 +862,26 @@ extern "C" fn new_confirm_modify_output(n_args: usize, args: *const Obj, kwargs:
 
 extern "C" fn new_confirm_modify_fee(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
         let sign: i32 = kwargs.get(Qstr::MP_QSTR_sign)?.try_into()?;
-        let user_fee_change: StrBuffer = kwargs.get(Qstr::MP_QSTR_user_fee_change)?.try_into()?;
-        let total_fee_new: StrBuffer = kwargs.get(Qstr::MP_QSTR_total_fee_new)?.try_into()?;
+        let user_fee_change: TString = kwargs.get(Qstr::MP_QSTR_user_fee_change)?.try_into()?;
+        let total_fee_new: TString = kwargs.get(Qstr::MP_QSTR_total_fee_new)?.try_into()?;
 
         let (description, change, total_label) = match sign {
             s if s < 0 => (
-                TR::modify_fee__decrease_fee.try_into()?,
+                TR::modify_fee__decrease_fee,
                 user_fee_change,
-                TR::modify_fee__new_transaction_fee.try_into()?,
+                TR::modify_fee__new_transaction_fee,
             ),
             s if s > 0 => (
-                TR::modify_fee__increase_fee.try_into()?,
+                TR::modify_fee__increase_fee,
                 user_fee_change,
-                TR::modify_fee__new_transaction_fee.try_into()?,
+                TR::modify_fee__new_transaction_fee,
             ),
             _ => (
-                TR::modify_fee__no_change.try_into()?,
-                StrBuffer::empty(),
-                TR::modify_fee__transaction_fee.try_into()?,
+                TR::modify_fee__no_change,
+                "".into(),
+                TR::modify_fee__transaction_fee,
             ),
         };
 
@@ -929,7 +895,7 @@ extern "C" fn new_confirm_modify_fee(n_args: usize, args: *const Obj, kwargs: *m
         let obj = LayoutObj::new(
             Frame::left_aligned(
                 title,
-                ButtonPage::<_, StrBuffer>::new(paragraphs, theme::BG)
+                ButtonPage::new(paragraphs, theme::BG)
                     .with_hold()?
                     .with_swipe_left(),
             )
@@ -945,15 +911,14 @@ fn new_show_modal(
     icon: BlendedImage,
     button_style: ButtonStyleSheet,
 ) -> Result<Obj, Error> {
-    let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
-    let value: StrBuffer = kwargs.get_or(Qstr::MP_QSTR_value, StrBuffer::empty())?;
-    let description: StrBuffer = kwargs.get_or(Qstr::MP_QSTR_description, StrBuffer::empty())?;
-    let button: StrBuffer =
-        kwargs.get_or(Qstr::MP_QSTR_button, TR::buttons__continue.try_into()?)?;
+    let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+    let value: TString = kwargs.get_or(Qstr::MP_QSTR_value, "".into())?;
+    let description: TString = kwargs.get_or(Qstr::MP_QSTR_description, "".into())?;
+    let button: TString = kwargs.get_or(Qstr::MP_QSTR_button, TR::buttons__continue.try_into()?)?;
     let allow_cancel: bool = kwargs.get_or(Qstr::MP_QSTR_allow_cancel, true)?;
     let time_ms: u32 = kwargs.get_or(Qstr::MP_QSTR_time_ms, 0)?;
 
-    let no_buttons = button.as_ref().is_empty();
+    let no_buttons = button.is_empty();
     let obj = if no_buttons && time_ms == 0 {
         // No buttons and no timer, used when we only want to draw the dialog once and
         // then throw away the layout object.
@@ -1026,9 +991,9 @@ extern "C" fn new_show_error(n_args: usize, args: *const Obj, kwargs: *mut Map)
 
 extern "C" fn new_confirm_fido(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
-        let app_name: StrBuffer = kwargs.get(Qstr::MP_QSTR_app_name)?.try_into()?;
-        let icon: Option<StrBuffer> = kwargs.get(Qstr::MP_QSTR_icon_name)?.try_into_option()?;
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let app_name: TString = kwargs.get(Qstr::MP_QSTR_app_name)?.try_into()?;
+        let icon: Option<TString> = kwargs.get(Qstr::MP_QSTR_icon_name)?.try_into_option()?;
         let accounts: Gc<List> = kwargs.get(Qstr::MP_QSTR_accounts)?.try_into()?;
 
         // Cache the page count so that we can move `accounts` into the closure.
@@ -1043,8 +1008,7 @@ extern "C" fn new_confirm_fido(n_args: usize, args: *const Obj, kwargs: *mut Map
 
         let controls = Button::cancel_confirm(
             Button::with_icon(theme::ICON_CANCEL),
-            Button::<StrBuffer>::with_text(TR::buttons__confirm.try_into()?)
-                .styled(theme::button_confirm()),
+            Button::with_text(TR::buttons__confirm.try_into()?).styled(theme::button_confirm()),
             true,
         );
 
@@ -1100,10 +1064,10 @@ extern "C" fn new_show_info(n_args: usize, args: *const Obj, kwargs: *mut Map) -
 
 extern "C" fn new_show_mismatch(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
-        let description: StrBuffer = TR::addr_mismatch__contact_support_at.try_into()?;
-        let url: StrBuffer = TR::addr_mismatch__support_url.try_into()?;
-        let button: StrBuffer = TR::buttons__quit.try_into()?;
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let description: TString = TR::addr_mismatch__contact_support_at.try_into()?;
+        let url: TString = TR::addr_mismatch__support_url.try_into()?;
+        let button: TString = TR::buttons__quit.try_into()?;
 
         let icon = BlendedImage::new(
             theme::IMAGE_BG_OCTAGON,
@@ -1140,10 +1104,9 @@ extern "C" fn new_show_mismatch(n_args: usize, args: *const Obj, kwargs: *mut Ma
 
 extern "C" fn new_show_simple(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: Option<StrBuffer> = kwargs.get(Qstr::MP_QSTR_title)?.try_into_option()?;
-        let description: StrBuffer =
-            kwargs.get_or(Qstr::MP_QSTR_description, StrBuffer::empty())?;
-        let button: StrBuffer = kwargs.get_or(Qstr::MP_QSTR_button, StrBuffer::empty())?;
+        let title: Option<TString> = kwargs.get(Qstr::MP_QSTR_title)?.try_into_option()?;
+        let description: TString = kwargs.get_or(Qstr::MP_QSTR_description, "".into())?;
+        let button: TString = kwargs.get_or(Qstr::MP_QSTR_button, "".into())?;
 
         let obj = if let Some(t) = title {
             LayoutObj::new(Frame::left_aligned(
@@ -1187,9 +1150,9 @@ extern "C" fn new_show_simple(n_args: usize, args: *const Obj, kwargs: *mut Map)
 
 extern "C" fn new_confirm_with_info(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
-        let button: StrBuffer = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
-        let info_button: StrBuffer = kwargs.get(Qstr::MP_QSTR_info_button)?.try_into()?;
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let button: TString = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
+        let info_button: TString = kwargs.get(Qstr::MP_QSTR_info_button)?.try_into()?;
         let items: Obj = kwargs.get(Qstr::MP_QSTR_items)?;
 
         let mut paragraphs = ParagraphVecShort::new();
@@ -1197,7 +1160,7 @@ extern "C" fn new_confirm_with_info(n_args: usize, args: *const Obj, kwargs: *mu
         for para in IterBuf::new().try_iterate(items)? {
             let [font, text]: [Obj; 2] = util::iter_into_array(para)?;
             let style: &TextStyle = theme::textstyle_number(font.try_into()?);
-            let text: StrBuffer = text.try_into()?;
+            let text: TString = text.try_into()?;
             paragraphs.add(Paragraph::new(style, text));
             if paragraphs.is_full() {
                 break;
@@ -1217,8 +1180,8 @@ extern "C" fn new_confirm_with_info(n_args: usize, args: *const Obj, kwargs: *mu
 
 extern "C" fn new_confirm_more(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
-        let button: StrBuffer = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let button: TString = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
         let items: Obj = kwargs.get(Qstr::MP_QSTR_items)?;
 
         let mut paragraphs = ParagraphVecLong::new();
@@ -1226,7 +1189,7 @@ extern "C" fn new_confirm_more(n_args: usize, args: *const Obj, kwargs: *mut Map
         for para in IterBuf::new().try_iterate(items)? {
             let [font, text]: [Obj; 2] = util::iter_into_array(para)?;
             let style: &TextStyle = theme::textstyle_number(font.try_into()?);
-            let text: StrBuffer = text.try_into()?;
+            let text: TString = text.try_into()?;
             paragraphs.add(Paragraph::new(style, text));
         }
 
@@ -1244,23 +1207,22 @@ extern "C" fn new_confirm_more(n_args: usize, args: *const Obj, kwargs: *mut Map
 
 extern "C" fn new_confirm_coinjoin(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let max_rounds: StrBuffer = kwargs.get(Qstr::MP_QSTR_max_rounds)?.try_into()?;
-        let max_feerate: StrBuffer = kwargs.get(Qstr::MP_QSTR_max_feerate)?.try_into()?;
+        let max_rounds: TString = kwargs.get(Qstr::MP_QSTR_max_rounds)?.try_into()?;
+        let max_feerate: TString = kwargs.get(Qstr::MP_QSTR_max_feerate)?.try_into()?;
 
         let paragraphs = Paragraphs::new([
-            Paragraph::new(&theme::TEXT_NORMAL, TR::coinjoin__max_rounds.try_into()?),
+            Paragraph::new(&theme::TEXT_NORMAL, TR::coinjoin__max_rounds),
             Paragraph::new(&theme::TEXT_MONO, max_rounds),
             Paragraph::new(
                 &theme::TEXT_NORMAL,
-                TR::coinjoin__max_mining_fee.try_into()?,
+                TR::coinjoin__max_mining_fee,
             ),
             Paragraph::new(&theme::TEXT_MONO, max_feerate),
         ]);
 
-        let tr_title: StrBuffer = TR::coinjoin__title.try_into()?;
         let obj = LayoutObj::new(Frame::left_aligned(
-            tr_title,
-            ButtonPage::<_, StrBuffer>::new(paragraphs, theme::BG).with_hold()?,
+            TR::coinjoin__title.into(),
+            ButtonPage::new(paragraphs, theme::BG).with_hold()?,
         ))?;
         Ok(obj.into())
     };
@@ -1269,12 +1231,12 @@ extern "C" fn new_confirm_coinjoin(n_args: usize, args: *const Obj, kwargs: *mut
 
 extern "C" fn new_request_pin(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let prompt: StrBuffer = kwargs.get(Qstr::MP_QSTR_prompt)?.try_into()?;
-        let subprompt: StrBuffer = kwargs.get(Qstr::MP_QSTR_subprompt)?.try_into()?;
+        let prompt: TString = kwargs.get(Qstr::MP_QSTR_prompt)?.try_into()?;
+        let subprompt: TString = kwargs.get(Qstr::MP_QSTR_subprompt)?.try_into()?;
         let allow_cancel: bool = kwargs.get_or(Qstr::MP_QSTR_allow_cancel, true)?;
         let warning: bool = kwargs.get_or(Qstr::MP_QSTR_wrong_pin, false)?;
         let warning = if warning {
-            Some(TR::pin__wrong_pin.try_into()?)
+            Some(TR::pin__wrong_pin.into())
         } else {
             None
         };
@@ -1286,7 +1248,7 @@ extern "C" fn new_request_pin(n_args: usize, args: *const Obj, kwargs: *mut Map)
 
 extern "C" fn new_request_passphrase(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let _prompt: StrBuffer = kwargs.get(Qstr::MP_QSTR_prompt)?.try_into()?;
+        let _prompt: TString = kwargs.get(Qstr::MP_QSTR_prompt)?.try_into()?;
         let _max_len: u32 = kwargs.get(Qstr::MP_QSTR_max_len)?.try_into()?;
         let obj = LayoutObj::new(PassphraseKeyboard::new())?;
         Ok(obj.into())
@@ -1296,11 +1258,11 @@ extern "C" fn new_request_passphrase(n_args: usize, args: *const Obj, kwargs: *m
 
 extern "C" fn new_request_bip39(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let prompt: StrBuffer = kwargs.get(Qstr::MP_QSTR_prompt)?.try_into()?;
-        let prefill_word: StrBuffer = kwargs.get(Qstr::MP_QSTR_prefill_word)?.try_into()?;
+        let prompt: TString = kwargs.get(Qstr::MP_QSTR_prompt)?.try_into()?;
+        let prefill_word: TString = kwargs.get(Qstr::MP_QSTR_prefill_word)?.try_into()?;
         let can_go_back: bool = kwargs.get(Qstr::MP_QSTR_can_go_back)?.try_into()?;
         let obj = LayoutObj::new(MnemonicKeyboard::new(
-            Bip39Input::prefilled_word(prefill_word.as_ref()),
+            prefill_word.map(Bip39Input::prefilled_word),
             prompt,
             can_go_back,
         ))?;
@@ -1311,11 +1273,11 @@ extern "C" fn new_request_bip39(n_args: usize, args: *const Obj, kwargs: *mut Ma
 
 extern "C" fn new_request_slip39(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let prompt: StrBuffer = kwargs.get(Qstr::MP_QSTR_prompt)?.try_into()?;
-        let prefill_word: StrBuffer = kwargs.get(Qstr::MP_QSTR_prefill_word)?.try_into()?;
+        let prompt: TString = kwargs.get(Qstr::MP_QSTR_prompt)?.try_into()?;
+        let prefill_word: TString = kwargs.get(Qstr::MP_QSTR_prefill_word)?.try_into()?;
         let can_go_back: bool = kwargs.get(Qstr::MP_QSTR_can_go_back)?.try_into()?;
         let obj = LayoutObj::new(MnemonicKeyboard::new(
-            Slip39Input::prefilled_word(prefill_word.as_ref()),
+            prefill_word.map(Slip39Input::prefilled_word),
             prompt,
             can_go_back,
         ))?;
@@ -1326,8 +1288,8 @@ extern "C" fn new_request_slip39(n_args: usize, args: *const Obj, kwargs: *mut M
 
 extern "C" fn new_select_word(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
-        let description: StrBuffer = kwargs.get(Qstr::MP_QSTR_description)?.try_into()?;
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let description: TString = kwargs.get(Qstr::MP_QSTR_description)?.try_into()?;
         let words_iterable: Obj = kwargs.get(Qstr::MP_QSTR_words)?;
         let words: [StrBuffer; 3] = util::iter_into_array(words_iterable)?;
 
@@ -1342,12 +1304,12 @@ extern "C" fn new_select_word(n_args: usize, args: *const Obj, kwargs: *mut Map)
 extern "C" fn new_show_tx_context_menu(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], _kwargs: &Map| {
         // TODO: this is just POC
-        let title: StrBuffer = StrBuffer::from("");
+        let title: TString = "".into();
 
-        let options: [(StrBuffer, Icon); 3] = [
-            (StrBuffer::from("Address QR code"), theme::ICON_QR_CODE),
-            (StrBuffer::from("Fee info"), theme::ICON_CHEVRON_RIGHT),
-            (StrBuffer::from("Cancel transaction"), theme::ICON_CANCEL),
+        let options: [(&'static str, Icon); 3] = [
+            ("Address QR code", theme::ICON_QR_CODE),
+            ("Fee info", theme::ICON_CHEVRON_RIGHT),
+            ("Cancel transaction", theme::ICON_CANCEL),
         ];
         let content = VerticalMenu::context_menu(options);
         let frame_with_menu = Frame::left_aligned(title, content).with_cancel_button();
@@ -1359,7 +1321,7 @@ extern "C" fn new_show_tx_context_menu(n_args: usize, args: *const Obj, kwargs:
 
 extern "C" fn new_show_share_words(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
         let share_words_obj: Obj = kwargs.get(Qstr::MP_QSTR_pages)?;
         let share_words_vec: Vec<TString, 33> = util::iter_into_vec(share_words_obj)?;
 
@@ -1373,7 +1335,7 @@ extern "C" fn new_show_share_words(n_args: usize, args: *const Obj, kwargs: *mut
 
 extern "C" fn new_request_number(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
         let min_count: u32 = kwargs.get(Qstr::MP_QSTR_min_count)?.try_into()?;
         let max_count: u32 = kwargs.get(Qstr::MP_QSTR_max_count)?.try_into()?;
         let count: u32 = kwargs.get(Qstr::MP_QSTR_count)?.try_into()?;
@@ -1381,7 +1343,7 @@ extern "C" fn new_request_number(n_args: usize, args: *const Obj, kwargs: *mut M
         assert!(description_callback != Obj::const_none());
 
         let callback = move |i: u32| {
-            StrBuffer::try_from(
+            TString::try_from(
                 description_callback
                     .call_with_n_args(&[i.try_into().unwrap()])
                     .unwrap(),
@@ -1400,8 +1362,8 @@ extern "C" fn new_request_number(n_args: usize, args: *const Obj, kwargs: *mut M
 
 extern "C" fn new_show_checklist(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
-        let button: StrBuffer = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let button: TString = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
         let active: usize = kwargs.get(Qstr::MP_QSTR_active)?.try_into()?;
         let items: Obj = kwargs.get(Qstr::MP_QSTR_items)?;
 
@@ -1412,7 +1374,7 @@ extern "C" fn new_show_checklist(n_args: usize, args: *const Obj, kwargs: *mut M
                 Ordering::Equal => &theme::TEXT_CHECKLIST_SELECTED,
                 Ordering::Greater => &theme::TEXT_CHECKLIST_DEFAULT,
             };
-            let text: StrBuffer = item.try_into()?;
+            let text: TString = item.try_into()?;
             paragraphs.add(Paragraph::new(style, text));
         }
 
@@ -1442,9 +1404,9 @@ extern "C" fn new_show_checklist(n_args: usize, args: *const Obj, kwargs: *mut M
 
 extern "C" fn new_confirm_recovery(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
-        let description: StrBuffer = kwargs.get(Qstr::MP_QSTR_description)?.try_into()?;
-        let button: StrBuffer = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let description: TString = kwargs.get(Qstr::MP_QSTR_description)?.try_into()?;
+        let button: TString = kwargs.get(Qstr::MP_QSTR_button)?.try_into()?;
         let dry_run: bool = kwargs.get(Qstr::MP_QSTR_dry_run)?.try_into()?;
         let info_button: bool = kwargs.get_or(Qstr::MP_QSTR_info_button, false)?;
 
@@ -1454,7 +1416,7 @@ extern "C" fn new_confirm_recovery(n_args: usize, args: *const Obj, kwargs: *mut
         ])
         .with_spacing(theme::RECOVERY_SPACING);
 
-        let notification: StrBuffer = if dry_run {
+        let notification: TString = if dry_run {
             TR::recovery__title_dry_run.try_into()?
         } else {
             TR::recovery__title.try_into()?
@@ -1465,9 +1427,9 @@ extern "C" fn new_confirm_recovery(n_args: usize, args: *const Obj, kwargs: *mut
                 notification,
                 Dialog::new(
                     paragraphs,
-                    Button::<StrBuffer>::cancel_info_confirm(
-                        TR::buttons__continue.try_into()?,
-                        TR::buttons__more_info.try_into()?,
+                    Button::cancel_info_confirm(
+                        TR::buttons__continue.into(),
+                        TR::buttons__more_info.into(),
                     ),
                 ),
             ))?
@@ -1485,15 +1447,15 @@ extern "C" fn new_confirm_recovery(n_args: usize, args: *const Obj, kwargs: *mut
 extern "C" fn new_select_word_count(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
         let dry_run: bool = kwargs.get(Qstr::MP_QSTR_dry_run)?.try_into()?;
-        let title: StrBuffer = if dry_run {
+        let title: TString = if dry_run {
             TR::recovery__title_dry_run.try_into()?
         } else {
             TR::recovery__title.try_into()?
         };
 
-        let paragraphs = Paragraphs::new(Paragraph::<StrBuffer>::new(
+        let paragraphs = Paragraphs::new(Paragraph::new(
             &theme::TEXT_DEMIBOLD,
-            TR::recovery__select_num_of_words.try_into()?,
+            TR::recovery__select_num_of_words,
         ));
 
         let obj = LayoutObj::new(Frame::left_aligned(
@@ -1512,15 +1474,13 @@ extern "C" fn new_show_group_share_success(
 ) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
         let lines_iterable: Obj = kwargs.get(Qstr::MP_QSTR_lines)?;
-        let lines: [StrBuffer; 4] = util::iter_into_array(lines_iterable)?;
+        let lines: [TString; 4] = util::iter_into_array(lines_iterable)?;
 
         let obj = LayoutObj::new(IconDialog::new_shares(
             lines,
-            theme::button_bar(
-                Button::<StrBuffer>::with_text(TR::buttons__continue.try_into()?).map(|msg| {
-                    (matches!(msg, ButtonMsg::Clicked)).then(|| CancelConfirmMsg::Confirmed)
-                }),
-            ),
+            theme::button_bar(Button::with_text(TR::buttons__continue.into()).map(|msg| {
+                (matches!(msg, ButtonMsg::Clicked)).then(|| CancelConfirmMsg::Confirmed)
+            })),
         ))?;
         Ok(obj.into())
     };
@@ -1533,17 +1493,16 @@ extern "C" fn new_show_remaining_shares(n_args: usize, args: *const Obj, kwargs:
 
         let mut paragraphs = ParagraphVecLong::new();
         for page in IterBuf::new().try_iterate(pages_iterable)? {
-            let [title, description]: [StrBuffer; 2] = util::iter_into_array(page)?;
+            let [title, description]: [TString; 2] = util::iter_into_array(page)?;
             paragraphs
                 .add(Paragraph::new(&theme::TEXT_DEMIBOLD, title))
                 .add(Paragraph::new(&theme::TEXT_NORMAL, description).break_after());
         }
 
-        let tr_title: StrBuffer = TR::recovery__title_remaining_shares.try_into()?;
         let obj = LayoutObj::new(Frame::left_aligned(
-            tr_title,
-            ButtonPage::<_, StrBuffer>::new(paragraphs.into_paragraphs(), theme::BG)
-                .with_cancel_confirm(None, Some(TR::buttons__continue.try_into()?))
+            TR::recovery__title_remaining_shares.into(),
+            ButtonPage::new(paragraphs.into_paragraphs(), theme::BG)
+                .with_cancel_confirm(None, Some(TR::buttons__continue.into()))
                 .with_confirm_style(theme::button_default())
                 .without_cancel(),
         ))?;
@@ -1554,19 +1513,20 @@ extern "C" fn new_show_remaining_shares(n_args: usize, args: *const Obj, kwargs:
 
 extern "C" fn new_show_progress(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let description: TString = kwargs.get(Qstr::MP_QSTR_description)?.try_into()?;
         let indeterminate: bool = kwargs.get_or(Qstr::MP_QSTR_indeterminate, false)?;
-        let description: StrBuffer =
-            kwargs.get_or(Qstr::MP_QSTR_description, StrBuffer::empty())?;
+        let title: Option<TString> = kwargs
+            .get(Qstr::MP_QSTR_title)
+            .and_then(Obj::try_into_option)
+            .unwrap_or(None);
 
-        // Description updates are received as &str and we need to provide a way to
-        // convert them to StrBuffer.
-        let obj = LayoutObj::new(Progress::new(
-            title,
-            indeterminate,
-            description,
-            StrBuffer::alloc,
-        ))?;
+        let (title, description) = if let Some(title) = title {
+            (title, description)
+        } else {
+            (description, "".into())
+        };
+
+        let obj = LayoutObj::new(Progress::new(title, indeterminate, description))?;
         Ok(obj.into())
     };
     unsafe { util::try_with_args_and_kwargs(n_args, args, kwargs, block) }
@@ -1574,14 +1534,14 @@ extern "C" fn new_show_progress(n_args: usize, args: *const Obj, kwargs: *mut Ma
 
 extern "C" fn new_show_progress_coinjoin(n_args: usize, args: *const Obj, kwargs: *mut Map) -> Obj {
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let title: StrBuffer = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
+        let title: TString = kwargs.get(Qstr::MP_QSTR_title)?.try_into()?;
         let indeterminate: bool = kwargs.get_or(Qstr::MP_QSTR_indeterminate, false)?;
         let time_ms: u32 = kwargs.get_or(Qstr::MP_QSTR_time_ms, 0)?;
         let skip_first_paint: bool = kwargs.get_or(Qstr::MP_QSTR_skip_first_paint, false)?;
 
         // The second type parameter is actually not used in `new()` but we need to
         // provide it.
-        let progress = CoinJoinProgress::<_, Never>::new(title, indeterminate)?;
+        let progress = CoinJoinProgress::<Never>::new(title, indeterminate)?;
         let obj = if time_ms > 0 && indeterminate {
             let timeout = Timeout::new(time_ms);
             LayoutObj::new((timeout, progress.map(|_msg| None)))?
@@ -1655,21 +1615,19 @@ extern "C" fn new_confirm_firmware_update(
 ) -> Obj {
     use super::component::bl_confirm::{Confirm, ConfirmTitle};
     let block = move |_args: &[Obj], kwargs: &Map| {
-        let description: StrBuffer = kwargs.get(Qstr::MP_QSTR_description)?.try_into()?;
-        let fingerprint: StrBuffer = kwargs.get(Qstr::MP_QSTR_fingerprint)?.try_into()?;
+        let description: TString = kwargs.get(Qstr::MP_QSTR_description)?.try_into()?;
+        let fingerprint: TString = kwargs.get(Qstr::MP_QSTR_fingerprint)?.try_into()?;
 
-        let title_str = TR::firmware_update__title.try_into()?;
+        let title_str = TR::firmware_update__title.into();
         let title = Label::left_aligned(title_str, theme::TEXT_BOLD).vertically_centered();
         let msg = Label::left_aligned(description, theme::TEXT_NORMAL);
 
-        let left =
-            Button::with_text(TR::buttons__cancel.try_into()?).styled(theme::button_default());
-        let right =
-            Button::with_text(TR::buttons__install.try_into()?).styled(theme::button_confirm());
+        let left = Button::with_text(TR::buttons__cancel.into()).styled(theme::button_default());
+        let right = Button::with_text(TR::buttons__install.into()).styled(theme::button_confirm());
 
         let obj = LayoutObj::new(
             Confirm::new(theme::BG, left, right, ConfirmTitle::Text(title), msg).with_info(
-                TR::firmware_update__title_fingerprint.try_into()?,
+                TR::firmware_update__title_fingerprint.into(),
                 fingerprint,
                 theme::button_moreinfo(),
             ),