diff --git a/avr/devices/c03/main/dlg_netstats.asm b/avr/devices/c03/main/dlg_netstats.asm
index 3947b28..48b1480 100644
--- a/avr/devices/c03/main/dlg_netstats.asm
+++ b/avr/devices/c03/main/dlg_netstats.asm
@@ -215,16 +215,16 @@ DlgNetStats_Show:
   ; packets in
   DLGNETSTATS_PRINTLABEL 2, dlgNetstats_lPacketsIn
   ; packets out
-  DLGNETSTATS_PRINTLABEL 24, dlgNetstats_lPacketsOut
+  DLGNETSTATS_PRINTLABEL 1*(2+STYLE_WIN_FONT_HEIGHT), dlgNetstats_lPacketsOut
   ; eContent
-  DLGNETSTATS_PRINTLABEL 46, dlgNetstats_lContentErr
+  DLGNETSTATS_PRINTLABEL 2*(2+STYLE_WIN_FONT_HEIGHT), dlgNetstats_lContentErr
   ; eIO
-  DLGNETSTATS_PRINTLABEL 68, dlgNetstats_lIoErr
+  DLGNETSTATS_PRINTLABEL 3*(2+STYLE_WIN_FONT_HEIGHT), dlgNetstats_lIoErr
   ; eMsgSize
-  DLGNETSTATS_PRINTLABEL 90, dlgNetstats_lMsgSizeErr
+  DLGNETSTATS_PRINTLABEL 4*(2+STYLE_WIN_FONT_HEIGHT), dlgNetstats_lMsgSizeErr
 
   ; update num
-  DLGNETSTATS_PRINTLABEL 114, dlgNetstats_lUpdate
+  DLGNETSTATS_PRINTLABEL 5*(2+STYLE_WIN_FONT_HEIGHT), dlgNetstats_lUpdate
 
   ldi zl, LOW(dlgNetstats_CloseBtn*2)
   ldi zh, HIGH(dlgNetstats_CloseBtn*2)
@@ -243,17 +243,17 @@ DlgNetStats_Update:
   sts dlgNetstatsUpdateNum, r16
 
   ; packets in
-  DLGNETSTATS_PRINTDATA 160, 2, netInterfaceData+NET_IFACE_OFFS_PACKETSIN_LOW
+  DLGNETSTATS_PRINTDATA (12*STYLE_WIN_FONT_WIDTH), 2, netInterfaceData+NET_IFACE_OFFS_PACKETSIN_LOW
   ; packets out
-  DLGNETSTATS_PRINTDATA 160, 24, netInterfaceData+NET_IFACE_OFFS_PACKETSOUT_LOW
+  DLGNETSTATS_PRINTDATA (12*STYLE_WIN_FONT_WIDTH), 1*(2+STYLE_WIN_FONT_HEIGHT), netInterfaceData+NET_IFACE_OFFS_PACKETSOUT_LOW
   ; eContent
-  DLGNETSTATS_PRINTDATA 160, 46, netInterfaceData+NET_IFACE_OFFS_ERR_CONTENT_LOW
+  DLGNETSTATS_PRINTDATA (12*STYLE_WIN_FONT_WIDTH), 2*(2+STYLE_WIN_FONT_HEIGHT), netInterfaceData+NET_IFACE_OFFS_ERR_CONTENT_LOW
   ; eIO
-  DLGNETSTATS_PRINTDATA 160, 68, netInterfaceData+NET_IFACE_OFFS_ERR_IO_LOW
+  DLGNETSTATS_PRINTDATA (12*STYLE_WIN_FONT_WIDTH), 3*(2+STYLE_WIN_FONT_HEIGHT), netInterfaceData+NET_IFACE_OFFS_ERR_IO_LOW
   ; eMsgSize
-  DLGNETSTATS_PRINTDATA 160, 90, netInterfaceData+NET_IFACE_OFFS_ERR_MSGSIZE_LOW
+  DLGNETSTATS_PRINTDATA (12*STYLE_WIN_FONT_WIDTH), 4*(2+STYLE_WIN_FONT_HEIGHT), netInterfaceData+NET_IFACE_OFFS_ERR_MSGSIZE_LOW
 
-  DLGNETSTATS_PRINTDATA 160, 114, dlgNetstatsUpdateNum
+  DLGNETSTATS_PRINTDATA (12*STYLE_WIN_FONT_WIDTH), 5*(2+STYLE_WIN_FONT_HEIGHT), dlgNetstatsUpdateNum
 
   ret
 ; @end
@@ -272,10 +272,10 @@ dlgNetstats_lClose:      .db "Close", 0
 
 
 dlgNetstats_CloseBtn:
