diff --git a/core/SConscript.bootloader b/core/SConscript.bootloader
index 8eb4913013..dd0060af83 100644
--- a/core/SConscript.bootloader
+++ b/core/SConscript.bootloader
@@ -261,6 +261,10 @@ def cargo_build():
         features = ["model_mercury"]
     else:
         features = ["model_tt"]
+
+    if TREZOR_MODEL in ("R",):
+        features.append("ui_empty_lock")
+
     features.append("ui")
     features.append("bootloader")
     features.extend(FEATURES_AVAILABLE)
diff --git a/core/SConscript.bootloader_emu b/core/SConscript.bootloader_emu
index 692224013b..789185f24f 100644
--- a/core/SConscript.bootloader_emu
+++ b/core/SConscript.bootloader_emu
@@ -277,6 +277,9 @@ def cargo_build():
     else:
         features = ["model_tt"]
 
+    if TREZOR_MODEL in ("R",):
+        features.append("ui_empty_lock")
+
     if NEW_RENDERING:
         features.append('new_rendering')
 
diff --git a/core/embed/bootloader/.changelog.d/4140.fixed b/core/embed/bootloader/.changelog.d/4140.fixed
new file mode 100644
index 0000000000..8f13291fe6
--- /dev/null
+++ b/core/embed/bootloader/.changelog.d/4140.fixed
@@ -0,0 +1 @@
+[T3B1] UI adjustments: fix icon on warning screen, replace empty logo with full during boot
diff --git a/core/embed/bootloader/bootui.c b/core/embed/bootloader/bootui.c
index 15d74d4c15..b1d446aec4 100644
--- a/core/embed/bootloader/bootui.c
+++ b/core/embed/bootloader/bootui.c
@@ -52,7 +52,7 @@
 #define COLOR_BL_GRAY COLOR_BL_FG
 #endif
 
-#ifndef TREZOR_MODEL_R
+#if !defined TREZOR_MODEL_R && !defined TREZOR_MODEL_T3B1
 #define BOOT_WAIT_HEIGHT 25
 #define BOOT_WAIT_Y_TOP (DISPLAY_RESY - BOOT_WAIT_HEIGHT)
 #else
@@ -95,7 +95,7 @@ static void ui_screen_boot_old(const vendor_header *const vhdr,
 
   display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, boot_background);
 
-#ifndef TREZOR_MODEL_R
+#if !defined TREZOR_MODEL_R && !defined TREZOR_MODEL_T3B1
   int image_top = show_string ? 30 : (DISPLAY_RESY - 120) / 2;
   // check whether vendor image is 120x120
   if (memcmp(vimg, "TOIF\x78\x00\x78\x00", 8) == 0) {
diff --git a/core/embed/rust/Cargo.toml b/core/embed/rust/Cargo.toml
index 4cd56c1153..77091f4326 100644
--- a/core/embed/rust/Cargo.toml
+++ b/core/embed/rust/Cargo.toml
@@ -28,6 +28,7 @@ ui_jpeg_decoder = ["jpeg"]
 ui_image_buffer = []
 ui_color_32bit = []
 ui_overlay = []
+ui_empty_lock = []
 new_rendering = []
 bootloader = []
 button = []
@@ -64,6 +65,7 @@ test = [
     "ui_blurring",
     "ui_image_buffer",
     "ui_overlay",
+    "ui_empty_lock",
     "universal_fw",
 ]
 universal_fw = []
diff --git a/core/embed/rust/src/ui/model_tr/bootloader/mod.rs b/core/embed/rust/src/ui/model_tr/bootloader/mod.rs
index 0b0307ca7a..fc5fa225fa 100644
--- a/core/embed/rust/src/ui/model_tr/bootloader/mod.rs
+++ b/core/embed/rust/src/ui/model_tr/bootloader/mod.rs
@@ -321,7 +321,7 @@ impl UIFeaturesBootloader for ModelTRFeatures {
         #[cfg(not(feature = "new_rendering"))]
         display::rect_fill(SCREEN, BLD_BG);
 
-        let mut frame = WelcomeScreen::new(true);
+        let mut frame = WelcomeScreen::new(cfg!(ui_empty_lock));
         show(&mut frame, false);
     }