diff --git a/radio/src/gui/horus/lcd.cpp b/radio/src/gui/horus/lcd.cpp
index 46cb8382d..63dadf370 100644
--- a/radio/src/gui/horus/lcd.cpp
+++ b/radio/src/gui/horus/lcd.cpp
@@ -509,8 +509,7 @@ char * getSourceString(char * dest, mixsrc_t idx)
     if (qr.quot < MAX_SCRIPTS && qr.rem < scriptInputsOutputs[qr.quot].outputsCount) {
       *dest++ = '\322';
       // *dest++ = '1'+qr.quot;
-      strncpy(dest, scriptInputsOutputs[qr.quot].outputs[qr.rem].name, sizeof(scriptInputsOutputs[qr.quot].outputs[qr.rem].name));
-      dest[sizeof(scriptInputsOutputs[qr.quot].outputs[qr.rem].name)] = '\0';
+      strcpy(dest, scriptInputsOutputs[qr.quot].outputs[qr.rem].name);
     }
 #endif
   }
diff --git a/radio/src/gui/taranis/lcd.h b/radio/src/gui/taranis/lcd.h
index 6711a247b..4cea7e3f7 100644
--- a/radio/src/gui/taranis/lcd.h
+++ b/radio/src/gui/taranis/lcd.h
@@ -220,7 +220,7 @@ void lcdSetContrast();
   void lcdRefresh();
 #endif
 
-const char * bmpLoad(uint8_t * dest, const char * filename, uint16_t width, uint16_t height);
+uint8_t * bmpLoad(uint8_t * dest, const char * filename, uint16_t width, uint16_t height);
 const char * writeScreenshot();
 
 #if defined(BOOT)
diff --git a/radio/src/gui/taranis/menu_general_sdmanager.cpp b/radio/src/gui/taranis/menu_general_sdmanager.cpp
index 584053a79..1660b4394 100644
--- a/radio/src/gui/taranis/menu_general_sdmanager.cpp
+++ b/radio/src/gui/taranis/menu_general_sdmanager.cpp
@@ -458,7 +458,7 @@ void menuGeneralSdManager(evt_t _event)
   char * ext = getFileExtension(reusableBuffer.sdmanager.lines[index], SD_SCREEN_FILE_LENGTH+1);
   if (ext && !strcasecmp(ext, BITMAPS_EXT)) {
     if (lastPos != menuVerticalPosition) {
-      if (bmpLoad(modelBitmap, reusableBuffer.sdmanager.lines[index], MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)) {
+      if (!bmpLoad(modelBitmap, reusableBuffer.sdmanager.lines[index], MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)) {
         memcpy(modelBitmap, logo_taranis, MODEL_BITMAP_SIZE);
       }
     }
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 464e68b20..0e24d59dc 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -38,14 +38,13 @@ bool loadModelBitmap(char * name, uint8_t * bitmap)
     char lfn[] = BITMAPS_PATH "/xxxxxxxxxx.bmp";
     strncpy(lfn+sizeof(BITMAPS_PATH), name, len);
     strcpy(lfn+sizeof(BITMAPS_PATH)+len, BITMAPS_EXT);
-    if (bmpLoad(bitmap, lfn, MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT) == 0) {
+    if (bmpLoad(bitmap, lfn, MODEL_BITMAP_WIDTH, MODEL_BITMAP_HEIGHT)) {
       return true;
     }
   }
 
   // In all error cases, we set the default logo
   memcpy(bitmap, logo_taranis, MODEL_BITMAP_SIZE);
-
   return false;
 }
 #endif
diff --git a/radio/src/tests/lcd.cpp b/radio/src/tests/lcd.cpp
index 659a92552..703dfea57 100644
--- a/radio/src/tests/lcd.cpp
+++ b/radio/src/tests/lcd.cpp
@@ -365,31 +365,31 @@ TEST(Lcd, lcdDrawBitmapLoadAndDisplay)
   // Test proper BMP files, they should display correctly
   {
     TestBuffer<1000>  bitmap(BITMAP_BUFFER_SIZE(7, 32));
-    EXPECT_EQ(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/4b_7x32.bmp", 7, 32), (char *)0);
+    EXPECT_TRUE(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/4b_7x32.bmp", 7, 32) != NULL);
     bitmap.leakCheck();
     lcdDrawBitmap(10, 2, bitmap.buffer());
   }
   {
     TestBuffer<1000>  bitmap(BITMAP_BUFFER_SIZE(6, 32));
-    EXPECT_EQ(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/1b_6x32.bmp", 6, 32), (char *)0);
+    EXPECT_TRUE(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/1b_6x32.bmp", 6, 32) != NULL);
     bitmap.leakCheck();
     lcdDrawBitmap(20, 2, bitmap.buffer());
   }
   {
     TestBuffer<1000>  bitmap(BITMAP_BUFFER_SIZE(31, 31));
-    EXPECT_EQ(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/4b_31x31.bmp", 31, 31), (char *)0);
+    EXPECT_TRUE(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/4b_31x31.bmp", 31, 31) != NULL);
     bitmap.leakCheck();
     lcdDrawBitmap(30, 2, bitmap.buffer());
   }
   {
     TestBuffer<1000>  bitmap(BITMAP_BUFFER_SIZE(39, 32));
-    EXPECT_EQ(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/1b_39x32.bmp", 39, 32), (char *)0);
+    EXPECT_TRUE(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/1b_39x32.bmp", 39, 32) != NULL);
     bitmap.leakCheck();
     lcdDrawBitmap(70, 2, bitmap.buffer());
   }
   {
     TestBuffer<1000>  bitmap(BITMAP_BUFFER_SIZE(20, 20));
-    EXPECT_EQ(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/4b_20x20.bmp", 20, 20), (char *)0);
+    EXPECT_TRUE(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/4b_20x20.bmp", 20, 20) != NULL);
     bitmap.leakCheck();
     lcdDrawBitmap(120, 2, bitmap.buffer());
   }
@@ -398,12 +398,12 @@ TEST(Lcd, lcdDrawBitmapLoadAndDisplay)
   // Test various bad BMP files, they should not display
   {
     TestBuffer<1000>  bitmap(BITMAP_BUFFER_SIZE(LCD_W+1, 32));
-    EXPECT_EQ(bmpLoad(bitmap.buffer(), "", LCD_W+1, 32), STR_INCOMPATIBLE) << "to wide";
+    EXPECT_TRUE(bmpLoad(bitmap.buffer(), "", LCD_W+1, 32) == NULL) << "to wide";
     bitmap.leakCheck();
   }
   {
     TestBuffer<1000>  bitmap(BITMAP_BUFFER_SIZE(10, 10));
-    EXPECT_EQ(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/1b_39x32.bmp", 10, 10), STR_INCOMPATIBLE) << "to small buffer";
+    EXPECT_TRUE(bmpLoad(bitmap.buffer(), TESTS_PATH "/tests/1b_39x32.bmp", 10, 10) == NULL) << "to small buffer";
     bitmap.leakCheck();
   }
 }