diff --git a/GWMS.UI/Components/OrderAdminEditor.razor b/GWMS.UI/Components/OrderAdminEditor.razor
index 5ec004d..0101f83 100644
--- a/GWMS.UI/Components/OrderAdminEditor.razor
+++ b/GWMS.UI/Components/OrderAdminEditor.razor
@@ -16,45 +16,60 @@
     <div class="card-body small p-1">
         <EditForm Model="@_currItem">
             <DataAnnotationsValidator />
-            <Blazorise.ValidationSummary />
             <div class="row">
                 <div class="col-12 col-lg-2">
-                    <img src="@getImgUrl(_currItem.OrderCode)" class="img-fluid" width="150" />
+                    <img src="@getImgUrl(_currItem.OrderCode)" class="img-fluid" width="85" />
                 </div>
-                <div class="col-12 col-lg-10">
+                <div class="col-12 col-lg-8 align-items-center">
                     <div class="row">
-                        <div class="col-3">
-                            <label>Fornitore:</label>
-                            <InputSelect @bind-Value="@_currItem.SupplierId" class="form-control form-control-sm">
-                                @foreach (var item in suppList)
-                                {
-                                    <option value="@item.SupplierId">@item.SupplierCode | @item.SupplierDesc</option>
-                                }
-                            </InputSelect>
+                        <div class="col-8">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text" style="width: 3em;">
+                                        <span class="fas fa-industry" aria-hidden="true"></span>
+                                    </span>
+                                </div>
+                                <InputSelect @bind-Value="@_currItem.SupplierId" class="form-control" title="Fornitore">
+                                    @foreach (var item in suppList)
+                                    {
+                                        <option value="@item.SupplierId">@item.SupplierCode | @item.SupplierDesc</option>
+                                    }
+                                </InputSelect>
+                            </div>
                         </div>
-                        @*<div class="col-3">
-                                <label for="DtEta">ETA (previsione consegna)</label>
-                                <InputDate id="DtEta" @bind-Value="_currItem.DtETA" class="form-control form-control-sm" />
-                            </div>*@
-                        <div class="col-9">
-                            <div class="form-group">
-                                <label for="OrderDesc">Note:</label>
-                                <InputText id="OrderDesc" @bind-Value="_currItem.OrderDesc" class="form-control form-control-sm" />
+                        <div class="col-4">
+                            @*<div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text">
+                                            <span class="fas fa-calendar-alt" aria-hidden="true"></span>
+                                        </span>
+                                    </div>
+                                    <InputDate id="DtEta" @bind-Value="_currItem.DtETA" class="form-control" title="ETA (previsione consegna)" />
+                                </div>*@
+                        </div>
+                        <div class="col-12 mt-2">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text" style="width: 3em;">
+                                        <span class="fas fa-comment-alt" aria-hidden="true"></span>
+                                    </span>
+                                </div>
+                                <InputText id="OrderDesc" @bind-Value="_currItem.OrderDesc" class="form-control" title="Note Ordine (opzionali)" />
+                                <div class="input-group-append">
+                                    <span class="input-group-text">
+                                        Note
+                                    </span>
+                                </div>
                             </div>
                         </div>
                     </div>
-                    <div class="row">
-                        <div class="col-3"></div>
-                        <div class="col-9">
-                            <div class="row">
-                                <div class="col-6">
-                                    <input type="submit" class="btn btn-success btn-block" value="Save" @onclick="saveUpdate" />
-                                </div>
-                                <div class="col-6">
-                                    <button type="button" class="btn btn-warning btn-block" value="Cancel" @onclick="cancelUpdate">Cancel</button>
-                                </div>
-                            </div>
-                        </div>
+                </div>
+                <div class="col-12 col-lg-2">
+                    <div class="mb-2">
+                        <button type="button" class="btn btn-outline-success btn-block" value="Save" @onclick="saveUpdate">Save <i class="far fa-save"></i></button>
+                    </div>
+                    <div>
+                        <button type="button" class="btn btn-outline-warning btn-block" value="Cancel" @onclick="cancelUpdate">Cancel <i class="fas fa-ban"></i></button>
                     </div>
                 </div>
             </div>
diff --git a/GWMS.UI/Components/OrderSupplierEditor.razor b/GWMS.UI/Components/OrderSupplierEditor.razor
index 0c61095..888eb7c 100644
--- a/GWMS.UI/Components/OrderSupplierEditor.razor
+++ b/GWMS.UI/Components/OrderSupplierEditor.razor
@@ -16,45 +16,60 @@
     <div class="card-body small p-1">
         <EditForm Model="@_currItem">
             <DataAnnotationsValidator />
-            <Blazorise.ValidationSummary />
             <div class="row">
                 <div class="col-12 col-lg-2">