-  .dw 128
-  .dw (140+STYLE_WIN_TITLE_HEIGHT)
-  .dw 64
-  .dw 24
+  .dw ((DISPLAY_WIDTH-((5*STYLE_WIN_FONT_WIDTH)+4))/2)  ; 5 = string length ("close")
+  .dw ((DISPLAY_HEIGHT-4)-(STYLE_WIN_FONT_HEIGHT+4))
+  .dw (5*STYLE_WIN_FONT_WIDTH)+4                        ; 5 = string length ("close")
+  .dw (STYLE_WIN_FONT_HEIGHT+4)
   .dw (dlgNetstats_lClose*2)
 
 
diff --git a/avr/devices/c03/main/main.asm b/avr/devices/c03/main/main.asm
index f32ba4c..f6fd8b4 100644
--- a/avr/devices/c03/main/main.asm
+++ b/avr/devices/c03/main/main.asm
@@ -246,8 +246,10 @@ test:
 ;.include "modules/lcd2/font/font16x26.asm"
 ;.include "modules/lcd2/font/font4.asm"
 ;.include "modules/lcd2/font/font12x16.asm"
-.include "modules/lcd2/ili9341/font12x20.asm"
-.include "modules/lcd2/ili9341/font12x20_1.asm"
+.include "modules/lcd2/ili9341/font12x16.asm"
+.include "modules/lcd2/ili9341/font12x16_1.asm"
+;.include "modules/lcd2/ili9341/font12x20.asm"
+;.include "modules/lcd2/ili9341/font12x20_1.asm"
 ;.include "common/list_t.asm"
 ;.include "common/tree_t.asm"
 .include "common/divide.asm"
diff --git a/avr/modules/lcd2/gui/dialog.asm b/avr/modules/lcd2/gui/dialog.asm
index b9b9d8f..5657ebb 100644
--- a/avr/modules/lcd2/gui/dialog.asm
+++ b/avr/modules/lcd2/gui/dialog.asm
@@ -69,8 +69,8 @@ DialogMgr_Init:
   ldi yh, HIGH(dialogWindow)
   bigcall TitleWindow_Init
 
-  ldi zl, LOW(ili9341Font12x20_1*2)
-  ldi zh, HIGH(ili9341Font12x20_1*2)
+  ldi zl, LOW(STYLE_WIN_FONT*2)
+  ldi zh, HIGH(STYLE_WIN_FONT*2)
   std Y+WIN_OFFS_FONT_LO, zl
   std Y+WIN_OFFS_FONT_HI, zh
   
diff --git a/avr/modules/lcd2/gui/style.asm b/avr/modules/lcd2/gui/style.asm
index 2f24051..2a9e652 100644
--- a/avr/modules/lcd2/gui/style.asm
+++ b/avr/modules/lcd2/gui/style.asm
@@ -14,16 +14,18 @@
 .equ STYLE_WIN_TITLE_BACKGROUND       = DISPLAY_COLOR_NAVY
 .equ STYLE_WIN_TITLE_FOREGROUND       = DISPLAY_COLOR_WHITE
 .equ STYLE_BUTTON_COL_BORDER          = DISPLAY_COLOR_BLACK
-.equ STYLE_BUTTON_COL_BG_NORM         = DISPLAY_COLOR_LIGHTGREY
+.equ STYLE_BUTTON_COL_BG_NORM         = DISPLAY_COLOR_WHITE
 .equ STYLE_BUTTON_COL_BG_PRESSED      = DISPLAY_COLOR_NAVY
 .equ STYLE_BUTTON_COL_FG_NORM         = DISPLAY_COLOR_BLACK
 .equ STYLE_BUTTON_COL_FG_PRESSED      = DISPLAY_COLOR_WHITE
 
-.equ STYLE_WIN_BACKGROUND        = DISPLAY_COLOR_LIGHTGREY
-.equ STYLE_WIN_FOREGROUND        = DISPLAY_COLOR_BLACK
-.equ STYLE_WIN_FONT              = ili9341Font12x20_1
+.equ STYLE_WIN_BACKGROUND             = DISPLAY_COLOR_LIGHTGREY
+.equ STYLE_WIN_FOREGROUND             = DISPLAY_COLOR_BLACK
+.equ STYLE_WIN_FONT                   = ili9341Font12x16_1
+.equ STYLE_WIN_FONT_WIDTH             = 12
+.equ STYLE_WIN_FONT_HEIGHT            = 16
 
-.equ STYLE_WIN_TITLE_HEIGHT      = 24
+.equ STYLE_WIN_TITLE_HEIGHT           = (STYLE_WIN_FONT_HEIGHT+4)
 
 
 #endif