diff --git a/src_bagl/ui_flow_stark_sign.c b/src_bagl/ui_flow_stark_sign.c
index df3c6a1..548e880 100644
--- a/src_bagl/ui_flow_stark_sign.c
+++ b/src_bagl/ui_flow_stark_sign.c
@@ -3,18 +3,7 @@
 #include "shared_context.h"
 #include "ui_callbacks.h"
 #include "ethUtils.h"
-
-void stark_sign_display_master_account() {
-    snprintf(strings.tmp.tmp,
-             sizeof(strings.tmp.tmp),
-             "0x%.*H",
-             32,
-             dataContext.starkContext.transferDestination);
-}
-
-void stark_sign_display_condition_fact() {
-    snprintf(strings.tmp.tmp, sizeof(strings.tmp.tmp), "0x%.*H", 32, dataContext.starkContext.fact);
-}
+#include "starkDisplayUtils.h"
 
 // clang-format off
 UX_STEP_NOCB(ux_stark_limit_order_1_step,
diff --git a/src_common/starkDisplayUtils.c b/src_common/starkDisplayUtils.c
new file mode 100644
index 0000000..a59ae99
--- /dev/null
+++ b/src_common/starkDisplayUtils.c
@@ -0,0 +1,17 @@
+#ifdef HAVE_STARKWARE
+
+#include "shared_context.h"
+
+void stark_sign_display_master_account() {
+    snprintf(strings.tmp.tmp,
+             sizeof(strings.tmp.tmp),
+             "0x%.*H",
+             32,
+             dataContext.starkContext.transferDestination);
+}
+
+void stark_sign_display_condition_fact() {
+    snprintf(strings.tmp.tmp, sizeof(strings.tmp.tmp), "0x%.*H", 32, dataContext.starkContext.fact);
+}
+
+#endif
\ No newline at end of file
diff --git a/src_common/starkDisplayUtils.h b/src_common/starkDisplayUtils.h
new file mode 100644
index 0000000..48399b8
--- /dev/null
+++ b/src_common/starkDisplayUtils.h
@@ -0,0 +1,6 @@
+#ifdef HAVE_STARKWARE
+
+void stark_sign_display_master_account();
+void stark_sign_display_condition_fact();
+
+#endif
\ No newline at end of file