diff --git a/core/embed/lib/buffers.h b/core/embed/lib/buffers.h
index 03d00a79e5..4203338a02 100644
--- a/core/embed/lib/buffers.h
+++ b/core/embed/lib/buffers.h
@@ -23,6 +23,7 @@
 #include <stdbool.h>
 
 #include "common.h"
+#include "model.h"
 #include TREZOR_BOARD
 
 #define BUFFER_PIXELS DISPLAY_RESX
diff --git a/core/embed/models/D001/boards/stm32f429i-disc1.h b/core/embed/models/D001/boards/stm32f429i-disc1.h
index be2d02e849..dd0e56e4d2 100644
--- a/core/embed/models/D001/boards/stm32f429i-disc1.h
+++ b/core/embed/models/D001/boards/stm32f429i-disc1.h
@@ -3,8 +3,6 @@
 
 #define HSE_8MHZ
 
-#define DISPLAY_RESX 240
-#define DISPLAY_RESY 320
 #define DISPLAY_COLOR_MODE DMA2D_OUTPUT_RGB565
 #define DISPLAY_LEGACY_HEADER "displays/ltdc.h"
 
diff --git a/core/embed/models/D001/model_D001.h b/core/embed/models/D001/model_D001.h
index 18b75baa4b..e15d2c0a9c 100644
--- a/core/embed/models/D001/model_D001.h
+++ b/core/embed/models/D001/model_D001.h
@@ -24,7 +24,10 @@
 
 #define IMAGE_CHUNK_SIZE (128 * 1024)
 #define IMAGE_HASH_BLAKE2S
+
 #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RESET_CONTENT
+#define DISPLAY_RESX 240
+#define DISPLAY_RESY 320
 
 // SHARED WITH MAKEFILE
 // common
diff --git a/core/embed/models/D002/boards/stm32u5a9j-dk.h b/core/embed/models/D002/boards/stm32u5a9j-dk.h
index fe25056fff..30e324f9e0 100644
--- a/core/embed/models/D002/boards/stm32u5a9j-dk.h
+++ b/core/embed/models/D002/boards/stm32u5a9j-dk.h
@@ -4,9 +4,6 @@
 #define HSE_16MHZ
 #define VDD_1V8 1
 
-#define DISPLAY_RESX 240
-#define DISPLAY_RESY 240
-
 #define DISPLAY_COLOR_MODE DMA2D_OUTPUT_ARGB8888
 #define DISPLAY_LEGACY_HEADER "displays/dsi.h"
 
diff --git a/core/embed/models/D002/model_D002.h b/core/embed/models/D002/model_D002.h
index c44c9aabab..4520ccf7ee 100644
--- a/core/embed/models/D002/model_D002.h
+++ b/core/embed/models/D002/model_D002.h
@@ -26,7 +26,10 @@
 
 #define IMAGE_CHUNK_SIZE SIZE_256K
 #define IMAGE_HASH_SHA256
+
 #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RESET_CONTENT
+#define DISPLAY_RESX 240
+#define DISPLAY_RESY 240
 
 // SHARED WITH MAKEFILE, LINKER SCRIPT etc.
 // misc
diff --git a/core/embed/models/T2B1/boards/t2b1-unix.h b/core/embed/models/T2B1/boards/t2b1-unix.h
index 3e42dc0deb..8e6f006589 100644
--- a/core/embed/models/T2B1/boards/t2b1-unix.h
+++ b/core/embed/models/T2B1/boards/t2b1-unix.h
@@ -1,9 +1,6 @@
 #ifndef BOARDS_T2B1_UNIX_H
 #define BOARDS_T2B1_UNIX_H
 
-#define DISPLAY_RESX 128
-#define DISPLAY_RESY 64
-
 #define WINDOW_WIDTH 193
 #define WINDOW_HEIGHT 339
 #define TOUCH_OFFSET_X 32
