diff --git a/src/ve/ve1600a.uml b/src/ve/ve1600a.uml
index b4ecaafd0..7e4b8d275 100644
--- a/src/ve/ve1600a.uml
+++ b/src/ve/ve1600a.uml
@@ -1,6 +1,18 @@
 #include "ve1600a.h"
 
-PAGE "Controllo bolle fatturate" -1 -1 61 4
+TOOLBAR "topbar" 0 0 0 2
+#include <printbar.h>
+ENDPAGE
+
+TOOLBAR "bottombar" 0 -1 0 1
+STRING DLG_PROFILE 50
+BEGIN
+	PROMPT 1 -1 "Profilo "
+	PSELECT
+END
+ENDPAGE
+
+PAGE "Controllo bolle fatturate" 0 0 0 0
 
 NUMBER F_ANNO 4
 BEGIN
@@ -53,8 +65,4 @@ END
 
 ENDPAGE
 
-TOOLBAR "topbar" 0 0 0 2
-#include <printbar.h>
-ENDPAGE
-
 ENDMASK
diff --git a/src/ve/ve1700.cpp b/src/ve/ve1700.cpp
index d0e560c5b..129d78a23 100644
--- a/src/ve/ve1700.cpp
+++ b/src/ve/ve1700.cpp
@@ -457,14 +457,12 @@ void TListaDoc_application::main_loop()
 {
   TStampa_lista_docs_mask m;
   TLista_documenti_report report(&m);
-
-	m.set(F_REPORT, "ve17001");
 	KEY k;
 
   while ((k = m.run()) != K_QUIT)
   {
     TReport_book book;
-    TFilename report_name = m.get(F_REPORT);
+    TFilename report_name = m.get(DLG_REPORT);
 
 		if (report_name.blank())
 			report_name = "ve17001";
diff --git a/src/ve/ve1700.h b/src/ve/ve1700.h
index 15f2b248a..11064054b 100644
--- a/src/ve/ve1700.h
+++ b/src/ve/ve1700.h
@@ -21,7 +21,6 @@
 #define F_SELVAL     116
 #define F_VALUTA     117
 #define F_DESCR_CLI  119
-#define F_REPORT     130
    
 #define F_SHEETNUMS  201
 
diff --git a/src/ve/ve17001.rep b/src/ve/ve17001.rep
index 1d7c59ca1..2ce0d5345 100644
--- a/src/ve/ve17001.rep
+++ b/src/ve/ve17001.rep
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<report libraries="ve1300" name="ve17001" orientation="2" lpi="6" command="ve1 -5" class="ve1600">
+<report libraries="ve1300" name="ve17001" orientation="2" lpi="6" command="ve1 -5" class="ve1700">
  <description>Lista documenti</description>
  <font face="Courier New" size="8" />
  <section type="Head" height="5" pattern="1">
diff --git a/src/ve/ve17002.rep b/src/ve/ve17002.rep
index fdc1ec6b5..052fc0765 100644
--- a/src/ve/ve17002.rep
+++ b/src/ve/ve17002.rep
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<report libraries="ve1300" name="ve17002" orientation="2" lpi="6" command="ve1 -5" class="ve1600">
+<report libraries="ve1300" name="ve17002" orientation="2" lpi="6" command="ve1 -5" class="ve1700">
  <description>Lista documenti con dettaglio</description>
  <font face="Courier New" size="8" />
  <section type="Head" height="5" pattern="1">
diff --git a/src/ve/ve1700a.uml b/src/ve/ve1700a.uml
index 90b3946c9..e7aa09456 100644
--- a/src/ve/ve1700a.uml
+++ b/src/ve/ve1700a.uml
@@ -1,9 +1,15 @@
 #include "ve1700.h"
+#define CLASS_NAME "ve1700"
+#define REPORT
 
 TOOLBAR "topbar" 0 0 0 2
 #include <aprintbar.h>
 ENDPAGE
 
+TOOLBAR "bottombar" 0 -2 0 1
+#include <bprintbar.h>
+ENDPAGE
+
 PAGE "Lista documenti" -1 -1 60 21
 
 NUMBER F_ANNO 4 0
@@ -115,19 +121,6 @@ BEGIN
   OUTPUT F_CODTO CODCF
 END
 
-STRING F_REPORT 50
-BEGIN
-  PROMPT 2 -3 "Report  "
-  RSELECT "ve1600"
-  CHECKTYPE NORMAL
-END
-
-STRING DLG_PROFILE 50
-BEGIN
-  PROMPT 2 -2 "Profilo "
-  PSELECT
-END
-
 ENDPAGE
 
 ENDMASK
diff --git a/src/ve/ve1800.cpp b/src/ve/ve1800.cpp
index ba56db186..5f320170f 100644
--- a/src/ve/ve1800.cpp
+++ b/src/ve/ve1800.cpp
@@ -21,9 +21,6 @@ void TListaFido_app::main_loop()
 	TMask m("ve1800a");
 	TDocument_report report;
 
-	m.set(F_REPORT, "ve18001");
-//	((TButton_tool&)m.field(DLG_PREVIEW)).set_exit_key(K_VISUALIZE);
-//	((TButton_tool&)m.field(DLG_PRINT)).set_exit_key(K_PRINT);
 	m.show(F_DADATA, ini_get_bool(CONFIG_STUDIO, "Main", "MYGOD"));
 	m.set(F_ADATA, today);
 	m.set(F_GIORNIRISK, ini_get_int(CONFIG_DITTA, "ve", "FIDO_RISKDAYS"));
@@ -33,7 +30,7 @@ void TListaFido_app::main_loop()
 	while ((k = m.run()) != K_QUIT)
 	{
 		TReport_book book;
-		TFilename report_name = m.get(F_REPORT);
+		TFilename report_name = m.get(DLG_REPORT);
 
 		if (report_name.blank())
 			report_name = "ve18001";
diff --git a/src/ve/ve1800a.uml b/src/ve/ve1800a.uml
index 7525c21eb..818d23d4c 100644
--- a/src/ve/ve1800a.uml
+++ b/src/ve/ve1800a.uml
@@ -1,9 +1,15 @@
 #include "ve1800a.h"
+#define REPORT
+#define CLASS_NAME "ve1800"
 
 TOOLBAR "topbar" 0 0 0 2
 #include <aprintbar.h>
 ENDPAGE
 
+TOOLBAR "bottombar" 0 -2 0 1
+#include <bprintbar.h>
+ENDPAGE
+
 PAGE "Lista documenti" -1 -1 60 21
 
 GROUPBOX DLG_NULL 74 5
@@ -119,14 +125,6 @@ NUMBER F_GIORNIRISK 3
 BEGIN
   PROMPT 2 13 "Giorni calcolo rischio"
 END
-
-STRING F_REPORT 50
-BEGIN
-  PROMPT 2 -3 "Report  "
-  RSELECT "ve1800"
-  CHECKTYPE NORMAL
-END
-
 ENDPAGE
 
 ENDMASK
diff --git a/src/ve/ve1900.cpp b/src/ve/ve1900.cpp
index 45ceb11c0..b367a3852 100644
--- a/src/ve/ve1900.cpp
+++ b/src/ve/ve1900.cpp
@@ -20,17 +20,12 @@ void TMetodiPagamentoClienti_app::main_loop()
 {
 	TMask m("ve1900a");
 	TDocument_report report;
-
-	m.set(F_REPORT, "ve19001");
-//	((TButton_tool&)m.field(DLG_PREVIEW)).set_exit_key('A');
-//	((TButton_tool&)m.field(DLG_PRINT)).set_exit_key('P');
-
 	KEY k;
 
 	while ((k = m.run()) != K_QUIT) 
 	{
 		TReport_book book;
-		TFilename report_name = m.get(F_REPORT);
+		TFilename report_name = m.get(DLG_REPORT);
 
 		if (report_name.blank())
 			report_name = "ve19001";
diff --git a/src/ve/ve1900a.uml b/src/ve/ve1900a.uml
index d98ae0367..4169c8a70 100644
--- a/src/ve/ve1900a.uml
+++ b/src/ve/ve1900a.uml
@@ -1,9 +1,15 @@
 #include "ve1900a.h"
+#define REPORT
+#define CLASS_NAME "ve1900"
 
 TOOLBAR "topbar" 0 0 0 2
 #include <aprintbar.h>
 ENDPAGE
 
+TOOLBAR "bottombar" 0 -2 0 1
+#include <bprintbar.h>
+ENDPAGE
+
 PAGE "Stampa Clienti con Metodo di pagamento" -1 -1 60 21
 
 STRING F_I_CONDPAG 4
@@ -31,15 +37,6 @@ BEGIN
   COPY OUTPUT F_I_CONDPAG
   CHECKTYPE SEARCH
 END
-
-
-STRING F_REPORT 50
-BEGIN
-  PROMPT 2 -3 "Report  "
-  RSELECT "ve1900"
-  CHECKTYPE NORMAL
-END
-
 ENDPAGE
 
 ENDMASK