diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java
index 48af157d..861a26d1 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java
@@ -57,9 +57,17 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                                         .setCodMenu("MG046")
                                         .setTitleText(R.string.vendita_title_fragment)
                                         .setTitleIcon(R.drawable.ic_dashboard_spedizione)
-                                        .setDrawerIcon(R.drawable.ic_black_upload)
+                                        .setDrawerIcon(R.drawable.ic_upload)
                                         .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, null)))
 
+                                .addItem(new MenuItem()
+                                        .setID(R.id.nav_rettifica_spedizione)
+                                        .setCodMenu("MG064")
+                                        .setTitleText(R.string.rettifica_spedizione_fragment_title)
+                                        .setTitleIcon(R.drawable.ic_dashboard_rettifica_spedizione)
+                                        .setDrawerIcon(R.drawable.ic_rettifica_spedizione_drawer)
+                                        .setFragmentFactory(() -> RettificaGiacenzeFragment.newInstance(GestioneEnum.VENDITA)))
+
                                 .addItem(new MenuItem()
                                         .setID(R.id.nav_free_picking)
                                         .setCodMenu("MG047")
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
index 44b3b696..c18cf849 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
@@ -795,8 +795,10 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
 
                     listModel.setSubDescription(x.getRifOrd());
 
-                    String testataDataConsString = String.format(getString(R.string.ord_ven_testata_data_cons), UtilityDate.formatDate(x.getDataConsD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
-                    listModel.setRightDescription(testataDataConsString);
+                    if(x.getDataConsD() != null) {
+                        String testataDataConsString = String.format(getString(R.string.ord_ven_testata_data_cons), UtilityDate.formatDate(x.getDataConsD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN));
+                        listModel.setRightDescription(testataDataConsString);
+                    }
 
                     listModel.setOriginalModel(x);
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java
index 508c4d2a..4fd732ce 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java
@@ -263,7 +263,7 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
 
     @Override
     public void onLURequest(boolean canLUBeCreated, boolean shouldCheckIfDocExist, RunnableArgss<MtbColt, Boolean> onComplete) {
-        DialogScanOrCreateLUView.newInstance(canLUBeCreated, shouldCheckIfDocExist, onComplete)
+        DialogScanOrCreateLUView.newInstance(canLUBeCreated, shouldCheckIfDocExist, true, onComplete)
                 .show(requireActivity().getSupportFragmentManager(), "tag");
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java
index 85acdbc7..fc54b08d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/ProdVersamentoMaterialeFragment.java
@@ -174,7 +174,7 @@ public class ProdVersamentoMaterialeFragment extends BaseFragment implements Pro
     }
 
     private void openLU() {
-        DialogScanOrCreateLUView.newInstance(false, false, true, false, (mtbColt, created) -> {
+        DialogScanOrCreateLUView.newInstance(false, false, true, false, true, (mtbColt, created) -> {
             if (mtbColt == null) {
                 popMe();
             } else if ((mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE || mtbColt.getGestioneEnum() == GestioneEnum.VENDITA) && mtbColt.getSegno().equals(+1)) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java
index 623304fb..4ae27ca9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java
@@ -43,6 +43,7 @@ import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityString;
@@ -83,6 +84,7 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
     private RettificaGiacenzeMainListAdapter mAdapter;
 
     private int barcodeScannerIstanceID = -1;
+    private GestioneEnum mCurrentGestione;
 
     public RettificaGiacenzeFragment() {
         // Required empty public constructor
@@ -90,13 +92,28 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
 
 
     public static RettificaGiacenzeFragment newInstance() {
+        return newInstance(null);
+    }
+
+
+    public static RettificaGiacenzeFragment newInstance(GestioneEnum gestione) {
         RettificaGiacenzeFragment fragment = new RettificaGiacenzeFragment();
+        Bundle args = new Bundle();
+
+        if (gestione != null)
+            args.putString("gestione", gestione.getText());
+
+        fragment.setArguments(args);
         return fragment;
     }
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         requireActivity().setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+
+        if (getArguments() != null && getArguments().containsKey("gestione"))
+            mCurrentGestione = GestioneEnum.fromString(getArguments().getString("gestione"));
+
         super.onCreate(savedInstanceState);
     }
 
@@ -198,7 +215,8 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
 
         mViewModel.init(
                 SettingsManager.i().getUser().getFullname(),
-                SettingsManager.i().getUserSession().getDepo().getCodMdep());
+                SettingsManager.i().getUserSession().getDepo().getCodMdep(),
+                mCurrentGestione);
     }
 
     @Override
@@ -287,8 +305,8 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr
     }
 
     @Override
-    public void onLUOpenRequest(RunnableArgss<MtbColt, Boolean> onComplete) {
-        DialogScanOrCreateLUView.newInstance(true, false, (mtbColt, created) -> {
+    public void onLUOpenRequest(boolean enableCreation, boolean checkIfDocumentExists, boolean warnOnOpeningVendita, RunnableArgss<MtbColt, Boolean> onComplete) {
+        DialogScanOrCreateLUView.newInstance(enableCreation, checkIfDocumentExists, warnOnOpeningVendita, (mtbColt, created) -> {
             if (mtbColt == null) {
                 popMe();
             } else {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
index 0f34b02e..bdf50c60 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeViewModel.java
@@ -24,6 +24,7 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.dto.PickDataDTO;
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
@@ -51,6 +52,8 @@ public class RettificaGiacenzeViewModel {
 
     private RettificaGiacenzeViewModel.Listener mListener;
 
+    private GestioneEnum mDefaultGestione;
+
     private String mCurrentUser;
     private String mCurrentCodMdep;
     private boolean mIsCreatedLU;
@@ -71,9 +74,10 @@ public class RettificaGiacenzeViewModel {
     }
 
 
-    public void init(String currentUser, String currentCodMdep) {
+    public void init(String currentUser, String currentCodMdep, GestioneEnum defaultGestione) {
         this.mCurrentUser = currentUser;
         this.mCurrentCodMdep = currentCodMdep;
+        this.mDefaultGestione = defaultGestione;
 
         this.sendOnLoadingStarted();
 
@@ -87,12 +91,15 @@ public class RettificaGiacenzeViewModel {
     }
 
     public void requestLU() {
-        this.sendOnLUOpenRequest((mtbColt, created) -> {
-            this.mCurrentMtbColt = mtbColt;
-            this.mIsCreatedLU = created;
+        this.sendOnLUOpenRequest(mDefaultGestione == null || mDefaultGestione != GestioneEnum.VENDITA,
+                mDefaultGestione != null && mDefaultGestione == GestioneEnum.VENDITA,
+                mDefaultGestione == null || mDefaultGestione != GestioneEnum.VENDITA,
+                (mtbColt, created) -> {
+                    this.mCurrentMtbColt = mtbColt;
+                    this.mIsCreatedLU = created;
 
-            this.sendLUOpened(mtbColt);
-        });
+                    this.sendLUOpened(mtbColt);
+                });
     }
 
     public RettificaGiacenzeViewModel setListener(RettificaGiacenzeViewModel.Listener listener) {
@@ -691,8 +698,9 @@ public class RettificaGiacenzeViewModel {
         if (this.mListener != null) mListener.onArtListLoaded(artList, onArtChoosed);
     }
 
-    private void sendOnLUOpenRequest(RunnableArgss<MtbColt, Boolean> onComplete) {
-        if (this.mListener != null) mListener.onLUOpenRequest(onComplete);
+    private void sendOnLUOpenRequest(boolean enableCreation, boolean checkIfDocumentExists, boolean warnOnOpeningVendita, RunnableArgss<MtbColt, Boolean> onComplete) {
+        if (this.mListener != null)
+            mListener.onLUOpenRequest(enableCreation, checkIfDocumentExists, warnOnOpeningVendita, onComplete);
     }
 
     private void sendError(Exception ex) {
@@ -778,7 +786,7 @@ public class RettificaGiacenzeViewModel {
 
         void onArtListLoaded(ArrayList<MtbAart> artList, RunnableArgs<MtbAart> onArtChoosed);
 
-        void onLUOpenRequest(RunnableArgss<MtbColt, Boolean> onComplete);
+        void onLUOpenRequest(boolean enableCreation, boolean checkIfDocumentExists, boolean warnOnOpeningVendita, RunnableArgss<MtbColt, Boolean> onComplete);
 
         void onLUOpened(MtbColt mtbColt);
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java
index ea61c82e..a6f159fb 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java
@@ -104,7 +104,7 @@ public class VersamentoMerceFragment extends BaseFragment implements ITitledFrag
 
 
     public void openLU() {
-        DialogScanOrCreateLUView.newInstance(true, false, true, false, (mtbColt, created) -> {
+        DialogScanOrCreateLUView.newInstance(true, false, true, false, true, (mtbColt, created) -> {
             if (mtbColt == null) {
                 ((IPoppableActivity) getActivity()).pop();
             } else if ((mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColt.getSegno().equals(+1)) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java
index b2688f6a..8e0e9f72 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java
@@ -43,27 +43,29 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial
     private final boolean mShouldCheckResiduo;
     private final boolean mShouldCheckIfExistDoc;
     private final boolean mEnableCreation;
+    private final boolean mWarnOnOpeningVendita;
 
     private final BindableBoolean basketEnabled = new BindableBoolean();
     private final BindableBoolean creationEnabled = new BindableBoolean();
 
 
     public static DialogScanOrCreateLUView newInstance(@NotNull RunnableArgss<MtbColt, Boolean> onComplete) {
-        return new DialogScanOrCreateLUView(false, true, true, true, onComplete);
+        return new DialogScanOrCreateLUView(false, true, true, true, true, onComplete);
     }
 
-    public static DialogScanOrCreateLUView newInstance(boolean enableCreation, boolean shouldCheckIfExistDoc, @NotNull RunnableArgss<MtbColt, Boolean> onComplete) {
-        return new DialogScanOrCreateLUView(false, enableCreation, true, shouldCheckIfExistDoc, onComplete);
+    public static DialogScanOrCreateLUView newInstance(boolean enableCreation, boolean shouldCheckIfExistDoc, boolean warnOnOpeningVendita, @NotNull RunnableArgss<MtbColt, Boolean> onComplete) {
+        return new DialogScanOrCreateLUView(false, enableCreation, true, shouldCheckIfExistDoc, warnOnOpeningVendita, onComplete);
     }
 
-    public static DialogScanOrCreateLUView newInstance(boolean enableBasket, boolean enableCreation, boolean checkResiduo, boolean shouldCheckIfExistDoc, @NotNull RunnableArgss<MtbColt, Boolean> onComplete) {
-        return new DialogScanOrCreateLUView(enableBasket, enableCreation, checkResiduo, shouldCheckIfExistDoc, onComplete);
+    public static DialogScanOrCreateLUView newInstance(boolean enableBasket, boolean enableCreation, boolean checkResiduo, boolean shouldCheckIfExistDoc, boolean warnOnOpeningVendita, @NotNull RunnableArgss<MtbColt, Boolean> onComplete) {
+        return new DialogScanOrCreateLUView(enableBasket, enableCreation, checkResiduo, shouldCheckIfExistDoc, warnOnOpeningVendita, onComplete);
     }
 
-    private DialogScanOrCreateLUView(boolean enableBasket, boolean enableCreation, boolean checkResiduo, boolean shouldCheckIfExistDoc, @NotNull RunnableArgss<MtbColt, Boolean> onComplete) {
+    private DialogScanOrCreateLUView(boolean enableBasket, boolean enableCreation, boolean checkResiduo, boolean shouldCheckIfExistDoc, boolean warnOnOpeningVendita, @NotNull RunnableArgss<MtbColt, Boolean> onComplete) {
         super();
         mShouldCheckResiduo = checkResiduo;
         mShouldCheckIfExistDoc = shouldCheckIfExistDoc;
+        mWarnOnOpeningVendita = warnOnOpeningVendita;
 
         this.basketEnabled.set(enableBasket);
         this.creationEnabled.set(enableCreation);
@@ -90,7 +92,7 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial
                 .setListener(this);
 
 
-        this.mViewModel.init(mShouldCheckResiduo, mShouldCheckIfExistDoc, mEnableCreation);
+        this.mViewModel.init(mShouldCheckResiduo, mShouldCheckIfExistDoc, mEnableCreation, mWarnOnOpeningVendita);
 
         mBindings.createNewLuButton.setOnClickListener(v -> {
             this.mViewModel.createNewLU();
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java
index 6493cea0..aec8e6c4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUViewModel.java
@@ -32,6 +32,7 @@ public class DialogScanOrCreateLUViewModel {
     private boolean mShouldCheckResiduo = false;
     private boolean mShouldCheckIfExistDoc = true;
     private boolean mEnableCreation = false;
+    private boolean mWarnOnOpeningVendita;
 
     private Listener mListener;
 
@@ -43,10 +44,11 @@ public class DialogScanOrCreateLUViewModel {
     }
 
 
-    public void init(boolean checkResiduo, boolean shouldCheckIfExistDoc, boolean enableCreation) {
+    public void init(boolean checkResiduo, boolean shouldCheckIfExistDoc, boolean enableCreation, boolean warnOnOpeningVendita) {
         this.mShouldCheckResiduo = checkResiduo;
         this.mShouldCheckIfExistDoc = shouldCheckIfExistDoc;
         this.mEnableCreation = enableCreation;
+        this.mWarnOnOpeningVendita = warnOnOpeningVendita;
     }
 
     public void createNewLU() {
@@ -137,7 +139,7 @@ public class DialogScanOrCreateLUViewModel {
                         if (mtbColt.getCodDtip() != null && mShouldCheckIfExistDoc) {
                             this.sendError(new AlreadyAttachedDocumentToLUException());
                         } else {
-                            if (mtbColt.getGestioneEnum() == GestioneEnum.VENDITA && mtbColt.getSegno() == -1) {
+                            if (mtbColt.getGestioneEnum() == GestioneEnum.VENDITA && mtbColt.getSegno() == -1 && mWarnOnOpeningVendita) {
                                 this.sendOnLUVenditaConfirmRequired(confirmed -> {
                                     if (confirmed) {
                                         onComplete.run();
diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml
new file mode 100644
index 00000000..0d6e19f7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_back.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M10,5.342C9.744,5.342 9.488,5.441 9.293,5.637L3.637,11.293C3.246,11.684 3.246,12.317 3.637,12.707L9.293,18.363C9.684,18.754 10.317,18.754 10.707,18.363L10.793,18.277C11.184,17.886 11.184,17.253 10.793,16.863L6.93,13L20,13C20.552,13 21,12.552 21,12C21,11.448 20.552,11 20,11L6.93,11L10.793,7.137C11.184,6.746 11.184,6.113 10.793,5.723L10.707,5.637C10.512,5.441 10.256,5.342 10,5.342z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_black_back.png b/app/src/main/res/drawable/ic_black_back.png
deleted file mode 100644
index 1973bf62..00000000
Binary files a/app/src/main/res/drawable/ic_black_back.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_black_shopping_cart.png b/app/src/main/res/drawable/ic_black_shopping_cart.png
deleted file mode 100644
index c591931a..00000000
Binary files a/app/src/main/res/drawable/ic_black_shopping_cart.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_black_tick.png b/app/src/main/res/drawable/ic_black_tick.png
deleted file mode 100644
index ca369c8e..00000000
Binary files a/app/src/main/res/drawable/ic_black_tick.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_black_truck.png b/app/src/main/res/drawable/ic_black_truck.png
deleted file mode 100644
index 91c170d0..00000000
Binary files a/app/src/main/res/drawable/ic_black_truck.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_dashboard_purchase_orders_pv.png b/app/src/main/res/drawable/ic_dashboard_purchase_orders_pv.png
deleted file mode 100644
index d59f1400..00000000
Binary files a/app/src/main/res/drawable/ic_dashboard_purchase_orders_pv.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_dashboard_purchase_orders_pv.xml b/app/src/main/res/drawable/ic_dashboard_purchase_orders_pv.xml
new file mode 100644
index 00000000..76e49d45
--- /dev/null
+++ b/app/src/main/res/drawable/ic_dashboard_purchase_orders_pv.xml
@@ -0,0 +1,33 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M37.4,41H10.6c-1,0 -1.8,-0.7 -2,-1.6L5,21h38l-3.7,18.4C39.1,40.3 38.3,41 37.4,41z"
+      android:fillColor="#388e3c"/>
+  <path
+      android:pathData="M25.4,5.6c-0.8,-0.8 -2,-0.8 -2.8,0l-12,12c-0.8,0.8 -0.8,2 0,2.8C11,20.8 11.5,21 12,21s1,-0.2 1.4,-0.6l12,-12C26.2,7.6 26.2,6.4 25.4,5.6z"
+      android:fillColor="#2e7d32"/>
+  <path
+      android:pathData="M37.4,17.6l-12,-12c-0.8,-0.8 -2,-0.8 -2.8,0s-0.8,2 0,2.8l12,12C35,20.8 35.5,21 36,21s1,-0.2 1.4,-0.6C38.2,19.6 38.2,18.4 37.4,17.6z"
+      android:fillColor="#1b5e20"/>
+  <path
+      android:pathData="M43,23H5c-1.1,0 -2,-0.9 -2,-2v-2c0,-1.1 0.9,-2 2,-2h38c1.1,0 2,0.9 2,2v2C45,22.1 44.1,23 43,23z"
+      android:fillColor="#4caf50"/>
+  <path
+      android:pathData="M25,25h-2c0,0 0,10.8 0,11 0,0.6 0.4,1 1,1s1,-0.4 1,-1C25,35.8 25,25 25,25zM29,25h-2c0,0 0,10.8 0,11 0,0.6 0.4,1 1,1s1,-0.4 1,-1C29,35.8 29,25 29,25zM17,25h-2c0,0 0,10.8 0,11 0,0.6 0.4,1 1,1s1,-0.4 1,-1C17,35.8 17,25 17,25zM21,25h-2c0,0 0,10.8 0,11 0,0.6 0.4,1 1,1s1,-0.4 1,-1C21,35.8 21,25 21,25z"
+      android:fillColor="#1b5e20"/>
+  <path
+      android:pathData="M34.414,26.588c-0.383,-0.383 -0.894,-0.586 -1.415,-0.586c-0.258,0 -0.517,0.05 -0.765,0.152C31.487,26.464 31,27.193 31,28.002V41h6.4c0.9,0 1.7,-0.7 1.9,-1.6l1.327,-6.599L34.414,26.588z"
+      android:fillColor="#2e7d32"/>
+  <path
+      android:pathData="M33.998,34.352L36.773,33.166L42.604,46.814L39.828,48z"
+      android:fillColor="#bdbdbd"/>
+  <path
+      android:pathData="M33,28.002L33,45.002 38,40.002 45,40.002z"
+      android:fillColor="#bdbdbd"/>
+  <path
+      android:pathData="M33,25h-2c0,0 0,10.8 0,11c0,0.6 0.4,1 1,1c0.6,0 1,-0.4 1,-1C33,35.8 33,25 33,25z"
+      android:fillColor="#1b5e20"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_dashboard_rettifica_spedizione.xml b/app/src/main/res/drawable/ic_dashboard_rettifica_spedizione.xml
new file mode 100644
index 00000000..2d4fc3ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_dashboard_rettifica_spedizione.xml
@@ -0,0 +1,79 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M2,33l0,10l8,0l0,-6l28,0l0,6l8,0l0,-10z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="24"
+          android:startY="46.447"
+          android:endX="24"
+          android:endY="32.536"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFF0B421"/>
+        <item android:offset="1" android:color="#FFC28200"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M7,15h34l5,18H2L7,15z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="0.866"
+          android:startY="13.904"
+          android:endX="40.388"
+          android:endY="33.242"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFCF54"/>
+        <item android:offset="0.261" android:color="#FFFDCB4D"/>
+        <item android:offset="0.639" android:color="#FFF7C13A"/>
+        <item android:offset="1" android:color="#FFF0B421"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M23,15h2v18h-2z"
+      android:fillColor="#C28200"/>
+  <path
+      android:pathData="M33,15l-2,0l3,18l2,0z"
+      android:fillColor="#C28200"/>
+  <path
+      android:pathData="M15,15l2,0l-3,18l-2,0z"
+      android:fillColor="#C28200"/>
+  <path
+      android:pathData="M36.9,19.9L35,21.9l4.3,4.3c0.1,0.1 0.3,0.1 0.4,0l1.5,-1.5c0.1,-0.1 0.1,-0.3 0,-0.4L36.9,19.9z"
+      android:fillColor="#199BE2"/>
+  <path
+      android:pathData="M34.5,17.6l-1.9,1.9l2.4,2.4l1.9,-2z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:centerX="28.257"
+          android:centerY="13.251"
+          android:gradientRadius="10.631"
+          android:type="radial">
+        <item android:offset="0.693" android:color="#FF006185"/>
+        <item android:offset="0.921" android:color="#FF35C1F1"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M28.2,13.2m-8.7,0a8.7,8.7 0,1 1,17.4 0a8.7,8.7 0,1 1,-17.4 0">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="22.23"
+          android:startY="7.185"
+          android:endX="34.393"
+          android:endY="19.348"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFA3FFFF"/>
+        <item android:offset="0.223" android:color="#FF9DFBFF"/>
+        <item android:offset="0.53" android:color="#FF8BF1FF"/>
+        <item android:offset="0.885" android:color="#FF6EE0FF"/>
+        <item android:offset="1" android:color="#FF63DAFF"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/app/src/main/res/drawable/ic_dashboard_trasmitted_orders_list.png b/app/src/main/res/drawable/ic_dashboard_trasmitted_orders_list.png
deleted file mode 100644
index c46805ee..00000000
Binary files a/app/src/main/res/drawable/ic_dashboard_trasmitted_orders_list.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_dashboard_trasmitted_orders_list.xml b/app/src/main/res/drawable/ic_dashboard_trasmitted_orders_list.xml
new file mode 100644
index 00000000..18085e97
--- /dev/null
+++ b/app/src/main/res/drawable/ic_dashboard_trasmitted_orders_list.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M36,4H26c0,1.105 -0.895,2 -2,2s-2,-0.895 -2,-2H12C9.789,4 8,5.789 8,8v32c0,2.211 1.789,4 4,4h24c2.211,0 4,-1.789 4,-4V8C40,5.789 38.211,4 36,4"
+      android:fillColor="#455a64"/>
+  <path
+      android:pathData="M36,41H12c-0.551,0 -1,-0.449 -1,-1V8c0,-0.551 0.449,-1 1,-1h24c0.551,0 1,0.449 1,1v32C37,40.551 36.551,41 36,41"
+      android:fillColor="#fff"/>
+  <path
+      android:pathData="M26,4c0,1.105 -0.895,2 -2,2s-2,-0.895 -2,-2h-7v4c0,1.105 0.895,2 2,2h14c1.105,0 2,-0.895 2,-2V4H26z"
+      android:fillColor="#90a4ae"/>
+  <path
+      android:pathData="M24,0c-2.207,0 -4,1.793 -4,4s1.793,4 4,4s4,-1.793 4,-4S26.207,0 24,0M24,6c-1.105,0 -2,-0.895 -2,-2s0.895,-2 2,-2s2,0.895 2,2S25.105,6 24,6"
+      android:fillColor="#90a4ae"/>
+  <path
+      android:pathData="M14,18h9v2h-9V18zM14,30h9v2h-9V30z"
+      android:fillColor="#03a9f4"/>
+  <path
+      android:pathData="M30.91,20.59L29.5,22 26,18.5 27.41,17.09 29.5,19.18z"
+      android:fillColor="#43a047"/>
+  <path
+      android:pathData="M33.972,17.528L29.5,22 28.09,20.59 29.5,19.18 32.562,16.118zM30.91,32.59L29.5,34 26,30.5 27.41,29.09 29.5,31.18z"
+      android:fillColor="#43a047"/>
+  <path
+      android:pathData="M33.972,29.528L29.5,34 28.09,32.59 29.5,31.18 32.562,28.118z"
+      android:fillColor="#43a047"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_erase.xml b/app/src/main/res/drawable/ic_erase.xml
new file mode 100644
index 00000000..b4cd0420
--- /dev/null
+++ b/app/src/main/res/drawable/ic_erase.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M14.65,2.006C14.146,2.006 13.641,2.195 13.262,2.574L2.576,13.264C1.817,14.023 1.817,15.282 2.576,16.041L7.961,21.426C8.351,21.816 8.872,22.001 9.391,21.99A1,1 0,0 0,9.539 22L21,22A1,1 0,1 0,21 20L12.164,20L21.424,10.736C22.183,9.977 22.183,8.718 21.424,7.959L16.039,2.574C15.66,2.195 15.155,2.006 14.65,2.006zM9.32,9.346L14.654,14.68L9.35,19.986L4.016,14.65L9.32,9.346z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_erase_96.png b/app/src/main/res/drawable/ic_erase_96.png
deleted file mode 100644
index de7c5565..00000000
Binary files a/app/src/main/res/drawable/ic_erase_96.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_inventario_header_outline.png b/app/src/main/res/drawable/ic_inventario_header_outline.png
deleted file mode 100644
index fb2e1527..00000000
Binary files a/app/src/main/res/drawable/ic_inventario_header_outline.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_inventario_header_outline.xml b/app/src/main/res/drawable/ic_inventario_header_outline.xml
new file mode 100644
index 00000000..bc707071
--- /dev/null
+++ b/app/src/main/res/drawable/ic_inventario_header_outline.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M19,3h-4.184C14.403,1.837 13.304,1 12,1S9.597,1.837 9.184,3H5C3.895,3 3,3.895 3,5v14c0,1.105 0.895,2 2,2h14c1.105,0 2,-0.895 2,-2V5C21,3.895 20.105,3 19,3zM9,16H7v-2h2V16zM8,11.5c-0.828,0 -1.5,-0.672 -1.5,-1.5S7.172,8.5 8,8.5S9.5,9.172 9.5,10S8.828,11.5 8,11.5zM12,3c0.552,0 1,0.448 1,1c0,0.552 -0.448,1 -1,1s-1,-0.448 -1,-1C11,3.448 11.448,3 12,3zM17,16h-6v-2h6V16zM17,11h-6V9h6V11zM19,19H5V5h14V19z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_pallet.xml b/app/src/main/res/drawable/ic_pallet.xml
new file mode 100644
index 00000000..fd0e7a2a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pallet.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M7.153,14L11,14 11,2 8.868,2zM18.868,14H22L19.47,3.53C19.253,2.632 18.449,2 17.526,2h-0.372L18.868,14zM13,14L16.847,14 15.132,2 13,2zM6.847,2H6.474C5.551,2 4.747,2.632 4.53,3.53L2,14h3.132L6.847,2zM2,16v4c0,1.105 0.895,2 2,2h2c1.105,0 2,-0.895 2,-2h8c0,1.105 0.895,2 2,2h2c1.105,0 2,-0.895 2,-2v-4H2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_pallet_96px.png b/app/src/main/res/drawable/ic_pallet_96px.png
deleted file mode 100644
index 4a8f8c9b..00000000
Binary files a/app/src/main/res/drawable/ic_pallet_96px.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_production_line.png b/app/src/main/res/drawable/ic_production_line.png
deleted file mode 100644
index 19f5ada7..00000000
Binary files a/app/src/main/res/drawable/ic_production_line.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_production_line.xml b/app/src/main/res/drawable/ic_production_line.xml
new file mode 100644
index 00000000..346674e7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_production_line.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+  <path
+      android:pathData="M37,42H5V32h32c2.8,0 5,2.2 5,5l0,0C42,39.8 39.8,42 37,42z"
+      android:fillColor="#B0BEC5"/>
+  <path
+      android:pathData="M10,34c-1.7,0 -3,1.3 -3,3s1.3,3 3,3 3,-1.3 3,-3S11.7,34 10,34zM10,38c-0.6,0 -1,-0.4 -1,-1s0.4,-1 1,-1 1,0.4 1,1S10.6,38 10,38zM19,34c-1.7,0 -3,1.3 -3,3s1.3,3 3,3 3,-1.3 3,-3S20.7,34 19,34zM19,38c-0.6,0 -1,-0.4 -1,-1s0.4,-1 1,-1 1,0.4 1,1S19.6,38 19,38zM37,34c-1.7,0 -3,1.3 -3,3s1.3,3 3,3 3,-1.3 3,-3S38.7,34 37,34zM37,38c-0.6,0 -1,-0.4 -1,-1s0.4,-1 1,-1 1,0.4 1,1S37.6,38 37,38zM28,34c-1.7,0 -3,1.3 -3,3s1.3,3 3,3 3,-1.3 3,-3S29.7,34 28,34zM28,38c-0.6,0 -1,-0.4 -1,-1s0.4,-1 1,-1 1,0.4 1,1S28.6,38 28,38z"
+      android:fillColor="#37474F"/>
+  <path
+      android:pathData="M35,31H11c-1.1,0 -2,-0.9 -2,-2V7c0,-1.1 0.9,-2 2,-2h24c1.1,0 2,0.9 2,2v22C37,30.1 36.1,31 35,31z"
+      android:fillColor="#FF9800"/>
+  <path
+      android:pathData="M26.5,13h-7c-0.8,0 -1.5,-0.7 -1.5,-1.5l0,0c0,-0.8 0.7,-1.5 1.5,-1.5h7c0.8,0 1.5,0.7 1.5,1.5l0,0C28,12.3 27.3,13 26.5,13z"
+      android:fillColor="#8A5100"/>
+  <path
+      android:pathData="M37,31H5v2h32c2.2,0 4,1.8 4,4s-1.8,4 -4,4H5v2h32c3.3,0 6,-2.7 6,-6S40.3,31 37,31z"
+      android:fillColor="#607D8B"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_rettifica_spedizione_drawer.xml b/app/src/main/res/drawable/ic_rettifica_spedizione_drawer.xml
new file mode 100644
index 00000000..3b2a0fca
--- /dev/null
+++ b/app/src/main/res/drawable/ic_rettifica_spedizione_drawer.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M7.2,14H11V2H8.9L7.2,14zM18.9,14H22l-0.4,-1.7l-3.5,-3.6L18.9,14zM13,14h3.8l-0.7,-5c0,0 -0.7,0 -1.7,-0.2C13.7,8.7 13,8 13,8V14zM6.8,2H6.5C5.6,2 4.7,2.6 4.5,3.5L2,14h3.1L6.8,2zM2,16v4c0,1.1 0.9,2 2,2h2c1.1,0 2,-0.9 2,-2h8c0,1.1 0.9,2 2,2h2c1.1,0 2,-0.9 2,-2v-4H2z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M15.9,1.2c-2,0 -3.7,1.6 -3.7,3.6s1.6,3.7 3.6,3.7c0.9,0 1.7,-0.3 2.4,-0.9l0.2,0.2l0,0.7l2.9,2.9c0.3,0.3 0.8,0.3 1,0c0.3,-0.3 0.3,-0.8 0,-1l-2.9,-2.9l-0.7,0l-0.2,-0.2c0.6,-0.6 0.9,-1.5 0.9,-2.4C19.5,2.9 17.9,1.2 15.9,1.2zM15.9,2.3c1.4,0 2.6,1.2 2.6,2.6c0,1.4 -1.2,2.6 -2.6,2.6s-2.6,-1.2 -2.6,-2.6S14.4,2.2 15.9,2.3z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_scale.png b/app/src/main/res/drawable/ic_scale.png
deleted file mode 100644
index f5c5ca11..00000000
Binary files a/app/src/main/res/drawable/ic_scale.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_scale.xml b/app/src/main/res/drawable/ic_scale.xml
new file mode 100644
index 00000000..923c478e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_scale.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,4A2,2 0,0 0,10.27 5L5,5L3,5C2.448,5 2,5.448 2,6C2,6.552 2.448,7 3,7L4,7L0,15C0,17.761 2.239,20 5,20C7.761,20 10,17.761 10,15L6,7L10.271,7A2,2 0,0 0,12 8A2,2 0,0 0,13.73 7L18,7L14,15C14,17.761 16.239,20 19,20C21.761,20 24,17.761 24,15L20,7L21,7C21.552,7 22,6.552 22,6C22,5.448 21.552,5 21,5L13.729,5A2,2 0,0 0,12 4zM5,9.021L7.988,15L2.012,15L5,9.021zM19,9.021L21.988,15L16.012,15L19,9.021z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_shopping_basket.xml b/app/src/main/res/drawable/ic_shopping_basket.xml
new file mode 100644
index 00000000..fd6f1b89
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shopping_basket.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M7.658,2C6.862,2 6.135,2.479 5.82,3.211L3.34,9L2.002,9C1.689,9 1.395,9.146 1.205,9.395C1.017,9.643 0.953,9.965 1.035,10.266L3.596,19.531C3.835,20.395 4.627,21 5.523,21L18.477,21C19.373,21 20.164,20.396 20.402,19.533L22.963,10.268C23.046,9.967 22.983,9.643 22.795,9.395C22.605,9.146 22.31,9 21.998,9L20.66,9L18.178,3.213L18.18,3.213C17.866,2.478 17.137,2 16.34,2L7.658,2zM7.658,4L16.34,4L18.482,9L5.518,9L7.658,4zM8,12C8.552,12 9,12.448 9,13L9,17C9,17.552 8.552,18 8,18C7.448,18 7,17.552 7,17L7,13C7,12.448 7.448,12 8,12zM12,12C12.552,12 13,12.448 13,13L13,17C13,17.552 12.552,18 12,18C11.448,18 11,17.552 11,17L11,13C11,12.448 11.448,12 12,12zM16,12C16.552,12 17,12.448 17,13L17,17C17,17.552 16.552,18 16,18C15.448,18 15,17.552 15,17L15,13C15,12.448 15.448,12 16,12z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_tick.xml b/app/src/main/res/drawable/ic_tick.xml
new file mode 100644
index 00000000..fbeed5dd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tick.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M19.98,5.99A1,1 0,0 0,19.293 6.293L9,16.586L5.707,13.293A1,1 0,1 0,4.293 14.707L8.293,18.707A1,1 0,0 0,9.707 18.707L20.707,7.707A1,1 0,0 0,19.98 5.99z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_truck.xml b/app/src/main/res/drawable/ic_truck.xml
new file mode 100644
index 00000000..b7349998
--- /dev/null
+++ b/app/src/main/res/drawable/ic_truck.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M2,3C1.45,3 1,3.45 1,4L1,17C1,17.55 1.45,18 2,18L3.051,18C3.296,19.692 4.741,21 6.5,21C8.259,21 9.704,19.692 9.949,18L14.051,18C14.296,19.692 15.741,21 17.5,21C19.259,21 20.704,19.692 20.949,18L22,18C22.55,18 23,17.55 23,17L23,12.311C23,11.751 22.851,11.21 22.551,10.73L20.52,7.43C19.97,6.55 19.001,6 17.961,6L14,6L14,4C14,3.45 13.55,3 13,3L2,3zM14,8L17.961,8C18.311,8 18.631,8.18 18.811,8.48L20.85,11.779C20.95,11.939 21,12.121 21,12.311L21,16L20.648,16C20.084,14.822 18.891,14 17.5,14C16.109,14 14.916,14.822 14.352,16L14,16L14,8zM6.5,16C7.327,16 8,16.673 8,17.5C8,18.327 7.327,19 6.5,19C5.673,19 5,18.327 5,17.5C5,16.673 5.673,16 6.5,16zM17.5,16C18.327,16 19,16.673 19,17.5C19,18.327 18.327,19 17.5,19C16.673,19 16,18.327 16,17.5C16,16.673 16.673,16 17.5,16z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_truck_black_96.png b/app/src/main/res/drawable/ic_truck_black_96.png
deleted file mode 100644
index 38d65b2d..00000000
Binary files a/app/src/main/res/drawable/ic_truck_black_96.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_truck_with_clock.xml b/app/src/main/res/drawable/ic_truck_with_clock.xml
new file mode 100644
index 00000000..a3fe5887
--- /dev/null
+++ b/app/src/main/res/drawable/ic_truck_with_clock.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M6,1C2.691,1 0,3.691 0,7C0,8.771 0.776,10.361 2,11.461L2,18C2,18.552 2.448,19 3,19L3.051,19C3.296,20.692 4.742,22 6.5,22C8.258,22 9.704,20.692 9.949,19L14.051,19C14.296,20.692 15.74,22 17.498,22C19.256,22 20.702,20.692 20.947,19L22,19C22.552,19 23,18.552 23,18L23,15.307C23,14.75 22.847,14.206 22.555,13.732L20.518,10.428C19.968,9.534 19.012,9 17.963,9L16,9L16,7C16,6.448 15.552,6 15,6L11.91,6C11.431,3.167 8.967,1 6,1zM6,3C8.206,3 10,4.794 10,7C10,9.206 8.206,11 6,11C3.794,11 2,9.206 2,7C2,4.794 3.794,3 6,3zM6,5C5.448,5 5,5.448 5,6L5,8.207C5,8.34 5.053,8.468 5.146,8.561L5.998,9.412C6.389,9.803 7.022,9.803 7.412,9.412C7.802,9.021 7.803,8.389 7.412,7.998L7,7.586L7,6C7,5.448 6.552,5 6,5zM16,11L17.963,11C18.313,11 18.631,11.179 18.814,11.477L20.852,14.781C20.95,14.939 21,15.121 21,15.307L21,17L20.648,17C20.084,15.822 18.891,15 17.5,15C16.961,15 16.456,15.134 16,15.352L16,11zM6.5,17C7.327,17 8,17.673 8,18.5C8,19.327 7.327,20 6.5,20C5.673,20 5,19.327 5,18.5C5,17.673 5.673,17 6.5,17zM17.5,17C18.327,17 19,17.673 19,18.5C19,19.327 18.327,20 17.5,20C16.673,20 16,19.327 16,18.5C16,17.673 16.673,17 17.5,17z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_black_upload.xml b/app/src/main/res/drawable/ic_upload.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_black_upload.xml
rename to app/src/main/res/drawable/ic_upload.xml
diff --git a/app/src/main/res/drawable/ic_weight_kg.xml b/app/src/main/res/drawable/ic_weight_kg.xml
new file mode 100644
index 00000000..49a14fe5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_weight_kg.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,1C9.794,1 8,2.794 8,5L5,5C4.001,5 3.17,5.696 3.014,6.729L2.021,19.777C1.933,20.351 2.113,20.927 2.51,21.355C2.888,21.765 3.432,22 4,22L20,22C20.568,22 21.111,21.765 21.488,21.357C21.887,20.927 22.065,20.353 21.986,19.854L20.988,6.729L20.979,6.652C20.831,5.695 19.999,5 19,5L16,5C16,2.794 14.206,1 12,1zM12,3C13.103,3 14,3.897 14,5L10,5C10,3.897 10.897,3 12,3zM6.676,9.205L8.313,9.205L8.313,13.168L8.477,12.949L9.711,11.414L11.672,11.414L9.832,13.576L11.793,16.67L9.92,16.67L8.773,14.713L8.311,15.174L8.311,16.67L6.676,16.67L6.676,9.205zM14.406,11.318C14.953,11.318 15.382,11.502 15.688,11.871L15.746,11.414L17.232,11.414L17.232,16.471C17.232,16.934 17.125,17.336 16.908,17.678C16.693,18.019 16.384,18.281 15.975,18.463C15.567,18.647 15.094,18.736 14.557,18.736C14.172,18.736 13.799,18.665 13.438,18.518C13.076,18.372 12.8,18.183 12.609,17.951L13.295,16.988C13.599,17.347 14,17.527 14.498,17.527C15.223,17.527 15.586,17.156 15.586,16.412L15.586,16.246C15.272,16.593 14.874,16.766 14.396,16.766C13.755,16.766 13.238,16.522 12.842,16.031C12.447,15.541 12.25,14.885 12.25,14.063L12.25,14.004C12.25,13.474 12.338,13.004 12.512,12.596C12.688,12.189 12.939,11.871 13.266,11.65C13.593,11.429 13.972,11.318 14.406,11.318zM14.824,12.58C14.532,12.579 14.305,12.711 14.139,12.971C13.974,13.233 13.891,13.609 13.891,14.105C13.891,14.535 13.973,14.877 14.135,15.127C14.296,15.378 14.522,15.504 14.814,15.504C15.166,15.504 15.424,15.384 15.586,15.148L15.586,12.939C15.428,12.7 15.174,12.58 14.824,12.58z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_weight_kg_96px.png b/app/src/main/res/drawable/ic_weight_kg_96px.png
deleted file mode 100644
index 0ae68dba..00000000
Binary files a/app/src/main/res/drawable/ic_weight_kg_96px.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_workers.xml b/app/src/main/res/drawable/ic_workers.xml
new file mode 100644
index 00000000..9cf6a9f5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_workers.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M15.5,3C15.224,3 15,3.224 15,3.5L15,4.088C12.401,4.526 10.368,6.638 10.049,9.275C10.741,9.458 11.395,9.731 12,10.082L12,10.08C12.507,10.376 12.972,10.733 13.4,11.131C13.582,11.299 13.75,11.479 13.916,11.662C14.017,11.775 14.126,11.88 14.221,11.998L14.223,11.998C14.477,12.314 14.713,12.645 14.918,12.998L22.5,12.998C22.776,12.998 23,12.774 23,12.498L23,11.498C23,11.222 22.776,10.998 22.5,10.998L22,10.998L22,10C22,7.785 20.79,5.852 19,4.813L19,8C19,8.552 18.552,9 18,9C17.448,9 17,8.552 17,8L17,4.09L17,3.5C17,3.224 16.776,3 16.5,3L15.5,3zM7.5,10C7.224,10 7,10.224 7,10.5L7,11.092C4.167,11.57 2,14.033 2,17L2,18L1.5,18C1.224,18 1,18.224 1,18.5L1,19.5C1,19.776 1.224,20 1.5,20L14.5,20C14.776,20 15,19.776 15,19.5L15,18.5C15,18.224 14.776,18 14.5,18L14,18L14,17C14,14.785 12.79,12.851 11,11.813L11,15C11,15.552 10.552,16 10,16C9.448,16 9,15.552 9,15L9,11.09L9,10.5C9,10.224 8.776,10 8.5,10L7.5,10z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_workers_96px.png b/app/src/main/res/drawable/ic_workers_96px.png
deleted file mode 100644
index 1153ad5e..00000000
Binary files a/app/src/main/res/drawable/ic_workers_96px.png and /dev/null differ
diff --git a/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml b/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml
index 48d60ac4..d78b5cda 100644
--- a/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml
+++ b/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml
@@ -62,7 +62,7 @@
                     android:backgroundTint="@android:color/transparent"
                     android:onClick="@{() -> view.resetValues()}"
                     android:scaleType="fitCenter"
-                    android:src="@drawable/ic_erase_96"
+                    android:src="@drawable/ic_erase"
                     android:tint="@android:color/white" />
 
                 <androidx.appcompat.widget.AppCompatImageButton
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 9c1c8a81..a67fc559 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
@@ -289,7 +289,7 @@
                                     android:layout_height="24dp"
                                     android:layout_gravity="center_vertical"
                                     android:layout_margin="8dp"
-                                    android:src="@drawable/ic_truck_black_96"
+                                    android:src="@drawable/ic_truck_with_clock"
                                     android:tint="@color/gray_500" />
 
                             </androidx.appcompat.widget.LinearLayoutCompat>
@@ -332,7 +332,7 @@
                                         android:layout_height="24dp"
                                         android:layout_gravity="center_vertical"
                                         android:layout_margin="8dp"
-                                        android:src="@drawable/ic_pallet_96px"
+                                        android:src="@drawable/ic_pallet"
                                         android:tint="@color/gray_500" />
 
                                     <androidx.appcompat.widget.LinearLayoutCompat
@@ -446,7 +446,7 @@
                                         android:layout_height="24dp"
                                         android:layout_gravity="center_vertical"
                                         android:layout_margin="8dp"
-                                        android:src="@drawable/ic_weight_kg_96px"
+                                        android:src="@drawable/ic_weight_kg"
                                         android:tint="@color/gray_500" />
 
                                     <androidx.appcompat.widget.LinearLayoutCompat
@@ -565,7 +565,7 @@
                                         android:layout_height="24dp"
                                         android:layout_gravity="center_vertical"
                                         android:layout_margin="8dp"
-                                        android:src="@drawable/ic_pallet_96px"
+                                        android:src="@drawable/ic_pallet"
                                         android:tint="@color/gray_500" />
 
 
@@ -706,7 +706,7 @@
                                         android:layout_height="24dp"
                                         android:layout_gravity="center_vertical"
                                         android:layout_margin="8dp"
-                                        android:src="@drawable/ic_weight_kg_96px"
+                                        android:src="@drawable/ic_weight_kg"
                                         android:tint="@color/gray_500" />
 
                                 </androidx.appcompat.widget.LinearLayoutCompat>
@@ -857,7 +857,7 @@
                                     android:layout_height="24dp"
                                     android:layout_gravity="center_vertical"
                                     android:layout_margin="8dp"
-                                    android:src="@drawable/ic_pallet_96px"
+                                    android:src="@drawable/ic_pallet"
                                     android:tint="@color/gray_500" />
 
                             </androidx.appcompat.widget.LinearLayoutCompat>
@@ -969,7 +969,7 @@
                                     android:layout_height="24dp"
                                     android:layout_gravity="center_vertical"
                                     android:layout_margin="8dp"
-                                    android:src="@drawable/ic_weight_kg_96px"
+                                    android:src="@drawable/ic_weight_kg"
                                     android:tint="@color/gray_500" />
 
                             </androidx.appcompat.widget.LinearLayoutCompat>
@@ -1125,7 +1125,7 @@
                                     android:layout_height="24dp"
                                     android:layout_gravity="center_vertical"
                                     android:layout_margin="8dp"
-                                    android:src="@drawable/ic_weight_kg_96px"
+                                    android:src="@drawable/ic_weight_kg"
                                     android:tint="@color/gray_500" />
 
                             </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/activity_contab_doc_interni_edit.xml b/app/src/main/res/layout/activity_contab_doc_interni_edit.xml
index 495a8f3c..d8eef804 100644
--- a/app/src/main/res/layout/activity_contab_doc_interni_edit.xml
+++ b/app/src/main/res/layout/activity_contab_doc_interni_edit.xml
@@ -319,7 +319,7 @@
                 android:id="@+id/export_document"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_black_upload"
+                android:src="@drawable/ic_upload"
                 android:visibility="@{view.isDocumentExportable.get() ? View.VISIBLE : View.GONE}"
                 app:fab_colorNormal="@color/white"
                 app:fab_colorPressed="@color/white_pressed"
diff --git a/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml b/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml
index 5d24dddb..1c2815a4 100644
--- a/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml
+++ b/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml
@@ -240,7 +240,7 @@
                     android:id="@+id/pv_ordine_export"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_black_upload"
+                    android:src="@drawable/ic_upload"
                     android:visibility="gone"
                     app:fab_colorNormal="@color/white"
                     app:fab_colorPressed="@color/white_pressed"
diff --git a/app/src/main/res/layout/dialog_basket_lu__page2.xml b/app/src/main/res/layout/dialog_basket_lu__page2.xml
index 532d1760..604a52ba 100644
--- a/app/src/main/res/layout/dialog_basket_lu__page2.xml
+++ b/app/src/main/res/layout/dialog_basket_lu__page2.xml
@@ -111,7 +111,7 @@
                         android:layout_height="52dp"
                         android:layout_marginHorizontal="8dp"
                         android:text="@string/back"
-                        app:icon="@drawable/ic_black_back"
+                        app:icon="@drawable/ic_back"
                         app:iconGravity="textStart"
                         app:layout_constraintEnd_toStartOf="@id/center_buttons_guideline"
                         app:layout_constraintStart_toStartOf="parent"
@@ -126,7 +126,7 @@
                         android:layout_height="52dp"
                         android:layout_marginHorizontal="8dp"
                         android:text="@string/use"
-                        app:icon="@drawable/ic_black_tick"
+                        app:icon="@drawable/ic_tick"
                         app:iconGravity="textStart"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="@id/center_buttons_guideline"
diff --git a/app/src/main/res/layout/dialog_input_lu_prod.xml b/app/src/main/res/layout/dialog_input_lu_prod.xml
index 9ee24e63..0d99ed97 100644
--- a/app/src/main/res/layout/dialog_input_lu_prod.xml
+++ b/app/src/main/res/layout/dialog_input_lu_prod.xml
@@ -47,7 +47,7 @@
                 android:layout_gravity="end"
                 android:adjustViewBounds="true"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_erase_96"
+                android:src="@drawable/ic_erase"
                 android:backgroundTint="@android:color/transparent"
                 android:onClick="@{() -> view.resetValues()}"
                 android:tint="@android:color/white" />
diff --git a/app/src/main/res/layout/dialog_scan_or_create_lu.xml b/app/src/main/res/layout/dialog_scan_or_create_lu.xml
index 8ebc95f6..866af6c0 100644
--- a/app/src/main/res/layout/dialog_scan_or_create_lu.xml
+++ b/app/src/main/res/layout/dialog_scan_or_create_lu.xml
@@ -133,7 +133,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/button_view_basket_ul"
-                    app:icon="@drawable/ic_black_shopping_cart"
+                    app:icon="@drawable/ic_shopping_basket"
                     app:iconSize="24dp" />
             </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 aa051083..2679d28e 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
@@ -279,7 +279,7 @@
                                 android:layout_height="24dp"
                                 android:layout_gravity="center_vertical"
                                 android:layout_margin="8dp"
-                                android:src="@drawable/ic_truck_black_96"
+                                android:src="@drawable/ic_truck_with_clock"
                                 android:tint="@color/gray_500" />
 
                         </androidx.appcompat.widget.LinearLayoutCompat>
@@ -322,7 +322,7 @@
                                     android:layout_height="24dp"
                                     android:layout_gravity="center_vertical"
                                     android:layout_margin="8dp"
-                                    android:src="@drawable/ic_pallet_96px"
+                                    android:src="@drawable/ic_pallet"
                                     android:tint="@color/gray_500" />
 
                                 <androidx.appcompat.widget.LinearLayoutCompat
@@ -436,7 +436,7 @@
                                     android:layout_height="24dp"
                                     android:layout_gravity="center_vertical"
                                     android:layout_margin="8dp"
-                                    android:src="@drawable/ic_weight_kg_96px"
+                                    android:src="@drawable/ic_weight_kg"
                                     android:tint="@color/gray_500" />
 
                                 <androidx.appcompat.widget.LinearLayoutCompat
@@ -555,7 +555,7 @@
                                     android:layout_height="24dp"
                                     android:layout_gravity="center_vertical"
                                     android:layout_margin="8dp"
-                                    android:src="@drawable/ic_pallet_96px"
+                                    android:src="@drawable/ic_pallet"
                                     android:tint="@color/gray_500" />
 
 
@@ -696,7 +696,7 @@
                                     android:layout_height="24dp"
                                     android:layout_gravity="center_vertical"
                                     android:layout_margin="8dp"
-                                    android:src="@drawable/ic_weight_kg_96px"
+                                    android:src="@drawable/ic_weight_kg"
                                     android:tint="@color/gray_500" />
 
                             </androidx.appcompat.widget.LinearLayoutCompat>
@@ -847,7 +847,7 @@
                                 android:layout_height="24dp"
                                 android:layout_gravity="center_vertical"
                                 android:layout_margin="8dp"
-                                android:src="@drawable/ic_pallet_96px"
+                                android:src="@drawable/ic_pallet"
                                 android:tint="@color/gray_500" />
 
                         </androidx.appcompat.widget.LinearLayoutCompat>
@@ -959,7 +959,7 @@
                                 android:layout_height="24dp"
                                 android:layout_gravity="center_vertical"
                                 android:layout_margin="8dp"
-                                android:src="@drawable/ic_weight_kg_96px"
+                                android:src="@drawable/ic_weight_kg"
                                 android:tint="@color/gray_500" />
 
                         </androidx.appcompat.widget.LinearLayoutCompat>
@@ -1115,7 +1115,7 @@
                                 android:layout_height="24dp"
                                 android:layout_gravity="center_vertical"
                                 android:layout_margin="8dp"
-                                android:src="@drawable/ic_weight_kg_96px"
+                                android:src="@drawable/ic_weight_kg"
                                 android:tint="@color/gray_500" />
 
                         </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/menu/picking_inventario_menu.xml b/app/src/main/res/menu/picking_inventario_menu.xml
index d76021b3..622d7c94 100644
--- a/app/src/main/res/menu/picking_inventario_menu.xml
+++ b/app/src/main/res/menu/picking_inventario_menu.xml
@@ -5,7 +5,7 @@
     <item
         android:id="@+id/export"
         android:title="@string/action_export"
-        android:icon="@drawable/ic_black_upload"
+        android:icon="@drawable/ic_upload"
         android:contentDescription="@string/action_export"
         app:showAsAction="always" />
 
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 673ed822..865f8501 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -21,6 +21,7 @@
     <string name="accettazione_ordine_inevaso_title_multiple_order">Ordini di accettazione</string>
     <string name="vendita_title_fragment">Spedizione</string>
     <string name="rettifica_giacenze_fragment_title">Rettifica giacenze</string>
+    <string name="rettifica_spedizione_fragment_title">Rettifica spedizione</string>
     <string name="inventario_fragment_title">Inventario</string>
     <string name="prod_fabbisogno_linee_prod_title">Approvvig. linee prod.</string>
     <string name="versamento_merce_fragment_title">Posizionamento merce</string>
diff --git a/app/src/main/res/values/config.xml b/app/src/main/res/values/config.xml
index e505f087..4a63fe50 100644
--- a/app/src/main/res/values/config.xml
+++ b/app/src/main/res/values/config.xml
@@ -15,6 +15,7 @@
     <item name="nav_accettazione" type="id" />
     <item name="nav_spedizione" type="id" />
     <item name="nav_rettifica_giacenze" type="id" />
+    <item name="nav_rettifica_spedizione" type="id" />
     <item name="nav_inventario" type="id" />
     <item name="nav_versamento_merce" type="id" />
     <item name="nav_free_picking" type="id" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c0f6948b..10f3e776 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -59,6 +59,7 @@
     <string name="accettazione_ordine_inevaso_title_multiple_order">Multiple acceptance orders</string>
     <string name="vendita_title_fragment">Check out</string>
     <string name="rettifica_giacenze_fragment_title">Inventory</string>
+    <string name="rettifica_spedizione_fragment_title">Inventory</string>
     <string name="inventario_fragment_title">Inventory</string>
     <string name="prod_fabbisogno_linee_prod_title">Production line requirements</string>
     <string name="versamento_merce_fragment_title">Items placement</string>
diff --git a/build.gradle b/build.gradle
index f5506849..591a7bb3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@
 buildscript {
     ext {
         kotlin_version = '1.8.0'
-        agp_version = '8.1.0-alpha05'
+        agp_version = '8.1.0-alpha06'
     }
 
     repositories {