diff --git a/core/embed/models/T2B1/boards/trezor_r_v10.h b/core/embed/models/T2B1/boards/trezor_r_v10.h
index 3dbe4c42e8..51bc29f416 100644
--- a/core/embed/models/T2B1/boards/trezor_r_v10.h
+++ b/core/embed/models/T2B1/boards/trezor_r_v10.h
@@ -3,8 +3,6 @@
 
 #define HSE_8MHZ
 
-#define DISPLAY_RESX 128
-#define DISPLAY_RESY 64
 #define DISPLAY_LEGACY_HEADER "displays/vg-2864ksweg01.h"
 
 #define BTN_LEFT_PIN GPIO_PIN_10
diff --git a/core/embed/models/T2B1/model_T2B1.h b/core/embed/models/T2B1/model_T2B1.h
index 24bc0d0da4..c2dd9d1983 100644
--- a/core/embed/models/T2B1/model_T2B1.h
+++ b/core/embed/models/T2B1/model_T2B1.h
@@ -24,7 +24,10 @@
 
 #define IMAGE_CHUNK_SIZE (128 * 1024)
 #define IMAGE_HASH_BLAKE2S
+
 #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT
+#define DISPLAY_RESX 128
+#define DISPLAY_RESY 64
 
 // SHARED WITH MAKEFILE
 // common
diff --git a/core/embed/models/T2T1/boards/t2t1-unix.h b/core/embed/models/T2T1/boards/t2t1-unix.h
index 77519fed7b..746bbba421 100644
--- a/core/embed/models/T2T1/boards/t2t1-unix.h
+++ b/core/embed/models/T2T1/boards/t2t1-unix.h
@@ -1,9 +1,6 @@
 #ifndef BOARDS_T2T1_UNIX_H
 #define BOARDS_T2T1_UNIX_H
 
-#define DISPLAY_RESX 240
-#define DISPLAY_RESY 240
-
 #define ORIENTATION_NSEW 1
 
 #ifdef TREZOR_EMULATOR_RASPI
diff --git a/core/embed/models/T2T1/boards/trezor_t.h b/core/embed/models/T2T1/boards/trezor_t.h
index c04da4860e..922f0d5df7 100644
--- a/core/embed/models/T2T1/boards/trezor_t.h
+++ b/core/embed/models/T2T1/boards/trezor_t.h
@@ -3,8 +3,6 @@
 
 #define HSE_8MHZ
 
-#define DISPLAY_RESX 240
-#define DISPLAY_RESY 240
 #define DISPLAY_COLOR_MODE DMA2D_OUTPUT_RGB565
 #define DISPLAY_LEGACY_HEADER "displays/st7789v.h"
 
diff --git a/core/embed/models/T2T1/model_T2T1.h b/core/embed/models/T2T1/model_T2T1.h
index ce2d8eadf3..e20d64a9f6 100644
--- a/core/embed/models/T2T1/model_T2T1.h
+++ b/core/embed/models/T2T1/model_T2T1.h
@@ -24,7 +24,10 @@
 
 #define IMAGE_CHUNK_SIZE (128 * 1024)
 #define IMAGE_HASH_BLAKE2S
+
 #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT
+#define DISPLAY_RESX 240
+#define DISPLAY_RESY 240
 
 // SHARED WITH MAKEFILE
 // common
diff --git a/core/embed/models/T3B1/boards/t3b1-unix.h b/core/embed/models/T3B1/boards/t3b1-unix.h
index cd99ddecb8..9b11bbc7bd 100644
--- a/core/embed/models/T3B1/boards/t3b1-unix.h
+++ b/core/embed/models/T3B1/boards/t3b1-unix.h
@@ -1,9 +1,6 @@
 #ifndef BOARDS_T3B1_UNIX_H
 #define BOARDS_T3B1_UNIX_H
 
-#define DISPLAY_RESX 128
-#define DISPLAY_RESY 64
-
 #define WINDOW_WIDTH 193
 #define WINDOW_HEIGHT 339
 #define TOUCH_OFFSET_X 32
