diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 00000000..931b96c3
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
index a67fc559..a4ba186a 100644
--- a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
+++ b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
@@ -142,6 +142,7 @@
                                     tools:text="Ordine #218" />
 
                                 <com.google.android.material.progressindicator.LinearProgressIndicator
+                                    style="?attr/linearProgressIndicatorStyle"
                                     android:id="@+id/order_progress"
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
@@ -446,25 +447,26 @@
                                         android:layout_height="24dp"
                                         android:layout_gravity="center_vertical"
                                         android:layout_margin="8dp"
-                                        android:src="@drawable/ic_weight_kg"
+                                        android:src="@{view.untMisIcon}"
+                                        tools:src="@drawable/ic_weight_kg"
                                         android:tint="@color/gray_500" />
 
                                     <androidx.appcompat.widget.LinearLayoutCompat
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:layout_gravity="center_vertical"
-                                        android:visibility="@{view.isOrderColli ? View.GONE  :View.VISIBLE}"
                                         android:gravity="start"
-                                        android:orientation="vertical">
+                                        android:orientation="vertical"
+                                        android:visibility="@{view.isOrderColli ? View.GONE : View.VISIBLE}">
 
                                         <androidx.appcompat.widget.AppCompatTextView
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
-                                            tools:text="KG"
                                             android:text="@{view.currentOrder.untOrd}"
                                             android:textAllCaps="true"
                                             android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
-                                            android:textStyle="bold" />
+                                            android:textStyle="bold"
+                                            tools:text="KG" />
 
                                         <androidx.appcompat.widget.LinearLayoutCompat
                                             android:layout_width="wrap_content"
@@ -485,9 +487,9 @@
                                                 android:layout_height="wrap_content"
                                                 android:layout_marginStart="4dp"
                                                 android:text="@{view.currentOrder.untOrd}"
-                                                tools:text="KG"
                                                 android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                                android:textColor="@android:color/black" />
+                                                android:textColor="@android:color/black"
+                                                tools:text="KG" />
 
                                         </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -1141,14 +1143,22 @@
                             android:padding="8dp">
 
 
+
                             <com.google.android.material.button.MaterialButton
-                                android:id="@+id/button_confirm"
                                 style="@style/Button.PrimaryOutline"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/add_lu"
                                 app:icon="@drawable/ic_add_24dp"
-                                app:singleClick="@{() -> view.addULButtonClick()}" />
+                                app:singleClick="@{() -> viewModel.addUL()}" />
+
+                            <com.google.android.material.button.MaterialButton
+                                style="@style/Button.PrimaryOutline"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:text="@string/add_unit"
+                                app:icon="@drawable/ic_add_24dp"
+                                app:singleClick="@{() -> viewModel.addUnitButtonClick()}" />
 
 
                         </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
index 339b5918..e0977529 100644
--- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
+++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
@@ -20,6 +20,10 @@
         <variable
             name="view"
             type="it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.ProdRientroMerceOrderDetailFragment" />
+
+        <variable
+            name="viewModel"
+            type="it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.ProdRientroMerceOrderDetailViewModel" />
     </data>
 
     <FrameLayout
@@ -132,6 +136,7 @@
                                 tools:text="Ordine #218" />
 
                             <com.google.android.material.progressindicator.LinearProgressIndicator
+                                style="?attr/linearProgressIndicatorStyle"
                                 android:id="@+id/order_progress"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
