diff --git a/GMW/GMW.csproj b/GMW/GMW.csproj
index 99ceb48e..bbc8ff08 100644
--- a/GMW/GMW.csproj
+++ b/GMW/GMW.csproj
@@ -1849,9 +1849,9 @@
     <Content Include="Reports\CartellinoFiniti.rdlc" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Reports\CartellinoAL.rdlc">
+    <Content Include="Reports\CartellinoAL.rdlc">
       <SubType>Designer</SubType>
-    </EmbeddedResource>
+    </Content>
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
diff --git a/GMW/PostRX.aspx b/GMW/PostRX.aspx
index 0037b3c8..ea32755d 100644
--- a/GMW/PostRX.aspx
+++ b/GMW/PostRX.aspx
@@ -11,15 +11,15 @@
 </asp:Content>
 <asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
     <div class="container-fluid stileAttesa">
-        <div class="row" style="height: 40px; padding: 2px; background: #dedede;">
+        <div class="row" style="height: 48px; padding: 1px; background: #dedede;">
             <div class="col-sm-4">
+                <asp:Button runat="server" ID="btnRefresh" Visible="false"></asp:Button>
                 <div class="btn-group" style="width: 100%;">
-                    <asp:LinkButton runat="server" ID="lbtRefresh" Text="" Width="0px" />
-                    <asp:LinkButton runat="server" ID="lbtShowHideStorico" class="btn btn-inverse " OnClick="btnShowHideStorico_Click" Width="200px"><i class="glyphicon glyphicon-book"></i> <%: traduci("btnShowStorico") %></asp:LinkButton>
+                    <asp:LinkButton runat="server" ID="lbtShowHideStorico" class="btn btn-inverse btn-lg" OnClick="btnShowHideStorico_Click" Width="200px"><i class="glyphicon glyphicon-book"></i> <%: traduci("btnShowStorico") %></asp:LinkButton>
                 </div>
             </div>
             <div class="col-sm-4">
-                <asp:DropDownList ID="ddlLinea" runat="server" AutoPostBack="True" DataSourceID="odsLinea" DataTextField="label" DataValueField="value" OnSelectedIndexChanged="ddlLinea_SelectedIndexChanged" CssClass="btn btn-primary dropdown-toggle"></asp:DropDownList>
+                <asp:DropDownList ID="ddlLinea" runat="server" AutoPostBack="True" DataSourceID="odsLinea" DataTextField="label" DataValueField="value" OnSelectedIndexChanged="ddlLinea_SelectedIndexChanged" CssClass="btn btn-primary btn-lg dropdown-toggle"></asp:DropDownList>
                 <asp:ObjectDataSource ID="odsLinea" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="GMW_data.DS_UtilityTableAdapters.v_selLineeTableAdapter">
                     <SelectParameters>
                         <asp:Parameter DefaultValue="W50" Name="conditio" Type="String" />
@@ -28,8 +28,8 @@
             </div>
             <div class="col-sm-4">
                 <div class="btn-group" style="width: 100%;">
-                    <asp:LinkButton runat="server" ID="lbtNT" OnClick="lbtNT_Click" CssClass="btn btn-inverse active" Width="50%"><i class="glyphicon glyphicon-barcode"></i> <%: traduci("modoNT") %></asp:LinkButton>
-                    <asp:LinkButton runat="server" ID="lbtDT" OnClick="lbtDT_Click" CssClass="btn btn-inverse" Width="50%"><i class="glyphicon glyphicon-qrcode"></i> <%: traduci("modoDT") %></asp:LinkButton>
+                    <asp:LinkButton runat="server" ID="lbtNT" OnClick="lbtNT_Click" CssClass="btn btn-inverse btn-lg active" Width="50%"><i class="glyphicon glyphicon-barcode"></i> <%: traduci("modoNT") %></asp:LinkButton>
+                    <asp:LinkButton runat="server" ID="lbtDT" OnClick="lbtDT_Click" CssClass="btn btn-inverse btn-lg" Width="50%"><i class="glyphicon glyphicon-qrcode"></i> <%: traduci("modoDT") %></asp:LinkButton>
                 </div>
             </div>
         </div>