diff --git a/core/embed/models/T3B1/boards/trezor_t3b1_revB.h b/core/embed/models/T3B1/boards/trezor_t3b1_revB.h
index dcfb2313ae..7ff3e2b80d 100644
--- a/core/embed/models/T3B1/boards/trezor_t3b1_revB.h
+++ b/core/embed/models/T3B1/boards/trezor_t3b1_revB.h
@@ -1,9 +1,6 @@
 #ifndef _TREZOR_T3B1_H
 #define _TREZOR_T3B1_H
 
-#define DISPLAY_RESX 128
-#define DISPLAY_RESY 64
-
 #define VDD_3V3 1
 
 #define DISPLAY_LEGACY_HEADER "displays/vg-2864ksweg01.h"
diff --git a/core/embed/models/T3B1/model_T3B1.h b/core/embed/models/T3B1/model_T3B1.h
index 0efedcc02b..2a904e45da 100644
--- a/core/embed/models/T3B1/model_T3B1.h
+++ b/core/embed/models/T3B1/model_T3B1.h
@@ -25,7 +25,10 @@
 
 #define IMAGE_CHUNK_SIZE (128 * 1024)
 #define IMAGE_HASH_SHA256
+
 #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT
+#define DISPLAY_RESX 128
+#define DISPLAY_RESY 64
 
 // SHARED WITH MAKEFILE, LINKER SCRIPT etc.
 // misc
diff --git a/core/embed/models/T3T1/boards/t3t1-unix.h b/core/embed/models/T3T1/boards/t3t1-unix.h
index 958ccb9c5c..6f90199b5c 100644
--- a/core/embed/models/T3T1/boards/t3t1-unix.h
+++ b/core/embed/models/T3T1/boards/t3t1-unix.h
@@ -1,9 +1,6 @@
 #ifndef BOARDS_T3T1_UNIX_H
 #define BOARDS_T3T1_UNIX_H
 
-#define DISPLAY_RESX 240
-#define DISPLAY_RESY 240
-
 #define WINDOW_WIDTH 400
 #define WINDOW_HEIGHT 600
 #define TOUCH_OFFSET_X 80
diff --git a/core/embed/models/T3T1/boards/trezor_t3t1_revE.h b/core/embed/models/T3T1/boards/trezor_t3t1_revE.h
index 8a4c0761ea..1439cb6f54 100644
--- a/core/embed/models/T3T1/boards/trezor_t3t1_revE.h
+++ b/core/embed/models/T3T1/boards/trezor_t3t1_revE.h
@@ -3,8 +3,6 @@
 
 #define VDD_3V3 1
 
-#define DISPLAY_RESX 240
-#define DISPLAY_RESY 240
 #define DISPLAY_LEGACY_HEADER "displays/st7789v.h"
 #define DISPLAY_COLOR_MODE DMA2D_OUTPUT_RGB565
 #define DISPLAY_PANEL_LX154A2482 1
diff --git a/core/embed/models/T3T1/model_T3T1.h b/core/embed/models/T3T1/model_T3T1.h
index 4e92c3d83c..993a2aea28 100644
--- a/core/embed/models/T3T1/model_T3T1.h
+++ b/core/embed/models/T3T1/model_T3T1.h
@@ -25,7 +25,10 @@
 
 #define IMAGE_CHUNK_SIZE (128 * 1024)
 #define IMAGE_HASH_SHA256
+
 #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RETAIN_CONTENT
+#define DISPLAY_RESX 240
+#define DISPLAY_RESY 240
 
 // SHARED WITH MAKEFILE, LINKER SCRIPT etc.
 // misc
diff --git a/core/embed/models/T3W1/boards/trezor_t3w1_d1.h b/core/embed/models/T3W1/boards/trezor_t3w1_d1.h
index 242f0eb8ae..477fce51ae 100644
--- a/core/embed/models/T3W1/boards/trezor_t3w1_d1.h
+++ b/core/embed/models/T3W1/boards/trezor_t3w1_d1.h
@@ -3,8 +3,6 @@
 
 #define HSE_8MHZ
 
-#define DISPLAY_RESX 240
-#define DISPLAY_RESY 320
 #define DISPLAY_COLOR_MODE DMA2D_OUTPUT_RGB565
 #define DISPLAY_LEGACY_HEADER "displays/st7789v.h"
 #define DISPLAY_PANEL_LHS200KB_IF21 1
