diff --git a/avr/devices/c03/main/main.asm b/avr/devices/c03/main/main.asm
index a538f78..b066387 100644
--- a/avr/devices/c03/main/main.asm
+++ b/avr/devices/c03/main/main.asm
@@ -536,6 +536,7 @@ GUI_MODULE_BEGIN:
 .include "modules/lcd2/gui/base/keypad_num.asm"
 .include "modules/lcd2/gui/base/d_numinput.asm"
 .include "modules/lcd2/gui/base/cwidget.asm"
+.include "modules/lcd2/gui/base/dialog.asm"
 .include "modules/lcd2/gui/base/cdialog.asm"
 .include "modules/lcd2/gui/aqhome/sensorwatch.asm"
 .include "modules/lcd2/gui/aqhome/lightsettings.asm"
diff --git a/avr/modules/lcd2/gui/aqhome/d_nodevalueid.asm b/avr/modules/lcd2/gui/aqhome/d_nodevalueid.asm
index 34d7787..6cf0e59 100644
--- a/avr/modules/lcd2/gui/aqhome/d_nodevalueid.asm
+++ b/avr/modules/lcd2/gui/aqhome/d_nodevalueid.asm
@@ -21,11 +21,9 @@
 
 
 ; selectors
-.equ DLGNODEVALUEID_SEL_DIALOG_OK    = 1
-.equ DLGNODEVALUEID_SEL_DIALOG_ABORT = 2
-.equ DLGNODEVALUEID_SEL_NODEADDR     = 3
-.equ DLGNODEVALUEID_SEL_VALUEID      = 4
-
+.equ DLGNODEVALUEID_SEL_NODEADDR     = DIALOG_SEL_NEXTFREE+0
+.equ DLGNODEVALUEID_SEL_VALUEID      = DIALOG_SEL_NEXTFREE+1
+.equ DLGNODEVALUEID_SEL_NEXTFREE     = DIALOG_SEL_NEXTFREE+2
 
 
 
@@ -88,6 +86,8 @@ DlgNodeValueId_Init:
   ldi r16, HIGH(DlgNodeValueId_DefaultSignalmap*2)
   std Y+OBJECT_OFFS_SIGNALMAP_HI, r16
 
+  bigcall Dialog_AddDefaultButtons
+
 DlgNodeValueId_Init_ret:
   ret
 ; @end
@@ -201,33 +201,25 @@ dlgNodeValueIdGetChildValue_ret:
 
 
 
+
+
 ; ***************************************************************************
 ; signal handlers
 
 
 ; ---------------------------------------------------------------------------
-; @routine DlgNodeValueId_OnOk @global
+; @routine DlgNodeValueId_OnDialogEnd @global
 ;
 ; @param Y pointer to dialog
 ; @clobbers any, !Y
 
-DlgNodeValueId_OnOk:
+DlgNodeValueId_OnDialogEnd:
   sec
   ret
 ; @end
 
 
 
-; ---------------------------------------------------------------------------
-; @routine DlgNodeValueId_OnAbort @global
-;
-; @param Y pointer to dialog
-; @clobbers any, !Y
-
-DlgNodeValueId_OnAbort:
-  sec
-  ret
-; @end
 
 
 
@@ -303,11 +295,9 @@ DlgNodeValueId_Config:
 ; signal map
 DlgNodeValueId_DefaultSignalmap:
   ; header
-  .dw MainWindow_DefaultSignalmap*2  ; next table to use
-
+  .dw Dialog_DefaultSignalmap*2  ; next table to use
   ; entries
-  .db DLGNODEVALUEID_SEL_DIALOG_OK,    WIDGET_SIGNAL_COMMAND,  LOW(DlgNodeValueId_OnOk),    HIGH(DlgNodeValueId_OnOk)
-  .db DLGNODEVALUEID_SEL_DIALOG_ABORT, WIDGET_SIGNAL_COMMAND,  LOW(DlgNodeValueId_OnAbort), HIGH(DlgNodeValueId_OnAbort)
+  .db 0,    WIDGET_SIGNAL_DIALOG_END,  LOW(DlgNodeValueId_OnDialogEnd),    HIGH(DlgNodeValueId_OnDialogEnd)
   ; end of table
   .db 0, 0, 0, 0
 
diff --git a/avr/modules/lcd2/gui/base/cdialog.asm b/avr/modules/lcd2/gui/base/cdialog.asm
index a1770e0..90b37fe 100644
--- a/avr/modules/lcd2/gui/base/cdialog.asm
+++ b/avr/modules/lcd2/gui/base/cdialog.asm
@@ -15,7 +15,7 @@
 ; defines
 
 ; CDIALOG data
-.equ CDIALOG_OFFS_BEGIN            = MAINWINDOW_SIZE
+.equ CDIALOG_OFFS_BEGIN            = DIALOG_SIZE
 .equ CDIALOG_OFFS_CONFIG_LO        = CDIALOG_OFFS_BEGIN+0
 .equ CDIALOG_OFFS_CONFIG_HI        = CDIALOG_OFFS_BEGIN+1
 .equ CDIALOG_SIZE                  = CDIALOG_OFFS_BEGIN+2
@@ -30,7 +30,7 @@
 
 
 ; ---------------------------------------------------------------------------
-; @routine CDialog__Init @global
+; @routine CDialog_Init @global
 ;
 ; @param Y pointer to MainWindow
 ; @param X pointer to root window
@@ -44,7 +44,7 @@ CDialog_Init:
     push r23
       ldi r16, 0                                                                                           ; OPTS
       ldi r17, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_FILLED<<WIDGET_PACK_VSELF0_BIT) ; PACK
-      bigcall MainWindow_Init
+      bigcall Dialog_Init
     pop r23
   pop r22
   brcc CDialog_Init_ret
@@ -73,12 +73,6 @@ CDialog_Init:
       pop xl
     pop zh
   pop zl
-  brcc CDialog_Init_ret
-  push yl
-    push yh
-      bigcall C03App_CreateBackButton
-    pop yh
-  pop yl
 CDialog_Init_ret:
   ret
 ; @end
diff --git a/avr/modules/lcd2/gui/base/dialog.asm b/avr/modules/lcd2/gui/base/dialog.asm
new file mode 100644
index 0000000..8b87312
--- /dev/null
+++ b/avr/modules/lcd2/gui/base/dialog.asm
@@ -0,0 +1,226 @@
+; ***************************************************************************
+; copyright   : (C) 2026 by Martin Preuss
+; email       : martin@libchipcard.de
+;
+; ***************************************************************************
+; * This file is part of the project "AqHome".                              *
+; * Please see toplevel file COPYING of that project for license details.   *
+; ***************************************************************************
+
+#ifndef AQH_AVR_GUI_BASE_DIALOG_ASM
+#define AQH_AVR_GUI_BASE_DIALOG_ASM
+
+
+; ***************************************************************************
+; defines
+
+; DIALOG data
+.equ DIALOG_OFFS_BEGIN            = MAINWINDOW_SIZE
+.equ DIALOG_SIZE                  = DIALOG_OFFS_BEGIN+0
+
+
+; selectors
+.equ DIALOG_SEL_OKBUTTON    = 1
+.equ DIALOG_SEL_ABORTBUTTON = 2
+.equ DIALOG_SEL_NEXTFREE    = 3
+
+
+
+; ***************************************************************************
+; code
+
+.cseg
+
+
+
+; ---------------------------------------------------------------------------
+; @routine Dialog_Init @global
+;
+; @param Y pointer to MainWindow
+; @param X pointer to root window
+; @param R21:R20 title ressource
+; @return CFLAG set of okay, cleared otherwise
+; @clobbers any, !Y
+
+Dialog_Init:
+  ldi r16, 0                                                                                           ; OPTS
+  ldi r17, (WIDGET_PACK_FILLED<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_FILLED<<WIDGET_PACK_VSELF0_BIT) ; PACK
+  bigcall MainWindow_Init
+  brcc Dialog_Init_ret
+
+  ; set default signal map
+  ldi r16, LOW(Dialog_DefaultSignalmap*2)
+  std Y+OBJECT_OFFS_SIGNALMAP_LO, r16
+  ldi r16, HIGH(Dialog_DefaultSignalmap*2)
+  std Y+OBJECT_OFFS_SIGNALMAP_HI, r16
+
+Dialog_Init_ret:
+  ret
+; @end
+
+
+
+
+; ---------------------------------------------------------------------------
+; @routine Dialog_AddDefaultButtons @global
+;
+; @param Y pointer to MainWindow
+; @clobbers any, !Y
+
+Dialog_AddDefaultButtons:
+  bigcall MainWindow_GetContentWidget  ; r19:r18=content window
+  brcc Dialog_AddDefaultButtons_ret
+  mov xl, r18                          ; use content window as parent
+  mov xh, r19
+
+  ; create HLayout
+  push yl
+    push yh
+      ldi r16, 0                                                                                     ; OPTS
+      ldi r17, (WIDGET_PACK_END<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_END<<WIDGET_PACK_VSELF0_BIT) ; PACK
+      ldi r20, HLAYOUT_MODE_EXPAND
+      bigcall HLayout_new
+      mov xl, yl                   ; use layout as new parent
+      mov xh, yh
+    pop yh
+  pop yl
+  brcc Dialog_AddDefaultButtons_ret
+  
+  ; create OK button
+  ldi r20, LOW(RESSOURCE_TXT_DIALOGOK)
+  ldi r21, HIGH(RESSOURCE_TXT_DIALOGOK)
+  ldi r22, DIALOG_SEL_OKBUTTON
+  rcall dialogCreateButton
+  brcc Dialog_AddDefaultButtons_ret
+
+  ; create Abort button
+  ldi r20, LOW(RESSOURCE_TXT_DIALOGABORT)
+  ldi r21, HIGH(RESSOURCE_TXT_DIALOGABORT)
+  ldi r22, DIALOG_SEL_ABORTBUTTON
+  rcall dialogCreateButton
+  brcc Dialog_AddDefaultButtons_ret
+
+  ; change style of HLayout (more space)
+  adiw xh:xl, WIDGET_OFFS_STYLE_LO
+  ldi r16, LOW(Dialog_HLayoutStyle*2)
+  st X+, r16
+  ldi r16, HIGH(Dialog_HLayoutStyle*2)
+  st X, r16
+  sec
+
+Dialog_AddDefaultButtons_ret:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine dialogCreateButton
+;
+; @param Y       pointer to MainWindow (target)
+; @param r21:r20 text ressource
+; @param r22     selector
+; @clobbers any, !X, !Y, !Z
+
+dialogCreateButton:
+  push zl
+    push zh
+      push yl
+        push yh
+          ldi r16, (1<<WIDGET_OPTS_BORDER_BIT)                                                           ; OPTS
+          ldi r17, (WIDGET_PACK_END<<WIDGET_PACK_HSELF0_BIT) | (WIDGET_PACK_END<<WIDGET_PACK_VSELF0_BIT) ; PACK
+          ldi r23, BUTTON_MODE_NORMAL
+          push xl
+            push xh
+              bigcall TextButton_new
+            pop xh
+          pop xl
+          mov zl, yl
+          mov zh, yh
+        pop yh
+      pop yl
+      brcc dialogCreateButton_done
+      std Z+OBJECT_OFFS_TARGET_LO, yl
+      std Z+OBJECT_OFFS_TARGET_HI, yh
+      ; set button style
+      push xl
+        push xh
+          push yl
+            push yh
+              mov yl, zl
+              mov yh, zh
+              ldi xl, LOW(DefaultStyle_SpacyButton*2)
+              ldi xh, HIGH(DefaultStyle_SpacyButton*2)
+              bigcall Widget_SetStyle
+            pop yh
+          pop yl
+        pop xh
+      pop xl
+      sec
+dialogCreateButton_done:
+    pop zh
+  pop zl  
+  ret
+; @end
+
+
+
+
+; ***************************************************************************
+; signal handlers
+
+Dialog_OnOk:
+  ; TODO: emit signal
+  sec
+  ret
+; @end
+
+
+Dialog_OnAbort:
+  ; TODO: emit signal
+  sec
+  ret
+; @end
+
+
+
+
+; ***************************************************************************
+; data in FLASH
+
+; ---------------------------------------------------------------------------
+; @data Dialog_HLayoutStyle
+
+Dialog_HLayoutStyle:
+  .dw STYLE_WIN_FGCOL_NORM           ; frontCol_norm
+  .dw STYLE_WIN_BGCOL_NORM           ; backCol_norm
+  .dw STYLE_WIN_BORDERCOL_NORM       ; borderCol_norm
+  .dw STYLE_WIN_SHADOWCOL_NORM       ; shadowCol_norm
+  
+  .dw STYLE_WIN_FGCOL_ACTIVATED      ; frontCol_activated
+  .dw STYLE_WIN_BGCOL_ACTIVATED      ; backCol_activated
+  .dw STYLE_WIN_BORDERCOL_ACTIVATED  ; borderCol_activated
+  .dw STYLE_WIN_SHADOWCOL_ACTIVATED  ; shadowCol_activated
+
+  .db 2, 10                          ; outerBorderSize, innerBorderSize
+  .dw (STYLE_WIN_FONT*2)             ; font
+  .db STYLE_WIN_FONT_WIDTH, \
+      STYLE_WIN_FONT_HEIGHT          ; charWidth, charHeight
+; @end
+
+
+
+Dialog_DefaultSignalmap:
+  ; header
+  .dw MainWindow_DefaultSignalmap*2  ; next table to use
+  ; entries
+  .db DIALOG_SEL_OKBUTTON,    WIDGET_SIGNAL_COMMAND,  LOW(Dialog_OnOk),    HIGH(Dialog_OnOk)
+  .db DIALOG_SEL_ABORTBUTTON, WIDGET_SIGNAL_COMMAND,  LOW(Dialog_OnAbort), HIGH(Dialog_OnAbort)
+  ; end of table
+  .db 0, 0, 0, 0
+
+
+
+
+#endif
+