diff --git a/GMW/PostRX.aspx.cs b/GMW/PostRX.aspx.cs
index 83da938f..08727960 100644
--- a/GMW/PostRX.aspx.cs
+++ b/GMW/PostRX.aspx.cs
@@ -113,8 +113,8 @@ namespace GMW
             if (Postazione.currCodCella != "")
             {
                 // SOLO se ho una linea procedo...
-                string cssBtn = "btn btn-inverse";
-                string cssBtnActive = "btn btn-inverse active";
+                string cssBtn = "btn btn-inverse btn-lg";
+                string cssBtnActive = "btn btn-inverse btn-lg active";
                 switch (modoPagina)
                 {
                     case "NT":
diff --git a/GMW/PostRX.aspx.designer.cs b/GMW/PostRX.aspx.designer.cs
index d2e67d14..4c797fce 100644
--- a/GMW/PostRX.aspx.designer.cs
+++ b/GMW/PostRX.aspx.designer.cs
@@ -13,13 +13,13 @@ namespace GMW {
     public partial class PostRX {
         
         /// <summary>
-        /// lbtRefresh control.
+        /// btnRefresh control.
         /// </summary>
         /// <remarks>
         /// Auto-generated field.
         /// To modify move field declaration from designer file to code-behind file.
         /// </remarks>
-        protected global::System.Web.UI.WebControls.LinkButton lbtRefresh;
+        protected global::System.Web.UI.WebControls.Button btnRefresh;
         
         /// <summary>
         /// lbtShowHideStorico control.
diff --git a/GMW/WebUserControls/mod_PostRX_NT.ascx b/GMW/WebUserControls/mod_PostRX_NT.ascx
index 209cfdc4..f30676e7 100644
--- a/GMW/WebUserControls/mod_PostRX_NT.ascx
+++ b/GMW/WebUserControls/mod_PostRX_NT.ascx
@@ -75,7 +75,7 @@
                                 </asp:TemplateField>
                                 <asp:TemplateField ShowHeader="False">
                                     <ItemTemplate>
-                                        <asp:LinkButton ID="lbtDelete" runat="server" CausesValidation="False" CommandName="Delete" OnClientClick="return confirm('Confermi eliminazione?')" CssClass="text-danger"><i class="glyphicon glyphicon-off btn-lg"></i></asp:LinkButton>
+                                        <asp:LinkButton ID="lbtDelete" runat="server" CausesValidation="False" CommandName="Delete" OnClientClick="return confirm('Confermi eliminazione?')" CssClass="text-danger"><i class="glyphicon glyphicon-trash btn-lg"></i></asp:LinkButton>
                                     </ItemTemplate>
                                 </asp:TemplateField>
                             </Columns>
@@ -130,8 +130,8 @@
             <div>
                 <div id="divModoInput" runat="server" style="width: 320px; margin: auto; text-align: center;">
                     <asp:RadioButtonList ID="rblInputMode" runat="server" AutoPostBack="true" OnSelectedIndexChanged="rblInputMode_SelectedIndexChanged" class="btn-group" RepeatDirection="Horizontal" RepeatLayout="Flow">
-                        <asp:ListItem Value="barcode" Selected="True" class="btn btn-default"></asp:ListItem>
-                        <asp:ListItem Value="elenco" class="btn btn-default"></asp:ListItem>
+                        <asp:ListItem Value="BARCODE" Selected="True" class="btn btn-default btn-lg"></asp:ListItem>
+                        <asp:ListItem Value="ELENCO" class="btn btn-default btn-lg"></asp:ListItem>
                     </asp:RadioButtonList>
                 </div>
                 <div id="divElenco" runat="server">
@@ -164,12 +164,8 @@
                         <asp:TextBox runat="server" ID="txtNote" Height="120px" Width="400px" Font-Size="24pt" TextMode="MultiLine" />
                     </div>
                     <div style="width: 400px; margin: auto;">
-                        <div style="float: left;">
-                            <asp:LinkButton runat="server" ID="lbtGeneraAl" Width="180px" CssClass="btn btn-warning btn-lg" OnClick="lbtGeneraAl_Click"><i aria-hidden='true' class='fa fa-print'></i> <%: traduci("lbtGeneraAl") %></asp:LinkButton>
-                        </div>
-                        <div style="float: right;">
-                            <asp:LinkButton runat="server" ID="lbtGeneraUDC" Width="180px" CssClass="btn btn-warning btn-lg" Visible="false"><i aria-hidden='true' class='fa fa-print'></i> <%: traduci("lbtGeneraUDC") %></asp:LinkButton>
-                        </div>
+                        <asp:LinkButton runat="server" ID="lbtGeneraAl" Width="400px" CssClass="btn btn-warning btn-lg" OnClick="lbtGeneraAl_Click"><i aria-hidden='true' class='fa fa-print fa-2x'></i> <%: traduci("lbtGeneraAl") %></asp:LinkButton>
+                        <asp:LinkButton runat="server" ID="lbtGeneraUDC" Width="400px" CssClass="btn btn-warning btn-lg" Visible="false"><i aria-hidden='true' class='fa fa-print fa-2x'></i> <%: traduci("lbtGeneraUDC") %></asp:LinkButton>
                     </div>
                 </div>
             </div>
diff --git a/GMW/WebUserControls/mod_PostRX_NT.ascx.cs b/GMW/WebUserControls/mod_PostRX_NT.ascx.cs
index bd97a375..f21e6242 100644
--- a/GMW/WebUserControls/mod_PostRX_NT.ascx.cs
+++ b/GMW/WebUserControls/mod_PostRX_NT.ascx.cs
@@ -46,7 +46,7 @@ namespace GMW.WebUserControls
             }
             doChecks();
         }
-        
+
         /// <summary>
         /// qta pezzi x UDC
         /// </summary>
@@ -103,7 +103,7 @@ namespace GMW.WebUserControls
         private void fixTipoInput()
         {
             bool barcodeEnabled = false;
-            if (rblInputMode.SelectedValue == "barcode")
+            if (rblInputMode.SelectedValue.ToUpper() == "BARCODE")
             {
                 barcodeEnabled = true;
                 Postazione.messaggiText = traduci("attesaBCode");
@@ -606,7 +606,7 @@ namespace GMW.WebUserControls
         /// <param name="e"></param>
         protected void txtCesta_TextChanged(object sender, EventArgs e)
         {
-            txtCesta.Text = txtCesta.Text.ToUpper();
+            txtCesta.Text = txtCesta.Text.ToUpper().Trim().PadLeft(4, '0').Substring(0, 4);
             doUpdate();
         }
         /// <summary>
diff --git a/GMW/WebUserControls/mod_storicoAzioniOperatore.ascx b/GMW/WebUserControls/mod_storicoAzioniOperatore.ascx
index 1e07eaf2..325abad4 100644
--- a/GMW/WebUserControls/mod_storicoAzioniOperatore.ascx
+++ b/GMW/WebUserControls/mod_storicoAzioniOperatore.ascx
@@ -2,7 +2,7 @@
     Inherits="GMW.WebUserControls.mod_storicoAzioniOperatore" %>
 <div style="text-align: center; margin: auto; padding: 2px;">
     <%--<asp:Button runat="server" ID="btnShowHideStorico" class="btn btn-inverse" OnClick="btnShowHideStorico_Click" Width="200px" />--%>
-    <asp:LinkButton runat="server" ID="lbtShowHideStorico" class="btn btn-inverse " OnClick="btnShowHideStorico_Click" Width="200px"><i class="glyphicon glyphicon-book"></i> <%: traduci("btnHideStorico") %></asp:LinkButton>
+    <asp:LinkButton runat="server" ID="lbtShowHideStorico" class="btn btn-inverse btn-lg" OnClick="btnShowHideStorico_Click" Width="200px"><i class="glyphicon glyphicon-book"></i> <%: traduci("btnHideStorico") %></asp:LinkButton>
 </div>
 <div style="text-align: center; margin: auto;">
     <asp:Button runat="server" ID="btnStampa" Width="120px" Text="(ri)stampa"
diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll
index d048d472..d9dbd994 100644
Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ
diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll
index c0e8ef0c..93ac7420 100644
Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ
diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll
index 14da9150..b961137f 100644
Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ
diff --git a/ReleaseClienti/SP_test/GMW.zip b/ReleaseClienti/SP_test/GMW.zip
index 4cf44214..ca2b1b09 100644
Binary files a/ReleaseClienti/SP_test/GMW.zip and b/ReleaseClienti/SP_test/GMW.zip differ
diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs
index 4d4f5c31..c95e21bb 100644
--- a/VersGen/GMW.cs
+++ b/VersGen/GMW.cs
@@ -5,7 +5,7 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.5.608.1523")]
-[assembly: AssemblyFileVersion("2.5.608.1523")]
+[assembly: AssemblyVersion("2.5.610.1525")]
+[assembly: AssemblyFileVersion("2.5.610.1525")]
 //[assembly: AssemblyCopyright("© Steamware 2007-2014")]
 //[assembly: AssemblyCompany("Steamware")]
diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt
index b29d2dba..4d1c0f5d 100644
--- a/VersGen/GMW.tt
+++ b/VersGen/GMW.tt
@@ -6,8 +6,8 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.5.608.<#= this.RevisionNumber #>")]
-[assembly: AssemblyFileVersion("2.5.608.<#= this.RevisionNumber #>")]
+[assembly: AssemblyVersion("2.5.610.<#= this.RevisionNumber #>")]
+[assembly: AssemblyFileVersion("2.5.610.<#= this.RevisionNumber #>")]
 //[assembly: AssemblyCopyright("© Steamware 2007-<#= DateTime.Now.Year #>")]
 //[assembly: AssemblyCompany("Steamware")]
 <#+