@@ -711,420 +716,6 @@
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-                    <!--<RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:id="@+id/provenienza_layout"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentStart="true"
-                            android:layout_toStartOf="@id/totale_bancali_layout"
-                            android:orientation="horizontal"
-                            android:visibility="@{view.currentOrder.codAnag != null ? View.VISIBLE : View.GONE}">
-
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:layout_gravity="center_vertical"
-                                android:layout_margin="8dp"
-                                android:src="@drawable/ic_person_filled_24dp"
-                                android:tint="@color/gray_500" />
-
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:orientation="vertical">
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Provenienza"
-                                    android:textAllCaps="true"
-                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
-                                    android:textStyle="bold" />
-
-                                <androidx.appcompat.widget.LinearLayoutCompat
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="horizontal">
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:ellipsize="end"
-                                        android:maxLines="1"
-                                        android:text="@{view.currentOrder.ragSocAnag + ` (` + view.currentOrder.codAnag + `)`}"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black"
-                                        android:visibility="@{view.currentOrder.ragSocAnag != null ? View.VISIBLE : View.GONE}"
-                                        tools:text="FRUDIS S.R.L. (F0312)" />
-
-                                </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:id="@+id/totale_bancali_layout"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:gravity="end"
-                            android:orientation="horizontal">
-
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:gravity="end"
-                                android:orientation="vertical">
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Totale bancali"
-                                    android:textAllCaps="true"
-                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
-                                    android:textStyle="bold" />
-
-                                <androidx.appcompat.widget.LinearLayoutCompat
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="horizontal">
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="@{UtilityNumber.decimalToString(view.sumLUNumber, 0)}"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black"
-                                        tools:text="0" />
-
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text=" UL"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black" />
-
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text=" ("
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black" />
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="@{UtilityNumber.decimalToString(view.sumColliNumber, 0)}"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black"
-                                        tools:text="0" />
-
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text=" COL)"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black" />
-
-                                </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:layout_gravity="center_vertical"
-                                android:layout_margin="8dp"
-                                android:src="@drawable/ic_pallet"
-                                android:tint="@color/gray_500" />
-
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-                    </RelativeLayout>
-
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp">
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:id="@+id/cliente_layout"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:layout_gravity="center_vertical"
-                                android:layout_margin="8dp"
-                                android:src="@drawable/ic_person_filled_24dp"
-                                android:tint="@color/gray_500" />
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:orientation="vertical">
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Cliente"
-                                    android:textAllCaps="true"
-                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
-                                    android:textStyle="bold" />
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="@{view.currentOrder.descCommessa != null ? view.currentOrder.descCommessa : `-`}"
-                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                    android:textColor="@android:color/black"
-                                    tools:text="GRUNDHOFER GBMH" />
-
-
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:layout_toEndOf="@id/cliente_layout"
-                            android:gravity="end"
-                            android:orientation="horizontal">
-
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:gravity="end"
-                                android:orientation="vertical">
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Totale netto"
-                                    android:textAllCaps="true"
-                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
-                                    android:textStyle="bold" />
-
-                                <androidx.appcompat.widget.LinearLayoutCompat
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="horizontal">
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="@{UtilityNumber.decimalToString(view.sumNetKG, 0)}"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black"
-                                        tools:text="0" />
-
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text=" KG"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black" />
-
-                                </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:layout_gravity="center_vertical"
-                                android:layout_margin="8dp"
-                                android:src="@drawable/ic_weight_kg"
-                                android:tint="@color/gray_500" />
-
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-                    </RelativeLayout>
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp">
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:id="@+id/orari_produzione_layout"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-
-
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:layout_gravity="center_vertical"
-                                android:layout_margin="8dp"
-                                android:src="@drawable/ic_workers_96px"
-                                android:tint="@color/gray_500" />
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:orientation="vertical">
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Orari produzione"
-                                    android:textAllCaps="true"
-                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
-                                    android:textStyle="bold" />
-
-
-                                <androidx.appcompat.widget.LinearLayoutCompat
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="horizontal"
-                                    android:visibility="@{view.currentOrder.dataInizD != null ? View.VISIBLE : View.GONE}">
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="@{UtilityDate.formatDate(view.currentOrder.dataInizD, UtilityDate.COMMONS_DATE_FORMATS.DM_TIME_SLASH)}"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black"
-                                        tools:text="11:00:00" />
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text=" - "
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black" />
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="@{UtilityDate.formatDate(view.currentOrder.dataFineD, UtilityDate.COMMONS_DATE_FORMATS.DM_TIME_SLASH)}"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black"
-                                        android:visibility="@{view.currentOrder.dataFineD != null ? View.VISIBLE : View.GONE}"
-                                        tools:text="18:00:00" />
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="IN CORSO"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black"
-                                        android:visibility="@{view.currentOrder.dataFineD == null ? View.VISIBLE : View.GONE}"
-                                        tools:text="IN CORSO"
-                                        tools:visibility="gone" />
-                                </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Non avviato"
-                                    android:textAllCaps="true"
-                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                    android:textColor="@android:color/black"
-                                    android:visibility="@{view.currentOrder.dataInizD == null ? View.VISIBLE : View.GONE}"
-                                    tools:visibility="gone" />
-
-
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-                        <androidx.appcompat.widget.LinearLayoutCompat
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentEnd="true"
-                            android:layout_toEndOf="@id/orari_produzione_layout"
-                            android:gravity="end"
-                            android:orientation="horizontal">
-
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:layout_width="wrap_content"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center_vertical"
-                                android:gravity="end"
-                                android:orientation="vertical">
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:text="Totale lordo"
-                                    android:textAllCaps="true"
-                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.ExtraSmall"
-                                    android:textStyle="bold" />
-
-                                <androidx.appcompat.widget.LinearLayoutCompat
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:orientation="horizontal">
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text="@{UtilityNumber.decimalToString(view.sumGrossKG, 0)}"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black"
-                                        tools:text="0" />
-
-
-                                    <androidx.appcompat.widget.AppCompatTextView
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:text=" KG"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                                        android:textColor="@android:color/black" />
-
-                                </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:layout_gravity="center_vertical"
-                                android:layout_margin="8dp"
-                                android:src="@drawable/ic_weight_kg"
-                                android:tint="@color/gray_500" />
-
-                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-                    </RelativeLayout>-->
-
 
                     <androidx.appcompat.widget.LinearLayoutCompat
                         android:layout_width="match_parent"