-                    <img src="@getImgUrl(_currItem.OrderCode)" class="img-fluid" width="150" />
+                    <img src="@getImgUrl(_currItem.OrderCode)" class="img-fluid" width="85" />
                 </div>
-                <div class="col-12 col-lg-10">
+                <div class="col-12 col-lg-8 align-items-center">
                     <div class="row">
-                        <div class="col-3">
-                            <label>Trasportatore:</label>
-                            <InputSelect @bind-Value="@_currItem.TransporterId" class="form-control form-control-sm">
-                                @foreach (var item in transpList)
-                                {
-                                    <option value="@item.TransporterId">@item.TransporterCode | @item.TransporterDesc</option>
-                                }
-                            </InputSelect>
+                        <div class="col-8">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text" style="width: 3em;">
+                                        <span class="fas fa-truck-moving" aria-hidden="true"></span>
+                                    </span>
+                                </div>
+                                <InputSelect @bind-Value="@_currItem.TransporterId" title="Trasportatore" class="form-control">
+                                    @foreach (var item in transpList)
+                                    {
+                                        <option value="@item.TransporterId">@item.TransporterCode | @item.TransporterDesc</option>
+                                    }
+                                </InputSelect>
+                            </div>
                         </div>
-                        <div class="col-3">
-                            <label for="DtEta">ETA (previsione consegna)</label>
-                            <InputDate id="DtEta" @bind-Value="_currItem.DtETA" class="form-control form-control-sm" />
+                        <div class="col-4">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text">
+                                        <span class="fas fa-calendar-alt" aria-hidden="true"></span>
+                                    </span>
+                                </div>
+                                <InputDate id="DtEta" @bind-Value="_currItem.DtETA" class="form-control" title="ETA (previsione consegna)" />
+                            </div>
                         </div>
-                        <div class="col-6">
-                            <div class="form-group">
-                                <label for="OrderDesc">Note:</label>
-                                <InputText id="OrderDesc" @bind-Value="_currItem.OrderDesc" class="form-control form-control-sm" />
+                        <div class="col-12 mt-2">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <span class="input-group-text" style="width: 3em;">
+                                        <span class="fas fa-comment-alt" aria-hidden="true"></span>
+                                    </span>
+                                </div>
+                                <InputText id="OrderDesc" @bind-Value="_currItem.OrderDesc" class="form-control" title="Note Ordine (opzionali)" />
+                                <div class="input-group-append">
+                                    <span class="input-group-text">
+                                        Note
+                                    </span>
+                                </div>
                             </div>
                         </div>
                     </div>
-                    <div class="row">
-                        <div class="col-3"></div>
-                        <div class="col-9">
-                            <div class="row">
-                                <div class="col-6">
-                                    <input type="submit" class="btn btn-success btn-block" value="Save" @onclick="saveUpdate" />
-                                </div>
-                                <div class="col-6">
-                                    <button type="button" class="btn btn-warning btn-block" value="Cancel" @onclick="cancelUpdate">Cancel</button>
-                                </div>
-                            </div>
-                        </div>
+                </div>
+                <div class="col-12 col-lg-2">
+                    <div class="mb-2">
+                        <button type="button" class="btn btn-outline-success btn-block" value="Save" @onclick="saveUpdate">Save <i class="far fa-save"></i></button>
+                    </div>
+                    <div>
+                        <button type="button" class="btn btn-outline-warning btn-block" value="Cancel" @onclick="cancelUpdate">Cancel <i class="fas fa-ban"></i></button>
                     </div>
                 </div>
             </div>
diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html
index a2f5ed4..92419e0 100644
--- a/Resources/ChangeLog.html
+++ b/Resources/ChangeLog.html
@@ -1,6 +1,6 @@
 <body>
     <i>Modulo statistiche MAPO</i>
-    <h4>Versione: 1.0.2106.2112</h4>
+    <h4>Versione: 1.0.2106.2116</h4>
     <br />
     Note di rilascio:
     <ul>
diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt
index f55da85..81f7759 100644
--- a/Resources/VersNum.txt
+++ b/Resources/VersNum.txt
@@ -1 +1 @@
-1.0.2106.2112
+1.0.2106.2116
diff --git a/Resources/manifest.xml b/Resources/manifest.xml
index 92ab233..3470a26 100644
--- a/Resources/manifest.xml
+++ b/Resources/manifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.0.2106.2112</version>
+  <version>1.0.2106.2116</version>
   <url>http://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/GWMS.UI.zip</url>
   <changelog>http://nexus.steamware.net/repository/SWS/MP-STATS/stable/0/ChangeLog.html</changelog>
   <mandatory>false</mandatory>