diff --git a/csrc/u8g2.h b/csrc/u8g2.h
index 273695733..e3a3919f4 100644
--- a/csrc/u8g2.h
+++ b/csrc/u8g2.h
@@ -282,7 +282,7 @@ struct u8g2_struct
   uint8_t tile_curr_row;	/* current row for picture loop */
   
   /* dimension of the buffer in pixel */
-  u8g2_uint_t pixel_buf_width;		/* equal to tile_buf_height*8 */
+  u8g2_uint_t pixel_buf_width;		/* equal to tile_buf_width*8 */
   u8g2_uint_t pixel_buf_height;		/* u8g2.display_info->tile_width*8 */
   u8g2_uint_t pixel_curr_row;		/* u8g2.tile_curr_row*8 */
   
diff --git a/sys/sdl/full_buffer_send_window/Makefile b/sys/sdl/full_buffer_send_window/Makefile
new file mode 100644
index 000000000..c6da5d2a2
--- /dev/null
+++ b/sys/sdl/full_buffer_send_window/Makefile
@@ -0,0 +1,12 @@
+CFLAGS = -g -Wall -I../../../csrc/.  `sdl2-config --cflags`
+
+SRC = $(shell ls ../../../csrc/*.c) ../../bitmap/common/u8x8_d_bitmap.c $(shell ls ../common/*.c ) main.c 
+
+OBJ = $(SRC:.c=.o)
+
+helloworld: $(OBJ) 
+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJ) `sdl2-config --libs` -o u8g2_sdl
+
+clean:	
+	-rm $(OBJ) u8g2_sdl
+
diff --git a/sys/sdl/full_buffer_send_window/main.c b/sys/sdl/full_buffer_send_window/main.c
new file mode 100644
index 000000000..1836e1132
--- /dev/null
+++ b/sys/sdl/full_buffer_send_window/main.c
@@ -0,0 +1,164 @@
+
+#include "u8g2.h"
+#include <stdio.h>
+
+
+u8g2_t u8g2;
+
+/*
+  Limitations:
+    - Tile positions and sizes (pixel position divided by 8)
+    - Any display rotation/mirror is ignored
+    - Only works with displays, which support U8x8 API
+    - Only available in full buffer mode
+*/
+u8g2_SendTileSubBuffer(u8g2_t *u8g2, uint8_t x, uint8_t y, uint8_t w, uint8_t h)
+{
+  uint16_t page_size;
+  uint8_t *ptr;
+
+  /* the page size in bytes is equal to the pixel width in bits */
+  page_size = u8g2->pixel_buf_width;
+    
+  ptr = u8g2_GetBufferPtr(u8g2);
+  ptr += x*8;
+  ptr += page_size*y;
+  
+  while( h > 0 )
+  {
+    u8x8_DrawTile( u8g2_GetU8x8(u8g2), x, y, w, ptr );
+    ptr += page_size;
+    y++;
+    h--;
+  }  
+}
+
+/*
+  sub buffer window in pixel coordinates
+  lower left corner is NOT included, this means the transfer range is from
+  x0..x1-1
+  y0..y1-1
+*/
+void u8g2_SendWindow(u8g2_t *u8g2, u8g2_uint_t x0, u8g2_uint_t y0, u8g2_uint_t x1, u8g2_uint_t y1)
+{
+  x0 /= 8;
+  y0 /= 8;
+  x1 += 7;
+  x1 /= 8;
+  y1 +=7;
+  y1 /= 8;
+  u8g2_SendTileSubBuffer(u8g2, x0, y0, x1-x0, y1-y0);
+  
+}
+
+
+
+int main(void)
+{
+  int x, y;
+  int k;
+  
+  //u8g2_SetupBuffer_SDL_240x160(&u8g2, &u8g2_cb_r0);
+  u8g2_SetupBuffer_SDL_128x64(&u8g2, &u8g2_cb_r0);
+  //u8x8_ConnectBitmapToU8x8(u8g2_GetU8x8(&u8g2));		/* connect to bitmap */
+  
+  u8x8_InitDisplay(u8g2_GetU8x8(&u8g2));
+  u8x8_SetPowerSave(u8g2_GetU8x8(&u8g2), 0);  
+  u8g2_SetFont(&u8g2, u8g2_font_helvB18_tr);
+  
+  x = 30;
+  y = 35;
+
+  
+  for(;;)
+  {
+#ifdef U8G2_WITH_HVLINE_COUNT
+    u8g2.hv_cnt = 0UL;
+#endif /* U8G2_WITH_HVLINE_COUNT */   
+    
+    u8g2_ClearBuffer(&u8g2);
+    
+      u8g2_SetFontDirection(&u8g2, 0);
+      u8g2_DrawStr(&u8g2, x, y, "A");
+      u8g2_SetFontDirection(&u8g2, 1);
+      u8g2_DrawStr(&u8g2, x, y, "a");
+      u8g2_SetFontDirection(&u8g2, 2);
+      u8g2_DrawStr(&u8g2, x, y, "a");
+      u8g2_SetFontDirection(&u8g2, 3);
+      u8g2_DrawStr(&u8g2, x, y, "a");
+
+	u8g2_DrawHVLine(&u8g2, u8g2.user_x0, u8g2.user_y0, 1, 0);
+	u8g2_DrawHVLine(&u8g2, u8g2.user_x0, u8g2.user_y1-1, 1, 0);
+	u8g2_DrawHVLine(&u8g2, u8g2.user_x1-1, u8g2.user_y1-1, 1, 0);
+	u8g2_DrawHVLine(&u8g2, u8g2.user_x1-1, u8g2.user_y0, 1, 0);
+    
+    
+    //u8g2_SendBuffer(&u8g2);
+    //u8g2_SendTileSubBuffer(&u8g2, 2, 2, 12, 3);
+    u8g2_SendWindow(&u8g2, 9, 17, 120, 42);
+    //u8g2_SendTileWindow(&u8g2, 0, 0, 16, 8);
+
+/*    
+    u8g2_FirstPage(&u8g2);
+    i = 0;
+    do
+    {
+      u8g2_SetFontDirection(&u8g2, 0);
+      u8g2_DrawStr(&u8g2, x, y, "ABC");
+      u8g2_SetFontDirection(&u8g2, 1);
+      u8g2_DrawStr(&u8g2, x, y, "abc");
+      u8g2_SetFontDirection(&u8g2, 2);
+      u8g2_DrawStr(&u8g2, x, y, "abc");
+      u8g2_SetFontDirection(&u8g2, 3);
+      u8g2_DrawStr(&u8g2, x, y, "abc");
+      if ( i == 1 )
+      {
+	u8g2_DrawHVLine(&u8g2, u8g2.user_x0, u8g2.user_y0, 1, 0);
+	u8g2_DrawHVLine(&u8g2, u8g2.user_x0, u8g2.user_y1-1, 1, 0);
+	u8g2_DrawHVLine(&u8g2, u8g2.user_x1-1, u8g2.user_y1-1, 1, 0);
+	u8g2_DrawHVLine(&u8g2, u8g2.user_x1-1, u8g2.user_y0, 1, 0);
+
+      }
+      
+      i++;
+      
+
+    } while( u8g2_NextPage(&u8g2) );
+*/
+#ifdef U8G2_WITH_HVLINE_COUNT
+    printf("hv cnt: %ld\n", u8g2.hv_cnt);
+#endif /* U8G2_WITH_HVLINE_COUNT */   
+    
+    do
+    {
+      k = u8g_sdl_get_key();
+    } while( k < 0 );
+    
+    if ( k == 273 ) y -= 7;
+    if ( k == 274 ) y += 7;
+    if ( k == 276 ) x -= 7;
+    if ( k == 275 ) x += 7;
+    
+    if ( k == 'e' ) y -= 1;
+    if ( k == 'x' ) y += 1;
+    if ( k == 's' ) x -= 1;
+    if ( k == 'd' ) x += 1;
+    if ( k == 'q' ) break;
+
+
+    //if ( k == 't' ) 
+    //  u8x8_SaveBitmapTGA(u8g2_GetU8x8(&u8g2), "screenshot.tga");
+    
+  }
+  
+  //u8x8_Set8x8Font(u8g2_GetU8x8(&u8g2), bdf_font);
+  //u8x8_Draw8x8String(u8g2_GetU8x8(&u8g2), 0, 0, "Hello World!");
+  
+  
+  
+  
+  
+  
+  return 0;
+}
+
diff --git a/tools/font/emoticons/emoticons21.fon b/tools/font/emoticons/emoticons21.fon
index 9d69cb84e..60d59ce6e 100644
Binary files a/tools/font/emoticons/emoticons21.fon and b/tools/font/emoticons/emoticons21.fon differ