diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c
index 0665397..76c47fe 100644
--- a/apps/gui/color_picker.c
+++ b/apps/gui/color_picker.c
@@ -72,14 +72,14 @@
 {
     unsigned color = rgb->color;
 #if LCD_PIXELFORMAT == RGB565SWAPPED
-    swap16(color);
+    color = swap16(color);
 #endif
-    rgb->r     = (color & 0xf800) >> 11;
-    rgb->g     = (color & 0x07e0) >> 5;
-    rgb->b     = (color & 0x001f);
     rgb->red   = _RGB_UNPACK_RED(color);
     rgb->green = _RGB_UNPACK_GREEN(color);
     rgb->blue  = _RGB_UNPACK_BLUE(color);
+    rgb->r     = (color & 0xf800) >> 11;
+    rgb->g     = (color & 0x07e0) >> 5;
+    rgb->b     = (color & 0x001f);
 }
 
 /* Packs the native rgb colors into a color value */
@@ -89,7 +89,7 @@
                      (rgb->g & 0x3f) << 5 |
                      (rgb->b & 0x1f);
 #if LCD_PIXELFORMAT == RGB565SWAPPED
-    swap16(color);
+    color = swap16(color);
 #endif
     rgb->color = color;
 }
diff --git a/apps/recorder/bmp.c b/apps/recorder/bmp.c
index f0f143f..4105753 100644
--- a/apps/recorder/bmp.c
+++ b/apps/recorder/bmp.c
@@ -42,6 +42,10 @@
 #pragma pack (push, 2)
 #endif
 
+//#undef LCD_RGBPACK
+//#define LCD_RGBPACK(r, g, b) swap16(_RGBPACK((r), (g), (b)))
+
+
 /* Struct from original code. */
 struct Fileheader {
     unsigned short Type;        /* signature - 'BM' */
@@ -128,7 +132,7 @@
     color = (unsigned short)(b | (g << 5) | (r << 11));
 
 #if LCD_PIXELFORMAT == RGB565SWAPPED
-    swap16(color);
+    color = swap16(color);
 #endif
     return color;
 }