diff --git a/cg/cg21cg.uml b/cg/cg21cg.uml
index 103bb8a0d..631de4ddf 100755
--- a/cg/cg21cg.uml
+++ b/cg/cg21cg.uml
@@ -44,16 +44,11 @@ BEGIN
   PROMPT 27 4 "Avere "
 END
 
-BUTTON CG_MASTRINO 8 1
-BEGIN
-  PROMPT 56 4 "Mastrino"
-END
-
 LIST CG_TIPO 1 12
 BEGIN
-  PROMPT 2 5 "Tipo "
+  PROMPT 2 5 ""
   FIELD TIPOC
-  FLAGS "U"
+  FLAGS "GU"
   ITEM " |Conto"
   MESSAGE SHOW,106|HIDE,206|HIDE,306|SHOW,107|HIDE,207|HIDE,307
   ITEM "C|Cliente"
@@ -64,13 +59,13 @@ END
 
 NUMBER CG_GRUPPO 3
 BEGIN
-  PROMPT 20 5 "Gruppo "
+  PROMPT 19 5 "Gruppo "
   FIELD GRUPPO
 END
 
 NUMBER CG_CONTO 3
 BEGIN
-  PROMPT 32 5 "Conto "
+  PROMPT 31 5 "Conto "
   FIELD CONTO
   USE LF_PCON SELECT (CONTO!="") && (SOTTOCONTO="")
   INPUT GRUPPO 104
@@ -205,9 +200,9 @@ END
 
 LIST 110 1 12
 BEGIN
-  PROMPT 2 9 "Tipo "
+  PROMPT 2 9 ""
 	FIELD TIPOCC
-  FLAGS "U"
+  FLAGS "GU"
   ITEM " |Conto"
   MESSAGE SHOW,113|HIDE,213|HIDE,313|SHOW,114|HIDE,214|HIDE,314
   ITEM "C|Cliente"
@@ -218,13 +213,13 @@ END
 
 NUMBER 111 3
 BEGIN
-  PROMPT 20 9 "Gruppo "
+  PROMPT 19 9 "Gruppo "
   FIELD GRUPPOC
 END
 
 NUMBER 112 3
 BEGIN
-  PROMPT 32 9 "Conto "
+  PROMPT 31 9 "Conto "
   FIELD CONTOC
   COPY USE 105
   INPUT GRUPPO 111
@@ -344,17 +339,15 @@ BEGIN
   FIELD ROWTYPE
 END
 
+ENDPAGE
+
+TOOLBAR "topbar" 0 0 0 2
 
 BUTTON DLG_OK 10 2
 BEGIN
   PROMPT -14 -1 ""
 END
 
-BUTTON DLG_CANCEL 10 2
-BEGIN
-  PROMPT -24 -1 ""
-END
-
 BUTTON DLG_DELREC 10 2
 BEGIN
   PROMPT -34 -1 "Elimina"
@@ -364,6 +357,18 @@ END
 BUTTON DLG_USER 10 2
 BEGIN
   PROMPT -44 -1 "~Partite"
+  PICTURE TOOL_LINK
+END
+
+BUTTON CG_MASTRINO 8 1
+BEGIN
+  PROMPT 56 4 "Mastrino"
+  PICTURE TOOL_LINK
+END
+
+BUTTON DLG_CANCEL 10 2
+BEGIN
+  PROMPT -24 -1 ""
 END
 
 ENDPAGE
diff --git a/cg/cg21iva.uml b/cg/cg21iva.uml
index 25dd5d301..da63a8491 100755
--- a/cg/cg21iva.uml
+++ b/cg/cg21iva.uml
@@ -1,4 +1,4 @@
-PAGE "RIGA IVA" -1 -1 78 12
+PAGE "RIGA IVA" -1 -1 78 13
 
 GROUPBOX DLG_NULL 76 5
 BEGIN
@@ -67,7 +67,7 @@ END
 
 LIST IVA_TIPO 1 12
 BEGIN
-  PROMPT 2 7 "Tipo "
+  PROMPT 2 7 ""
   HELP "Tipo del conto"
   FIELD TIPOC
   ITEM " |Conto"
@@ -90,7 +90,7 @@ NUMBER IVA_CONTO 3
 BEGIN
   PROMPT 38 7 "Conto "
   FIELD CONTO
-  USE LF_PCON SELECT (CONTO!="") && (SOTTOCONTO="")
+  USE LF_PCON SELECT (CONTO!="")&&(SOTTOCONTO="")
   INPUT GRUPPO IVA_GRUPPO
   INPUT CONTO IVA_CONTO
   DISPLAY "Gruppo" GRUPPO
@@ -238,6 +238,10 @@ BEGIN
   FIELD NOTAVARECF
 END
 
+ENDPAGE
+
+TOOLBAR "topbar" 0 0 0 2
+
 BUTTON DLG_OK 10 2
 BEGIN
   PROMPT -13 -1 ""