diff --git a/tag_fw/drawing.c b/tag_fw/drawing.c
index 1211384b..bb1a8137 100644
--- a/tag_fw/drawing.c
+++ b/tag_fw/drawing.c
@@ -433,6 +433,9 @@ void drawImageAtAddress(uint32_t addr, uint8_t lut) {
 
             pr(" complete.\n");
             break;
+        default:  // prevent drawing from an unknown file image type
+            pr("Image with type 0x%02X was requested, but we don't know what to do with that currently...\n", eih->dataType);
+            return;
     }
     addOverlay();
     drawWithSleep();
diff --git a/tag_fw/fw154.bin b/tag_fw/fw154.bin
index 9282512b..ffcba72f 100644
Binary files a/tag_fw/fw154.bin and b/tag_fw/fw154.bin differ
diff --git a/tag_fw/fw29.bin b/tag_fw/fw29.bin
index c203750b..2129cbdc 100644
Binary files a/tag_fw/fw29.bin and b/tag_fw/fw29.bin differ
diff --git a/tag_fw/fw42.bin b/tag_fw/fw42.bin
index fb397e13..874f0235 100644
Binary files a/tag_fw/fw42.bin and b/tag_fw/fw42.bin differ
diff --git a/tag_fw/main.c b/tag_fw/main.c
index 78751587..b0aacaa4 100644
--- a/tag_fw/main.c
+++ b/tag_fw/main.c
@@ -141,7 +141,7 @@ uint8_t channelSelect() {  // returns 0 if no accesspoints were found
     return highestSlot;
 }
 
-void mainProtocolLoop(void) {
+void main() {
     // displayLoop();  // remove me
     setupPortsInitial();
     powerUp(INIT_BASE | INIT_UART);
@@ -340,7 +340,3 @@ void mainProtocolLoop(void) {
         }
     }
 }
-
-void main(void) {
-    mainProtocolLoop();
-}
diff --git a/tag_fw/userinterface.c b/tag_fw/userinterface.c
index 73e08152..683a4669 100644
--- a/tag_fw/userinterface.c
+++ b/tag_fw/userinterface.c
@@ -70,12 +70,12 @@ void showSplashScreen() {
     setColorMode(EPD_MODE_NORMAL, EPD_MODE_INVERT);
 
 #if (SCREEN_WIDTH == 152)  // 1.54"
-    epdPrintBegin(12, 2, EPD_DIRECTION_X, EPD_SIZE_DOUBLE, EPD_COLOR_BLACK);
+    epdPrintBegin(12, 52, EPD_DIRECTION_X, EPD_SIZE_DOUBLE, EPD_COLOR_BLACK);
     epdpr("Starting");
     epdPrintEnd();
 
-    loadRawBitmap(oepli, 0, 12, EPD_COLOR_BLACK);
-    loadRawBitmap(cloud, 0, 0, EPD_COLOR_RED);
+    loadRawBitmap(oepli, 8, 12, EPD_COLOR_BLACK);
+    loadRawBitmap(cloud, 8, 0, EPD_COLOR_RED);
 
     epdPrintBegin(5, 136, EPD_DIRECTION_X, EPD_SIZE_SINGLE, EPD_COLOR_RED);
     epdpr("%02X%02X", mSelfMac[7], mSelfMac[6]);