@@ -1135,13 +726,20 @@
 
 
                         <com.google.android.material.button.MaterialButton
-                            android:id="@+id/button_confirm"
                             style="@style/Button.PrimaryOutline"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/add_lu"
                             app:icon="@drawable/ic_add_24dp"
-                            app:singleClick="@{() -> view.addULButtonClick()}" />
+                            app:singleClick="@{() -> viewModel.addUL()}" />
+
+                        <com.google.android.material.button.MaterialButton
+                            style="@style/Button.PrimaryOutline"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/add_unit"
+                            app:icon="@drawable/ic_add_24dp"
+                            app:singleClick="@{() -> viewModel.addUnitButtonClick()}" />
 
 
                     </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index c53e1467..84b76379 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -381,6 +381,7 @@
     <string name="seleziona_crea_ordine_a_pv">Seleziona / Crea ordine</string>
     <string name="add">Aggiungi</string>
     <string name="add_lu">Aggiungi pedana</string>
+    <string name="add_unit">Aggiungi unità</string>
     <string name="action_close">Chiudi</string>
     <string name="close_and_export">Chiudi ed esporta ordine</string>
     <string name="close_and_exit">Chiudi ordine</string>
diff --git a/app/src/main/res/values/buttons_style.xml b/app/src/main/res/values/buttons_style.xml
index c9e70ff9..f6ad59c2 100644
--- a/app/src/main/res/values/buttons_style.xml
+++ b/app/src/main/res/values/buttons_style.xml
@@ -9,6 +9,7 @@
         <!--        <item name="android:paddingTop">8dp</item>-->
         <!--        <item name="android:paddingBottom">8dp</item>-->
         <item name="iconTint">@color/colorPrimary</item>
+        <item name="strokeColor">@color/colorPrimary</item>
     </style>
 
     <style name="Button.PrimaryFull" parent="Widget.Material3.Button.UnelevatedButton">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1f91c0ec..7445fae1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -386,6 +386,7 @@
     <string name="seleziona_crea_ordine_a_pv">Select/Create order</string>
     <string name="add">Add</string>
     <string name="add_lu">Add LU</string>
+    <string name="add_unit">Add unit</string>
     <string name="action_close">Close</string>
     <string name="close_and_export">Close and export</string>
     <string name="close_and_exit">Close order</string>