diff --git a/core/embed/models/T3W1/model_T3W1.h b/core/embed/models/T3W1/model_T3W1.h
index 04b46a0140..303944257c 100644
--- a/core/embed/models/T3W1/model_T3W1.h
+++ b/core/embed/models/T3W1/model_T3W1.h
@@ -26,8 +26,17 @@
 
 #define IMAGE_CHUNK_SIZE (128 * 1024)
 #define IMAGE_HASH_BLAKE2S
+
 #define DISPLAY_JUMP_BEHAVIOR DISPLAY_RESET_CONTENT
 
+#ifdef TREZOR_EMULATOR
+#define DISPLAY_RESX 380
+#define DISPLAY_RESY 520
+#else
+#define DISPLAY_RESX 240
+#define DISPLAY_RESY 320
+#endif
+
 // SHARED WITH MAKEFILE
 // common
 
diff --git a/core/embed/trezorhal/stm32f4/touch/panels/lhs200kb-if21.c b/core/embed/trezorhal/stm32f4/touch/panels/lhs200kb-if21.c
index 19e1d11504..36405ee91a 100644
--- a/core/embed/trezorhal/stm32f4/touch/panels/lhs200kb-if21.c
+++ b/core/embed/trezorhal/stm32f4/touch/panels/lhs200kb-if21.c
@@ -22,6 +22,7 @@
 
 #include "lx154a2422cpt23.h"
 
+#include "model.h"
 #include "touch.h"
 
 void lhs200kb_if21_touch_correction(uint16_t x, uint16_t y, uint16_t *x_new,
diff --git a/core/embed/trezorhal/stm32f4/touch/panels/lx154a2422cpt23.c b/core/embed/trezorhal/stm32f4/touch/panels/lx154a2422cpt23.c
index 1da0f19161..1f412a0acb 100644
--- a/core/embed/trezorhal/stm32f4/touch/panels/lx154a2422cpt23.c
+++ b/core/embed/trezorhal/stm32f4/touch/panels/lx154a2422cpt23.c
@@ -21,6 +21,7 @@
 
 #include "lx154a2422cpt23.h"
 
+#include "model.h"
 #include "touch.h"
 
 void lx154a2422cpt23_touch_correction(uint16_t x, uint16_t y, uint16_t *x_new,
diff --git a/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lhs200kb-if21.c b/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lhs200kb-if21.c
index f4e382f3fa..565a690b9c 100644
--- a/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lhs200kb-if21.c
+++ b/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lhs200kb-if21.c
@@ -1,6 +1,7 @@
 
 #include "lhs200kb-if21.h"
 #include "../display_io.h"
+#include "model.h"
 
 void lhs200kb_if21_gamma(void) {
   ISSUE_CMD_BYTE(0xE0);
diff --git a/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lx154a2422.c b/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lx154a2422.c
index d793e09522..cf9bac5adb 100644
--- a/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lx154a2422.c
+++ b/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lx154a2422.c
@@ -20,6 +20,7 @@
 #include "lx154a2422.h"
 
 #include "../display_io.h"
+#include "model.h"
 
 void lx154a2422_gamma(void) {
   // positive voltage correction
diff --git a/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lx154a2482.c b/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lx154a2482.c
index 6ef516fb8d..5626adde3f 100644
--- a/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lx154a2482.c
+++ b/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/lx154a2482.c
@@ -20,6 +20,7 @@
 #include "lx154a2482.h"
 
 #include "../display_io.h"
+#include "model.h"
 
 void lx154a2482_gamma(void) {
   // positive voltage correction
diff --git a/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/tf15411a.c b/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/tf15411a.c
index 155bf017a7..2c45fb66e9 100644
--- a/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/tf15411a.c
+++ b/core/embed/trezorhal/stm32f4/xdisplay/st-7789/panels/tf15411a.c
@@ -19,6 +19,7 @@
 
 #include "tf15411a.h"
 #include "../display_io.h"
+#include "model.h"
 
 void tf15411a_init_seq(void) {
   // Inter Register Enable1