diff --git a/core/embed/bootloader_ci/ChangeLog b/core/embed/bootloader_ci/ChangeLog
index f15f7f68f..95df4d0c6 100644
--- a/core/embed/bootloader_ci/ChangeLog
+++ b/core/embed/bootloader_ci/ChangeLog
@@ -21,6 +21,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Older changelog:
 
+Version 1.0.1 [Jan 2021]
+* decouple files from original bootloader as it will be reworked and symlink
+  magic will break
+* version in version.h must be kept to match the original bootloader,
+  otherwise firmware update will fail (bootloader will look too old)
+
 Version 1.0.0 [Aug 2020]
 * initial version
 
diff --git a/core/embed/bootloader_ci/bootui.c b/core/embed/bootloader_ci/bootui.c
deleted file mode 120000
index 8255dcb62..000000000
--- a/core/embed/bootloader_ci/bootui.c
+++ /dev/null
@@ -1 +0,0 @@
-../bootloader/bootui.c
\ No newline at end of file
diff --git a/core/embed/bootloader_ci/bootui.c b/core/embed/bootloader_ci/bootui.c
new file mode 100644
index 000000000..783a7aeff
--- /dev/null
+++ b/core/embed/bootloader_ci/bootui.c
@@ -0,0 +1,374 @@
+/*
+ * This file is part of the Trezor project, https://trezor.io/
+ *
+ * Copyright (c) SatoshiLabs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <string.h>
+
+#include "display.h"
+#include "mini_printf.h"
+
+#include "bootui.h"
+#include "touch.h"
+#include "version.h"
+
+#include "icon_cancel.h"
+#include "icon_confirm.h"
+#include "icon_done.h"
+#include "icon_fail.h"
+#include "icon_info.h"
+#include "icon_install.h"
+#include "icon_wipe.h"
+
+#include "icon_logo.h"
+#include "icon_safeplace.h"
+#include "icon_welcome.h"
+
+#define BACKLIGHT_NORMAL 150
+
+#define COLOR_BL_FAIL RGB16(0xFF, 0x00, 0x00)     // red
+#define COLOR_BL_DONE RGB16(0x00, 0xAE, 0x0B)     // green
+#define COLOR_BL_PROCESS RGB16(0x4A, 0x90, 0xE2)  // blue
+#define COLOR_BL_GRAY RGB16(0x99, 0x99, 0x99)     // gray
+
+// common shared functions
+
+static void ui_confirm_cancel_buttons(void) {
+  display_bar_radius(9, 184, 108, 50, COLOR_BL_FAIL, COLOR_WHITE, 4);
+  display_icon(9 + (108 - 16) / 2, 184 + (50 - 16) / 2, 16, 16,
+               toi_icon_cancel + 12, sizeof(toi_icon_cancel) - 12, COLOR_WHITE,
+               COLOR_BL_FAIL);
+  display_bar_radius(123, 184, 108, 50, COLOR_BL_DONE, COLOR_WHITE, 4);
+  display_icon(123 + (108 - 19) / 2, 184 + (50 - 16) / 2, 20, 16,
+               toi_icon_confirm + 12, sizeof(toi_icon_confirm) - 12,
+               COLOR_WHITE, COLOR_BL_DONE);
+}
+
+static const char *format_ver(const char *format, uint32_t version) {
+  static char ver_str[64];
+  mini_snprintf(ver_str, sizeof(ver_str), format, (int)(version & 0xFF),
+                (int)((version >> 8) & 0xFF), (int)((version >> 16) & 0xFF)
+                // ignore build field (int)((version >> 24) & 0xFF)
+  );
+  return ver_str;
+}
+
+// boot UI
+
+static uint16_t boot_background;
+
+void ui_screen_boot(const vendor_header *const vhdr,
+                    const image_header *const hdr) {
+  const int show_string = ((vhdr->vtrust & VTRUST_STRING) == 0);
+  if ((vhdr->vtrust & VTRUST_RED) == 0) {
+    boot_background = COLOR_BL_FAIL;
+  } else {
+    boot_background = COLOR_BLACK;
+  }
+
+  const uint8_t *vimg = vhdr->vimg;
+  const uint32_t fw_version = hdr->version;
+
+  display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, boot_background);
+
+  int image_top = show_string ? 30 : (DISPLAY_RESY - 120) / 2;
+
+  // check whether vendor image is 120x120
+  if (memcmp(vimg, "TOIf\x78\x00\x78\x00", 4) == 0) {
+    uint32_t datalen = *(uint32_t *)(vimg + 8);
+    display_image((DISPLAY_RESX - 120) / 2, image_top, 120, 120, vimg + 12,
+                  datalen);
+  }
+
+  if (show_string) {
+    display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 5 - 50, vhdr->vstr,
+                        vhdr->vstr_len, FONT_NORMAL, COLOR_WHITE,
+                        boot_background);
+    const char *ver_str = format_ver("%d.%d.%d", fw_version);
+    display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 5 - 25, ver_str, -1,
+                        FONT_NORMAL, COLOR_WHITE, boot_background);
+  }
+}
+
+void ui_screen_boot_wait(int wait_seconds) {
+  char wait_str[16];
+  mini_snprintf(wait_str, sizeof(wait_str), "starting in %d s", wait_seconds);
+  display_bar(0, DISPLAY_RESY - 5 - 20, DISPLAY_RESX, 5 + 20, boot_background);
+  display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 5, wait_str, -1,
+                      FONT_NORMAL, COLOR_WHITE, boot_background);
+}
+
+void ui_screen_boot_click(void) {
+  display_bar(0, DISPLAY_RESY - 5 - 20, DISPLAY_RESX, 5 + 20, boot_background);
+  display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 5,
+                      "click to continue ...", -1, FONT_NORMAL, COLOR_WHITE,
+                      boot_background);
+}
+
+// welcome UI
+
+void ui_screen_first(void) {
+  display_icon(0, 0, 240, 240, toi_icon_logo + 12, sizeof(toi_icon_logo) - 12,
+               COLOR_BLACK, COLOR_WHITE);
+}
+
+void ui_screen_second(void) {
+  display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, COLOR_WHITE);
+  display_icon((DISPLAY_RESX - 200) / 2, (DISPLAY_RESY - 60) / 2, 200, 60,
+               toi_icon_safeplace + 12, sizeof(toi_icon_safeplace) - 12,
+               COLOR_BLACK, COLOR_WHITE);
+}
+
+void ui_screen_third(void) {
+  display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, COLOR_WHITE);
+  display_icon((DISPLAY_RESX - 180) / 2, (DISPLAY_RESY - 30) / 2 - 5, 180, 30,
+               toi_icon_welcome + 12, sizeof(toi_icon_welcome) - 12,
+               COLOR_BLACK, COLOR_WHITE);
+  display_text_center(120, 220, "Go to trezor.io/start", -1, FONT_NORMAL,
+                      COLOR_BLACK, COLOR_WHITE);
+}
+
+// info UI
+
+static int display_vendor_string(const char *text, int textlen,
+                                 uint16_t fgcolor) {
+  int split = display_text_split(text, textlen, FONT_NORMAL, DISPLAY_RESX - 55);
+  if (split >= textlen) {
+    display_text(55, 95, text, textlen, FONT_NORMAL, fgcolor, COLOR_WHITE);
+    return 120;
+  } else {
+    display_text(55, 95, text, split, FONT_NORMAL, fgcolor, COLOR_WHITE);
+    if (text[split] == ' ') {
+      split++;
+    }
+    display_text(55, 120, text + split, textlen - split, FONT_NORMAL, fgcolor,
+                 COLOR_WHITE);
+    return 145;
+  }
+}
+
+void ui_screen_info(secbool buttons, const vendor_header *const vhdr,
+                    const image_header *const hdr) {
+  display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, COLOR_WHITE);
+  const char *ver_str = format_ver("Bootloader %d.%d.%d", VERSION_UINT32);
+  display_text(16, 32, ver_str, -1, FONT_NORMAL, COLOR_BLACK, COLOR_WHITE);
+  display_bar(16, 44, DISPLAY_RESX - 14 * 2, 1, COLOR_BLACK);
+  display_icon(16, 54, 32, 32, toi_icon_info + 12, sizeof(toi_icon_info) - 12,
+               COLOR_BL_GRAY, COLOR_WHITE);
+  if (vhdr && hdr) {
+    ver_str = format_ver("Firmware %d.%d.%d by", (hdr->version));
+    display_text(55, 70, ver_str, -1, FONT_NORMAL, COLOR_BL_GRAY, COLOR_WHITE);
+    display_vendor_string(vhdr->vstr, vhdr->vstr_len, COLOR_BL_GRAY);
+  } else {
+    display_text(55, 70, "No Firmware", -1, FONT_NORMAL, COLOR_BL_GRAY,
+                 COLOR_WHITE);
+  }
+
+  if (sectrue == buttons) {
+    display_text_center(120, 170, "Connect to host?", -1, FONT_NORMAL,
+                        COLOR_BLACK, COLOR_WHITE);
+    ui_confirm_cancel_buttons();
+  } else {
+    display_text_center(120, 220, "Go to trezor.io/start", -1, FONT_NORMAL,
+                        COLOR_BLACK, COLOR_WHITE);
+  }
+}
+
+void ui_screen_info_fingerprint(const image_header *const hdr) {
+  display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, COLOR_WHITE);
+  display_text(16, 32, "Firmware fingerprint", -1, FONT_NORMAL, COLOR_BLACK,
+               COLOR_WHITE);
+  display_bar(16, 44, DISPLAY_RESX - 14 * 2, 1, COLOR_BLACK);
+
+  static const char *hexdigits = "0123456789abcdef";
+  char fingerprint_str[64];
+  for (int i = 0; i < 32; i++) {
+    fingerprint_str[i * 2] = hexdigits[(hdr->fingerprint[i] >> 4) & 0xF];
+    fingerprint_str[i * 2 + 1] = hexdigits[hdr->fingerprint[i] & 0xF];
+  }
+  for (int i = 0; i < 4; i++) {
+    display_text_center(120, 70 + i * 25, fingerprint_str + i * 16, 16,
+                        FONT_MONO, COLOR_BLACK, COLOR_WHITE);
+  }
+
+  display_bar_radius(9, 184, 222, 50, COLOR_BL_DONE, COLOR_WHITE, 4);
+  display_icon(9 + (222 - 19) / 2, 184 + (50 - 16) / 2, 20, 16,
+               toi_icon_confirm + 12, sizeof(toi_icon_confirm) - 12,
+               COLOR_WHITE, COLOR_BL_DONE);
+}
+
+// install UI
+
+void ui_screen_install_confirm_upgrade(const vendor_header *const vhdr,
+                                       const image_header *const hdr) {
+  display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, COLOR_WHITE);
+  display_text(16, 32, "Firmware update", -1, FONT_NORMAL, COLOR_BLACK,
+               COLOR_WHITE);
+  display_bar(16, 44, DISPLAY_RESX - 14 * 2, 1, COLOR_BLACK);
+  display_icon(16, 54, 32, 32, toi_icon_info + 12, sizeof(toi_icon_info) - 12,
+               COLOR_BLACK, COLOR_WHITE);
+  display_text(55, 70, "Update firmware by", -1, FONT_NORMAL, COLOR_BLACK,
+               COLOR_WHITE);
+  int next_y = display_vendor_string(vhdr->vstr, vhdr->vstr_len, COLOR_BLACK);
+  const char *ver_str = format_ver("to version %d.%d.%d?", hdr->version);
+  display_text(55, next_y, ver_str, -1, FONT_NORMAL, COLOR_BLACK, COLOR_WHITE);
+  ui_confirm_cancel_buttons();
+}
+
+void ui_screen_install_confirm_newvendor_or_downgrade_wipe(
+    const vendor_header *const vhdr, const image_header *const hdr,
+    secbool downgrade_wipe) {
+  display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, COLOR_WHITE);
+  display_text(
+      16, 32,
+      (sectrue == downgrade_wipe) ? "Firmware downgrade" : "Vendor change", -1,
+      FONT_NORMAL, COLOR_BLACK, COLOR_WHITE);
+  display_bar(16, 44, DISPLAY_RESX - 14 * 2, 1, COLOR_BLACK);
+  display_icon(16, 54, 32, 32, toi_icon_info + 12, sizeof(toi_icon_info) - 12,
+               COLOR_BLACK, COLOR_WHITE);
+  display_text(55, 70, "Install firmware by", -1, FONT_NORMAL, COLOR_BLACK,
+               COLOR_WHITE);
+  int next_y = display_vendor_string(vhdr->vstr, vhdr->vstr_len, COLOR_BLACK);
+  const char *ver_str = format_ver("(version %d.%d.%d)?", hdr->version);
+  display_text(55, next_y, ver_str, -1, FONT_NORMAL, COLOR_BLACK, COLOR_WHITE);
+  display_text_center(120, 170, "Seed will be erased!", -1, FONT_NORMAL,
+                      COLOR_BL_FAIL, COLOR_WHITE);
+  ui_confirm_cancel_buttons();
+}
+
+void ui_screen_install(void) {
+  display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, COLOR_WHITE);
+  display_loader(0, false, -20, COLOR_BL_PROCESS, COLOR_WHITE, toi_icon_install,
+                 sizeof(toi_icon_install), COLOR_BLACK);
+  display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 24,
+                      "Installing firmware", -1, FONT_NORMAL, COLOR_BLACK,
+                      COLOR_WHITE);
+}
+
+void ui_screen_install_progress_erase(int pos, int len) {
+  display_loader(250 * pos / len, false, -20, COLOR_BL_PROCESS, COLOR_WHITE,
+                 toi_icon_install, sizeof(toi_icon_install), COLOR_BLACK);
+}
+
+void ui_screen_install_progress_upload(int pos) {
+  display_loader(pos, false, -20, COLOR_BL_PROCESS, COLOR_WHITE,
+                 toi_icon_install, sizeof(toi_icon_install), COLOR_BLACK);
+}
+
+// wipe UI
+
+void ui_screen_wipe_confirm(void) {
+  display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, COLOR_WHITE);
+  display_text(16, 32, "Wipe device", -1, FONT_NORMAL, COLOR_BLACK,
+               COLOR_WHITE);
+  display_bar(16, 44, DISPLAY_RESX - 14 * 2, 1, COLOR_BLACK);
+  display_icon(16, 54, 32, 32, toi_icon_info + 12, sizeof(toi_icon_info) - 12,
+               COLOR_BLACK, COLOR_WHITE);
+  display_text(55, 70, "Do you want to", -1, FONT_NORMAL, COLOR_BLACK,
+               COLOR_WHITE);
+  display_text(55, 95, "wipe the device?", -1, FONT_NORMAL, COLOR_BLACK,
+               COLOR_WHITE);
+
+  display_text_center(120, 170, "Seed will be erased!", -1, FONT_NORMAL,
+                      COLOR_BL_FAIL, COLOR_WHITE);
+  ui_confirm_cancel_buttons();
+}
+
+void ui_screen_wipe(void) {
+  display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, COLOR_WHITE);
+  display_loader(0, false, -20, COLOR_BL_PROCESS, COLOR_WHITE, toi_icon_wipe,
+                 sizeof(toi_icon_wipe), COLOR_BLACK);
+  display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 24, "Wiping device", -1,
+                      FONT_NORMAL, COLOR_BLACK, COLOR_WHITE);
+}
+
+void ui_screen_wipe_progress(int pos, int len) {
+  display_loader(1000 * pos / len, false, -20, COLOR_BL_PROCESS, COLOR_WHITE,
+                 toi_icon_wipe, sizeof(toi_icon_wipe), COLOR_BLACK);
+}
+
+// done UI
+
+void ui_screen_done(int restart_seconds, secbool full_redraw) {
+  const char *str;
+  char count_str[24];
+  if (restart_seconds >= 1) {
+    mini_snprintf(count_str, sizeof(count_str), "Done! Restarting in %d s",
+                  restart_seconds);
+    str = count_str;
+  } else {
+    str = "Done! Unplug the device.";
+  }
+  if (sectrue == full_redraw) {
+    display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, COLOR_WHITE);
+  }
+  display_loader(1000, false, -20, COLOR_BL_DONE, COLOR_WHITE, toi_icon_done,
+                 sizeof(toi_icon_done), COLOR_BLACK);
+  if (secfalse == full_redraw) {
+    display_bar(0, DISPLAY_RESY - 24 - 18, 240, 23, COLOR_WHITE);
+  }
+  display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 24, str, -1, FONT_NORMAL,
+                      COLOR_BLACK, COLOR_WHITE);
+}
+
+// error UI
+
+void ui_screen_fail(void) {
+  display_bar(0, 0, DISPLAY_RESX, DISPLAY_RESY, COLOR_WHITE);
+  display_loader(1000, false, -20, COLOR_BL_FAIL, COLOR_WHITE, toi_icon_fail,
+                 sizeof(toi_icon_fail), COLOR_BLACK);
+  display_text_center(DISPLAY_RESX / 2, DISPLAY_RESY - 24,
+                      "Failed! Please, reconnect.", -1, FONT_NORMAL,
+                      COLOR_BLACK, COLOR_WHITE);
+}
+
+// general functions
+
+void ui_fadein(void) { display_fade(0, BACKLIGHT_NORMAL, 1000); }
+
+void ui_fadeout(void) {
+  display_fade(BACKLIGHT_NORMAL, 0, 500);
+  display_clear();
+}
+
+int ui_user_input(int zones) {
+  for (;;) {
+    uint32_t evt = touch_click();
+    uint16_t x = touch_unpack_x(evt);
+    uint16_t y = touch_unpack_y(evt);
+    // clicked on Cancel button
+    if ((zones & INPUT_CANCEL) && x >= 9 && x < 9 + 108 && y > 184 &&
+        y < 184 + 50) {
+      return INPUT_CANCEL;
+    }
+    // clicked on Confirm button
+    if ((zones & INPUT_CONFIRM) && x >= 123 && x < 123 + 108 && y > 184 &&
+        y < 184 + 50) {
+      return INPUT_CONFIRM;
+    }
+    // clicked on Long Confirm button
+    if ((zones & INPUT_LONG_CONFIRM) && x >= 9 && x < 9 + 222 && y > 184 &&
+        y < 184 + 50) {
+      return INPUT_LONG_CONFIRM;
+    }
+    // clicked on Info icon
+    if ((zones & INPUT_INFO) && x >= 16 && x < 16 + 32 && y > 54 &&
+        y < 54 + 32) {
+      return INPUT_INFO;
+    }
+  }
+}
diff --git a/core/embed/bootloader_ci/bootui.h b/core/embed/bootloader_ci/bootui.h
deleted file mode 120000
index 9baee876a..000000000
--- a/core/embed/bootloader_ci/bootui.h
+++ /dev/null
@@ -1 +0,0 @@
-../bootloader/bootui.h
\ No newline at end of file
diff --git a/core/embed/bootloader_ci/bootui.h b/core/embed/bootloader_ci/bootui.h
new file mode 100644
index 000000000..b53b10334
--- /dev/null
+++ b/core/embed/bootloader_ci/bootui.h
@@ -0,0 +1,68 @@
+/*
+ * This file is part of the Trezor project, https://trezor.io/
+ *
+ * Copyright (c) SatoshiLabs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __BOOTUI_H__
+#define __BOOTUI_H__
+
+#include "image.h"
+#include "secbool.h"
+
+void ui_screen_boot(const vendor_header* const vhdr,
+                    const image_header* const hdr);
+void ui_screen_boot_wait(int wait_seconds);
+void ui_screen_boot_click(void);
+
+void ui_screen_first(void);
+void ui_screen_second(void);
+void ui_screen_third(void);
+
+void ui_screen_info(secbool buttons, const vendor_header* const vhdr,
+                    const image_header* const hdr);
+void ui_screen_info_fingerprint(const image_header* const hdr);
+
+void ui_screen_install_confirm_upgrade(const vendor_header* const vhdr,
+                                       const image_header* const hdr);
+void ui_screen_install_confirm_newvendor_or_downgrade_wipe(
+    const vendor_header* const vhdr, const image_header* const hdr,
+    secbool downgrade_wipe);
+void ui_screen_install(void);
+void ui_screen_install_progress_erase(int pos, int len);
+void ui_screen_install_progress_upload(int pos);
+
+void ui_screen_wipe_confirm(void);
+void ui_screen_wipe(void);
+void ui_screen_wipe_progress(int pos, int len);
+
+void ui_screen_done(int restart_seconds, secbool full_redraw);
+
+void ui_screen_fail(void);
+
+void ui_fadein(void);
+void ui_fadeout(void);
+
+// clang-format off
+#define INPUT_CANCEL 0x01        // Cancel button
+#define INPUT_CONFIRM 0x02       // Confirm button
+#define INPUT_LONG_CONFIRM 0x04  // Long Confirm button
+#define INPUT_INFO 0x08          // Info icon
+// clang-format on
+
+int ui_user_input(int zones);
+
+#endif
diff --git a/core/embed/bootloader_ci/header.S b/core/embed/bootloader_ci/header.S
deleted file mode 120000
index ae273718d..000000000
--- a/core/embed/bootloader_ci/header.S
+++ /dev/null
@@ -1 +0,0 @@
-../bootloader/header.S
\ No newline at end of file
diff --git a/core/embed/bootloader_ci/header.S b/core/embed/bootloader_ci/header.S
new file mode 100644
index 000000000..3e3849a67
--- /dev/null
+++ b/core/embed/bootloader_ci/header.S
@@ -0,0 +1,28 @@
+    .syntax unified
+
+#include "version.h"
+
+    .section .header, "a"
+
+    .type g_header, %object
+    .size g_header, .-g_header
+
+g_header:
+    .byte 'T','R','Z','B'            // magic
+    .word g_header_end - g_header    // hdrlen
+    .word 0                          // expiry
+    .word _codelen                   // codelen
+    .byte VERSION_MAJOR              // vmajor
+    .byte VERSION_MINOR              // vminor
+    .byte VERSION_PATCH              // vpatch
+    .byte VERSION_BUILD              // vbuild
+    .byte FIX_VERSION_MAJOR          // fix_vmajor
+    .byte FIX_VERSION_MINOR          // fix_vminor
+    .byte FIX_VERSION_PATCH          // fix_vpatch
+    .byte FIX_VERSION_BUILD          // fix_vbuild
+    . = . + 8                        // reserved
+    . = . + 512                      // hash1 ... hash16
+    . = . + 415                      // reserved
+    .byte 0                          // sigmask
+    . = . + 64                       // sig
+g_header_end:
diff --git a/core/embed/bootloader_ci/icon_cancel.h b/core/embed/bootloader_ci/icon_cancel.h
deleted file mode 120000
index 21f13d159..000000000
--- a/core/embed/bootloader_ci/icon_cancel.h
+++ /dev/null
@@ -1 +0,0 @@
-../bootloader/icon_cancel.h
\ No newline at end of file
diff --git a/core/embed/bootloader_ci/icon_cancel.h b/core/embed/bootloader_ci/icon_cancel.h
new file mode 100644
index 000000000..d983ae3a6
--- /dev/null
+++ b/core/embed/bootloader_ci/icon_cancel.h
@@ -0,0 +1,11 @@
+// clang-format off
+static const uint8_t toi_icon_cancel[] = {
+    // magic
+    'T', 'O', 'I', 'g',
+    // width (16-bit), height (16-bit)
+    0x10, 0x00, 0x10, 0x00,
+    // compressed data length (32-bit)
+    0x52, 0x00, 0x00, 0x00,
+    // compressed data
+    0x45, 0x4d, 0xc1, 0x09, 0x80, 0x30, 0x10, 0x4b, 0xeb, 0x02, 0x5d, 0x40, 0xb8, 0x01, 0x2c, 0xb8, 0xff, 0x47, 0x70, 0x81, 0xa2, 0x0b, 0x74, 0x10, 0x7b, 0xc4, 0x48, 0x5b, 0x0c, 0x1c, 0x09, 0xe1, 0x92, 0x60, 0x4b, 0x40, 0x38, 0x11, 0xeb, 0x0d, 0x64, 0xb7, 0x4c, 0xb7, 0x58, 0x79, 0x1f, 0xe4, 0xb5, 0x92, 0x8f, 0xce, 0xab, 0x74, 0x2c, 0x14, 0x9a, 0x21, 0x7f, 0xac, 0xdf, 0x20, 0xd7, 0xd3, 0xcf, 0xc3, 0x57, 0x56, 0x70, 0x9b, 0xb9, 0xd2, 0x7b, 0xda, 0xec, 0x5d, 0xfa, 0xce, 0x8e, 0xb1, 0xfb, 0x02,
+};
diff --git a/core/embed/bootloader_ci/icon_confirm.h b/core/embed/bootloader_ci/icon_confirm.h
deleted file mode 120000
index cd4d7024f..000000000
--- a/core/embed/bootloader_ci/icon_confirm.h
+++ /dev/null
@@ -1 +0,0 @@
-../bootloader/icon_confirm.h
\ No newline at end of file
diff --git a/core/embed/bootloader_ci/icon_confirm.h b/core/embed/bootloader_ci/icon_confirm.h
new file mode 100644
index 000000000..ded1cd297
--- /dev/null
+++ b/core/embed/bootloader_ci/icon_confirm.h
@@ -0,0 +1,11 @@
+// clang-format off
+static const uint8_t toi_icon_confirm[] = {
+    // magic
+    'T', 'O', 'I', 'g',
+    // width (16-bit), height (16-bit)
+    0x14, 0x00, 0x10, 0x00,
+    // compressed data length (32-bit)
+    0x69, 0x00, 0x00, 0x00,
+    // compressed data
+    0x63, 0x60, 0x80, 0x80, 0xa9, 0x50, 0x9a, 0x81, 0xf3, 0x7f, 0x00, 0x94, 0xd5, 0xff, 0xff, 0x2b, 0x84, 0xc1, 0xf1, 0xff, 0xff, 0x2f, 0x08, 0xab, 0xfe, 0xff, 0xff, 0x0d, 0x60, 0x06, 0xfb, 0xff, 0xff, 0xbf, 0x19, 0x18, 0x58, 0x26, 0x30, 0x30, 0xe4, 0x83, 0x85, 0xfc, 0x7f, 0x32, 0xb0, 0x01, 0x85, 0x04, 0x18, 0x58, 0xfe, 0xff, 0x6f, 0xcc, 0xfb, 0xff, 0x7f, 0x23, 0x03, 0x03, 0x17, 0x90, 0xff, 0x1e, 0x24, 0xc4, 0xc0, 0xb8, 0xff, 0x3f, 0x10, 0x6c, 0x02, 0xe9, 0x93, 0x06, 0x32, 0x7e, 0x2b, 0x80, 0x58, 0x20, 0xc1, 0x43, 0x10, 0x53, 0xb5, 0xff, 0xff, 0x31, 0x80, 0xb0, 0x98, 0xf6, 0x1f, 0x86, 0xb9, 0xc3, 0xca, 0x01, 0x4c, 0x01, 0x00,
+};
diff --git a/core/embed/bootloader_ci/icon_done.h b/core/embed/bootloader_ci/icon_done.h
deleted file mode 120000
index 30d8d7c83..000000000
--- a/core/embed/bootloader_ci/icon_done.h
+++ /dev/null
@@ -1 +0,0 @@
-../bootloader/icon_done.h
\ No newline at end of file
diff --git a/core/embed/bootloader_ci/icon_done.h b/core/embed/bootloader_ci/icon_done.h
new file mode 100644
index 000000000..a57196b4f
--- /dev/null
+++ b/core/embed/bootloader_ci/icon_done.h
@@ -0,0 +1,11 @@
+// clang-format off
+static const uint8_t toi_icon_done[] = {
+    // magic
+    'T', 'O', 'I', 'g',
+    // width (16-bit), height (16-bit)
+    0x40, 0x00, 0x40, 0x00,
+    // compressed data length (32-bit)
+    0xce, 0x00, 0x00, 0x00,
+    // compressed data
+    0xed, 0x92, 0xdf, 0x11, 0xc1, 0x40, 0x10, 0x87, 0x77, 0x26, 0xe3, 0xef, 0x93, 0x12, 0x94, 0x90, 0x0a, 0x24, 0x0d, 0x50, 0x02, 0x25, 0x28, 0x41, 0x09, 0x74, 0xa0, 0x04, 0x52, 0x01, 0x4a, 0x88, 0x0a, 0xd0, 0x80, 0x21, 0xde, 0xc8, 0x2d, 0xe7, 0x8e, 0xdc, 0xc8, 0xed, 0x6f, 0xbc, 0x27, 0xbf, 0x97, 0x7b, 0xf8, 0xe6, 0xdb, 0xdb, 0xbd, 0x3d, 0xa2, 0x3a, 0xd5, 0x4b, 0x67, 0x8d, 0xf9, 0x26, 0xc7, 0x3a, 0x73, 0x82, 0xf8, 0x8a, 0xf9, 0x81, 0x75, 0xe6, 0xad, 0xcc, 0xe7, 0x9a, 0xdf, 0x45, 0xdc, 0xe5, 0x77, 0x16, 0x50, 0xe7, 0x1c, 0xde, 0xce, 0xbc, 0xc7, 0xba, 0xea, 0x09, 0xb8, 0xfd, 0x9f, 0xde, 0xc7, 0x7a, 0x5a, 0xea, 0x2a, 0xc1, 0xba, 0xdd, 0x88, 0x6d, 0xfe, 0xe8, 0x19, 0x6a, 0xa7, 0xcf, 0x99, 0x99, 0xbd, 0xa4, 0x2f, 0xcd, 0x46, 0xec, 0xed, 0x27, 0xef, 0x93, 0xa6, 0x1f, 0x5d, 0xf9, 0x74, 0xbd, 0x91, 0x96, 0x30, 0xbb, 0x2d, 0x7b, 0x98, 0x9a, 0x33, 0xfc, 0xe5, 0xc1, 0xd9, 0xb4, 0x25, 0xdc, 0x4e, 0x14, 0xb1, 0x93, 0xb0, 0xcc, 0x03, 0x07, 0x5f, 0x7c, 0xcf, 0x3a, 0xf8, 0x62, 0x15, 0xfa, 0x78, 0x51, 0xe0, 0xea, 0xdf, 0xcb, 0x18, 0xea, 0x45, 0x81, 0x4c, 0xda, 0xfb, 0x44, 0x6c, 0xde, 0x2d, 0x90, 0xc9, 0xbf, 0x3e, 0x82, 0x3a, 0x51, 0xe3, 0x85, 0x6f, 0x04, 0x32, 0x62, 0x8e, 0x11, 0x6f, 0x62, 0x9d, 0x68, 0x18, 0x53, 0x9d, 0x8a, 0xe5, 0x09,
+};
diff --git a/core/embed/bootloader_ci/icon_fail.h b/core/embed/bootloader_ci/icon_fail.h
deleted file mode 120000
index e521c613f..000000000
--- a/core/embed/bootloader_ci/icon_fail.h
+++ /dev/null
@@ -1 +0,0 @@
-../bootloader/icon_fail.h
\ No newline at end of file
diff --git a/core/embed/bootloader_ci/icon_fail.h b/core/embed/bootloader_ci/icon_fail.h
new file mode 100644
index 000000000..7d4f95737
--- /dev/null
+++ b/core/embed/bootloader_ci/icon_fail.h
@@ -0,0 +1,11 @@
+// clang-format off
+static const uint8_t toi_icon_fail[] = {
+    // magic
+    'T', 'O', 'I', 'g',
+    // width (16-bit), height (16-bit)
+    0x40, 0x00, 0x40, 0x00,
+    // compressed data length (32-bit)
+    0x21, 0x01, 0x00, 0x00,
+    // compressed data
+    0xed, 0x52, 0xb9, 0x0d, 0xc2, 0x40, 0x10, 0x34, 0xf8, 0x89, 0xa9, 0x00, 0xd1, 0x00, 0xe8, 0x2a, 0x00, 0x17, 0x80, 0xc0, 0x1d, 0xe0, 0x0e, 0x28, 0x91, 0x84, 0x1c, 0x89, 0x12, 0x80, 0xdc, 0xc1, 0xd9, 0x24, 0xa0, 0x5b, 0xb0, 0x7d, 0xe7, 0xbd, 0x67, 0xe4, 0x98, 0x80, 0x89, 0x46, 0x3b, 0xde, 0xf5, 0xcd, 0xee, 0x44, 0xd1, 0x1f, 0x3f, 0x81, 0xe9, 0x99, 0xf9, 0x76, 0x11, 0xea, 0x73, 0x2a, 0x0d, 0xcd, 0xe8, 0x16, 0xb6, 0x57, 0x54, 0x1b, 0xbe, 0x27, 0x15, 0x0c, 0x58, 0x12, 0x51, 0xd1, 0xd3, 0xf4, 0x4b, 0xaf, 0x61, 0x3b, 0x51, 0xd3, 0xf3, 0xc3, 0x97, 0xfa, 0x03, 0xda, 0x76, 0xa2, 0xbc, 0xa5, 0x49, 0x47, 0xdd, 0x01, 0x93, 0xaa, 0x2b, 0x3e, 0x5b, 0x7e, 0xec, 0xa8, 0x9a, 0xd9, 0xfa, 0x8a, 0xc8, 0x0c, 0x48, 0x34, 0x75, 0x2c, 0x9c, 0x74, 0xb1, 0x6e, 0x1f, 0xdf, 0xe3, 0x65, 0xeb, 0x1b, 0x5d, 0xa4, 0x32, 0x33, 0x4c, 0xda, 0xba, 0x19, 0x4a, 0xb5, 0x69, 0xef, 0xdf, 0x3a, 0x60, 0xad, 0xab, 0xaa, 0xd2, 0xe4, 0xee, 0xfa, 0x8b, 0xc9, 0x83, 0xf0, 0x16, 0xb4, 0x73, 0xe5, 0x87, 0xbf, 0xdf, 0x78, 0xbc, 0x9d, 0x7d, 0x19, 0x9f, 0xc1, 0x80, 0x8a, 0x65, 0x25, 0x40, 0x40, 0x36, 0xac, 0x4b, 0x14, 0xa0, 0x64, 0x18, 0xa0, 0x72, 0x98, 0x30, 0xb3, 0x03, 0xdf, 0x7b, 0x60, 0xf1, 0x01, 0xe5, 0x8c, 0xff, 0x5f, 0x22, 0x7d, 0x3f, 0x6a, 0x8f, 0x4f, 0x14, 0x1e, 0x27, 0xe2, 0xd8, 0x68, 0x3c, 0xc7, 0xdb, 0xc1, 0x80, 0x83, 0xab, 0x37, 0x9e, 0x9c, 0xfa, 0xf7, 0xcd, 0xf1, 0x72, 0x87, 0x7c, 0x48, 0xdc, 0x2e, 0x87, 0x2b, 0x14, 0xd0, 0x7b, 0x91, 0xc2, 0x1d, 0x5c, 0xc2, 0x7c, 0xbf, 0xd1, 0xef, 0x05, 0x07, 0x49, 0x82, 0x74, 0x35, 0x96, 0x53, 0x01, 0x6e, 0x2b, 0xf8, 0x5b, 0x94, 0xef, 0xc6, 0x5a, 0x95, 0x00, 0xe1, 0xc8, 0x79, 0xd5, 0x77, 0x90, 0x6f, 0x69, 0xbd, 0x56, 0x80, 0x78, 0x16, 0xbc, 0x2d, 0x10, 0xd0, 0xf8, 0xcc, 0x7c, 0x2b, 0xa2, 0x3f, 0x7e, 0x03, 0x1f,
+};
diff --git a/core/embed/bootloader_ci/icon_info.h b/core/embed/bootloader_ci/icon_info.h
deleted file mode 120000
index b24400bcb..000000000
--- a/core/embed/bootloader_ci/icon_info.h
+++ /dev/null
@@ -1 +0,0 @@
-../bootloader/icon_info.h
\ No newline at end of file
diff --git a/core/embed/bootloader_ci/icon_info.h b/core/embed/bootloader_ci/icon_info.h
new file mode 100644
index 000000000..270a0710a
--- /dev/null
+++ b/core/embed/bootloader_ci/icon_info.h
@@ -0,0 +1,11 @@
+// clang-format off
+static const uint8_t toi_icon_info[] = {
+    // magic
+    'T', 'O', 'I', 'g',
+    // width (16-bit), height (16-bit)
+    0x20, 0x00, 0x20, 0x00,
+    // compressed data length (32-bit)
+    0xd9, 0x00, 0x00, 0x00,
+    // compressed data
+    0x7d, 0x91, 0x3d, 0x0a, 0xc2, 0x40, 0x10, 0x85, 0x47, 0xfc, 0x47, 0x59, 0x72, 0x10, 0x21, 0x85, 0x1e, 0x20, 0xe0, 0x41, 0x62, 0x6d, 0xa3, 0x37, 0xd0, 0xde, 0x26, 0x37, 0x88, 0xb5, 0x4d, 0xac, 0xd4, 0x5b, 0xd8, 0x59, 0xaa, 0x17, 0x10, 0x23, 0x18, 0x62, 0x34, 0xe6, 0xb9, 0xd9, 0x1f, 0x8c, 0xab, 0x38, 0xc5, 0xce, 0x7e, 0x30, 0x3b, 0xb3, 0xf3, 0x1e, 0x11, 0x8f, 0xf2, 0x6c, 0x7f, 0xda, 0x38, 0xa4, 0xa3, 0x01, 0x11, 0x9e, 0xc2, 0x1a, 0x54, 0x4c, 0x25, 0x6f, 0x81, 0x75, 0xbf, 0x37, 0x04, 0x9e, 0x02, 0x19, 0x30, 0x56, 0x65, 0x97, 0x3c, 0x9f, 0xb1, 0x94, 0x75, 0x4d, 0xc0, 0x22, 0x6a, 0x21, 0xd6, 0x7d, 0x5d, 0x1c, 0x89, 0x46, 0xa2, 0xda, 0xbd, 0xf3, 0xa3, 0x8a, 0x1b, 0x11, 0x1e, 0xfc, 0x56, 0x02, 0x06, 0x3c, 0xf9, 0xb0, 0xea, 0x08, 0xf9, 0xa5, 0x22, 0xa7, 0x33, 0x78, 0x4c, 0x4e, 0x05, 0x1c, 0xf1, 0x20, 0xb4, 0x21, 0x5a, 0x75, 0x76, 0x22, 0x21, 0x9a, 0xa4, 0x54, 0x88, 0x20, 0x09, 0xe2, 0x22, 0xbb, 0xe9, 0x36, 0xa2, 0x77, 0x7f, 0xb2, 0xb3, 0xc3, 0xf5, 0x3f, 0x9b, 0xf5, 0xb2, 0x9f, 0x66, 0x37, 0x95, 0xf3, 0x34, 0xfb, 0x89, 0xfc, 0x8f, 0x66, 0x44, 0x4c, 0xac, 0xa7, 0x98, 0xff, 0x57, 0xee, 0xa3, 0x98, 0x61, 0x6e, 0xee, 0xab, 0xf4, 0x58, 0x2c, 0x1c, 0xa5, 0x47, 0xdb, 0xd0, 0xcb, 0xd4, 0xf3, 0x4b, 0xef, 0xdc, 0x8f, 0x55, 0xbf, 0xcb, 0xfd, 0xc8, 0xac, 0x9f, 0x7e, 0x99, 0x7e, 0x7e, 0xf8, 0xfd, 0x02,
+};
diff --git a/core/embed/bootloader_ci/icon_install.h b/core/embed/bootloader_ci/icon_install.h
deleted file mode 120000
index 615ffc096..000000000
--- a/core/embed/bootloader_ci/icon_install.h
+++ /dev/null
@@ -1 +0,0 @@
-../bootloader/icon_install.h
\ No newline at end of file
diff --git a/core/embed/bootloader_ci/icon_install.h b/core/embed/bootloader_ci/icon_install.h
new file mode 100644
index 000000000..2ab3cada2
--- /dev/null
+++ b/core/embed/bootloader_ci/icon_install.h
@@ -0,0 +1,11 @@
+// clang-format off
+static const uint8_t toi_icon_install[] = {
+    // magic
+    'T', 'O', 'I', 'g',
+    // width (16-bit), height (16-bit)
+    0x40, 0x00, 0x40, 0x00,
+    // compressed data length (32-bit)
+    0xb8, 0x00, 0x00, 0x00,
+    // compressed data
+    0x63, 0x60, 0x18, 0x05, 0xa3, 0x80, 0x58, 0x60, 0xe2, 0xe2, 0xe2, 0x8c, 0x4f, 0xfe, 0xfc, 0xff, 0xff, 0x7f, 0x46, 0xe5, 0xc9, 0x93, 0x5f, 0x83, 0x90, 0x3f, 0x85, 0x45, 0x9a, 0xeb, 0xff, 0x05, 0x98, 0x3c, 0xef, 0xff, 0x05, 0x98, 0xf2, 0xeb, 0xff, 0xff, 0x86, 0xc9, 0xef, 0xff, 0xff, 0x0b, 0x43, 0x9a, 0xe7, 0xff, 0x7f, 0xa0, 0x01, 0x60, 0x79, 0x5e, 0x20, 0xf3, 0x00, 0xba, 0x3c, 0x0b, 0x50, 0xf0, 0x8f, 0x00, 0x48, 0x9e, 0x11, 0x48, 0xfc, 0x77, 0xc0, 0x30, 0xc0, 0x1f, 0x28, 0x7a, 0x09, 0x24, 0xaf, 0x0b, 0x64, 0x7c, 0xc1, 0xb4, 0x9f, 0x09, 0x28, 0xfc, 0xef, 0x3d, 0x04, 0xff, 0x57, 0xc0, 0xe2, 0x01, 0x90, 0x01, 0x50, 0xf0, 0x05, 0x9b, 0xff, 0x99, 0x10, 0xf2, 0x0a, 0x58, 0x03, 0x48, 0x1f, 0x26, 0xfd, 0x09, 0x7b, 0x00, 0x32, 0xc3, 0xe4, 0x0d, 0x70, 0x84, 0xb0, 0x1d, 0x44, 0xfa, 0x11, 0xae, 0x18, 0x60, 0x02, 0x39, 0xfd, 0xff, 0x3f, 0x05, 0x9c, 0xd1, 0x27, 0x0b, 0x92, 0xbf, 0x88, 0x3b, 0x7a, 0x19, 0xef, 0xff, 0xff, 0xff, 0x57, 0x00, 0x4f, 0xfc, 0xcb, 0xfc, 0xff, 0x7f, 0x90, 0x01, 0x6f, 0x02, 0xc1, 0x9b, 0x7c, 0x80, 0x06, 0xe0, 0xd7, 0xce, 0xc0, 0x28, 0xc0, 0x30, 0x0a, 0x46, 0x01, 0xf1, 0x00, 0x00,
+};
diff --git a/core/embed/bootloader_ci/icon_logo.h b/core/embed/bootloader_ci/icon_logo.h
deleted file mode 120000
index 39123ea9a..000000000
--- a/core/embed/bootloader_ci/icon_logo.h
+++ /dev/null
@@ -1 +0,0 @@
-../bootloader/icon_logo.h
\ No newline at end of file
diff --git a/core/embed/bootloader_ci/icon_logo.h b/core/embed/bootloader_ci/icon_logo.h
new file mode 100644
index 000000000..92134acc1
--- /dev/null
+++ b/core/embed/bootloader_ci/icon_logo.h
@@ -0,0 +1,11 @@
+// clang-format off
+static const uint8_t toi_icon_logo[] = {
+    // magic
+    'T', 'O', 'I', 'g',
+    // width (16-bit), height (16-bit)
+    0xf0, 0x00, 0xf0, 0x00,
+    // compressed data length (32-bit)
+    0x85, 0x04, 0x00, 0x00,
+    // compressed data
+    0xed, 0x92, 0xcf, 0x6b, 0x9c, 0x45, 0x18, 0xc7, 0x9f, 0xdd, 0x6c, 0x9a, 0x26, 0x8d, 0x66, 0xa1, 0x28, 0x22, 0xa6, 0x2e, 0x16, 0x34, 0x1e, 0x9a, 0xbe, 0xb2, 0x8a, 0x08, 0xd2, 0xa6, 0xb0, 0x17, 0x41, 0xe8, 0xf6, 0xa2, 0x07, 0x7f, 0x6c, 0xa1, 0x92, 0x83, 0x97, 0x6e, 0x0b, 0xda, 0x93, 0x66, 0x8d, 0x97, 0x78, 0xd1, 0x78, 0x10, 0x44, 0x90, 0xd4, 0xa6, 0xa0, 0xac, 0x48, 0x2a, 0xfd, 0x03, 0xd2, 0xe0, 0xcd, 0x5f, 0xa9, 0x42, 0x11, 0x7a, 0x79, 0x0b, 0x3d, 0x8a, 0xac, 0x64, 0x77, 0x6b, 0x6c, 0xde, 0xbc, 0xe3, 0xcc, 0x33, 0xf3, 0xbe, 0xef, 0xbe, 0x9b, 0x64, 0x59, 0xf7, 0x75, 0x67, 0x2b, 0x7c, 0x3f, 0x87, 0x9d, 0x67, 0x66, 0x9e, 0x9d, 0xcf, 0x3b, 0xf3, 0x3c, 0x44, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0xcf, 0x92, 0x1a, 0x88, 0xf5, 0xd9, 0x6f, 0x84, 0xb8, 0x79, 0xc6, 0xba, 0xf6, 0xd5, 0x9a, 0x90, 0xf8, 0x57, 0x2d, 0x6b, 0xc7, 0x84, 0xa1, 0x62, 0x55, 0x9b, 0x76, 0x03, 0xef, 0x56, 0xd6, 0xa6, 0xf7, 0x98, 0x08, 0xf9, 0xd5, 0x66, 0x27, 0xbb, 0x91, 0xd7, 0xcb, 0x0e, 0xa0, 0xba, 0x8a, 0xb2, 0x3d, 0x6f, 0x89, 0x2f, 0xfa, 0xe9, 0x07, 0x7c, 0xed, 0x0d, 0x7b, 0xde, 0x9a, 0xd4, 0x6d, 0x3b, 0x44, 0x19, 0x15, 0x78, 0xd6, 0xb4, 0x19, 0x75, 0xcd, 0x2b, 0x2a, 0x7a, 0x44, 0x45, 0x39, 0x5b, 0xde, 0x51, 0x75, 0x5d, 0x8e, 0xd2, 0x35, 0x9b, 0x05, 0x3e, 0x20, 0x65, 0xf5, 0xa8, 0xd2, 0x17, 0x6d, 0x79, 0x27, 0xa5, 0xec, 0xba, 0x0e, 0x27, 0x64, 0x78, 0xcd, 0x96, 0xf7, 0x88, 0x94, 0x2d, 0xea, 0x70, 0x5c, 0x86, 0x6b, 0xb6, 0xbc, 0xd3, 0x52, 0x56, 0x89, 0x9e, 0x1c, 0xde, 0x3e, 0xd6, 0xd7, 0xba, 0xf7, 0x60, 0xa1, 0xf0, 0xba, 0x94, 0x2d, 0x17, 0x98, 0xe7, 0x65, 0x78, 0xa3, 0x50, 0x70, 0xfa, 0xef, 0x2d, 0x89, 0x5d, 0xa8, 0x0f, 0xc8, 0x7b, 0x1b, 0x5e, 0x78, 0xff, 0xbf, 0xde, 0xbb, 0x17, 0x5a, 0x58, 0xb5, 0xe7, 0x6d, 0xb4, 0x2e, 0xcc, 0xc1, 0x0b, 0x2f, 0xbc, 0xf0, 0xc2, 0x0b, 0x2f, 0xbc, 0xf0, 0xfe, 0xf7, 0xde, 0xe6, 0x80, 0xbc, 0xde, 0xa9, 0x68, 0xfe, 0xb8, 0x6b, 0xcf, 0x2b, 0xb6, 0xdf, 0x0b, 0xa6, 0x4f, 0x2a, 0xad, 0x35, 0xaf, 0x10, 0x15, 0x3d, 0x7b, 0x58, 0xcf, 0xec, 0x79, 0xc5, 0xbc, 0x9a, 0x3c, 0x27, 0xac, 0x7b, 0xfd, 0xcb, 0x44, 0xaf, 0x98, 0x58, 0xd4, 0xfb, 0xef, 0x3d, 0x12, 0xb8, 0xc4, 0x77, 0xaf, 0x85, 0xe1, 0xb7, 0xfd, 0xf7, 0xd2, 0x8b, 0xa2, 0x1d, 0xff, 0x2a, 0xd9, 0xe0, 0x85, 0x76, 0xed, 0xfb, 0x64, 0x87, 0xa9, 0xb8, 0xf7, 0x1c, 0xd9, 0x62, 0xb4, 0xf5, 0xb6, 0x65, 0xb2, 0xc7, 0x43, 0x6e, 0xa0, 0xf5, 0xce, 0x91, 0x4d, 0x1e, 0x30, 0xe2, 0xad, 0x13, 0x64, 0x97, 0x0c, 0x8b, 0x3d, 0x87, 0x6c, 0x33, 0xbc, 0x2a, 0xc4, 0xef, 0x33, 0x64, 0x9f, 0xa1, 0xa5, 0x4d, 0x87, 0x06, 0x41, 0x8a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xb8, 0x87, 0xd8, 0x77, 0x21, 0xe2, 0x3c, 0x3d, 0x61, 0xa2, 0x53, 0xbc, 0x17, 0xed, 0xbc, 0xd5, 0x9a, 0xf7, 0x36, 0x6f, 0x66, 0x3e, 0x17, 0xe2, 0x66, 0x51, 0x1f, 0xf2, 0xb2, 0xd9, 0x70, 0xba, 0xf7, 0xde, 0x27, 0x22, 0x1a, 0x74, 0x32, 0x08, 0x7f, 0xcb, 0xca, 0xbd, 0x68, 0xc7, 0xa3, 0x43, 0xd1, 0xc4, 0x57, 0xff, 0x9b, 0xd2, 0xf1, 0x32, 0x1f, 0xb2, 0x1e, 0x6c, 0x2d, 0x77, 0xed, 0x1d, 0xdf, 0xdd, 0x2b, 0x6e, 0x74, 0xf6, 0xee, 0x0f, 0x26, 0x97, 0xd4, 0x21, 0xab, 0xe1, 0xde, 0x17, 0x49, 0xbd, 0xa2, 0xdc, 0xc9, 0x9b, 0x72, 0xc3, 0x49, 0x31, 0xe6, 0xf5, 0xb3, 0x49, 0xbd, 0x8d, 0x4e, 0xde, 0xa3, 0xd1, 0xac, 0x19, 0xf3, 0x8a, 0x6b, 0x49, 0xbd, 0x5e, 0x76, 0x6f, 0x6f, 0x74, 0x5d, 0xc9, 0x4c, 0xcc, 0xdb, 0x4c, 0xd6, 0x57, 0x7c, 0xde, 0x1e, 0x5e, 0x8f, 0xc6, 0x5a, 0xd2, 0xc4, 0xad, 0x98, 0xd7, 0xeb, 0xd2, 0x3b, 0xb2, 0xb0, 0xb0, 0xf0, 0xa1, 0xcc, 0xdf, 0x94, 0xe3, 0x3c, 0x7b, 0x3f, 0x99, 0x9d, 0x7d, 0x47, 0x9d, 0xb0, 0xa8, 0xbc, 0xfe, 0x4b, 0xb3, 0x8a, 0x37, 0x38, 0x4f, 0x67, 0x8a, 0x3f, 0xf5, 0xe7, 0x6d, 0x3a, 0xe9, 0x77, 0xd5, 0xb8, 0xa5, 0xbd, 0x32, 0x71, 0x49, 0x4d, 0xb3, 0x5d, 0xb7, 0x34, 0x1d, 0xe0, 0xc3, 0x14, 0xea, 0x40, 0xd5, 0x28, 0x73, 0x5c, 0x29, 0xf9, 0xb3, 0x1d, 0xcf, 0x2c, 0xe9, 0x87, 0xa8, 0xc9, 0xdf, 0xbf, 0xc9, 0xe4, 0x09, 0x87, 0xbd, 0x64, 0xba, 0xad, 0xd8, 0xab, 0xf7, 0xb4, 0x1c, 0x27, 0xf9, 0xfd, 0x76, 0x78, 0x87, 0x94, 0x70, 0x93, 0x86, 0x95, 0xad, 0xa2, 0x16, 0x86, 0xf5, 0xc3, 0x18, 0x2f, 0x9d, 0x95, 0x63, 0x39, 0x89, 0x57, 0xaf, 0xec, 0xf0, 0xaa, 0x65, 0x71, 0x9d, 0x07, 0xb3, 0xf1, 0x91, 0x0c, 0xd7, 0x42, 0x6f, 0x29, 0xf8, 0x9e, 0xc4, 0xf7, 0xf5, 0x0f, 0xe7, 0x15, 0x4f, 0xe9, 0x44, 0x7e, 0xd6, 0x1c, 0xef, 0xd6, 0xf5, 0xca, 0xfd, 0x32, 0xdc, 0x08, 0xbd, 0x73, 0x49, 0xee, 0x2b, 0x0b, 0x94, 0x5a, 0x09, 0xea, 0x6b, 0xb8, 0x43, 0xe1, 0xab, 0x36, 0x88, 0x8e, 0xe9, 0x2e, 0x56, 0xec, 0x97, 0x61, 0x33, 0xf0, 0x66, 0x6a, 0x5c, 0xfd, 0x1e, 0xbd, 0xdf, 0x57, 0xab, 0x3f, 0xeb, 0x02, 0xb6, 0x7b, 0xa7, 0x4d, 0x5d, 0x4f, 0x72, 0x51, 0xc3, 0x4f, 0xf9, 0x8b, 0xbd, 0xd5, 0xea, 0xd7, 0x6e, 0xa2, 0x7e, 0x0e, 0x70, 0x76, 0x78, 0xd5, 0xf1, 0x5e, 0x56, 0x97, 0xd1, 0x3c, 0x67, 0x86, 0x3b, 0x7b, 0x35, 0xca, 0xdc, 0xa2, 0x84, 0x5e, 0x79, 0x40, 0x9b, 0x77, 0x44, 0x98, 0xba, 0x96, 0x4c, 0x17, 0xa8, 0x0e, 0x6f, 0xf7, 0x36, 0x92, 0x7a, 0x37, 0x76, 0x78, 0x79, 0xb3, 0x48, 0x9d, 0xef, 0xbb, 0x98, 0xd4, 0x9b, 0x6b, 0xf7, 0xa6, 0x04, 0x3b, 0x4c, 0xd6, 0xc5, 0xf6, 0xfa, 0xfe, 0xfb, 0x67, 0xde, 0xcd, 0xeb, 0x5f, 0x22, 0xed, 0xfd, 0xac, 0xaa, 0xb8, 0x6c, 0xb2, 0xc4, 0x2f, 0x2a, 0xab, 0xa5, 0x9f, 0x47, 0xf9, 0x69, 0x43, 0xef, 0x76, 0x39, 0xa1, 0x97, 0xbf, 0x5b, 0x1d, 0x14, 0x65, 0xcd, 0xe9, 0x66, 0x93, 0x4c, 0xca, 0xa0, 0xa9, 0x17, 0x27, 0xb8, 0x22, 0xa1, 0xb7, 0x4e, 0xbd, 0x7b, 0xcf, 0x4f, 0xa9, 0xfb, 0xe6, 0xda, 0xbd, 0x69, 0xc1, 0x4f, 0x1a, 0xe4, 0xfb, 0x7a, 0x75, 0x45, 0x86, 0x6b, 0xec, 0x7d, 0x6c, 0x3a, 0x28, 0x43, 0x8f, 0xde, 0x22, 0xd5, 0x4c, 0x7f, 0xc4, 0xbc, 0x87, 0x44, 0x58, 0xd5, 0xe1, 0x30, 0xdc, 0xa7, 0xa2, 0x0a, 0x7b, 0xb9, 0xc5, 0x7c, 0xa7, 0x77, 0xef, 0x69, 0x3a, 0x6e, 0x5e, 0x2c, 0xe6, 0x55, 0x67, 0x7b, 0x26, 0x76, 0x55, 0x25, 0xa4, 0x22, 0xb5, 0xa4, 0x3b, 0x90, 0xbd, 0xfc, 0x7b, 0x25, 0x89, 0x77, 0xcc, 0x08, 0xd5, 0xa1, 0xdc, 0x56, 0xd5, 0xaf, 0xf4, 0xcd, 0xfc, 0x1f, 0x15, 0x3f, 0xf0, 0x87, 0x09, 0xef, 0xcc, 0x33, 0x2b, 0xa6, 0xc5, 0xb5, 0xf7, 0x78, 0x54, 0xf6, 0xde, 0xbc, 0x43, 0x82, 0x07, 0x12, 0x21, 0x9e, 0x7e, 0x66, 0xd3, 0xeb, 0xdc, 0xc5, 0x21, 0xb7, 0x02, 0xaf, 0xfa, 0x5c, 0x91, 0xc4, 0xcb, 0xdd, 0xb2, 0xd1, 0xc1, 0x9b, 0x5a, 0x6f, 0x99, 0xe5, 0x02, 0x2f, 0x7f, 0xee, 0x62, 0x12, 0xef, 0x51, 0xfd, 0x7c, 0x7b, 0x7a, 0x5b, 0x67, 0x0d, 0x0a, 0xbc, 0xfc, 0xb9, 0xb7, 0x93, 0x78, 0xf9, 0x1d, 0x9d, 0x0e, 0x5e, 0x0a, 0x2f, 0xcc, 0x1d, 0x6c, 0xbc, 0x13, 0x72, 0xb8, 0x9b, 0xc4, 0x4b, 0x35, 0x6e, 0xcd, 0x0e, 0xde, 0x11, 0xd7, 0xc4, 0x1f, 0x53, 0xe4, 0xe5, 0xde, 0x9b, 0xe9, 0xde, 0x3b, 0x1e, 0x7a, 0x4b, 0xc6, 0x7b, 0x56, 0x8e, 0x77, 0x62, 0xde, 0x47, 0xe3, 0x5e, 0x7a, 0x90, 0xc5, 0xfe, 0x3c, 0xff, 0x6d, 0x5d, 0x7b, 0x53, 0x6e, 0x78, 0x50, 0x57, 0xa4, 0xf3, 0xf9, 0xbc, 0xfe, 0xcc, 0x83, 0xf9, 0xfc, 0xd3, 0x59, 0x39, 0x0e, 0xc9, 0x95, 0x3c, 0xe5, 0x23, 0xf4, 0x4a, 0x30, 0x51, 0xa4, 0xde, 0xfc, 0xe9, 0x8f, 0x2f, 0x73, 0xfa, 0x80, 0xc3, 0x66, 0x51, 0x8d, 0x27, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x9f, 0xf9, 0x07,
+};
diff --git a/core/embed/bootloader_ci/icon_safeplace.h b/core/embed/bootloader_ci/icon_safeplace.h
deleted file mode 120000
index 04fdde31b..000000000
--- a/core/embed/bootloader_ci/icon_safeplace.h
+++ /dev/null
@@ -1 +0,0 @@
-../bootloader/icon_safeplace.h
\ No newline at end of file
diff --git a/core/embed/bootloader_ci/icon_safeplace.h b/core/embed/bootloader_ci/icon_safeplace.h
new file mode 100644
index 000000000..038007e52
--- /dev/null
+++ b/core/embed/bootloader_ci/icon_safeplace.h
@@ -0,0 +1,11 @@
+// clang-format off
+static const uint8_t toi_icon_safeplace[] = {
+    // magic
+    'T', 'O', 'I', 'g',
+    // width (16-bit), height (16-bit)
+    0xc8, 0x00, 0x3c, 0x00,
+    // compressed data length (32-bit)
+    0xc2, 0x04, 0x00, 0x00,
+    // compressed data
+    0xed, 0x92, 0x4f, 0x68, 0x1b, 0x47, 0x14, 0xc6, 0x47, 0xf6, 0xca, 0x92, 0x65, 0x5b, 0xd2, 0xb1, 0x81, 0x86, 0x88, 0x6d, 0x2f, 0x39, 0xc9, 0x04, 0xd4, 0x34, 0x50, 0xb0, 0x8a, 0x73, 0x2c, 0xb1, 0xa0, 0x47, 0xc7, 0xd8, 0xf7, 0x42, 0xec, 0x42, 0x8f, 0xa5, 0x56, 0x4b, 0x8f, 0xa1, 0x76, 0xeb, 0x73, 0xb1, 0xce, 0x39, 0xd8, 0xa2, 0xa4, 0x50, 0x28, 0xc4, 0x81, 0x86, 0x36, 0x97, 0x46, 0x3a, 0x34, 0xe0, 0x1e, 0xd2, 0x15, 0xc1, 0x04, 0x42, 0xda, 0xac, 0x6c, 0x13, 0xd9, 0xb1, 0xfe, 0x7c, 0x79, 0x6f, 0x76, 0x46, 0x3b, 0xf2, 0xca, 0x8a, 0x1b, 0x57, 0xbe, 0xd4, 0x0f, 0xa4, 0xd9, 0x7d, 0xef, 0x9b, 0xf7, 0xdb, 0x99, 0xf7, 0x09, 0xe1, 0x47, 0x02, 0x55, 0xf1, 0xba, 0x98, 0x76, 0x9f, 0x74, 0x4b, 0x03, 0xbd, 0xb7, 0x25, 0xe0, 0x45, 0xf5, 0x18, 0x8c, 0x18, 0xb0, 0xdf, 0x6f, 0xc6, 0xfc, 0x29, 0x30, 0x4a, 0xb8, 0x7d, 0xe9, 0x4d, 0x18, 0x03, 0xb6, 0x9d, 0xc6, 0x8e, 0x6d, 0xa7, 0x8e, 0xc1, 0x70, 0x91, 0x14, 0x6f, 0xc2, 0x68, 0x4f, 0xfb, 0x18, 0x8c, 0xa3, 0x7a, 0xfd, 0x1b, 0xc6, 0x75, 0xfc, 0x4a, 0x0f, 0x43, 0x77, 0x5a, 0x3f, 0xaa, 0xca, 0x45, 0xa7, 0xf5, 0x1b, 0x7d, 0x7a, 0xe8, 0x73, 0xb7, 0xf1, 0x25, 0xb7, 0x02, 0x2b, 0x3f, 0x71, 0x9f, 0xe5, 0x54, 0xef, 0xfa, 0x39, 0xf7, 0x69, 0xd2, 0x63, 0x28, 0x8d, 0xb0, 0xd6, 0xb0, 0xc9, 0xa7, 0xf5, 0x55, 0x1d, 0x8c, 0x03, 0xea, 0x51, 0x14, 0x21, 0x47, 0x2e, 0x1c, 0x11, 0xee, 0xba, 0x25, 0xc4, 0x35, 0x5e, 0xe7, 0x14, 0xe3, 0x3c, 0xfd, 0xd7, 0x15, 0xa3, 0xe5, 0x02, 0x8f, 0x3d, 0x86, 0xd2, 0x88, 0x55, 0x6f, 0x8b, 0xa1, 0xea, 0x60, 0x70, 0xbc, 0x10, 0x63, 0xbc, 0xbc, 0x94, 0x85, 0x59, 0x99, 0x4a, 0x0d, 0xca, 0x65, 0x57, 0x31, 0xf8, 0x13, 0xb0, 0xac, 0xee, 0x88, 0xa2, 0x29, 0x19, 0x5a, 0x13, 0xf5, 0xb6, 0x98, 0xaa, 0x0e, 0x46, 0xf3, 0xe3, 0x19, 0x62, 0xaf, 0xe2, 0xe1, 0x7b, 0x2e, 0xa9, 0xa4, 0x8f, 0xee, 0x65, 0x1c, 0x14, 0x46, 0x50, 0x9f, 0x9c, 0xc1, 0x81, 0xb0, 0x01, 0x3b, 0x35, 0x4c, 0xb2, 0x1b, 0xd8, 0x51, 0x8c, 0x7b, 0x97, 0x81, 0x1c, 0x33, 0xb4, 0x26, 0x8d, 0x5a, 0xc6, 0xc5, 0xb2, 0xa9, 0xea, 0x60, 0x6c, 0xd3, 0xd7, 0xb4, 0x68, 0x43, 0x52, 0x4c, 0x21, 0xaf, 0x7d, 0x94, 0x46, 0x25, 0xf6, 0x73, 0x51, 0x0c, 0x50, 0x45, 0xde, 0x09, 0xcb, 0x2c, 0xec, 0x2b, 0x46, 0x52, 0x2c, 0xa1, 0xc0, 0x79, 0xad, 0x59, 0xc2, 0x02, 0xed, 0xae, 0x98, 0xaa, 0xc3, 0xbe, 0x02, 0x2c, 0xd4, 0x6d, 0x7b, 0x02, 0x77, 0xbd, 0x73, 0xe4, 0x95, 0x24, 0x64, 0x73, 0x7f, 0xfe, 0x4d, 0xe1, 0x07, 0xfb, 0x1d, 0x34, 0xda, 0x7e, 0x9a, 0x40, 0x59, 0xf9, 0x4a, 0x6a, 0x1c, 0xba, 0x81, 0xd8, 0xad, 0x82, 0xa9, 0x0a, 0x32, 0x86, 0xe4, 0x85, 0xa2, 0xc2, 0x85, 0x29, 0xe0, 0xa7, 0xac, 0xe7, 0x15, 0x68, 0xc6, 0xbc, 0x2c, 0xb7, 0xda, 0x0c, 0xde, 0xc6, 0xab, 0xd2, 0x28, 0x1b, 0x9b, 0xaa, 0x20, 0x23, 0xe2, 0x31, 0x38, 0x23, 0x06, 0x4b, 0xf4, 0xf4, 0x9d, 0xe7, 0x15, 0xcd, 0x58, 0x84, 0x7a, 0x39, 0xc4, 0x50, 0x1a, 0x55, 0x31, 0x55, 0xbd, 0x19, 0x62, 0xf0, 0x26, 0x3d, 0x8e, 0x47, 0xd0, 0xfc, 0x50, 0xbc, 0x86, 0xa1, 0x35, 0xc7, 0x62, 0x84, 0xc9, 0x1c, 0x46, 0x58, 0x25, 0x14, 0xc7, 0xd8, 0x20, 0x9a, 0x31, 0x4b, 0x33, 0xd6, 0x61, 0xcc, 0x43, 0x6b, 0x78, 0x1e, 0xd6, 0xd5, 0xac, 0xa9, 0x0a, 0x32, 0x42, 0xf4, 0xe1, 0x42, 0xcc, 0xc9, 0xc2, 0xef, 0x8f, 0x84, 0xb8, 0xc0, 0x26, 0xa9, 0x92, 0x67, 0x14, 0xe3, 0x02, 0x76, 0x85, 0x18, 0x12, 0x86, 0xaf, 0x96, 0x39, 0xaf, 0x35, 0xec, 0x2b, 0xb2, 0xa2, 0xa9, 0x0a, 0x32, 0xe8, 0x62, 0xf7, 0x26, 0xaf, 0xd7, 0x65, 0x61, 0x83, 0x7c, 0x35, 0x8b, 0x72, 0x1c, 0xf5, 0xc9, 0x2f, 0x34, 0x63, 0x18, 0xf8, 0x2c, 0x53, 0x2a, 0x2a, 0xc6, 0x1f, 0x97, 0x81, 0x2c, 0xe7, 0xb5, 0x26, 0x8d, 0x5a, 0xc6, 0x41, 0xc1, 0x54, 0x75, 0x61, 0x9c, 0x97, 0x37, 0x99, 0xe3, 0xc2, 0x04, 0xf0, 0x17, 0x30, 0x17, 0x85, 0x31, 0xf3, 0x90, 0xc3, 0xcf, 0x2f, 0x14, 0x83, 0xa2, 0x21, 0xf3, 0x5a, 0xe3, 0xad, 0x29, 0x53, 0xd5, 0x85, 0x11, 0x62, 0x33, 0xed, 0x79, 0xc3, 0x70, 0xe9, 0x71, 0x9f, 0xcf, 0x83, 0x96, 0x4b, 0xf7, 0x22, 0x87, 0xf8, 0x36, 0xef, 0x5e, 0x50, 0x0c, 0x6a, 0xf5, 0xd8, 0x63, 0x6b, 0xcd, 0x3a, 0x55, 0xb7, 0x3a, 0x54, 0x5d, 0x18, 0x22, 0x7c, 0xa7, 0xb5, 0x99, 0xf2, 0x2a, 0x6f, 0x3d, 0xc0, 0x9f, 0x34, 0x9d, 0xa1, 0x52, 0xeb, 0xdb, 0x55, 0x3a, 0x9a, 0x67, 0x94, 0x69, 0xf7, 0x9f, 0xaf, 0xf4, 0x3c, 0xce, 0xb9, 0x4f, 0x93, 0xde, 0x2e, 0xad, 0xb1, 0xd6, 0x70, 0x3f, 0xd9, 0xa1, 0x3a, 0x59, 0x98, 0xe6, 0xec, 0x57, 0x9c, 0x31, 0xfe, 0x7f, 0x8c, 0xb3, 0x38, 0x8b, 0x9e, 0x31, 0xed, 0x3e, 0x39, 0x69, 0x8b, 0xf0, 0xf3, 0x5c, 0xcf, 0x7a, 0x0c, 0xd8, 0x3f, 0x29, 0x23, 0x8e, 0x4a, 0xcf, 0xfa, 0xfc, 0x29, 0x30, 0x4a, 0xb8, 0x7d, 0xa9, 0xdf, 0x77, 0xe5, 0x22, 0xd9, 0xf7, 0x91, 0x03, 0xa7, 0x80, 0x00, 0xaa, 0x42, 0x5c, 0x74, 0x9a, 0x2b, 0xf2, 0x2d, 0xea, 0xe6, 0xe5, 0x90, 0xca, 0xfc, 0x32, 0xae, 0xf2, 0x09, 0x96, 0xd0, 0xc7, 0xd0, 0xfa, 0x8d, 0x37, 0x3c, 0x6b, 0x0d, 0x9b, 0x7c, 0x7e, 0xbf, 0x8e, 0xfa, 0xd0, 0x83, 0x26, 0xed, 0x1d, 0xf8, 0x1e, 0x7f, 0x7f, 0xda, 0x8d, 0x11, 0xe1, 0x25, 0xcf, 0x6f, 0x1b, 0xbc, 0xd0, 0xa6, 0x1d, 0x61, 0xa1, 0xa5, 0xf3, 0x3e, 0xa3, 0xae, 0x0c, 0xb2, 0x4a, 0xf9, 0x2d, 0x61, 0xd6, 0xd1, 0xdc, 0x00, 0x1a, 0x42, 0x2c, 0x52, 0xa6, 0x95, 0xed, 0xc2, 0xe0, 0x02, 0xf6, 0xbc, 0x37, 0x66, 0x8c, 0xa0, 0x26, 0xa2, 0xd4, 0x4e, 0xe5, 0x7d, 0x86, 0x32, 0x61, 0x94, 0xf3, 0x48, 0x99, 0x75, 0x99, 0xc1, 0x5c, 0x58, 0x2e, 0x3b, 0x1d, 0x0c, 0x1b, 0xb0, 0x53, 0x21, 0x60, 0xe5, 0x0a, 0x68, 0xf8, 0x9a, 0x11, 0x46, 0x5d, 0x8c, 0x61, 0x57, 0xe7, 0x03, 0x8c, 0x34, 0x6a, 0x19, 0x17, 0xcb, 0x66, 0x1d, 0x78, 0x98, 0x71, 0x50, 0x1c, 0x45, 0x63, 0x72, 0x06, 0x07, 0xc1, 0x99, 0x47, 0x39, 0xb9, 0x4e, 0xdd, 0x81, 0x5f, 0xda, 0xd9, 0x34, 0xca, 0x3a, 0xef, 0x33, 0x1a, 0xe3, 0xb2, 0xbc, 0x84, 0x05, 0x31, 0x85, 0x8a, 0x59, 0xe7, 0x4f, 0x9c, 0x40, 0x25, 0x8e, 0x6d, 0x31, 0x40, 0xb7, 0x1c, 0x60, 0x8c, 0x62, 0x57, 0x90, 0xe0, 0xae, 0x14, 0xca, 0x58, 0x47, 0x6e, 0x1e, 0x79, 0x9d, 0xf7, 0x19, 0xdb, 0x5e, 0xd9, 0xa1, 0x7b, 0x8a, 0xdd, 0x2a, 0x98, 0x75, 0xee, 0x43, 0xeb, 0xa8, 0x1a, 0x58, 0x80, 0x11, 0xe7, 0x1e, 0x09, 0x54, 0x7c, 0x23, 0xcf, 0x62, 0x79, 0x03, 0x29, 0x9d, 0x37, 0x7c, 0xd5, 0x61, 0x78, 0xb3, 0xae, 0x18, 0x16, 0x50, 0xff, 0xba, 0x1b, 0x23, 0xe1, 0x69, 0xab, 0x3e, 0x83, 0x36, 0xa2, 0xd9, 0xce, 0x1f, 0xc5, 0x30, 0xeb, 0xba, 0xcf, 0x07, 0x34, 0xb3, 0x97, 0xa9, 0x23, 0x19, 0xc6, 0x39, 0x62, 0xd8, 0xd3, 0x7e, 0xea, 0x71, 0x8e, 0x44, 0xf0, 0x1c, 0x42, 0xbc, 0x5f, 0x02, 0x5f, 0x61, 0x8f, 0x79, 0xa8, 0xac, 0x25, 0x0d, 0x18, 0x9c, 0x47, 0xd5, 0x9f, 0x87, 0x75, 0x35, 0xdb, 0x65, 0x1e, 0x5c, 0xfd, 0x88, 0x5c, 0xd9, 0xcb, 0x57, 0x3a, 0xed, 0x82, 0x90, 0xbe, 0x6f, 0xd8, 0x2c, 0x06, 0x83, 0x7d, 0x95, 0x3e, 0xec, 0x2b, 0x6f, 0xe6, 0x8f, 0xca, 0x22, 0xd4, 0xcd, 0x57, 0xda, 0xe7, 0x06, 0x63, 0x15, 0xd4, 0x46, 0xe7, 0xd9, 0xf4, 0x37, 0x4c, 0x46, 0x1a, 0xb5, 0x8c, 0x83, 0x82, 0xae, 0x1b, 0x8c, 0x11, 0xf2, 0x55, 0x98, 0x46, 0x19, 0x7e, 0x9e, 0xed, 0x64, 0x88, 0x45, 0xba, 0x1a, 0xba, 0x7f, 0x83, 0x31, 0x25, 0x6d, 0xac, 0xf2, 0x11, 0xc8, 0xf0, 0x19, 0x51, 0xf9, 0x9e, 0xd2, 0x75, 0x83, 0x31, 0x08, 0x34, 0x5d, 0xd4, 0xc8, 0x72, 0xe5, 0x43, 0x0c, 0xb9, 0x27, 0x6f, 0x32, 0xe2, 0x68, 0x18, 0xf9, 0x92, 0xdc, 0xe9, 0x33, 0xe8, 0x82, 0x80, 0xad, 0x76, 0xdd, 0x9c, 0xc7, 0x35, 0x2f, 0x15, 0x64, 0x88, 0x2b, 0x4e, 0x73, 0x45, 0x98, 0x8c, 0x61, 0xfa, 0x16, 0x3f, 0x1f, 0x29, 0x35, 0xf3, 0x25, 0x93, 0x61, 0xad, 0xe1, 0x7e, 0xb2, 0x5d, 0x37, 0x19, 0xa1, 0x9b, 0x2e, 0xa7, 0x3a, 0xee, 0xea, 0x88, 0x88, 0xd2, 0x98, 0xfb, 0x1d, 0x71, 0x14, 0xfb, 0x8d, 0x78, 0x77, 0x03, 0xb9, 0x7e, 0x33, 0x68, 0xc6, 0xa2, 0xff, 0x8c, 0xdd, 0xbe, 0x33, 0x9c, 0x67, 0xe3, 0xff, 0x45, 0x9b, 0x57,
+};
diff --git a/core/embed/bootloader_ci/icon_welcome.h b/core/embed/bootloader_ci/icon_welcome.h
deleted file mode 120000
index 1420701e8..000000000
--- a/core/embed/bootloader_ci/icon_welcome.h
+++ /dev/null
@@ -1 +0,0 @@
-../bootloader/icon_welcome.h
\ No newline at end of file
diff --git a/core/embed/bootloader_ci/icon_welcome.h b/core/embed/bootloader_ci/icon_welcome.h
new file mode 100644
index 000000000..73d548364
--- /dev/null
+++ b/core/embed/bootloader_ci/icon_welcome.h
@@ -0,0 +1,11 @@
+// clang-format off
+static const uint8_t toi_icon_welcome[] = {
+    // magic
+    'T', 'O', 'I', 'g',
+    // width (16-bit), height (16-bit)
+    0xb4, 0x00, 0x1e, 0x00,
+    // compressed data length (32-bit)
+    0x31, 0x03, 0x00, 0x00,
+    // compressed data
+    0xc5, 0x52, 0x3d, 0x53, 0x13, 0x51, 0x14, 0xbd, 0x01, 0x24, 0x42, 0x20, 0xa1, 0x56, 0x07, 0xe8, 0x9c, 0xf1, 0x63, 0x42, 0xa9, 0x33, 0xce, 0x40, 0x8b, 0x85, 0xf0, 0x0f, 0x42, 0x45, 0x9b, 0xd8, 0x21, 0xe3, 0x0c, 0x58, 0x51, 0x39, 0xa1, 0xb3, 0x33, 0xf9, 0x07, 0xf1, 0x17, 0x88, 0x76, 0xb1, 0x11, 0x28, 0x2c, 0x6c, 0x08, 0xd2, 0xa1, 0x33, 0x2e, 0x10, 0x3e, 0x43, 0xd8, 0xe3, 0xb9, 0xf7, 0x6d, 0x36, 0x9b, 0x05, 0x66, 0x1c, 0xc9, 0x8c, 0xb7, 0xd8, 0xbd, 0xef, 0xbd, 0x7b, 0xce, 0xbb, 0xef, 0xdc, 0x23, 0xf2, 0x9f, 0x02, 0x38, 0xba, 0x09, 0x7c, 0x12, 0x98, 0xe2, 0x6f, 0x1d, 0x07, 0xfc, 0x66, 0x80, 0xe5, 0x9b, 0x31, 0x47, 0x30, 0x24, 0x2b, 0x84, 0x3b, 0x59, 0x60, 0xb6, 0x6b, 0xcc, 0x43, 0x40, 0x59, 0xa4, 0x0f, 0x38, 0xe3, 0x22, 0x07, 0x8c, 0x74, 0x8d, 0x79, 0x00, 0xd8, 0x10, 0x49, 0x02, 0x4d, 0x2e, 0x8a, 0xf0, 0xa5, 0x6b, 0xcc, 0xfd, 0xc0, 0x9e, 0x48, 0x0a, 0x00, 0x17, 0x6b, 0x68, 0x74, 0x8f, 0xb9, 0x07, 0xa8, 0x8b, 0xa4, 0xc9, 0x3c, 0x21, 0xe2, 0xe1, 0xa4, 0x7b, 0xcc, 0xcc, 0x8f, 0x6d, 0x74, 0x1c, 0x64, 0xc2, 0x6e, 0xe9, 0x1a, 0xf3, 0x9a, 0xce, 0x8e, 0xa3, 0xc3, 0x07, 0x9d, 0x23, 0x95, 0x91, 0x27, 0x5f, 0xfd, 0xea, 0x44, 0xbb, 0x6a, 0x7a, 0xcb, 0xff, 0x32, 0x61, 0xa5, 0x3c, 0xb0, 0x8c, 0x7e, 0x1a, 0x79, 0x5e, 0xbb, 0x78, 0x23, 0x89, 0xd7, 0xde, 0xcf, 0xf0, 0x28, 0x8a, 0xb1, 0x28, 0xea, 0xec, 0x4a, 0x64, 0xde, 0xd6, 0x39, 0x72, 0x9a, 0x77, 0x98, 0x9b, 0xde, 0xae, 0xea, 0x91, 0x2d, 0xd5, 0x32, 0x77, 0x35, 0x3b, 0x1f, 0x31, 0xe6, 0x07, 0x4c, 0xfd, 0x09, 0x6d, 0xe8, 0x54, 0x49, 0x62, 0x18, 0x17, 0x33, 0x3a, 0xbb, 0x1a, 0x6a, 0x38, 0x90, 0x41, 0x60, 0x55, 0x12, 0x35, 0xad, 0xc2, 0xe7, 0xa0, 0xaa, 0xd7, 0xb3, 0xe5, 0x26, 0x27, 0xe2, 0xb2, 0x1d, 0x63, 0xb6, 0xfc, 0x9b, 0x6d, 0xcc, 0x49, 0x1c, 0x13, 0xc4, 0x18, 0x30, 0xce, 0x8d, 0x3c, 0xb7, 0x86, 0xb5, 0x6c, 0xd8, 0x8a, 0xb4, 0x01, 0xab, 0x1a, 0x75, 0xcb, 0x73, 0x69, 0x1d, 0x5c, 0x18, 0x73, 0x24, 0xb6, 0x25, 0x8e, 0x09, 0x82, 0xb6, 0x98, 0xa5, 0xc0, 0x8f, 0x29, 0x77, 0x46, 0x2f, 0x29, 0x02, 0xbb, 0x0b, 0x9e, 0x5a, 0xc5, 0xaa, 0xa8, 0x53, 0x75, 0x91, 0xa8, 0x29, 0xcd, 0x76, 0x5f, 0x79, 0xfa, 0x2c, 0x65, 0x7e, 0xf7, 0x5e, 0xf5, 0x58, 0xa9, 0x00, 0x87, 0x12, 0xc7, 0x04, 0x41, 0x09, 0x96, 0x93, 0xf0, 0x07, 0xd8, 0x4c, 0x56, 0x85, 0xb1, 0xfe, 0x86, 0x80, 0xb2, 0x55, 0xd1, 0x2e, 0x67, 0xa6, 0x58, 0x99, 0x19, 0x07, 0x72, 0x0f, 0xd8, 0x57, 0xe6, 0x1d, 0x55, 0x10, 0x9f, 0xa4, 0x17, 0x6a, 0xd4, 0x4e, 0x4c, 0x2b, 0x38, 0xb6, 0x72, 0x0a, 0x8d, 0x5b, 0x64, 0xcd, 0x11, 0xdb, 0xaf, 0x50, 0x05, 0xec, 0x59, 0x55, 0xd2, 0xec, 0xc2, 0xdb, 0x37, 0x78, 0x70, 0x60, 0x07, 0xc7, 0xca, 0x4c, 0x71, 0x97, 0xf4, 0x85, 0xe4, 0x3f, 0x8d, 0x63, 0x5a, 0xc1, 0x8d, 0x8d, 0x34, 0x8e, 0xd9, 0xd2, 0x54, 0x91, 0x55, 0x83, 0x7a, 0xb3, 0x76, 0x71, 0x60, 0x55, 0x29, 0x75, 0xa3, 0x42, 0xb7, 0x07, 0xb5, 0x45, 0x65, 0x6a, 0x28, 0xf3, 0xac, 0x48, 0x5e, 0x5f, 0x68, 0xa6, 0x8d, 0x61, 0x22, 0xe6, 0xde, 0xcb, 0xa2, 0x2e, 0x1e, 0x0a, 0x6b, 0x6e, 0x8a, 0x2e, 0x0e, 0xad, 0x8a, 0x53, 0x58, 0x76, 0x65, 0xc3, 0x2e, 0x2b, 0x52, 0x35, 0xc7, 0x9c, 0x0b, 0x98, 0x1b, 0x71, 0x4c, 0x18, 0xeb, 0xa8, 0xe7, 0xf9, 0x8e, 0x0a, 0x3e, 0x78, 0x7c, 0x54, 0xba, 0x55, 0x75, 0x64, 0x55, 0xee, 0xe1, 0x1a, 0xcc, 0x0a, 0x62, 0x1a, 0x5c, 0x62, 0x8e, 0x61, 0xc2, 0x28, 0xe1, 0xb8, 0xc4, 0x27, 0xe7, 0xf1, 0x43, 0x1d, 0x94, 0xb9, 0xc4, 0x3c, 0x1b, 0x32, 0x6b, 0x96, 0xbb, 0x82, 0x39, 0x73, 0x0d, 0x73, 0x1e, 0x67, 0x35, 0xb6, 0x93, 0xc5, 0x89, 0xca, 0x95, 0xf9, 0x87, 0x9e, 0xaf, 0x63, 0xce, 0xe2, 0x42, 0xed, 0x9a, 0xd6, 0x5f, 0x41, 0x5f, 0xb6, 0x1a, 0x0e, 0xe0, 0x2f, 0x75, 0x8e, 0x60, 0x3a, 0xc2, 0x6e, 0x14, 0x75, 0x81, 0x5e, 0x90, 0x52, 0x49, 0xda, 0xcc, 0xce, 0x1b, 0x3d, 0xf3, 0xf3, 0x73, 0x29, 0xe7, 0x8d, 0xf5, 0xd0, 0x1b, 0x6d, 0xe6, 0x08, 0xa6, 0x23, 0x94, 0xb2, 0x69, 0xbe, 0xd6, 0xd2, 0xa4, 0x1a, 0x96, 0x5c, 0x73, 0x12, 0xf1, 0xf3, 0x6d, 0x42, 0x93, 0xe6, 0xe7, 0x1e, 0xe0, 0xe4, 0x12, 0x73, 0x04, 0xd3, 0x11, 0x84, 0xd1, 0xc7, 0xea, 0x6b, 0x3e, 0x54, 0x12, 0xd6, 0xb9, 0xbc, 0x38, 0x72, 0xcc, 0x09, 0x3b, 0x9b, 0x64, 0xe7, 0x09, 0xbb, 0x7f, 0x08, 0xf4, 0x4f, 0x9c, 0x39, 0x82, 0x19, 0xf8, 0x1d, 0xd1, 0xa5, 0x0f, 0x4e, 0x76, 0xfe, 0xce, 0x4c, 0x48, 0x34, 0x57, 0xde, 0x6a, 0xa9, 0x6d, 0x57, 0x80, 0xea, 0x22, 0x94, 0xaa, 0x04, 0xec, 0x2e, 0x78, 0x2a, 0x69, 0x9c, 0x39, 0x82, 0x29, 0x19, 0x47, 0x10, 0x7a, 0xe3, 0xbe, 0x29, 0x68, 0x6f, 0x6a, 0xd9, 0xbe, 0xec, 0x98, 0x47, 0xdd, 0xaa, 0x19, 0x1e, 0xf8, 0x72, 0x99, 0xb9, 0x8d, 0xf1, 0xf4, 0x3c, 0x0c, 0xf6, 0xb1, 0xe1, 0x9a, 0xad, 0xeb, 0x45, 0x35, 0x2b, 0x3a, 0x77, 0x6a, 0x98, 0x48, 0x8c, 0x4d, 0xca, 0xe8, 0x59, 0xb6, 0x73, 0x05, 0x73, 0x1b, 0xd3, 0xc9, 0x5c, 0x71, 0xa6, 0x99, 0xb1, 0x61, 0x51, 0x2a, 0xab, 0x2a, 0x04, 0xcc, 0xf2, 0x4c, 0x57, 0x0d, 0x3d, 0x78, 0x68, 0xe8, 0xf1, 0x2b, 0x98, 0xdb, 0x98, 0x0e, 0x35, 0x64, 0x09, 0xd0, 0xa9, 0x8e, 0x39, 0x5b, 0x89, 0xdc, 0xff, 0x88, 0x5f, 0x2f, 0xa5, 0xc5, 0x2c, 0xd3, 0x5b, 0x7e, 0x75, 0xdc, 0x0e, 0x9e, 0x6e, 0xf9, 0xdf, 0xa7, 0xe4, 0x2a, 0xe6, 0x10, 0x13, 0x4c, 0xf0, 0x0f,
+};
diff --git a/core/embed/bootloader_ci/icon_wipe.h b/core/embed/bootloader_ci/icon_wipe.h
deleted file mode 120000
index 5e7054d17..000000000
--- a/core/embed/bootloader_ci/icon_wipe.h
+++ /dev/null
@@ -1 +0,0 @@
-../bootloader/icon_wipe.h
\ No newline at end of file
diff --git a/core/embed/bootloader_ci/icon_wipe.h b/core/embed/bootloader_ci/icon_wipe.h
new file mode 100644
index 000000000..dcc93bea3
--- /dev/null
+++ b/core/embed/bootloader_ci/icon_wipe.h
@@ -0,0 +1,11 @@
+// clang-format off
+static const uint8_t toi_icon_wipe[] = {
+    // magic
+    'T', 'O', 'I', 'g',
+    // width (16-bit), height (16-bit)
+    0x40, 0x00, 0x40, 0x00,
+    // compressed data length (32-bit)
+    0x2e, 0x01, 0x00, 0x00,
+    // compressed data
+    0xed, 0xd2, 0x31, 0x4e, 0x02, 0x41, 0x14, 0x06, 0xe0, 0x07, 0x2a, 0x1a, 0x85, 0x95, 0xce, 0x92, 0x3d, 0x00, 0x09, 0x7a, 0x00, 0x83, 0xd1, 0x03, 0x58, 0x5a, 0xc2, 0x0d, 0xdc, 0xc4, 0xda, 0xe8, 0x11, 0xbc, 0x01, 0x54, 0xb6, 0x78, 0x02, 0x63, 0x67, 0x27, 0x7a, 0x02, 0xd6, 0xc6, 0x56, 0x22, 0x23, 0x1a, 0x82, 0x3c, 0xe6, 0xcd, 0x2c, 0x71, 0x92, 0xfd, 0x67, 0xa8, 0x49, 0xf8, 0x93, 0x9d, 0x6c, 0xf6, 0xcb, 0xce, 0xce, 0xbe, 0xf7, 0x88, 0xd6, 0x59, 0x9d, 0x1c, 0x2c, 0xf1, 0xda, 0x38, 0xec, 0x0d, 0xee, 0x06, 0xfd, 0x9c, 0x27, 0x41, 0xbf, 0x61, 0xbe, 0x0d, 0x79, 0x8f, 0x59, 0x1d, 0x05, 0xbc, 0xcf, 0x3c, 0x8d, 0x0e, 0xbd, 0x5c, 0x64, 0x9d, 0x0b, 0xe5, 0xd1, 0x98, 0x4a, 0xe2, 0x29, 0x7b, 0x36, 0xb8, 0xa2, 0xb2, 0xb8, 0xea, 0xbf, 0x61, 0xbf, 0xa7, 0x9a, 0xf8, 0x5f, 0xef, 0x17, 0xfb, 0xa3, 0x1c, 0x5f, 0xe7, 0xd3, 0xf3, 0x01, 0x3e, 0xe5, 0x2c, 0xaf, 0x88, 0x0b, 0xfc, 0xbc, 0x70, 0xf8, 0x07, 0x3b, 0x3c, 0x5b, 0x38, 0x2c, 0x72, 0x85, 0xff, 0x53, 0x05, 0xde, 0x74, 0x3c, 0x01, 0xde, 0x71, 0xfc, 0x09, 0x1d, 0xdf, 0xc9, 0x30, 0xcf, 0x25, 0xd7, 0xbf, 0xf2, 0x5e, 0x76, 0x1d, 0xfc, 0xe0, 0xbe, 0x95, 0x0f, 0xb3, 0x8e, 0xd1, 0xe8, 0x99, 0xa4, 0x2d, 0x59, 0x7f, 0xf2, 0xde, 0xca, 0x4a, 0xbb, 0x2b, 0xeb, 0x37, 0x1c, 0x3d, 0xc9, 0xc3, 0x86, 0xac, 0xa3, 0xbc, 0x5f, 0xca, 0xf3, 0x17, 0x3e, 0x31, 0x4d, 0x1c, 0xa2, 0xd1, 0xd6, 0x39, 0x9e, 0xd9, 0x1b, 0xd0, 0x40, 0x99, 0x8d, 0x49, 0x45, 0xd9, 0x9b, 0x04, 0xb7, 0x67, 0x14, 0xe9, 0xc2, 0x46, 0xb8, 0x3f, 0x52, 0xbf, 0xb4, 0x51, 0x35, 0x0e, 0x07, 0x6c, 0xc0, 0x7c, 0x77, 0x46, 0xc6, 0xdf, 0x09, 0xf7, 0xb7, 0x9d, 0x1d, 0x24, 0x46, 0xbe, 0x9d, 0x1d, 0xab, 0x89, 0xaa, 0x63, 0x2b, 0xd8, 0xb5, 0x85, 0x6a, 0x63, 0xdf, 0xb2, 0x65, 0x19, 0x28, 0xf2, 0xa4, 0x2e, 0x1b, 0x6f, 0x4e, 0x63, 0x9f, 0xd3, 0xb5, 0xbe, 0xf6, 0x12, 0x2f, 0x53, 0x41, 0xbf, 0x5a, 0xa4, 0x75, 0x56, 0x28, 0x73,
+};
diff --git a/core/embed/bootloader_ci/memory.ld b/core/embed/bootloader_ci/memory.ld
deleted file mode 120000
index 81c15226b..000000000
--- a/core/embed/bootloader_ci/memory.ld
+++ /dev/null
@@ -1 +0,0 @@
-../bootloader/memory.ld
\ No newline at end of file
diff --git a/core/embed/bootloader_ci/memory.ld b/core/embed/bootloader_ci/memory.ld
new file mode 100644
index 000000000..2015d0f9b
--- /dev/null
+++ b/core/embed/bootloader_ci/memory.ld
@@ -0,0 +1,55 @@
+/* Trezor v2 bootloader linker script */
+
+ENTRY(reset_handler)
+
+MEMORY {
+  FLASH  (rx)  : ORIGIN = 0x08020000, LENGTH = 128K
+  CCMRAM (wal) : ORIGIN = 0x10000000, LENGTH = 64K
+  SRAM   (wal) : ORIGIN = 0x20000000, LENGTH = 192K
+}
+
+main_stack_base = ORIGIN(CCMRAM) + LENGTH(CCMRAM); /* 8-byte aligned full descending stack */
+
+/* used by the startup code to populate variables used by the C code */
+data_lma = LOADADDR(.data);
+data_vma = ADDR(.data);
+data_size = SIZEOF(.data);
+
+/* used by the startup code to wipe memory */
+ccmram_start = ORIGIN(CCMRAM);
+ccmram_end = ORIGIN(CCMRAM) + LENGTH(CCMRAM);
+
+/* used by the startup code to wipe memory */
+sram_start = ORIGIN(SRAM);
+sram_end = ORIGIN(SRAM) + LENGTH(SRAM);
+
+_codelen = SIZEOF(.flash) + SIZEOF(.data);
+
+SECTIONS {
+  .header : ALIGN(4) {
+    KEEP(*(.header));
+  } >FLASH AT>FLASH
+
+  .flash : ALIGN(512) {
+    KEEP(*(.vector_table));
+    . = ALIGN(4);
+    *(.text*);
+    . = ALIGN(4);
+    *(.rodata*);
+    . = ALIGN(512);
+  } >FLASH AT>FLASH
+
+  .data : ALIGN(4) {
+    *(.data*);
+    . = ALIGN(512);
+  } >CCMRAM AT>FLASH
+
+  .bss : ALIGN(4) {
+    *(.bss*);
+    . = ALIGN(4);
+  } >CCMRAM
+
+  .stack : ALIGN(8) {
+    . = 4K; /* this acts as a build time assertion that at least this much memory is available for stack use */
+  } >CCMRAM
+}
diff --git a/core/embed/bootloader_ci/messages.h b/core/embed/bootloader_ci/messages.h
deleted file mode 120000
index 439bd22f2..000000000
--- a/core/embed/bootloader_ci/messages.h
+++ /dev/null
@@ -1 +0,0 @@
-../bootloader/messages.h
\ No newline at end of file
diff --git a/core/embed/bootloader_ci/messages.h b/core/embed/bootloader_ci/messages.h
new file mode 100644
index 000000000..fd11b82ac
--- /dev/null
+++ b/core/embed/bootloader_ci/messages.h
@@ -0,0 +1,51 @@
+/*
+ * This file is part of the Trezor project, https://trezor.io/
+ *
+ * Copyright (c) SatoshiLabs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __MESSAGES_H__
+#define __MESSAGES_H__
+
+#include <stdint.h>
+#include "image.h"
+#include "secbool.h"
+
+#define USB_TIMEOUT 500
+#define USB_PACKET_SIZE 64
+
+#define FIRMWARE_UPLOAD_CHUNK_RETRY_COUNT 2
+
+secbool msg_parse_header(const uint8_t *buf, uint16_t *msg_id,
+                         uint32_t *msg_size);
+
+void send_user_abort(uint8_t iface_num, const char *msg);
+
+void process_msg_Initialize(uint8_t iface_num, uint32_t msg_size, uint8_t *buf,
+                            const vendor_header *const vhdr,
+                            const image_header *const hdr);
+void process_msg_GetFeatures(uint8_t iface_num, uint32_t msg_size, uint8_t *buf,
+                             const vendor_header *const vhdr,
+                             const image_header *const hdr);
+void process_msg_Ping(uint8_t iface_num, uint32_t msg_size, uint8_t *buf);
+void process_msg_FirmwareErase(uint8_t iface_num, uint32_t msg_size,
+                               uint8_t *buf);
+int process_msg_FirmwareUpload(uint8_t iface_num, uint32_t msg_size,
+                               uint8_t *buf);
+int process_msg_WipeDevice(uint8_t iface_num, uint32_t msg_size, uint8_t *buf);
+void process_msg_unknown(uint8_t iface_num, uint32_t msg_size, uint8_t *buf);
+
+#endif
diff --git a/core/embed/bootloader_ci/startup.s b/core/embed/bootloader_ci/startup.s
deleted file mode 120000
index 7b784274a..000000000
--- a/core/embed/bootloader_ci/startup.s
+++ /dev/null
@@ -1 +0,0 @@
-../bootloader/startup.s
\ No newline at end of file
diff --git a/core/embed/bootloader_ci/startup.s b/core/embed/bootloader_ci/startup.s
new file mode 100644
index 000000000..cbcfb67bd
--- /dev/null
+++ b/core/embed/bootloader_ci/startup.s
@@ -0,0 +1,41 @@
+  .syntax unified
+
+  .text
+
+  .global reset_handler
+  .type reset_handler, STT_FUNC
+reset_handler:
+  // setup environment for subsequent stage of code
+  ldr r0, =ccmram_start // r0 - point to beginning of CCMRAM
+  ldr r1, =ccmram_end   // r1 - point to byte after the end of CCMRAM
+  ldr r2, =0            // r2 - the word-sized value to be written
+  bl memset_reg
+
+  ldr r0, =sram_start   // r0 - point to beginning of SRAM
+  ldr r1, =sram_end     // r1 - point to byte after the end of SRAM
+  ldr r2, =0            // r2 - the word-sized value to be written
+  bl memset_reg
+
+  // copy data in from flash
+  ldr r0, =data_vma     // dst addr
+  ldr r1, =data_lma     // src addr
+  ldr r2, =data_size    // size in bytes
+  bl memcpy
+
+  // setup the stack protector (see build script "-fstack-protector-all") with an unpredictable value
+  bl rng_get
+  ldr r1, = __stack_chk_guard
+  str r0, [r1]
+
+  // re-enable exceptions
+  // according to "ARM Cortex-M Programming Guide to Memory Barrier Instructions" Application Note 321, section 4.7:
+  // "If it is not necessary to ensure that a pended interrupt is recognized immediately before
+  // subsequent operations, it is not necessary to insert a memory barrier instruction."
+  cpsie f
+
+  // enter the application code
+  bl main
+
+  b shutdown
+
+  .end
diff --git a/core/embed/bootloader_ci/version.h b/core/embed/bootloader_ci/version.h
deleted file mode 120000
index 0caef111b..000000000
--- a/core/embed/bootloader_ci/version.h
+++ /dev/null
@@ -1 +0,0 @@
-../bootloader/version.h
\ No newline at end of file
diff --git a/core/embed/bootloader_ci/version.h b/core/embed/bootloader_ci/version.h
new file mode 100644
index 000000000..05d8755e7
--- /dev/null
+++ b/core/embed/bootloader_ci/version.h
@@ -0,0 +1,14 @@
+#define VERSION_MAJOR 2
+#define VERSION_MINOR 0
+#define VERSION_PATCH 4
+#define VERSION_BUILD 0
+#define VERSION_UINT32                                            \
+  (VERSION_MAJOR | (VERSION_MINOR << 8) | (VERSION_PATCH << 16) | \
+   (VERSION_BUILD << 24))
+
+#define FIX_VERSION_MAJOR 2
+#define FIX_VERSION_MINOR 0
+#define FIX_VERSION_PATCH 0
+#define FIX_VERSION_BUILD 0
+
+#define VERSION_MONOTONIC 1