diff --git a/core/embed/rust/src/ui/model_tr/component/frame.rs b/core/embed/rust/src/ui/model_tr/component/frame.rs
index 9acb5a8b1a..859a586e81 100644
--- a/core/embed/rust/src/ui/model_tr/component/frame.rs
+++ b/core/embed/rust/src/ui/model_tr/component/frame.rs
@@ -169,8 +169,6 @@ where
     }
 }
 
-// DEBUG-ONLY SECTION BELOW
-
 #[cfg(feature = "ui_debug")]
 impl<T> crate::trace::Trace for ScrollableFrame<T>
 where
@@ -179,7 +177,7 @@ where
     fn trace(&self, t: &mut dyn crate::trace::Tracer) {
         t.open("ScrollableFrame");
         t.field("title", &self.title);
-        t.field("scrollbar", &self.title);
+        t.field("scrollbar", &self.scrollbar);
         t.field("content", &self.content);
         t.close();
     }
diff --git a/core/embed/rust/src/ui/model_tr/component/homescreen.rs b/core/embed/rust/src/ui/model_tr/component/homescreen.rs
index 8c6769a918..0bc6868000 100644
--- a/core/embed/rust/src/ui/model_tr/component/homescreen.rs
+++ b/core/embed/rust/src/ui/model_tr/component/homescreen.rs
@@ -132,8 +132,6 @@ impl Component for Lockscreen {
 impl crate::trace::Trace for Homescreen {
     fn trace(&self, d: &mut dyn crate::trace::Tracer) {
         d.open("Homescreen");
-        d.kw_pair("active_page", "0");
-        d.kw_pair("page_count", "1");
         d.field("label", &self.label.as_ref());
         d.close();
     }
diff --git a/core/embed/rust/src/ui/model_tr/component/input_methods/pin.rs b/core/embed/rust/src/ui/model_tr/component/input_methods/pin.rs
index 35a9a4cbae..b810adaa19 100644
--- a/core/embed/rust/src/ui/model_tr/component/input_methods/pin.rs
+++ b/core/embed/rust/src/ui/model_tr/component/input_methods/pin.rs
@@ -244,6 +244,7 @@ impl crate::trace::Trace for PinEntry {
         t.open("PinEntry");
         // NOTE: `show_real_pin` was not able to be transferred,
         // as it is true only for a very small amount of time
+        t.title(self.prompt.as_ref());
         t.kw_pair("textbox", self.textbox.content());
         self.report_btn_actions(t);
         t.field("choice_page", &self.choice_page);
diff --git a/core/embed/rust/src/ui/model_tr/component/scrollbar.rs b/core/embed/rust/src/ui/model_tr/component/scrollbar.rs
index b8d3c385ff..00e73c7e79 100644
--- a/core/embed/rust/src/ui/model_tr/component/scrollbar.rs
+++ b/core/embed/rust/src/ui/model_tr/component/scrollbar.rs
@@ -242,3 +242,13 @@ impl Component for ScrollBar {
         self.paint_horizontal();
     }
 }
+
+#[cfg(feature = "ui_debug")]
+impl crate::trace::Trace for ScrollBar {
+    fn trace(&self, t: &mut dyn crate::trace::Tracer) {
+        t.open("ScrollBar");
+        t.field("page_count", &self.page_count);
+        t.field("active_page", &self.active_page);
+        t.close();
+    }
+}
diff --git a/tests/input_flows.py b/tests/input_flows.py
index 8b517c4e7a..59fe0ac099 100644
--- a/tests/input_flows.py
+++ b/tests/input_flows.py
@@ -37,7 +37,7 @@ B = messages.ButtonRequestType
 class InputFlowBase:
     def __init__(self, client: Client):
         self.client = client
-        self.debug = client.debug
+        self.debug: DebugLink = client.debug
         self.layout = client.debug.wait_layout
 
     def model(self) -> Optional[str]: