diff --git a/li/li0500a.uml b/li/li0500a.uml
index 29ef03863..e59d8fe2d 100755
--- a/li/li0500a.uml
+++ b/li/li0500a.uml
@@ -1,6 +1,17 @@
 #include "li0500a.h"
 
-PAGE "Stampa dichiarazioni d'intento" -1 -1 76 8
+TOOLBAR "topbar" 0 0 0 2
+
+BUTTON F_RIPRISTINA 10 2
+BEGIN 
+  PROMPT -1 -1 "~Ripristina"
+END
+
+#include <printbar.h>
+
+ENDPAGE
+
+PAGE "Stampa dichiarazioni d'intento" 0 2 0 0
 
 BOOLEAN F_DEFINITIVA
 BEGIN
@@ -51,21 +62,5 @@ BEGIN
   CHECKTYPE NORMAL
 END
 
-BUTTON DLG_PRINT 10 2
-BEGIN 
-  PROMPT -13 -1 "~Stampa"
-  MESSAGE EXIT,K_ENTER
-END
-
-BUTTON F_RIPRISTINA 10 2
-BEGIN 
-  PROMPT -23 -1 "~Ripristina"
-END
-
-BUTTON DLG_QUIT 10 2
-BEGIN
-  PROMPT -33 -1 ""
-END
-
 ENDPAGE
 ENDMASK
diff --git a/li/li0500b.uml b/li/li0500b.uml
index cf0ec4c79..371b4ba8d 100755
--- a/li/li0500b.uml
+++ b/li/li0500b.uml
@@ -1,6 +1,10 @@
 #include "li0500b.h"
 
-PAGE "Ripristino dichiarazioni d'intento" -1 -1 28 6
+TOOLBAR "topbar" 0 0 0 2
+#include <stdbar.h>
+ENDPAGE
+
+PAGE "Ripristino dichiarazioni d'intento" 0 2 0 0
 
 NUMBER F_ANNO 4
 BEGIN
@@ -16,15 +20,5 @@ BEGIN
   FLAGS "AM"
 END
 
-BUTTON DLG_OK 10 2
-BEGIN
-  PROMPT -12 -1 ""
-END
-
-BUTTON DLG_CANCEL 10 2
-BEGIN
-  PROMPT -22 -1 ""
-END
-
 ENDPAGE
 ENDMASK
diff --git a/li/li0600a.uml b/li/li0600a.uml
index 25fef5156..32f696fc2 100755
--- a/li/li0600a.uml
+++ b/li/li0600a.uml
@@ -1,6 +1,24 @@
 #include "li0600a.h"
 
-PAGE "Invio dichiarazioni d'intento" -1 -1 56 14
+TOOLBAR "topbar" 0 0 0 2
+
+BUTTON DLG_OK 10 2
+BEGIN 
+  PROMPT -1 -1 "~Invia"
+  PICTURE BMP_EXPORT
+  MESSAGE EXIT,K_ENTER
+END
+
+BUTTON F_RIPRISTINA 10 2
+BEGIN 
+  PROMPT -1 -1 "~Ripristina"
+END
+
+#include <printbar.h>
+
+ENDPAGE
+
+PAGE "Invio dichiarazioni d'intento" 0 2 0 0
 
 NUMBER F_ANNO 4
 BEGIN
@@ -52,26 +70,5 @@ BEGIN
   CHECKTYPE REQUIRED
 END
 
-BUTTON DLG_OK 10 2
-BEGIN 
-  PROMPT -14 -1 "~Invia"
-  MESSAGE EXIT,K_ENTER
-END
-
-BUTTON DLG_PRINT 10 2
-BEGIN 
-  PROMPT -24 -1 "~Stampa"
-END
-
-BUTTON F_RIPRISTINA 10 2
-BEGIN 
-  PROMPT -34 -1 "~Ripristina"
-END
-
-BUTTON DLG_QUIT 10 2
-BEGIN
-  PROMPT -44 -1 ""
-END
-
 ENDPAGE
 ENDMASK
diff --git a/li/li0600b.uml b/li/li0600b.uml
index 7af75af5c..f949bfc74 100755
--- a/li/li0600b.uml
+++ b/li/li0600b.uml
@@ -1,6 +1,10 @@
 #include "li0600b.h"
 
-PAGE "Ripristino dichiarazioni d'intento inviate" -1 -1 28 6
+TOOLBAR "topbar" 0 0 0 2
+#include <stdbar.h>
+ENDPAGE
+
+PAGE "Ripristino dichiarazioni d'intento inviate" 0 2 0 0
 
 NUMBER F_ANNO 4
 BEGIN
@@ -16,15 +20,5 @@ BEGIN
   FLAGS "AM"
 END
 
-BUTTON DLG_OK 10 2
-BEGIN
-  PROMPT -12 -1 ""
-END
-
-BUTTON DLG_CANCEL 10 2
-BEGIN
-  PROMPT -22 -1 ""
-END
-
 ENDPAGE
 ENDMASK