diff --git a/avr/devices/c03/main/w_netstats.asm b/avr/devices/c03/main/w_netstats.asm
index e6285c4..11d77db 100644
--- a/avr/devices/c03/main/w_netstats.asm
+++ b/avr/devices/c03/main/w_netstats.asm
@@ -295,7 +295,7 @@ netStatWinUpdate_ret:
 netWinStatsUpdatePacketsIn:
   lds xl, netInterfaceData+NET_IFACE_OFFS_PACKETSIN_LOW
   lds xh, netInterfaceData+NET_IFACE_OFFS_PACKETSIN_HIGH
-  bigcall ValueLabel_SetValue
+  bigcall Widget_SetCurrentValue
   rjmp netWinStatsSkip2
 ; @end
 
@@ -304,7 +304,7 @@ netWinStatsUpdatePacketsIn:
 netWinStatsUpdatePacketsOut:
   lds xl, netInterfaceData+NET_IFACE_OFFS_PACKETSOUT_LOW
   lds xh, netInterfaceData+NET_IFACE_OFFS_PACKETSOUT_HIGH
-  bigcall ValueLabel_SetValue
+  bigcall Widget_SetCurrentValue
   rjmp netWinStatsSkip2
 ; @end
 
@@ -312,7 +312,7 @@ netWinStatsUpdatePacketsOut:
 netWinStatsUpdateContentErrors:
   lds xl, netInterfaceData+NET_IFACE_OFFS_ERR_CONTENT_LOW
   lds xh, netInterfaceData+NET_IFACE_OFFS_ERR_CONTENT_HIGH
-  bigcall ValueLabel_SetValue
+  bigcall Widget_SetCurrentValue
   rjmp netWinStatsSkip2
 ; @end
 
@@ -321,7 +321,7 @@ netWinStatsUpdateContentErrors:
 netWinStatsUpdateIoErrors:
   lds xl, netInterfaceData+NET_IFACE_OFFS_ERR_IO_LOW
   lds xh, netInterfaceData+NET_IFACE_OFFS_ERR_IO_HIGH
-  bigcall ValueLabel_SetValue
+  bigcall Widget_SetCurrentValue
   rjmp netWinStatsSkip2
 ; @end
 
@@ -329,7 +329,7 @@ netWinStatsUpdateIoErrors:
 netWinStatsUpdateMsgSizeErrors:
   lds xl, netInterfaceData+NET_IFACE_OFFS_ERR_MSGSIZE_LOW
   lds xh, netInterfaceData+NET_IFACE_OFFS_ERR_MSGSIZE_HIGH
-  bigcall ValueLabel_SetValue
+  bigcall Widget_SetCurrentValue
   ret
 ; @end
 
diff --git a/avr/modules/lcd2/gui/aqhome/sensorwatch.asm b/avr/modules/lcd2/gui/aqhome/sensorwatch.asm
index 33f167d..79eba42 100644
--- a/avr/modules/lcd2/gui/aqhome/sensorwatch.asm
+++ b/avr/modules/lcd2/gui/aqhome/sensorwatch.asm
@@ -444,8 +444,7 @@ sensorWatchSetValueLabel:
       ldd xh, Y+SENSORWATCH_OFFS_VALUE_HI
       mov yl, r18
       mov yh, r19
-      ldi r17, VLABEL_VALUE
-      bigcall Widget_SetValue                     ; (any, !Y)
+      bigcall Widget_SetCurrentValue                   ; (any, !Y)
     pop yh
   pop yl
 sensorWatchSetValueLabel_ret:
diff --git a/avr/modules/lcd2/gui/base/hspinner.asm b/avr/modules/lcd2/gui/base/hspinner.asm
index ad9cab9..4e00fa6 100644
--- a/avr/modules/lcd2/gui/base/hspinner.asm
+++ b/avr/modules/lcd2/gui/base/hspinner.asm
@@ -240,7 +240,7 @@ hSpinnerSendValue:
       ldd xh, Y+HSPINNER_OFFS_CURVALUE_HI
       mov yl, r18
       mov yh, r19
-      bigcall ValueLabel_SetValue       ; (any, !Y)
+      bigcall Widget_SetCurrentValue       ; (any, !Y)
     pop yh
   pop yl
 
diff --git a/avr/modules/lcd2/gui/base/valuelabel.asm b/avr/modules/lcd2/gui/base/valuelabel.asm
index 8da520c..9a59cce 100644
--- a/avr/modules/lcd2/gui/base/valuelabel.asm
+++ b/avr/modules/lcd2/gui/base/valuelabel.asm
@@ -22,10 +22,6 @@
 .equ VLABEL_SIZE                 =  VLABEL_OFFS_BEGIN+4
 
 
-.equ VLABEL_VALUE          = WIDGET_VALUE_NEXTFREE+0
-.equ VLABEL_VALUE_NEXTFREE = WIDGET_VALUE_NEXTFREE+1
-
-
 
 ; ***************************************************************************
 ; code
@@ -97,19 +93,6 @@ ValueLabel_Init:
 
 
 
-; ---------------------------------------------------------------------------
-; @routine ValueLabel_SetValue @global
-;
-; @param Y address of widget
-; @param X new value
-
-ValueLabel_SetValue:
-  ldi r17, VLABEL_VALUE
-  bigjmp Widget_SetValue                     ; (any, !Y)
-; @end
-
-
-
 ; ---------------------------------------------------------------------------
 ; @routine ValueLabel_OnSetValue @global
 ;
@@ -132,6 +115,24 @@ ValueLabel_OnSetValue:
 
 
 
+; ---------------------------------------------------------------------------
+; @routine ValueLabel_OnGetValue @global
+;
+; @param  Y       address of widget
+; @param  X       new value
+; @return CFLAG   set if signal handled
+; @return r19:r18 value
+; @clobbers r17
+
+ValueLabel_OnGetValue:
+  ldd r18, Y+VLABEL_OFFS_VALUE_LO
+  ldd r19, Y+VLABEL_OFFS_VALUE_HI
+  sec
+  ret
+; @end
+
+
+
 ; ---------------------------------------------------------------------------
 ; @routine ValueLabel_OnDraw @global
 ;
@@ -285,7 +286,8 @@ ValueLabel_DefaultSignalmap:
   .dw Widget_DefaultSignalmap*2  ; next table to use
   ; entries
   .db 0,                           WIDGET_SIGNAL_DRAW,     LOW(ValueLabel_OnDraw),             HIGH(ValueLabel_OnDraw)
-  .db VLABEL_VALUE,                WIDGET_SIGNAL_SETVALUE, LOW(ValueLabel_OnSetValue),         HIGH(ValueLabel_OnSetValue)
+  .db WIDGET_VALUE_CURRENTVALUE,   WIDGET_SIGNAL_SETVALUE, LOW(ValueLabel_OnSetValue),         HIGH(ValueLabel_OnSetValue)
+  .db WIDGET_VALUE_CURRENTVALUE,   WIDGET_SIGNAL_GETVALUE, LOW(ValueLabel_OnGetValue),         HIGH(ValueLabel_OnGetValue)
   .db WIDGET_VALUE_DEFAULT_WIDTH,  WIDGET_SIGNAL_GETVALUE, LOW(ValueLabel_OnGetDefaultWidth),  HIGH(ValueLabel_OnGetDefaultWidth)
   .db WIDGET_VALUE_DEFAULT_HEIGHT, WIDGET_SIGNAL_GETVALUE, LOW(ValueLabel_OnGetDefaultHeight), HIGH(ValueLabel_OnGetDefaultHeight)