diff --git a/.gitignore b/.gitignore
index 29149da5..bb20401c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -149,5 +149,6 @@ crashlytics.properties
 crashlytics-build.properties
 ### AndroidStudio Patch ###
 !/gradle/wrapper/gradle-wrapper.jar
-/.idea/copilot.data.migration.agent.xml
-/.idea/copilot.data.migration.edit.xml
+
+copilot.*.xml
+/.idea/dataSources.xml
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 65815674..5ab70353 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-05-14T09:45:15.341614500Z">
+        <DropdownSelection timestamp="2025-10-02T11:26:10.944286600Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=23324B682F" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=7da0808" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index 51b09c0b..4c7538b0 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -36,7 +36,7 @@ pipeline {
 
         stage('Publish') {
             steps {
-                azureUpload allowAnonymousAccess: true, fileShareName: 'storage-ci', filesPath: 'app/build/outputs/apk/release/*', removePrefixPath: 'app/build/outputs/apk/release/', storageCredentialId: '83a86793-c1d6-4776-b20f-1ff652a57fee', storageType: 'filestorage', uploadArtifactsOnlyIfSuccessful: true, verbose: true, virtualPath: 'wms'
+                azureUpload allowAnonymousAccess: true, fileShareName: 'storage-ci', filesPath: 'app/build/outputs/apk/release/*.apk,app/build/outputs/apk/release/*.txt', removePrefixPath: 'app/build/outputs/apk/release/', storageCredentialId: '83a86793-c1d6-4776-b20f-1ff652a57fee', storageType: 'filestorage', uploadArtifactsOnlyIfSuccessful: true, verbose: true, virtualPath: 'wms'
             }
         }
     }
diff --git a/app/build.gradle b/app/build.gradle
index 0287b3c4..4707b2de 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 528
-    def appVersionName = '1.47.15'
+    def appVersionCode = 537
+    def appVersionName = '1.47.24'
 
     signingConfigs {
         release {
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
index c7116656..dce9fdbd 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
@@ -142,6 +142,8 @@ import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBat
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotModule;
 import it.integry.integrywmsnative.view.dialogs.create_new_art.DialogCreateNewArtComponent;
 import it.integry.integrywmsnative.view.dialogs.create_new_art.DialogCreateNewArtModule;
+import it.integry.integrywmsnative.view.dialogs.device_end_of_life.DialogDeviceEndOfLifeComponent;
+import it.integry.integrywmsnative.view.dialogs.device_end_of_life.DialogDeviceEndOfLifeModule;
 import it.integry.integrywmsnative.view.dialogs.extra_info.DialogExtraInfoComponent;
 import it.integry.integrywmsnative.view.dialogs.extra_info.DialogExtraInfoModule;
 import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLUComponent;
@@ -251,7 +253,8 @@ import it.integry.integrywmsnative.view.dialogs.update_available.DialogUpdateAva
         VerificaGiacenzeModule.class,
         DialogExtraInfoModule.class,
         DialogAskDepositoModule.class,
-        DialogChooseArtFromListaArtsModule.class
+        DialogChooseArtFromListaArtsModule.class,
+        DialogDeviceEndOfLifeModule.class
 })
 public interface MainApplicationComponent {
 
@@ -422,6 +425,8 @@ public interface MainApplicationComponent {
 
     DialogChooseArtFromListaArtsComponent.Factory dialogChooseArtFromListaArtsComponent();
 
+    DialogDeviceEndOfLifeComponent.Factory dialogDeviceEndOfLifeComponent();
+
     void inject(MainApplication mainApplication);
 
     void inject(AppContext mainApplication);
diff --git a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
index 8527b644..732a8f77 100644
--- a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.SpannableString;
@@ -12,8 +13,10 @@ import android.view.LayoutInflater;
 
 import androidx.databinding.DataBindingUtil;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
 
 import javax.inject.Inject;
 
@@ -27,6 +30,7 @@ import it.integry.integrywmsnative.databinding.ActivitySplashBinding;
 import it.integry.integrywmsnative.gest.login.LoginActivity;
 import it.integry.integrywmsnative.gest.main.MainActivity;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
+import it.integry.integrywmsnative.view.dialogs.device_end_of_life.DialogDeviceEndOfLifeView;
 
 public class SplashActivity extends BaseActivity implements MainContext.Listener {
 
@@ -65,9 +69,24 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener
 
         UtilityContext.initMainActivity(this);
 
+        LocalDate endSupportDate = LocalDate.of(2026, 1, 31);
 
-        initAppVersion();
-        initPermissions(this::init);
+        boolean isOldAndroid = Build.VERSION.SDK_INT < Build.VERSION_CODES.O;
+
+        executorService.execute(() -> {
+
+            if (isOldAndroid)
+                showDeviceEndOfLifeMessage();
+
+            handler.post(() -> {
+                if (LocalDate.now().isBefore(endSupportDate) || !isOldAndroid) {
+                    initAppVersion();
+                    initPermissions(this::init);
+                } else {
+                    this.finish();
+                }
+            });
+        });
     }
 
     private void initAppVersion() {
@@ -105,6 +124,21 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener
         }
     }
 
+
+    private void showDeviceEndOfLifeMessage() {
+
+        CountDownLatch latch = new CountDownLatch(1);
+
+        DialogDeviceEndOfLifeView.newInstance(latch::countDown)
+                .show(this.getSupportFragmentManager(), "dialog_device_end_of_life");
+
+        try {
+            latch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     @Override
     public void onDBDataLoading(String item) {
         handler.post(() -> mBinding.loadingInfoTextview.setText("Caricamento " + item));
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java
index 6709366e..21cbe253 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java
@@ -89,7 +89,21 @@ public class AppContext {
     private void initLogger() {
         Logger.addLogAdapter(new AndroidLogAdapter());
 
-        logsFolder = new File(mApplicationContext.getExternalFilesDir(null).getAbsolutePath());
+        File dataDir = mApplicationContext.getExternalFilesDir(null);
+
+        logsFolder = new File(dataDir, "logs");
+
+        if (!logsFolder.exists())
+            logsFolder.mkdirs();
+
+        //Temporary clean
+        File[] wrongFilesToBeDeleted = dataDir.listFiles((file, s) -> s.startsWith("logs_"));
+
+        if (wrongFilesToBeDeleted != null)
+            for (File fileToDelete : wrongFilesToBeDeleted) {
+                fileToDelete.delete();
+            }
+
         removeOldLogs(logsFolder);
 
         int maxBytesSize = 5 * 1024 * 1024;
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableFloat.java b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableFloat.java
index b6223f41..fcb58c50 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/di/BindableFloat.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/BindableFloat.java
@@ -4,9 +4,6 @@ import androidx.databinding.BaseObservable;
 
 import java.math.BigDecimal;
 
-import it.integry.integrywmsnative.core.CommonConst;
-import it.integry.integrywmsnative.core.utility.UtilityNumber;
-
 public class BindableFloat extends BaseObservable {
     private Float value;
 
@@ -15,10 +12,6 @@ public class BindableFloat extends BaseObservable {
     }
 
     public BigDecimal getBigDecimal() {
-        int numberOfDigits = UtilityNumber.countNumberOfDecimalDigits(get());
-
-        if(numberOfDigits > CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS) numberOfDigits = CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS;
-
         return BigDecimal.valueOf(get());
     }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
index 6b7ece87..8ccd1b09 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
@@ -11,6 +11,7 @@ import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
+import android.widget.TextView;
 
 import androidx.annotation.ColorRes;
 import androidx.appcompat.widget.AppCompatCheckBox;
@@ -37,6 +38,8 @@ import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
@@ -45,6 +48,7 @@ import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.LocaleDecimalKeyListener;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
@@ -261,7 +265,7 @@ public class Converters {
                     BigDecimal value = null;
 
                     if (!UtilityString.isNullOrEmpty(s.toString()))
-                        value = new BigDecimal(s.toString());
+                        value = UtilityNumber.parseBigDecimal(s.toString(), Locale.getDefault());
 
                     observableBigDecimal.set(value);
                 }
@@ -271,7 +275,7 @@ public class Converters {
         }
 
         BigDecimal newValue = observableBigDecimal.get();
-        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
+        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? UtilityNumber.parseBigDecimal(view.getText().toString(), Locale.getDefault()) : null;
 
         if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
             view.setText(UtilityNumber.decimalToString(newValue));
@@ -292,7 +296,7 @@ public class Converters {
                     String newValueString = s.toString().trim();
 
                     if (!UtilityString.isNullOrEmpty(newValueString))
-                        value = new BigDecimal(newValueString);
+                        value = UtilityNumber.parseBigDecimal(newValueString, Locale.getDefault());
 
                     observableBigDecimal.set(value);
                 }
@@ -301,7 +305,7 @@ public class Converters {
             view.addTextChangedListener(watcher);
         }
         BigDecimal newValue = observableBigDecimal.get();
-        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
+        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? UtilityNumber.parseBigDecimal(view.getText().toString(), Locale.getDefault()) : null;
 
         if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
             view.setText(UtilityNumber.decimalToString(newValue));
@@ -322,7 +326,7 @@ public class Converters {
                     String newValueString = s.toString().trim();
 
                     if (!UtilityString.isNullOrEmpty(newValueString))
-                        value = new BigDecimal(newValueString);
+                        value = UtilityNumber.parseBigDecimal(newValueString, Locale.getDefault());
 
                     observableBigDecimal.set(value);
                 }
@@ -331,7 +335,7 @@ public class Converters {
             view.addTextChangedListener(watcher);
         }
         BigDecimal newValue = observableBigDecimal.get();
-        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
+        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? UtilityNumber.parseBigDecimal(view.getText().toString(), Locale.getDefault()) : null;
 
         if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
             view.setText(UtilityNumber.decimalToString(newValue));
@@ -350,7 +354,8 @@ public class Converters {
                 public void onTextChanged(CharSequence s, int start, int before, int count) {
                     BigDecimal value = null;
                     if (!UtilityString.isNullOrEmpty(s.toString()))
-                        value = new BigDecimal(s.toString());
+                        value = UtilityNumber.parseBigDecimal(s.toString(), Locale.getDefault());
+
                     bindableBigDecimal.set(value);
                 }
             };
@@ -358,7 +363,7 @@ public class Converters {
             view.addTextChangedListener(watcher);
         }
         BigDecimal newValue = bindableBigDecimal.get();
-        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? new BigDecimal(view.getText().toString()) : null;
+        BigDecimal viewValue = !view.getText().toString().trim().isEmpty() ? UtilityNumber.parseBigDecimal(view.getText().toString(), Locale.getDefault()) : null;
 
         if (!UtilityBigDecimal.equalsTo(viewValue, newValue)) {
             view.setText(UtilityNumber.decimalToString(newValue));
@@ -974,4 +979,64 @@ public class Converters {
         view.setLayoutParams(layoutParams);
     }
 
-}
\ No newline at end of file
+    /**
+     * BindingAdapter per bindare una LocalDate diretta su una TextView con un formato specificato.
+     * Esempio di utilizzo in XML:
+     * app:localDateText="@{myLocalDate}" app:dateFormat="@{@string/my_date_format}"
+     */
+    @BindingAdapter(value = {"localDateText", "dateFormat"}, requireAll = false)
+    public static void bindLocalDateText(TextView view, LocalDate date, String dateFormat) {
+        if (date == null) {
+            view.setText("");
+            return;
+        }
+        String pattern = dateFormat != null ? dateFormat : "dd/MM/yyyy";
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        view.setText(date.format(formatter));
+    }
+
+    @BindingAdapter(value = {"localDateTimeText", "dateFormat"}, requireAll = false)
+    public static void bindLocalDateText(TextView view, LocalDateTime date, String dateFormat) {
+        if (date == null) {
+            view.setText("");
+            return;
+        }
+        String pattern = dateFormat != null ? dateFormat : "dd/MM/yyyy hh:mm";
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        view.setText(date.format(formatter));
+    }
+
+    /**
+     * BindingAdapter per bindare una ObservableField<LocalDate> su una TextView con un formato specificato.
+     * Esempio di utilizzo in XML:
+     * app:localDateObservableText="@{myObservableLocalDate}" app:dateFormat="@{@string/my_date_format}"
+     */
+    @BindingAdapter(value = {"localDateObservableText", "dateFormat"}, requireAll = false)
+    public static void bindObservableLocalDateText(TextView view, ObservableField<LocalDate> observableDate, String dateFormat) {
+        if (observableDate == null) {
+            view.setText("");
+            return;
+        }
+        LocalDate date = observableDate.get();
+        if (date == null) {
+            view.setText("");
+            return;
+        }
+        String pattern = dateFormat != null ? dateFormat : "dd/MM/yyyy";
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        view.setText(date.format(formatter));
+    }
+
+    /**
+     * BindingAdapter che applica automaticamente il KeyListener localizzato
+     * ai campi con inputType numberDecimal, permettendo l'uso della virgola
+     * come separatore decimale in base al locale del dispositivo.
+     */
+    @BindingAdapter("useLocaleDecimalInput")
+    public static void setLocaleDecimalInput(EditText view, boolean useLocaleInput) {
+        if (useLocaleInput) {
+            view.setKeyListener(LocaleDecimalKeyListener.getInstance());
+        }
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumer.java
index ada5b12f..2fd21ad6 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumer.java
@@ -1,5 +1,6 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import java.util.List;
 import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
@@ -9,6 +10,7 @@ import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.RESTBuilder;
 import it.integry.integrywmsnative.core.rest.model.materiali.RecuperaMaterialiRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.materiali.VersaMaterialiRequestDTO;
+import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdULRestDTO;
 
 @Singleton
 public class MaterialiRESTConsumer extends _BaseRESTConsumer {
@@ -21,6 +23,28 @@ public class MaterialiRESTConsumer extends _BaseRESTConsumer {
         this.executorService = executorService;
     }
 
+    public List<HistoryVersamentoProdULRestDTO> makeSynchronousRetrieveLastVersamentiRequest(String codJfas) throws Exception {
+        var materialiRESTConsumerService = restBuilder.getService(MaterialiRESTConsumerService.class);
+
+        var response = materialiRESTConsumerService.retrieveLastVersamenti(codJfas)
+                .execute();
+
+
+        var data = analyzeAnswer(response, "retrieveLastVersamenti");
+        return data;
+    }
+
+    public void makeRetrieveLastVersamentiRequest(String codJfas, final RunnableArgs<List<HistoryVersamentoProdULRestDTO>> onComplete, final RunnableArgs<Exception> onFailed) {
+        executorService.execute(() -> {
+            try {
+                var response = makeSynchronousRetrieveLastVersamentiRequest(codJfas);
+                if (onComplete != null) onComplete.run(response);
+            } catch (Exception ex) {
+                if (onFailed != null) onFailed.run(ex);
+            }
+        });
+    }
+
     public MtbColt makeSynchronousRecuperaRequest(RecuperaMaterialiRequestDTO request) throws Exception {
         var materialiRESTConsumerService = restBuilder.getService(MaterialiRESTConsumerService.class);
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumerService.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumerService.java
index b26c51a2..6d0f99f4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumerService.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MaterialiRESTConsumerService.java
@@ -1,17 +1,26 @@
 package it.integry.integrywmsnative.core.rest.consumers;
 
+import java.util.List;
+
 import it.integry.integrywmsnative.core.rest.model.ServiceRESTResponse;
 import it.integry.integrywmsnative.core.rest.model.materiali.RecuperaMaterialiRequestDTO;
 import it.integry.integrywmsnative.core.rest.model.materiali.RecuperaMaterialiResponseDTO;
 import it.integry.integrywmsnative.core.rest.model.materiali.VersaMaterialiRequestDTO;
+import it.integry.integrywmsnative.core.rest.model.materiali.VersaMaterialiResponseDTO;
+import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdULRestDTO;
 import retrofit2.Call;
 import retrofit2.http.Body;
+import retrofit2.http.GET;
 import retrofit2.http.POST;
+import retrofit2.http.Query;
 
 public interface MaterialiRESTConsumerService {
 
     @POST("wms/materiali/versa")
-    Call<ServiceRESTResponse<RecuperaMaterialiResponseDTO>> versa(@Body VersaMaterialiRequestDTO request);
+    Call<ServiceRESTResponse<VersaMaterialiResponseDTO>> versa(@Body VersaMaterialiRequestDTO request);
+
+    @GET("wms/materiali/retrieveLastVersamenti")
+    Call<ServiceRESTResponse<List<HistoryVersamentoProdULRestDTO>>> retrieveLastVersamenti(@Query("codJfas") String codJfas);
 
     @POST("wms/materiali/recupera")
     Call<ServiceRESTResponse<RecuperaMaterialiResponseDTO>> recupera(@Body RecuperaMaterialiRequestDTO request);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/DecimalInputFilter.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/DecimalInputFilter.java
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/DecimalInputFilter.java
@@ -0,0 +1 @@
+
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/LocaleDecimalKeyListener.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/LocaleDecimalKeyListener.java
new file mode 100644
index 00000000..18db4ddd
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/LocaleDecimalKeyListener.java
@@ -0,0 +1,29 @@
+package it.integry.integrywmsnative.core.utility;
+
+import android.text.method.DigitsKeyListener;
+
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
+
+/**
+ * KeyListener personalizzato che accetta numeri decimali
+ * usando il separatore decimale del locale corrente (virgola per italiano)
+ */
+public class LocaleDecimalKeyListener {
+
+    /**
+     * Ottiene un'istanza del KeyListener per il locale corrente
+     */
+    public static DigitsKeyListener getInstance() {
+        return getInstance(Locale.getDefault());
+    }
+
+    /**
+     * Ottiene un'istanza del KeyListener per un locale specifico
+     */
+    public static DigitsKeyListener getInstance(Locale locale) {
+        DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
+        char decimalSeparator = symbols.getDecimalSeparator();
+        return DigitsKeyListener.getInstance("0123456789" + decimalSeparator);
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java
index 4da65217..232b78fc 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityNumber.java
@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.core.utility;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.util.Locale;
@@ -9,7 +10,8 @@ import it.integry.integrywmsnative.core.CommonConst;
 
 public class UtilityNumber {
 
-    private static DecimalFormat decimalFormatInstance;
+    // Locale italiano per la formattazione
+    private static final Locale ITALIAN_LOCALE = new Locale("it", "IT");
 
     public static String decimalToString(Float bigDecimal){
         if(bigDecimal == null) return "0";
@@ -23,71 +25,59 @@ public class UtilityNumber {
 
     public static String decimalToString(BigDecimal bigDecimal, int decimal){
         if(bigDecimal == null) return "0";
-        return decimalToString(bigDecimal.floatValue(), decimal);
+
+        // Usa stripTrailingZeros per rimuovere gli zeri finali
+        BigDecimal stripped = bigDecimal.stripTrailingZeros();
+        // Limita il numero di decimali visualizzati
+        int scale = Math.min(stripped.scale(), decimal);
+        stripped = stripped.setScale(scale, RoundingMode.DOWN);
+
+        // Configura il formato italiano con virgola come separatore decimale
+        DecimalFormatSymbols italianSymbols = new DecimalFormatSymbols(ITALIAN_LOCALE);
+        italianSymbols.setDecimalSeparator(',');
+
+        // Crea il pattern dinamico basato sul numero di decimali
+        StringBuilder patternBuilder = new StringBuilder("0");
+        if (scale > 0) {
+            patternBuilder.append(".");
+            for (int i = 0; i < scale; i++) {
+                patternBuilder.append("0");
+            }
+        }
+
+        DecimalFormat formatter = new DecimalFormat(patternBuilder.toString(), italianSymbols);
+        String result = formatter.format(stripped);
+
+        // Se il risultato termina con ',', rimuovilo (per i numeri interi)
+        if (result.endsWith(",")) {
+            result = result.substring(0, result.length() - 1);
+        }
+
+        return result;
     }
 
     public static String decimalToString(float floatValue, int decimal) {
-        DecimalFormatSymbols otherSymbols = new DecimalFormatSymbols(Locale.getDefault());
-        otherSymbols.setDecimalSeparator('.');
-        otherSymbols.setGroupingSeparator(',');
-
-        final DecimalFormat decimalFormat = new DecimalFormat();
-        decimalFormat.setMaximumFractionDigits(decimal);
-        decimalFormat.setDecimalFormatSymbols(otherSymbols);
-        decimalFormat.setGroupingUsed(false);
-        decimalFormat.setMinimumFractionDigits(Math.min(2, decimal));
-
-        return decimalFormat.format(floatValue);
+        return decimalToString(BigDecimal.valueOf(floatValue), decimal);
     }
 
-    public static DecimalFormat getNumberFormatInstance() {
-
-        if(decimalFormatInstance == null) {
-            DecimalFormatSymbols otherSymbols = new DecimalFormatSymbols(Locale.getDefault());
-            otherSymbols.setDecimalSeparator('.');
-            otherSymbols.setGroupingSeparator(',');
-
-            decimalFormatInstance = new DecimalFormat();
-            decimalFormatInstance.setMaximumFractionDigits(CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS);
-            decimalFormatInstance.setDecimalFormatSymbols(otherSymbols);
-            decimalFormatInstance.setGroupingUsed(false);
+    public static BigDecimal parseBigDecimal(String value, Locale locale) {
+        if (value == null || value.trim().isEmpty()) return null;
+        try {
+            DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
+            DecimalFormat format = new DecimalFormat();
+            format.setDecimalFormatSymbols(symbols);
+            format.setParseBigDecimal(true);
+            return (BigDecimal) format.parse(value);
+        } catch (Exception e) {
+            return null;
         }
-
-        return decimalFormatInstance;
     }
 
-    public static int countNumberOfDecimalDigits(Float value) {
-        String text = getNumberFormatInstance().format(Math.abs(value));
-        int integerPlaces = text.indexOf('.');
-        int decimalPlaces = text.length() - integerPlaces - 1;
-
-        return decimalPlaces;
-    }
-
-    public static String normalizeStringNumber(String numberString) {
-        return numberString.replaceAll(",", ".");
-    }
-
-
-
-
-    public static Float decimalToFloat(BigDecimal bigDecimalValue) {
-        float multiplier = (float) Math.pow(10, CommonConst.Config.NUMBER_OF_DECIMAL_DIGITS);
-
-        Float floatValue = null;
-
-        if(bigDecimalValue != null) {
-            int intValue = (int) (bigDecimalValue.floatValue() * multiplier);
-            floatValue = Float.valueOf(intValue / multiplier);
-        }
-
-        return floatValue;
-    }
-
-    public static float truncateToDecimal(float v, int i) {
-        int delta = 10*i;
-
-        return ((int)v*delta)/delta;
-
+    /**
+     * Parsa una stringa numerica italiana (con virgola come separatore decimale)
+     * e restituisce un BigDecimal
+     */
+    public static BigDecimal parseItalianBigDecimal(String value) {
+        return parseBigDecimal(value, ITALIAN_LOCALE);
     }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityResources.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityResources.java
index bf222acf..dabced17 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityResources.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityResources.java
@@ -3,9 +3,15 @@ package it.integry.integrywmsnative.core.utility;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.content.res.ColorStateList;
+import android.util.TypedValue;
 
+import androidx.annotation.AttrRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
 import androidx.annotation.RawRes;
 import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -69,4 +75,23 @@ public class UtilityResources {
         return 0;
     }
 
+
+
+
+
+    // Funzione di utilità per ottenere un colore da un attributo del tema
+    public static @ColorRes int getColorResourceFromAttr(Context context, @AttrRes int attrRes) {
+        TypedValue typedValue = new TypedValue();
+        context.getTheme().resolveAttribute(attrRes, typedValue, true);
+        return typedValue.data;
+    }
+
+    public static @ColorInt int getColorFromAttr(Context context, @AttrRes int attrRes) {
+        return ContextCompat.getColor(context, getColorResourceFromAttr(context, attrRes));
+    }
+
+    public static ColorStateList getColorStateListFromAttr(Context context, @AttrRes int attrRes) {
+        return ColorStateList.valueOf(getColorResourceFromAttr(context, attrRes));
+    }
+
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
index bf8f8a83..6010f2e8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
@@ -114,7 +114,7 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
         } else if (position % 2 == 1) {
             holder.mBinding.getRoot().setBackgroundColor(Color.WHITE);
         } else {
-            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
+            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBGLight));
         }
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java
index eb21ba04..4ec1481a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java
@@ -114,7 +114,7 @@ public class AccettazioneOrdiniPickingListAdapter extends SectionedRecyclerViewA
         } else if (position % 2 == 1) {
             holder.mBinding.getRoot().setBackgroundColor(Color.WHITE);
         } else {
-            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
+            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBGLight));
         }
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java
index 0d522fb4..ac8346cd 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java
@@ -102,7 +102,7 @@ public class MainActivity extends BaseActivity
 
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
                 this, mBinding.drawerLayout, mBinding.appBarMain.toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
-        mBinding.drawerLayout.setDrawerListener(toggle);
+        mBinding.drawerLayout.addDrawerListener(toggle);
         toggle.syncState();
 
 
@@ -122,6 +122,16 @@ public class MainActivity extends BaseActivity
         startActivity(myIntent);
     }
 
+
+    public void toggleDrawer() {
+        if (mBinding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
+            mBinding.drawerLayout.closeDrawer(GravityCompat.START);
+        } else {
+            mBinding.drawerLayout.openDrawer(GravityCompat.START);
+        }
+    }
+
+
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
@@ -294,9 +304,13 @@ public class MainActivity extends BaseActivity
         for (int i = 0; i < count; i++) {
             getSupportFragmentManager().popBackStack();
         }
+
+        mBinding.appBarMain.elevatedToolbar.setVisibility(getSupportFragmentManager().getBackStackEntryCount() > 1 ? View.VISIBLE : View.GONE);
     }
 
     private void adaptViewToFragment(Fragment fragment) {
+        mBinding.appBarMain.elevatedToolbar.setVisibility(fragment instanceof MainFragment ? View.GONE : View.VISIBLE);
+
         if (fragment instanceof ISearchableFragment) {
             mBinding.appBarMain.mainSearch.setOnQueryTextListener((SearchView.OnQueryTextListener) fragment);
             mBinding.appBarMain.mainSearch.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
index e31fdc8f..8ffd9ca1 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
@@ -1,10 +1,7 @@
 package it.integry.integrywmsnative.gest.main;
 
 
-import android.animation.ArgbEvaluator;
-import android.animation.ObjectAnimator;
 import android.content.Context;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.LayoutInflater;
@@ -122,7 +119,6 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
         mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_main, container, false);
         mBindings.setView(this);
 
-        mBindings.easterEggHorrorBloodExpandableLayout.setExpanded(false, false);
         return mBindings.getRoot();
     }
 
@@ -246,6 +242,13 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
     }
 
+
+    public void toggleDrawer() {
+        if (getActivity() != null && getActivity() instanceof MainActivity) {
+            ((MainActivity) getActivity()).toggleDrawer();
+        }
+    }
+
     private void collapseNoConnectionLayout() {
         if (getActivity() != null)
             getActivity().runOnUiThread(() -> mBindings.noConnectionTopLayout.collapse(true));
@@ -284,8 +287,8 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
         MenuConfiguration baseMenuConfiguration = new MenuConfiguration();
         List<MenuConfiguration.MenuGroup> menuGroups = baseMenuConfiguration.getGroups();
 
-        for (int i = 0; i < menuGroups.size(); i++) {
-            try {
+        try {
+            for (int i = 0; i < menuGroups.size(); i++) {
 
                 BaseMenuConfiguration.MenuGroup menuGroup = menuGroups.get(i);
 
@@ -313,16 +316,12 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
                     menuListAdapter.setClickListener(this::onMenuClick);
 
                     mBindings.menuContainer.addView(groupBinding.getRoot());
-
-
                 }
-
-
-            } catch (Exception exception) {
-                UtilityExceptions.defaultException(requireActivity(), exception);
             }
-        }
 
+        } catch (Exception exception) {
+            UtilityExceptions.defaultException(requireActivity(), exception);
+        }
     }
 
     private void onMenuClick(MenuConfiguration.MenuItem menuItem) {
@@ -339,89 +338,6 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
         this.mOnPreDestroyList.add(onPreDestroy);
     }
 
-
-    public void toggleEasterEggMode() {
-        easterEggToggle = !easterEggToggle;
-
-
-        int rootBgStart, rootBgEnd;
-        int profileBgStart, profileBgEnd;
-        float titleFlipStart, titleFlipEnd;
-        int animationTimeMillis = 0;
-
-        if (easterEggToggle) {
-            rootBgStart = Color.argb(255, 255, 255, 255);
-            rootBgEnd = Color.argb(255, 0, 0, 0);
-
-            profileBgStart = Color.argb(255, 26, 115, 232);
-            profileBgEnd = Color.argb(255, 211, 47, 47);
-            animationTimeMillis = 2500;
-            titleFlipStart = 1f;
-            titleFlipEnd = -1f;
-        } else {
-            rootBgStart = Color.argb(255, 0, 0, 0);
-            rootBgEnd = Color.argb(255, 255, 255, 255);
-
-            profileBgStart = Color.argb(255, 211, 47, 47);
-            profileBgEnd = Color.argb(255, 26, 115, 232);
-            animationTimeMillis = 750;
-            titleFlipStart = -1f;
-            titleFlipEnd = 1f;
-        }
-
-        mBindings.easterEggHorrorBloodExpandableLayout.setDuration(animationTimeMillis);
-        mBindings.easterEggHorrorBloodExpandableLayout.setExpanded(easterEggToggle, true);
-
-        View rootActivityView = requireActivity().findViewById(R.id.drawer_layout);
-        ObjectAnimator colorFadeRootBg = ObjectAnimator.ofObject(rootActivityView, "backgroundColor",
-                new ArgbEvaluator(),
-                rootBgStart,
-                rootBgEnd);
-
-        colorFadeRootBg.setDuration(animationTimeMillis);
-        colorFadeRootBg.start();
-
-        View toolbarActivityView = requireActivity().findViewById(R.id.toolbar);
-        ObjectAnimator colorFadeToolbarBg = ObjectAnimator.ofObject(toolbarActivityView, "backgroundColor",
-                new ArgbEvaluator(),
-                rootBgStart,
-                rootBgEnd);
-
-        colorFadeToolbarBg.setDuration(animationTimeMillis);
-        colorFadeToolbarBg.start();
-
-        ObjectAnimator colorFadeProfileBg = ObjectAnimator.ofObject(mBindings.profileRootContainer, "backgroundColor",
-                new ArgbEvaluator(),
-                profileBgStart,
-                profileBgEnd);
-
-        colorFadeProfileBg.setDuration(animationTimeMillis);
-        colorFadeProfileBg.start();
-
-        View toolbarTitleActivityView = requireActivity().findViewById(R.id.toolbar_title);
-        ObjectAnimator flipToolbarTitleX = ObjectAnimator.ofFloat(toolbarTitleActivityView, "scaleX",
-                titleFlipStart,
-                titleFlipEnd);
-
-        flipToolbarTitleX.setDuration(animationTimeMillis);
-        flipToolbarTitleX.start();
-
-        ObjectAnimator flipToolbarTitleY = ObjectAnimator.ofFloat(toolbarTitleActivityView, "scaleY",
-                titleFlipStart,
-                titleFlipEnd);
-
-        flipToolbarTitleY.setDuration(animationTimeMillis);
-        flipToolbarTitleY.start();
-
-        ObjectAnimator colorFadeTitleTextColor = ObjectAnimator.ofObject(toolbarTitleActivityView, "textColor",
-                new ArgbEvaluator(),
-                rootBgEnd,
-                rootBgStart);
-
-        colorFadeTitleTextColor.setDuration(animationTimeMillis);
-        colorFadeTitleTextColor.start();
-    }
-
     public void changeUserDepo() {
         DialogSwitchUserDepoView.newInstance(SettingsManager.iDB().getAvailableCodMdep(), this::onUserDepoChanged)
                 .show(getParentFragmentManager(), "switch-user-depo");
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java
index 9450607c..dc770015 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java
@@ -251,6 +251,9 @@ public class OrdiniUscitaElencoFiltroViewModel {
                 .distinct()
                 .toList();
 
+        if(codMdeps.isEmpty())
+            return new ArrayList<>();
+
         return Stream.of(Objects.requireNonNull(mtbDepoFullList))
                 .filter(x -> codMdeps.contains(x.getCodMdep()))
                 .distinct()
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/ui/PickingResiListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/ui/PickingResiListAdapter.java
index b7af8dfe..859915af 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/ui/PickingResiListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/ui/PickingResiListAdapter.java
@@ -102,7 +102,7 @@ public class PickingResiListAdapter extends SectionedRecyclerViewAdapter<Picking
         } else if (position % 2 == 1) {
             holder.mBinding.getRoot().setBackgroundColor(Color.WHITE);
         } else {
-            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
+            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBGLight));
         }
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingResiListModel.isActive() ? View.VISIBLE : View.GONE);
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 2a0eefeb..089dafcd 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
@@ -122,7 +122,13 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
                 BarcodeManager.removeCallback(mBarcodeScannerInstanceID);
             }
         });
+
         mViewModel.init(codJfas);
+        mViewModel.refreshData(); // This will eventually trigger the LiveData observer for getOrderList
+
+        mBinding.swiperefresh.setOnRefreshListener(() -> {
+            mViewModel.refreshData();
+        });
     }
 
 
@@ -299,8 +305,30 @@ public class ProdRecuperoMaterialeFragment extends BaseFragment implements ITitl
     @Override
     public void onDataSaved() {
         this.onLoadingEnded();
-        this.requireActivity().runOnUiThread(() -> {
+        handler.post(() -> {
             DialogCommon.showDataSaved(requireActivity(), this::popMe);
         });
     }
+
+    @Override
+    public void onDataRefreshStarted() {
+        handler.post(() -> {
+            mBinding.swiperefresh.setRefreshing(true);
+        });
+    }
+
+    @Override
+    public void onDataRefreshEnded() {
+        handler.post(() -> {
+            mBinding.swiperefresh.setRefreshing(false);
+            // applyFilters(); // Non strettamente necessario qui se l'observer di getOrderList() fa il suo dovere
+        });
+    }
+
+    @Override
+    public void onError(Exception ex) {
+        super.onError(ex);
+        onDataRefreshEnded();
+    }
 }
+
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeModule.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeModule.java
index 83f5cad7..deb9aa48 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeModule.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeModule.java
@@ -1,28 +1,10 @@
 package it.integry.integrywmsnative.gest.prod_recupero_materiale;
 
 import dagger.Module;
-import dagger.Provides;
-import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.MaterialiRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
-import it.integry.integrywmsnative.gest.prod_recupero_materiale.rest.ProdRecuperoMaterialeRESTConsumer;
 
 @Module(subcomponents = ProdRecuperoMaterialeComponent.class)
 public class ProdRecuperoMaterialeModule {
 
-    @Provides
-    ProdRecuperoMaterialeRESTConsumer providesProdRecuperMaterialeRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
-        return new ProdRecuperoMaterialeRESTConsumer(systemRESTConsumer, articoloRESTConsumer);
-    }
 
-    @Provides
-    ProdRecuperoMaterialeViewModel providesProdRecuperoMaterialeViewModel(ProdRecuperoMaterialeRESTConsumer prodRecuperoMaterialeRESTConsumer,
-                                                                          ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
-                                                                          PrinterRESTConsumer printerRESTConsumer,
-                                                                          MaterialiRESTConsumer materialiRESTConsumer) {
-        return new ProdRecuperoMaterialeViewModel(prodRecuperoMaterialeRESTConsumer, colliMagazzinoRESTConsumer, printerRESTConsumer, materialiRESTConsumer);
-    }
 
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java
index 67cf8433..e2f56069 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java
@@ -3,8 +3,10 @@ package it.integry.integrywmsnative.gest.prod_recupero_materiale;
 import androidx.lifecycle.MutableLiveData;
 
 import java.math.BigDecimal;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
 
 import javax.inject.Inject;
@@ -16,6 +18,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss;
 import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.MaterialiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
@@ -28,62 +31,88 @@ import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO;
 
 public class ProdRecuperoMaterialeViewModel {
 
+    private final BarcodeRESTConsumer mBarcodeRESTConsumer;
     private final ProdRecuperoMaterialeRESTConsumer mProdRecuperoMaterialeRESTConsumer;
     private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer;
     private final PrinterRESTConsumer mPrinterRESTConsumer;
     private final MaterialiRESTConsumer mMaterialiRESTConsumer;
+    private final ExecutorService mExecutorService;
 
     private final MutableLiveData<List<HistoryVersamentoProdULDTO>> mUlList = new MutableLiveData<>();
 
     private Listener mListener;
 
+    private String mCodJfas;
+
 
     @Inject
-    public ProdRecuperoMaterialeViewModel(ProdRecuperoMaterialeRESTConsumer prodRecuperoMaterialeRESTConsumer,
+    public ProdRecuperoMaterialeViewModel(BarcodeRESTConsumer barcodeRESTConsumer,
+                                          ProdRecuperoMaterialeRESTConsumer prodRecuperoMaterialeRESTConsumer,
                                           ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer,
                                           PrinterRESTConsumer printerRESTConsumer,
-                                          MaterialiRESTConsumer materialiRESTConsumer) {
+                                          MaterialiRESTConsumer materialiRESTConsumer,
+                                          ExecutorService executorService) {
+        this.mBarcodeRESTConsumer = barcodeRESTConsumer;
         this.mProdRecuperoMaterialeRESTConsumer = prodRecuperoMaterialeRESTConsumer;
         this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer;
         this.mPrinterRESTConsumer = printerRESTConsumer;
         this.mMaterialiRESTConsumer = materialiRESTConsumer;
+        this.mExecutorService = executorService;
     }
 
     public void init(String codJfas) {
-        this.sendOnLoadingStarted();
+        this.mCodJfas = codJfas;
+    }
 
-        mProdRecuperoMaterialeRESTConsumer.loadLastULVersate(codJfas, ulList -> {
-            this.mUlList.postValue(ulList);
+    public void refreshData() {
+        this.sendOnDataRefreshStarted();
 
-            this.sendOnLoadingEnded();
-        }, this::sendError);
+        this.mExecutorService.execute(() -> {
+            try {
+                List<HistoryVersamentoProdULDTO> lastUlVersate = mProdRecuperoMaterialeRESTConsumer.loadLastULVersateSynchronized(mCodJfas);
+                lastUlVersate.sort(Comparator.comparing(HistoryVersamentoProdULDTO::getCodJfas));
+
+                this.mUlList.postValue(lastUlVersate);
+                this.sendOnDataRefreshEnded();
+            } catch (Exception e) {
+                this.sendError(e);
+            }
+        });
     }
 
     public void processBarcodeDTO(BarcodeScanDTO data) {
         if (UtilityBarcode.isEtichettaAnonima(data) || UtilityBarcode.isEtichetta128(data)) {
-            this.executeEtichettaLU(data.getStringValue());
+            this.executeEtichettaLU(data);
 
         }
     }
 
-    private void executeEtichettaLU(String sscc) {
+    private void executeEtichettaLU(BarcodeScanDTO barcodeScanDTO) {
         this.sendOnLoadingStarted();
+        this.mBarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> {
 
-        this.mColliMagazzinoRESTConsumer.getBySSCC(sscc, true, false, mtbColt -> {
-            this.sendOnLoadingEnded();
+            if(ean128Model == null || ean128Model.Sscc == null) {
+                this.sendError(new NoLUFoundException());
+                this.sendOnLoadingEnded();
+                return;
+            }
+
+            this.mColliMagazzinoRESTConsumer.getBySSCC(ean128Model.Sscc, true, false, mtbColt -> {
+                this.sendOnLoadingEnded();
+
+                if (mtbColt != null) {
+                    HistoryVersamentoProdULDTO historyVersamentoProdULRestDTO = this.getHistoryElementFromMtbColt(mtbColt);
+                    if (historyVersamentoProdULRestDTO != null) {
+                        this.dispatchItem(historyVersamentoProdULRestDTO, mtbColt);
+                    } else {
+                        this.sendError(new NoLUFoundException());
+                    }
 
-            if (mtbColt != null) {
-                HistoryVersamentoProdULDTO historyVersamentoProdULRestDTO = this.getHistoryElementFromMtbColt(mtbColt);
-                if (historyVersamentoProdULRestDTO != null) {
-                    this.dispatchItem(historyVersamentoProdULRestDTO, mtbColt);
                 } else {
                     this.sendError(new NoLUFoundException());
                 }
 
-            } else {
-                this.sendError(new NoLUFoundException());
-            }
-
+            }, this::sendError);
         }, this::sendError);
     }
 
@@ -164,7 +193,7 @@ public class ProdRecuperoMaterialeViewModel {
                     .setNumColloRif(item.getNumColloRif())
                     .setOrdini(ordiniRequest);
 
-            if(mtbColt != null) {
+            if (mtbColt != null) {
                 request.setMtbColtCarico(mtbColt);
             } else {
                 request.setMtbColtCarico(sourceMtbColt);
@@ -204,6 +233,14 @@ public class ProdRecuperoMaterialeViewModel {
         return this;
     }
 
+    private void sendOnDataRefreshStarted() {
+        if (this.mListener != null) mListener.onDataRefreshStarted();
+    }
+
+    private void sendOnDataRefreshEnded() {
+        if (this.mListener != null) mListener.onDataRefreshEnded();
+    }
+
     private void sendOnLoadingStarted() {
         if (this.mListener != null) mListener.onLoadingStarted();
     }
@@ -274,6 +311,10 @@ public class ProdRecuperoMaterialeViewModel {
         void onNoLUFound(Runnable onComplete);
 
         void onDataSaved();
+
+        void onDataRefreshStarted();
+
+        void onDataRefreshEnded();
     }
 
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperoMaterialeRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperoMaterialeRESTConsumer.java
index 394459d9..faaa25c1 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperoMaterialeRESTConsumer.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/rest/ProdRecuperoMaterialeRESTConsumer.java
@@ -1,310 +1,432 @@
 package it.integry.integrywmsnative.gest.prod_recupero_materiale.rest;
 
-import com.annimon.stream.Stream;
-import com.google.gson.reflect.TypeToken;
+import androidx.annotation.NonNull;
 
-import java.lang.reflect.Type;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbAart;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
-import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MaterialiRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers._BaseRESTConsumer;
-import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.integrywmsnative.core.utility.UtilityDB;
-import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdULDTO;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdULRestDTO;
 
 @Singleton
 public class ProdRecuperoMaterialeRESTConsumer extends _BaseRESTConsumer {
 
-    private final SystemRESTConsumer mSystemRESTConsumer;
     private final ArticoloRESTConsumer mArticoloRESTConsumer;
+    private final MaterialiRESTConsumer mMaterialiRESTConsumer;
 
-    public ProdRecuperoMaterialeRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
-        this.mSystemRESTConsumer = systemRESTConsumer;
+    @Inject
+    public ProdRecuperoMaterialeRESTConsumer(ArticoloRESTConsumer articoloRESTConsumer, MaterialiRESTConsumer materialiRESTConsumer) {
+        this.mMaterialiRESTConsumer = materialiRESTConsumer;
         this.mArticoloRESTConsumer = articoloRESTConsumer;
     }
 
 
-    public void loadLastULVersate(RunnableArgs<List<HistoryVersamentoProdULDTO>> onComplete, RunnableArgs<Exception> onFailed) {
-        loadLastULVersate(null, onComplete, onFailed);
+    public List<HistoryVersamentoProdULDTO> loadLastULVersateSynchronized() throws Exception {
+        return loadLastULVersateSynchronized(null);
     }
 
-    public void loadLastULVersate(String codJfas, RunnableArgs<List<HistoryVersamentoProdULDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+    public @NonNull List<HistoryVersamentoProdULDTO> loadLastULVersateSynchronized(String codJfas) throws Exception {
+        var ulList = mMaterialiRESTConsumer.makeSynchronousRetrieveLastVersamentiRequest(codJfas);
 
-        String sql = "WITH ul_list AS ( " +
-                "    SELECT jtb_fasi.cod_jfas, " +
-                "           jtb_fasi.descrizione                                      AS descrizione_fase, " +
-                "           mtb_colr.gestione, " +
-                "           mtb_colr.data_collo, " +
-                "           mtb_colr.num_collo, " +
-                "           mtb_colr.ser_collo, " +
-                "           mtb_colr.cod_mart, " +
-                "           mtb_colr.cod_col, " +
-                "           mtb_colr.cod_tagl, " +
-                "           SUM(mtb_colr.qta_col)                                     AS qta_col, " +
-                "           mtb_colr.qta_cnf                                          AS qta_cnf, " +
-                "           SUM(mtb_colr.num_cnf)                                     AS num_cnf, " +
-                "           mtb_colr.partita_mag, " +
-                "           mtb_colr.cod_jcom, " +
-                "           mtb_colr.num_collo_rif, " +
-                "           mtb_colr.data_collo_rif, " +
-                "           mtb_colr.ser_collo_rif, " +
-                "           mtb_colr.gestione_rif, " +
-                "           mtb_colt.segno, " +
-                "           ISNULL(mtb_aart.descrizione_estesa, mtb_aart.descrizione) AS descrizione_art, " +
-                "           mtb_aart.unt_mis, " +
-                "           MAX(datetime_row)                                         AS datetime_row, " +
-                "           mtb_colr.num_ord, " +
-                "           mtb_colr.data_ord, " +
-                "           mtb_colr.gestione                                    as gestione_ord, " +
-                "           mtb_colr.riga_ord, " +
-                "           dtb_ord_steps.hr_num                                      as hr, " +
-                "           CONVERT(INTEGER, ROUND((CAST(dtb_ord_steps.hr_num AS DECIMAL(20, 5)) / " +
-                "                                   SUM(dtb_ord_steps.hr_num) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " +
-                "                                   SUM(CASE WHEN dtb_ord_steps.hr_num > 0 then dtb_ord_steps.hr_num else 1 end) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " +
-                "                                  0)                                as percentage_hr " +
-                "    FROM mtb_colr " +
-                "             INNER JOIN mtb_colt ON mtb_colr.num_collo = mtb_colt.num_collo " +
-                "        AND mtb_colr.data_collo = mtb_colt.data_collo " +
-                "        AND mtb_colr.ser_collo = mtb_colt.ser_collo " +
-                "        AND mtb_colr.gestione = mtb_colt.gestione " +
-                "             " + (SettingsManager.iDB().isFlagVersamentoDirettoProduzione() ? "INNER" : "LEFT OUTER") + " join dtb_ord_steps ON dtb_ord_steps.data_ord = mtb_colr.data_ord " +
-                "        AND dtb_ord_steps.gestione = mtb_colr.gestione " +
-                "        AND dtb_ord_steps.num_ord = mtb_colr.num_ord " +
-                "        AND dtb_ord_steps.data_iniz is not null " +
-                "        AND dtb_ord_steps.data_fine is null " +
-                "             INNER JOIN mtb_aart ON mtb_colr.cod_mart = mtb_aart.cod_mart " +
-                "             LEFT OUTER JOIN jtb_fasi ON mtb_colt.cod_jfas = jtb_fasi.cod_jfas " +
-                "    WHERE jtb_fasi.cod_jfas IS NOT NULL " +
-                (UtilityString.isNullOrEmpty(codJfas) ? "" : " AND jtb_fasi.cod_jfas = " + UtilityDB.valueToString(codJfas)) +
-                "      AND segno = -1 " +
-                "      AND mtb_colr.data_collo > DATEADD(DAY, -5, GETDATE()) " +
-                "    GROUP BY jtb_fasi.cod_jfas, " +
-                "             jtb_fasi.descrizione, " +
-                "             mtb_colr.gestione, " +
-                "             mtb_colr.data_collo, " +
-                "             mtb_colr.num_collo, " +
-                "             mtb_colr.ser_collo, " +
-                "             mtb_colr.qta_cnf, " +
-                "             mtb_colr.cod_mart, " +
-                "             mtb_colr.cod_col, " +
-                "             mtb_colr.cod_tagl, " +
-                "             mtb_colr.ser_collo, " +
-                "             mtb_colr.partita_mag, " +
-                "             mtb_colr.cod_jcom, " +
-                "             mtb_aart.descrizione_estesa, " +
-                "             mtb_aart.descrizione, " +
-                "             mtb_aart.unt_mis, " +
-                "             mtb_colr.num_collo_rif, " +
-                "             mtb_colr.data_collo_rif, " +
-                "             mtb_colr.ser_collo_rif, " +
-                "             mtb_colr.gestione_rif, " +
-                "             mtb_colt.segno, " +
-                "             mtb_colr.num_ord, " +
-                "             mtb_colr.data_ord, " +
-                "             mtb_colr.gestione, " +
-                "             mtb_colr.riga_ord, " +
-                "             dtb_ord_steps.hr_num " +
-                "    HAVING SUM(mtb_colr.qta_col) > 0 " +
-                "), max_ul AS ( " +
-                "    SELECT " +
-                "           cod_jfas, " +
-                "             descrizione_fase, " +
-                "             gestione, " +
-                "             cod_mart, " +
-                "             cod_col, " +
-                "             cod_tagl, " +
-                "             ser_collo, " +
-                "             partita_mag, " +
-                "             cod_jcom, " +
-                "             descrizione_art, " +
-                "             unt_mis, " +
-                "             num_collo_rif, " +
-                "             data_collo_rif, " +
-                "             ser_collo_rif, " +
-                "             gestione_rif, " +
-                "             segno, " +
-                "             num_ord, " +
-                "             data_ord, " +
-                "             gestione_ord, " +
-                "             riga_ord, " +
-                "             hr, " +
-                "        MAX (datetime_row) as max_datetime_row " +
-                "    FROM ul_list " +
-                "    GROUP BY cod_jfas, " +
-                "             descrizione_fase, " +
-                "             gestione, " +
-                "             cod_mart, " +
-                "             cod_col, " +
-                "             cod_tagl, " +
-                "             ser_collo, " +
-                "             partita_mag, " +
-                "             cod_jcom, " +
-                "             descrizione_art, " +
-                "             unt_mis, " +
-                "             num_collo_rif, " +
-                "             data_collo_rif, " +
-                "             ser_collo_rif, " +
-                "             gestione_rif, " +
-                "             segno, " +
-                "             num_ord, " +
-                "             data_ord, " +
-                "             gestione_ord, " +
-                "             riga_ord, " +
-                "             hr " +
-                ") " +
-                " " +
-                "SELECT ul_list.* FROM max_ul " +
-                "LEFT OUTER JOIN ul_list ON " +
-                "            ISNULL(max_ul.cod_jfas, '') = ISNULL(ul_list.cod_jfas, '') AND " +
-                "            ISNULL(max_ul.descrizione_fase, '') = ISNULL(ul_list.descrizione_fase, '') AND " +
-                "            ISNULL(max_ul.gestione, '') = ISNULL(ul_list.gestione, '') AND " +
-                "            ISNULL(max_ul.cod_mart, '') = ISNULL(ul_list.cod_mart, '') AND " +
-                "            ISNULL(max_ul.cod_col, '') = ISNULL(ul_list.cod_col, '') AND " +
-                "            ISNULL(max_ul.cod_tagl, '') = ISNULL(ul_list.cod_tagl, '') AND " +
-                "            ISNULL(max_ul.ser_collo, '') = ISNULL(ul_list.ser_collo, '') AND " +
-                "            ISNULL(max_ul.partita_mag, '') = ISNULL(ul_list.partita_mag, '') AND " +
-                "            ISNULL(max_ul.cod_jcom, '') = ISNULL(ul_list.cod_jcom, '') AND " +
-                "            ISNULL(max_ul.descrizione_art, '') = ISNULL(ul_list.descrizione_art, '') AND " +
-                "            ISNULL(max_ul.unt_mis, '') = ISNULL(ul_list.unt_mis, '') AND " +
-                "            ISNULL(max_ul.num_collo_rif, '') = ISNULL(ul_list.num_collo_rif, '') AND " +
-                "            ISNULL(max_ul.data_collo_rif, '') = ISNULL(ul_list.data_collo_rif, '') AND " +
-                "            ISNULL(max_ul.ser_collo_rif, '') = ISNULL(ul_list.ser_collo_rif, '') AND " +
-                "            ISNULL(max_ul.gestione_rif, '') = ISNULL(ul_list.gestione_rif, '') AND " +
-                "            ISNULL(max_ul.segno, '') = ISNULL(ul_list.segno, '') AND " +
-                "            ISNULL(max_ul.num_ord, '') = ISNULL(ul_list.num_ord, '') AND " +
-                "            ISNULL(max_ul.data_ord, '') = ISNULL(ul_list.data_ord, '') AND " +
-                "            ISNULL(max_ul.gestione_ord, '') = ISNULL(ul_list.gestione_ord, '') AND " +
-                "            ISNULL(max_ul.riga_ord, '') = ISNULL(ul_list.riga_ord, '') AND " +
-                "            ISNULL(max_ul.hr, '') = ISNULL(ul_list.hr, '') AND " +
-                "            max_ul.max_datetime_row = ul_list.datetime_row";
+        if (ulList == null) {
+            return new ArrayList<>();
+        }
 
-        Type typeOfObjectsList = new TypeToken<ArrayList<HistoryVersamentoProdULRestDTO>>() {
-        }.getType();
-        this.mSystemRESTConsumer.<ArrayList<HistoryVersamentoProdULRestDTO>>processSql(sql, typeOfObjectsList, ulList -> {
+        List<HistoryVersamentoProdULDTO> newUlList = new ArrayList<>();
 
-            if (ulList == null) {
-                onComplete.run(null);
-                return;
+        Map<HashMap<String, Object>, List<HistoryVersamentoProdULRestDTO>> ulListGrouped = ulList.stream()
+                .collect(Collectors.groupingBy(x -> {
+                    var keyMap = new HashMap<String, Object>();
+                    keyMap.put("gestione", x.getGestione());
+                    keyMap.put("data_collo", x.getDataCollo());
+                    keyMap.put("ser_collo", x.getSerCollo());
+                    keyMap.put("num_collo", x.getNumCollo());
+                    keyMap.put("cod_mart", x.getCodMart());
+                    keyMap.put("partita_mag", x.getPartitaMag());
+                    keyMap.put("gestione_rif", x.getGestioneRif());
+                    keyMap.put("data_collo_rif", x.getDataColloRif());
+                    keyMap.put("ser_collo_rif", x.getSerColloRif());
+                    keyMap.put("num_collo_rif", x.getNumColloRif());
+                    return keyMap;
+                }, Collectors.toList()));
+
+        for (HashMap<String, Object> ulKey : ulListGrouped.keySet()) {
+            var matchingUls = ulList.stream().filter(x ->
+                            Objects.equals(x.getGestione(), ulKey.get("gestione")) &&
+                                    Objects.equals(x.getDataCollo(), ulKey.get("data_collo")) &&
+                                    Objects.equals(x.getSerCollo(), ulKey.get("ser_collo")) &&
+                                    Objects.equals(x.getNumCollo(), ulKey.get("num_collo")) &&
+                                    Objects.equals(x.getCodMart(), ulKey.get("cod_mart")) &&
+                                    Objects.equals(x.getPartitaMag(), ulKey.get("partita_mag")) &&
+                                    Objects.equals(x.getGestioneRif(), ulKey.get("gestione_rif")) &&
+                                    Objects.equals(x.getDataColloRif(), ulKey.get("data_collo_rif")) &&
+                                    Objects.equals(x.getSerColloRif(), ulKey.get("ser_collo_rif")) &&
+                                    Objects.equals(x.getNumColloRif(), ulKey.get("num_collo_rif"))
+                    ).collect(Collectors.toUnmodifiableList());
+
+            ulKey.put("qta_col", matchingUls.stream().map(HistoryVersamentoProdULRestDTO::getQtaCol)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add));
+            ulKey.put("num_cnf", matchingUls.stream().map(HistoryVersamentoProdULRestDTO::getNumCnf)
+                    .reduce(BigDecimal.ZERO, BigDecimal::add));
+        }
+
+        ulListGrouped.forEach((key, value) -> {
+
+            var listaOrdini = value.stream()
+                    .filter(x -> x.getDataOrd() != null &&
+                            x.getGestioneOrd() != null &&
+                            x.getNumOrd() != null)
+                    .map(x -> new HistoryVersamentoProdULDTO.OrdineDto()
+                            .setData(x.getDataOrd())
+                            .setNumero(x.getNumOrd())
+                            .setGestione(x.getGestione())
+                            .setRigaOrd(x.getRigaOrd())
+                            .setQtaCol(x.getQtaCol())
+                            .setNumCnf(x.getNumCnf())
+                            .setPercentageHr(x.getPercentageHr()))
+                    .distinct()
+                    .collect(Collectors.toUnmodifiableList());
+
+            var restData = value.get(0);
+            var qtaCol = (BigDecimal) key.get("qta_col");
+            var numCnf = (BigDecimal) key.get("num_cnf");
+
+            newUlList.add(new HistoryVersamentoProdULDTO()
+                    .setGestione(restData.getGestione())
+                    .setDataCollo(restData.getDataCollo())
+                    .setSerCollo(restData.getSerCollo())
+                    .setNumCollo(restData.getNumCollo())
+                    .setSegno(restData.getSegno())
+                    .setCodMart(restData.getCodMart())
+                    .setCodCol(restData.getCodCol())
+                    .setCodTagl(restData.getCodTagl())
+                    .setCodJfas(restData.getCodJfas())
+                    .setDescrizioneArt(restData.getDescrizioneArt())
+                    .setDescrizioneFase(restData.getDescrizioneFase())
+                    .setQtaCol(qtaCol)
+                    .setQtaCnf(restData.getQtaCnf())
+                    .setNumCnf(numCnf)
+                    .setPartitaMag(restData.getPartitaMag())
+                    .setCodJcom(restData.getCodJcom())
+                    .setDatetimeRow(restData.getDatetimeRow())
+                    .setUntMis(restData.getUntMis())
+                    .setGestioneRif(restData.getGestioneRif())
+                    .setDataColloRif(restData.getDataColloRif())
+                    .setSerColloRif(restData.getSerColloRif())
+                    .setNumColloRif(restData.getNumColloRif())
+                    .setOrdini(listaOrdini));
+
+        });
+
+
+        if (!newUlList.isEmpty()) {
+            List<String> codMarts = newUlList.stream()
+                    .map(HistoryVersamentoProdULDTO::getCodMart)
+                    .filter(Objects::nonNull)
+                    .distinct()
+                    .collect(Collectors.toUnmodifiableList());
+
+            var arts = this.mArticoloRESTConsumer.getByCodMartsSynchronized(codMarts);
+
+            if (arts != null && !arts.isEmpty()) {
+                for (HistoryVersamentoProdULDTO value : newUlList) {
+
+                    MtbAart foundMtbAart = arts.stream()
+                            .filter(x -> x.getCodMart().equalsIgnoreCase(value.getCodMart()))
+                            .findFirst()
+                            .orElse(null);
+
+                    value.setMtbAart(foundMtbAart);
+                }
             }
 
-            List<HistoryVersamentoProdULDTO> newUlList = new ArrayList<>();
+            return newUlList;
 
-            Stream.of(ulList)
-                    .distinctBy(x -> {
-                        HashMap<String, Object> hashMap = new HashMap<>();
-                        hashMap.put("gestione", x.getGestione());
-                        hashMap.put("data_collo", x.getDataCollo());
-                        hashMap.put("ser_collo", x.getSerCollo());
-                        hashMap.put("num_collo", x.getNumCollo());
-                        hashMap.put("cod_mart", x.getCodMart());
-                        hashMap.put("gestione_rif", x.getGestioneRif());
-                        hashMap.put("data_collo_rif", x.getDataColloRif());
-                        hashMap.put("ser_collo_rif", x.getSerColloRif());
-                        hashMap.put("num_collo_rif", x.getNumColloRif());
 
-                        return hashMap;
-                    })
-                    .forEach(restDTO -> {
+        } else {
+            return newUlList;
+        }
+    }
 
-                        List<HistoryVersamentoProdULDTO.OrdineDto> ordineList = ulList.stream()
-                                .filter(x -> x.getNumCollo().equals(restDTO.getNumCollo()) &&
-                                        x.getDataCollo().equals(restDTO.getDataCollo()) &&
-                                        x.getSerCollo().equals(restDTO.getSerCollo()) &&
-                                        x.getGestione().equals(restDTO.getGestione()) &&
-                                        (x.getRigaOrd() == null || Objects.equals(x.getRigaOrd(), restDTO.getRigaOrd())))
-                                .map(x -> new HistoryVersamentoProdULDTO.OrdineDto()
-                                        .setData(x.getDataOrd())
-                                        .setNumero(x.getNumOrd())
-                                        .setGestione(x.getGestione())
-                                        .setRigaOrd(x.getRigaOrd())
-                                        .setQtaCol(x.getQtaCol())
-                                        .setNumCnf(x.getNumCnf())
-                                        .setPercentageHr(x.getPercentageHr()))
-                                .collect(Collectors.toList());
 
-//                        BigDecimal qtaColTot = BigDecimal.ZERO;
-//                        BigDecimal numCnfColTot = BigDecimal.ZERO;
+//    public void loadLastULVersate(String codJfas, RunnableArgs<List<HistoryVersamentoProdULDTO>> onComplete, RunnableArgs<Exception> onFailed) {
 //
-//                        for (HistoryVersamentoProdULDTO.OrdineDto ordine :
-//                                ordineList) {
-//                            qtaColTot = qtaColTot.add(ordine.getQtaCol());
-//                            numCnfColTot = numCnfColTot.add(ordine.getNumCnf());
+//        String sql = "WITH ul_list AS ( " +
+//                "    SELECT jtb_fasi.cod_jfas, " +
+//                "           jtb_fasi.descrizione                                      AS descrizione_fase, " +
+//                "           mtb_colr.gestione, " +
+//                "           mtb_colr.data_collo, " +
+//                "           mtb_colr.num_collo, " +
+//                "           mtb_colr.ser_collo, " +
+//                "           mtb_colr.cod_mart, " +
+//                "           mtb_colr.cod_col, " +
+//                "           mtb_colr.cod_tagl, " +
+//                "           SUM(mtb_colr.qta_col)                                     AS qta_col, " +
+//                "           mtb_colr.qta_cnf                                          AS qta_cnf, " +
+//                "           SUM(mtb_colr.num_cnf)                                     AS num_cnf, " +
+//                "           mtb_colr.partita_mag, " +
+//                "           mtb_colr.cod_jcom, " +
+//                "           mtb_colr.num_collo_rif, " +
+//                "           mtb_colr.data_collo_rif, " +
+//                "           mtb_colr.ser_collo_rif, " +
+//                "           mtb_colr.gestione_rif, " +
+//                "           mtb_colt.segno, " +
+//                "           ISNULL(mtb_aart.descrizione_estesa, mtb_aart.descrizione) AS descrizione_art, " +
+//                "           mtb_aart.unt_mis, " +
+//                "           MAX(datetime_row)                                         AS datetime_row, " +
+//                "           mtb_colr.num_ord, " +
+//                "           mtb_colr.data_ord, " +
+//                "           mtb_colr.gestione                                    as gestione_ord, " +
+//                "           mtb_colr.riga_ord, " +
+//                "           dtb_ord_steps.hr_num                                      as hr, " +
+//                "           CONVERT(INTEGER, ROUND((CAST(dtb_ord_steps.hr_num AS DECIMAL(20, 5)) / " +
+//                "                                   SUM(dtb_ord_steps.hr_num) OVER (PARTITION BY mtb_colr.num_collo)), " +
+//                "                                   SUM(CASE WHEN dtb_ord_steps.hr_num > 0 then dtb_ord_steps.hr_num else 1 end) OVER (PARTITION BY mtb_colr.num_collo)) * 100, " +
+//                "                                  0)                                as percentage_hr " +
+//                "    FROM mtb_colr " +
+//                "             INNER JOIN mtb_colt ON mtb_colr.num_collo = mtb_colt.num_collo " +
+//                "        AND mtb_colr.data_collo = mtb_colt.data_collo " +
+//                "        AND mtb_colr.ser_collo = mtb_colt.ser_collo " +
+//                "        AND mtb_colr.gestione = mtb_colt.gestione " +
+//                "             " + (SettingsManager.iDB().isFlagVersamentoDirettoProduzione() ? "INNER" : "LEFT OUTER") + " join dtb_ord_steps ON dtb_ord_steps.data_ord = mtb_colr.data_ord " +
+//                "        AND dtb_ord_steps.gestione = mtb_colr.gestione " +
+//                "        AND dtb_ord_steps.num_ord = mtb_colr.num_ord " +
+//                "        AND dtb_ord_steps.data_iniz is not null " +
+//                "        AND dtb_ord_steps.data_fine is null " +
+//                "             INNER JOIN mtb_aart ON mtb_colr.cod_mart = mtb_aart.cod_mart " +
+//                "             LEFT OUTER JOIN jtb_fasi ON mtb_colt.cod_jfas = jtb_fasi.cod_jfas " +
+//                "    WHERE jtb_fasi.cod_jfas IS NOT NULL " +
+//                (UtilityString.isNullOrEmpty(codJfas) ? "" : " AND jtb_fasi.cod_jfas = " + UtilityDB.valueToString(codJfas)) +
+//                "      AND segno = -1 " +
+//                "      AND mtb_colr.data_collo > DATEADD(DAY, -5, GETDATE()) " +
+//                "    GROUP BY jtb_fasi.cod_jfas, " +
+//                "             jtb_fasi.descrizione, " +
+//                "             mtb_colr.gestione, " +
+//                "             mtb_colr.data_collo, " +
+//                "             mtb_colr.num_collo, " +
+//                "             mtb_colr.ser_collo, " +
+//                "             mtb_colr.qta_cnf, " +
+//                "             mtb_colr.cod_mart, " +
+//                "             mtb_colr.cod_col, " +
+//                "             mtb_colr.cod_tagl, " +
+//                "             mtb_colr.ser_collo, " +
+//                "             mtb_colr.partita_mag, " +
+//                "             mtb_colr.cod_jcom, " +
+//                "             mtb_aart.descrizione_estesa, " +
+//                "             mtb_aart.descrizione, " +
+//                "             mtb_aart.unt_mis, " +
+//                "             mtb_colr.num_collo_rif, " +
+//                "             mtb_colr.data_collo_rif, " +
+//                "             mtb_colr.ser_collo_rif, " +
+//                "             mtb_colr.gestione_rif, " +
+//                "             mtb_colt.segno, " +
+//                "             mtb_colr.num_ord, " +
+//                "             mtb_colr.data_ord, " +
+//                "             mtb_colr.gestione, " +
+//                "             mtb_colr.riga_ord, " +
+//                "             dtb_ord_steps.hr_num " +
+//                "    HAVING SUM(mtb_colr.qta_col) > 0 " +
+//                "), max_ul AS ( " +
+//                "    SELECT " +
+//                "           cod_jfas, " +
+//                "             descrizione_fase, " +
+//                "             gestione, " +
+//                "             cod_mart, " +
+//                "             cod_col, " +
+//                "             cod_tagl, " +
+//                "             ser_collo, " +
+//                "             partita_mag, " +
+//                "             cod_jcom, " +
+//                "             descrizione_art, " +
+//                "             unt_mis, " +
+//                "             num_collo_rif, " +
+//                "             data_collo_rif, " +
+//                "             ser_collo_rif, " +
+//                "             gestione_rif, " +
+//                "             segno, " +
+//                "             num_ord, " +
+//                "             data_ord, " +
+//                "             gestione_ord, " +
+//                "             riga_ord, " +
+//                "             hr, " +
+//                "        MAX (datetime_row) as max_datetime_row " +
+//                "    FROM ul_list " +
+//                "    GROUP BY cod_jfas, " +
+//                "             descrizione_fase, " +
+//                "             gestione, " +
+//                "             cod_mart, " +
+//                "             cod_col, " +
+//                "             cod_tagl, " +
+//                "             ser_collo, " +
+//                "             partita_mag, " +
+//                "             cod_jcom, " +
+//                "             descrizione_art, " +
+//                "             unt_mis, " +
+//                "             num_collo_rif, " +
+//                "             data_collo_rif, " +
+//                "             ser_collo_rif, " +
+//                "             gestione_rif, " +
+//                "             segno, " +
+//                "             num_ord, " +
+//                "             data_ord, " +
+//                "             gestione_ord, " +
+//                "             riga_ord, " +
+//                "             hr " +
+//                ") " +
+//                " " +
+//                "SELECT ul_list.* FROM max_ul " +
+//                "LEFT OUTER JOIN ul_list ON " +
+//                "            ISNULL(max_ul.cod_jfas, '') = ISNULL(ul_list.cod_jfas, '') AND " +
+//                "            ISNULL(max_ul.descrizione_fase, '') = ISNULL(ul_list.descrizione_fase, '') AND " +
+//                "            ISNULL(max_ul.gestione, '') = ISNULL(ul_list.gestione, '') AND " +
+//                "            ISNULL(max_ul.cod_mart, '') = ISNULL(ul_list.cod_mart, '') AND " +
+//                "            ISNULL(max_ul.cod_col, '') = ISNULL(ul_list.cod_col, '') AND " +
+//                "            ISNULL(max_ul.cod_tagl, '') = ISNULL(ul_list.cod_tagl, '') AND " +
+//                "            ISNULL(max_ul.ser_collo, '') = ISNULL(ul_list.ser_collo, '') AND " +
+//                "            ISNULL(max_ul.partita_mag, '') = ISNULL(ul_list.partita_mag, '') AND " +
+//                "            ISNULL(max_ul.cod_jcom, '') = ISNULL(ul_list.cod_jcom, '') AND " +
+//                "            ISNULL(max_ul.descrizione_art, '') = ISNULL(ul_list.descrizione_art, '') AND " +
+//                "            ISNULL(max_ul.unt_mis, '') = ISNULL(ul_list.unt_mis, '') AND " +
+//                "            ISNULL(max_ul.num_collo_rif, '') = ISNULL(ul_list.num_collo_rif, '') AND " +
+//                "            ISNULL(max_ul.data_collo_rif, '') = ISNULL(ul_list.data_collo_rif, '') AND " +
+//                "            ISNULL(max_ul.ser_collo_rif, '') = ISNULL(ul_list.ser_collo_rif, '') AND " +
+//                "            ISNULL(max_ul.gestione_rif, '') = ISNULL(ul_list.gestione_rif, '') AND " +
+//                "            ISNULL(max_ul.segno, '') = ISNULL(ul_list.segno, '') AND " +
+//                "            ISNULL(max_ul.num_ord, '') = ISNULL(ul_list.num_ord, '') AND " +
+//                "            ISNULL(max_ul.data_ord, '') = ISNULL(ul_list.data_ord, '') AND " +
+//                "            ISNULL(max_ul.gestione_ord, '') = ISNULL(ul_list.gestione_ord, '') AND " +
+//                "            ISNULL(max_ul.riga_ord, '') = ISNULL(ul_list.riga_ord, '') AND " +
+//                "            ISNULL(max_ul.hr, '') = ISNULL(ul_list.hr, '') AND " +
+//                "            max_ul.max_datetime_row = ul_list.datetime_row";
+//
+//        Type typeOfObjectsList = new TypeToken<ArrayList<HistoryVersamentoProdULRestDTO>>() {
+//        }.getType();
+//        this.mSystemRESTConsumer.<ArrayList<HistoryVersamentoProdULRestDTO>>processSql(sql, typeOfObjectsList, ulList -> {
+//
+//            if (ulList == null) {
+//                onComplete.run(null);
+//                return;
+//            }
+//
+//            List<HistoryVersamentoProdULDTO> newUlList = new ArrayList<>();
+//
+//            Stream.of(ulList)
+//                    .distinctBy(x -> {
+//                        HashMap<String, Object> hashMap = new HashMap<>();
+//                        hashMap.put("gestione", x.getGestione());
+//                        hashMap.put("data_collo", x.getDataCollo());
+//                        hashMap.put("ser_collo", x.getSerCollo());
+//                        hashMap.put("num_collo", x.getNumCollo());
+//                        hashMap.put("cod_mart", x.getCodMart());
+//                        hashMap.put("gestione_rif", x.getGestioneRif());
+//                        hashMap.put("data_collo_rif", x.getDataColloRif());
+//                        hashMap.put("ser_collo_rif", x.getSerColloRif());
+//                        hashMap.put("num_collo_rif", x.getNumColloRif());
+//
+//                        return hashMap;
+//                    })
+//                    .forEach(restDTO -> {
+//
+//                        List<HistoryVersamentoProdULDTO.OrdineDto> ordineList = ulList.stream()
+//                                .filter(x -> x.getNumCollo().equals(restDTO.getNumCollo()) &&
+//                                        x.getDataCollo().equals(restDTO.getDataCollo()) &&
+//                                        x.getSerCollo().equals(restDTO.getSerCollo()) &&
+//                                        x.getGestione().equals(restDTO.getGestione()) &&
+//                                        (x.getRigaOrd() == null || Objects.equals(x.getRigaOrd(), restDTO.getRigaOrd())))
+//                                .map(x -> new HistoryVersamentoProdULDTO.OrdineDto()
+//                                        .setData(x.getDataOrd())
+//                                        .setNumero(x.getNumOrd())
+//                                        .setGestione(x.getGestione())
+//                                        .setRigaOrd(x.getRigaOrd())
+//                                        .setQtaCol(x.getQtaCol())
+//                                        .setNumCnf(x.getNumCnf())
+//                                        .setPercentageHr(x.getPercentageHr()))
+//                                .collect(Collectors.toList());
+//
+////                        BigDecimal qtaColTot = BigDecimal.ZERO;
+////                        BigDecimal numCnfColTot = BigDecimal.ZERO;
+////
+////                        for (HistoryVersamentoProdULDTO.OrdineDto ordine :
+////                                ordineList) {
+////                            qtaColTot = qtaColTot.add(ordine.getQtaCol());
+////                            numCnfColTot = numCnfColTot.add(ordine.getNumCnf());
+////                        }
+//
+//                        newUlList.add(new HistoryVersamentoProdULDTO()
+//                                .setGestione(restDTO.getGestione())
+//                                .setDataCollo(restDTO.getDataCollo())
+//                                .setSerCollo(restDTO.getSerCollo())
+//                                .setNumCollo(restDTO.getNumCollo())
+//                                .setSegno(restDTO.getSegno())
+//                                .setCodMart(restDTO.getCodMart())
+//                                .setCodCol(restDTO.getCodCol())
+//                                .setCodTagl(restDTO.getCodTagl())
+//                                .setCodJfas(restDTO.getCodJfas())
+//                                .setDescrizioneArt(restDTO.getDescrizioneArt())
+//                                .setDescrizioneFase(restDTO.getDescrizioneFase())
+//                                .setQtaCol(restDTO.getQtaCol())
+//                                .setQtaCnf(restDTO.getQtaCnf())
+//                                .setNumCnf(restDTO.getNumCnf())
+//                                .setPartitaMag(restDTO.getPartitaMag())
+//                                .setCodJcom(restDTO.getCodJcom())
+//                                .setDatetimeRow(restDTO.getDatetimeRow())
+//                                .setUntMis(restDTO.getUntMis())
+//                                .setGestioneRif(restDTO.getGestioneRif())
+//                                .setDataColloRif(restDTO.getDataColloRif())
+//                                .setSerColloRif(restDTO.getSerColloRif())
+//                                .setNumColloRif(restDTO.getNumColloRif())
+//                                .setOrdini(ordineList));
+//
+//                    });
+//
+//
+//            if (!newUlList.isEmpty()) {
+//                List<String> codMarts = Stream.of(newUlList)
+//                        .map(HistoryVersamentoProdULDTO::getCodMart)
+//                        .withoutNulls()
+//                        .distinct()
+//                        .toList();
+//
+//                this.mArticoloRESTConsumer.getByCodMarts(codMarts, arts -> {
+//
+//                    if (arts != null && !arts.isEmpty()) {
+//                        for (HistoryVersamentoProdULDTO value : newUlList) {
+//
+//                            MtbAart foundMtbAart = null;
+//
+//                            List<MtbAart> mtbAartStream = Stream.of(arts)
+//                                    .filter(x -> x.getCodMart().equalsIgnoreCase(value.getCodMart())).toList();
+//
+//                            if (mtbAartStream != null && !mtbAartStream.isEmpty()) {
+//                                foundMtbAart = mtbAartStream.get(0);
+//                            }
+//
+//                            value.setMtbAart(foundMtbAart);
 //                        }
-
-                        newUlList.add(new HistoryVersamentoProdULDTO()
-                                .setGestione(restDTO.getGestione())
-                                .setDataCollo(restDTO.getDataCollo())
-                                .setSerCollo(restDTO.getSerCollo())
-                                .setNumCollo(restDTO.getNumCollo())
-                                .setSegno(restDTO.getSegno())
-                                .setCodMart(restDTO.getCodMart())
-                                .setCodCol(restDTO.getCodCol())
-                                .setCodTagl(restDTO.getCodTagl())
-                                .setCodJfas(restDTO.getCodJfas())
-                                .setDescrizioneArt(restDTO.getDescrizioneArt())
-                                .setDescrizioneFase(restDTO.getDescrizioneFase())
-                                .setQtaCol(restDTO.getQtaCol())
-                                .setQtaCnf(restDTO.getQtaCnf())
-                                .setNumCnf(restDTO.getNumCnf())
-                                .setPartitaMag(restDTO.getPartitaMag())
-                                .setCodJcom(restDTO.getCodJcom())
-                                .setDatetimeRow(restDTO.getDatetimeRow())
-                                .setUntMis(restDTO.getUntMis())
-                                .setGestioneRif(restDTO.getGestioneRif())
-                                .setDataColloRif(restDTO.getDataColloRif())
-                                .setSerColloRif(restDTO.getSerColloRif())
-                                .setNumColloRif(restDTO.getNumColloRif())
-                                .setOrdini(ordineList));
-
-                    });
-
-
-            if (!newUlList.isEmpty()) {
-                List<String> codMarts = Stream.of(newUlList)
-                        .map(HistoryVersamentoProdULDTO::getCodMart)
-                        .withoutNulls()
-                        .distinct()
-                        .toList();
-
-                this.mArticoloRESTConsumer.getByCodMarts(codMarts, arts -> {
-
-                    if (arts != null && !arts.isEmpty()) {
-                        for (HistoryVersamentoProdULDTO value : newUlList) {
-
-                            MtbAart foundMtbAart = null;
-
-                            List<MtbAart> mtbAartStream = Stream.of(arts)
-                                    .filter(x -> x.getCodMart().equalsIgnoreCase(value.getCodMart())).toList();
-
-                            if (mtbAartStream != null && !mtbAartStream.isEmpty()) {
-                                foundMtbAart = mtbAartStream.get(0);
-                            }
-
-                            value.setMtbAart(foundMtbAart);
-                        }
-                    }
-
-                    onComplete.run(newUlList);
-
-                }, onFailed);
-
-            } else {
-                onComplete.run(newUlList);
-            }
-
-        }, onFailed);
-    }
+//                    }
+//
+//                    onComplete.run(newUlList);
+//
+//                }, onFailed);
+//
+//            } else {
+//                onComplete.run(newUlList);
+//            }
+//
+//        }, onFailed);
+//    }
 
 
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
index 1ca01cb3..cd9c3418 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java
@@ -270,7 +270,7 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
 
 
             File logFilePath = appContext.getLogFilePath();
-            var files = logFilePath.listFiles();
+            var files = logFilePath.listFiles(File::isFile);
 
             var fileToShare = Arrays.stream(files)
                     .sorted(Comparator.reverseOrder())
@@ -280,15 +280,27 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
                 List<MailAttachmentDTO> attachmentDTOList = new ArrayList<>();
 
                 if (fileToShare != null) {
-                    var htmlContent = createAppLogAttachment(fileToShare);
+                    try {
+                        var htmlContent = createAppLogAttachment(fileToShare);
 
-                    byte[] buffer = htmlContent.getBytes();//specify the size to allow.
-                    String base64 = Base64.encodeToString(buffer, Base64.NO_WRAP);
+                        byte[] buffer = htmlContent.getBytes();//specify the size to allow.
+                        String base64 = Base64.encodeToString(buffer, Base64.NO_WRAP);
 
-                    var logAttachment = new MailAttachmentDTO()
-                            .setFileName("wms_log.html")
-                            .setFileb64Content(base64);
-                    attachmentDTOList.add(logAttachment);
+                        var logAttachment = new MailAttachmentDTO()
+                                .setFileName("wms_log.html")
+                                .setFileb64Content(base64);
+                        attachmentDTOList.add(logAttachment);
+                    } catch (Exception ex) {
+                        String rawLogFile = getRawLogAttachment(fileToShare);
+
+                        byte[] buffer = rawLogFile.getBytes();//specify the size to allow.
+                        String base64 = Base64.encodeToString(buffer, Base64.NO_WRAP);
+
+                        var logAttachment = new MailAttachmentDTO()
+                                .setFileName("raw_log.txt")
+                                .setFileb64Content(base64);
+                        attachmentDTOList.add(logAttachment);
+                    }
                 }
 
 
@@ -461,4 +473,24 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
 
         return htmlContent.toString();
     }
+
+    private String getRawLogAttachment(File logFile) {
+        //Read text from file
+        StringBuilder text = new StringBuilder();
+
+        try {
+            BufferedReader br = new BufferedReader(new FileReader(logFile));
+            String line;
+
+            while ((line = br.readLine()) != null) {
+                text.append(line);
+                text.append('\n');
+            }
+            br.close();
+        } catch (IOException e) {
+            //You'll need to add proper error handling here
+        }
+
+        return text.toString();
+    }
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
index 3a93dcc5..5cd9e95f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java
@@ -855,11 +855,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo
     public void closeOrder() {
         this.fabPopupMenu.dismiss();
 
-        this.onLoadingStarted();
         executorService.execute(() -> {
             try {
                 this.mViewmodel.closeOrder();
-                this.onLoadingEnded();
             } catch (Exception e) {
                 onError(e);
             }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
index e24097f7..ef5e82aa 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java
@@ -1015,7 +1015,7 @@ public class SpedizioneViewModel {
                 if (availableBatchLots.stream().anyMatch(x -> x.getDataScad() == null)) {
                     tmp.addAll(availableBatchLots.stream()
                             .filter(x -> x.getDataScad() == null)
-                            .sorted(Comparator.comparing(x -> UtilityString.isNull(x.getPartitaMag(), "")))
+                            .sorted(Comparator.comparing(x -> x.getPartitaMag() == null ? "" : x.getPartitaMag()))
                             .collect(Collectors.toList()));
                 }
 
@@ -2127,7 +2127,10 @@ public class SpedizioneViewModel {
 
         if (SettingsManager.iDB().isFlagPrintEtichetteOnOrderClose() || SettingsManager.iDB().isFlagPrintPackingListOnOrderClose()) {
             var printRequestResult = this.sendOnCloseOrderPrintRequest();
+
+            this.sendOnLoadingStarted();
             this.onCloseOrderPrintRequested(printRequestResult);
+            this.sendOnLoadingEnded();
         }
 
         if (this.mIsOrdTrasf && !UtilityString.isNullOrEmpty(SettingsManager.iDB().getCodDtipOrdTrasfV())) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java
index 88e2bab4..a31e85c9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java
@@ -30,6 +30,7 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.SpedizioneMainListGroupHeaderBinding;
 import it.integry.integrywmsnative.databinding.SpedizioneMainListGroupItemBinding;
@@ -123,9 +124,9 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
         } else if (pickingObjectDTO.getQtaEvasa().floatValue() > 0) {
             holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha));
         } else if (position % 2 == 1) {
-            holder.mBinding.getRoot().setBackgroundColor(Color.WHITE);
+            holder.mBinding.getRoot().setBackgroundColor(0);
         } else {
-            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
+            holder.mBinding.getRoot().setBackgroundColor(UtilityResources.getColorResourceFromAttr(mContext, R.attr.colorLetturaFacilitataSurface));
         }
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);
@@ -135,8 +136,10 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
         holder.mBinding.qtaEvasa.setTextColor(ResourcesCompat.getColor(mContext.getResources(), !pickingObjectDTO.isActive() ? R.color.gray_600 : R.color.green_700, null));
 
         holder.mBinding.descrizione.setText(pickingObjectDTO.getDescrizione());
-        holder.mBinding.descrizione.setTextColor(pickingObjectDTO.isDescrizionePresente() ? Color.BLACK : Color.GRAY);
-
+        if(pickingObjectDTO.isDescrizionePresente())
+            holder.mBinding.descrizione.setTextColor(UtilityResources.getColorResourceFromAttr(mContext, android.R.attr.colorForeground));
+        else
+            holder.mBinding.descrizione.setTextColor(Color.GRAY);
 
         holder.mBinding.badge1.setText(pickingObjectDTO.getBadge1());
         holder.mBinding.badge2.setText(pickingObjectDTO.getBadge2());
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentListAdapter.java
index 30fb1104..702c77e0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentListAdapter.java
@@ -91,7 +91,7 @@ public class BottomSheetFragmentLUContentListAdapter extends RecyclerView.Adapte
         holder.mViewDataBinding.executePendingBindings();
 
         if (position % 2 == 1)
-            holder.mViewDataBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
+            holder.mViewDataBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBGLight));
 
         holder.mViewDataBinding.getRoot().setOnClickListener(new OnSingleClickListener() {
             @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java
index 03a1608f..4f35bb6d 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentViewModel.java
@@ -44,7 +44,7 @@ public class BottomSheetFragmentLUContentViewModel {
         if (collo == null) return;
 
         ObservableMtbTcol tipoPedana = collo.getMtbTCol();
-        BigDecimal taraPedana = tipoPedana != null ? tipoPedana.getTaraKg() : BigDecimal.ZERO;
+        BigDecimal taraPedana = tipoPedana != null && tipoPedana.getTaraKg() != null ? tipoPedana.getTaraKg() : BigDecimal.ZERO;
         BigDecimal pesoNetto = BigDecimal.ZERO;
 
         for (MtbColr mtbColr : collo.getMtbColr()) {
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageView.java
index c4ede104..41d4c9ed 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageView.java
@@ -148,7 +148,7 @@ public class DialogSimpleMessageView extends BaseDialogFragment {
             }
             case WARNING -> {
                 colorBackgroundTitle = ContextCompat.getColor(requireContext(), R.color.yellow_600);
-                yield ResourcesCompat.getDrawable(requireContext().getResources(), R.drawable.ic_warning_white_24dp, null);
+                yield ResourcesCompat.getDrawable(requireContext().getResources(), R.drawable.ic_baseline_warning_24, null);
             }
             case ERROR -> {
                 colorBackgroundTitle = ContextCompat.getColor(requireContext(), R.color.red_300);
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeComponent.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeComponent.java
new file mode 100644
index 00000000..584da834
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.device_end_of_life;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogDeviceEndOfLifeComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogDeviceEndOfLifeComponent create();
+    }
+
+    void inject(DialogDeviceEndOfLifeView dialogDeviceEndOfLifeView);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeModule.java
new file mode 100644
index 00000000..1b13bdec
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeModule.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.device_end_of_life;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = DialogDeviceEndOfLifeComponent.class)
+public class DialogDeviceEndOfLifeModule {
+
+    @Provides
+    DialogDeviceEndOfLifeViewModel providesDialogDeviceEndOfLifeViewModel() {
+        return new DialogDeviceEndOfLifeViewModel();
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeView.java
new file mode 100644
index 00000000..58343ce9
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeView.java
@@ -0,0 +1,77 @@
+package it.integry.integrywmsnative.view.dialogs.device_end_of_life;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.databinding.DialogDeviceEndOfLifeBinding;
+
+public class DialogDeviceEndOfLifeView extends BaseDialogFragment {
+
+    @Inject
+    DialogDeviceEndOfLifeViewModel mViewModel;
+
+    private DialogDeviceEndOfLifeBinding mBindings;
+    private Context mContext;
+
+    private final Runnable onComplete;
+
+    //Pass here all external parameters
+    public static DialogDeviceEndOfLifeView newInstance(Runnable onComplete) {
+        return new DialogDeviceEndOfLifeView(onComplete);
+    }
+
+    private DialogDeviceEndOfLifeView(Runnable onComplete) {
+        super();
+
+        this.onComplete = onComplete;
+
+        MainApplication.appComponent
+                .dialogDeviceEndOfLifeComponent()
+                .create()
+                .inject(this);
+    }
+
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        this.mContext = requireContext();
+
+        mBindings = DialogDeviceEndOfLifeBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+        mBindings.setLifecycleOwner(this);
+
+
+        setCancelable(false);
+
+        var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
+                .setView(mBindings.getRoot())
+                .setCancelable(isCancelable())
+                .setPositiveButton(R.string.i_understand_action, (dialog, which) -> {
+                    if (onComplete != null) onComplete.run();
+                    dismiss();
+                })
+                .create();
+
+        alertDialog.setCanceledOnTouchOutside(isCancelable());
+        alertDialog.setOnShowListener(this);
+        return alertDialog;
+    }
+
+    @Override
+    public void dismiss() {
+        if (getDialog() != null) getDialog().dismiss();
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeViewModel.java
new file mode 100644
index 00000000..fce6b11b
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeViewModel.java
@@ -0,0 +1,5 @@
+package it.integry.integrywmsnative.view.dialogs.device_end_of_life;
+
+public class DialogDeviceEndOfLifeViewModel {
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
index ddeaa3a9..740b3d2f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
@@ -214,6 +214,8 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
                 }
             });
         }
+
+
         return mBindings.getRoot();
     }
 
diff --git a/app/src/main/res/drawable/badge_round_corner.xml b/app/src/main/res/drawable/badge_round_corner.xml
index e7af763b..1b3c0ba6 100644
--- a/app/src/main/res/drawable/badge_round_corner.xml
+++ b/app/src/main/res/drawable/badge_round_corner.xml
@@ -7,7 +7,7 @@
 
             <padding
                 android:left="6dp"
-                android:right="6dp"
+                android:right="8dp"
                 android:top="1dp" />
 
             <corners android:radius="12dp" />
diff --git a/app/src/main/res/drawable/easter_egg__horror_blood.xml b/app/src/main/res/drawable/easter_egg__horror_blood.xml
deleted file mode 100644
index adc323f1..00000000
--- a/app/src/main/res/drawable/easter_egg__horror_blood.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="488.3dp"
-    android:height="168.7dp"
-    android:viewportWidth="488.3"
-    android:viewportHeight="168.7">
-  <path
-      android:pathData="M484.96,0c0.1,1.5 0.2,3.6 -0.3,6c-0.7,3.4 -2.1,5.8 -3.6,8.5c-0.9,1.7 -2,3.3 -3.5,5.2c-3.5,4.7 -7.2,17.7 -9.9,39.7s-1.3,59.4 1.5,72s-0.1,22.1 -4.6,26.3s0.9,2.1 -6.7,5.1c-7.6,3 -18.9,-5.4 -21.2,-17.7l0,0c-2.3,-12.3 -3.1,-9.1 -0.1,-21.5c3,-12.4 7.6,-24.9 7.7,-36.7c0.1,-11.8 -5.1,-34.2 -12.3,-38s-7,-2.7 -13.8,-3.1s-9.9,-0.1 -13.8,4.3c-3.9,4.4 -6.5,10.3 -7.9,19.7c-1.4,9.4 0,26.7 2.4,33.1c2.4,6.4 3.7,6.8 1,14.9c-2.7,8.1 -15.7,9.9 -20.5,2.9c-4.8,-7.1 -4.3,-17.9 -1.5,-34.7c2.8,-16.8 2.3,-14.6 2.2,-27.2c0,-12.6 1,-11.4 -1.3,-15.8c-2.3,-4.4 -9.7,-9.7 -16.9,-5.7c-7.2,4 -11.7,21.3 -12.6,28.1s-0.9,24.5 0.4,31c1.2,6.5 1.3,12.8 -0.6,17.5s-4,7.4 -7.2,8.6s-6.4,1.4 -10.1,-0.9c-3.7,-2.3 -8.2,-4.8 -8.7,-16.8c-0.5,-12 3.7,-39.8 2.1,-53.6c-1.2,-10.7 -3.7,-14.3 -9.2,-10.6c-3.9,2.6 -7.2,9.4 -4.9,16s2.8,8.4 2.7,13s-1.1,8 -4.4,11.6c-3.3,3.5 -8.3,5 -12.8,1.9c-4.5,-3.1 -6.7,-9.9 -4.3,-18.3c2.5,-8.4 10.1,-11.6 1.7,-19.2c-8.3,-7.6 -14.9,1.7 -15.1,15.6c-0.2,14 0.8,23 3.6,32.5c2.8,9.6 4.1,14.7 4.1,22.7s-5.1,16.1 -12.8,15.3s-12.7,-15.8 -14.7,-26.2c-2,-10.4 -1.8,-8.8 -2.5,-11.3s-1.3,-5 -1.6,-9.6c-1.8,-13 4.7,-26 4.8,-37.1c0,-6.6 0.8,-8.5 -2.8,-12.3s-19.3,6.1 -23.4,17.1s-3.9,10.9 -3.6,25.9s1.8,25.1 5.1,34.5c3.3,9.4 3.9,16.5 3.2,19.7c-0.6,3.3 -0.6,3.1 -1.3,8.3c-0.7,5.2 -3.9,10.8 -6.8,12.3c-3.9,2 -8.2,0.3 -10.5,-1.8c-2.4,-2.4 -5.4,-8.4 -6.7,-13.9s-1.3,-8.5 -1.3,-16s0.3,-14.8 0.7,-19.7c0.4,-4.9 0.8,-11.8 1.1,-25.1c0.3,-13.3 -0.4,-19.2 -3.6,-29.8s-3.5,-9.7 -7.1,-13.5s-5.6,-4.9 -8.6,-4.9c-2.9,0 -8.5,3 -11.3,5.9c-2.7,2.9 -5.6,8.2 -8,15.5s-2.7,9.4 0.3,22.8s3.5,16.2 1.4,27.5c-2,11.3 -7.2,16.8 -14.8,16.8s-12.2,-3.3 -14.5,-7.8s-3.7,-12.1 -3.4,-17.3s2,-15.6 2.8,-18.3c0.9,-2.6 2.8,-14.6 3.3,-20.7c0.5,-6.1 -0.4,-11 -3.4,-16.2s-4.6,-7.1 -6.5,-8.3c-4.8,-2.5 -9.5,2.4 -11.6,4.6c-3.8,3.9 -7.6,10.3 -9,14.7s-1,4.3 -0.3,12s0.8,8.5 -0.2,17s-1.6,11.8 -4.2,15.3s-4,4.7 -9.7,4.7s-12.5,-6.7 -13.7,-12.5s1.4,-15.6 3.1,-23.4s1,-20.1 -0.3,-24c-4,-13.1 -11.8,-9.2 -16.1,-1.2c-5.2,7.4 -5.5,31.2 -3.5,39.9s0.6,19.8 -0.4,24.8s-4.2,12.3 -7,15.4s-10.6,4.7 -14.7,2.4s-8.1,-6.9 -9.7,-11.6c-1.6,-4.7 -1.4,-13.4 0.3,-17.2c1.7,-3.8 7.6,-11.5 8.4,-23.2c0.9,-11.7 -4.8,-17 -5.4,-18.6c-0.6,-1.6 -2.5,-1.1 -4.5,1c-7.6,9.1 -5.7,19.2 -5.8,24.7c-0.4,14.7 3.9,39.6 4.1,49.4c0.2,9.8 -1.7,12.8 -3.5,17.6c-1.8,4.8 -3.4,7.4 -7.6,10s-10.2,5.3 -14.5,3.4c-4.3,-2 -5.1,0.1 -9.1,-11.3c-4,-11.4 1.5,-34 4.2,-42.1c2.7,-8.1 4.2,-11 5.3,-18.4s2.4,-20.6 2.4,-38c0,-17.3 0.6,-16.8 -1.5,-21.5c-3.1,-6.7 -5.1,-14.5 -1.9,-20.4c0.2,-0.4 0.6,-1.1 1.2,-1.8C171.66,0 328.26,0 484.96,0z"
-      android:fillColor="#D32F2F"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_round_check_24.xml b/app/src/main/res/drawable/ic_round_check_24.xml
index e202540c..f987077d 100644
--- a/app/src/main/res/drawable/ic_round_check_24.xml
+++ b/app/src/main/res/drawable/ic_round_check_24.xml
@@ -1,4 +1,4 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="?attr/colorControlNormal" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
       
     <path android:fillColor="@android:color/white" android:pathData="M9,16.17L5.53,12.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41l4.18,4.18c0.39,0.39 1.02,0.39 1.41,0L20.29,7.71c0.39,-0.39 0.39,-1.02 0,-1.41 -0.39,-0.39 -1.02,-0.39 -1.41,0L9,16.17z"/>
     
diff --git a/app/src/main/res/drawable/ic_warning_white_24dp.xml b/app/src/main/res/drawable/ic_warning_white_24dp.xml
deleted file mode 100644
index 3aea284b..00000000
--- a/app/src/main/res/drawable/ic_warning_white_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="76dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="76dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
-</vector>
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 05a513ca..98019791 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
@@ -101,7 +101,7 @@
                         tools:text="COD MART (Partita mag)" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="4dp"
@@ -218,7 +218,8 @@
                                 android:imeOptions="actionDone"
                                 android:inputType="numberDecimal"
                                 android:textColor="@{ContextCompat.getColor(context, view.enabledQtaCnf ? android.R.color.black : R.color.gray_400)}"
-                                app:binding="@{view.currentPesoCollo}" />
+                                app:binding="@{view.currentPesoCollo}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml b/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml
index 08246c7c..34899652 100644
--- a/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml
+++ b/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml
@@ -31,7 +31,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:background="@android:color/white"
         android:orientation="vertical"
         app:cardCornerRadius="12dp"
         app:cardElevation="0dp">
@@ -50,8 +49,7 @@
                 android:minHeight="?attr/actionBarSize"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:titleTextColor="@android:color/white">
+                app:layout_constraintTop_toTopOf="parent">
 
 
             </androidx.appcompat.widget.Toolbar>
@@ -92,7 +90,7 @@
                         tools:text="DIACOD" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="4dp"
@@ -109,12 +107,11 @@
 
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/TextAppearance.Material3.BodyLarge"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_toStartOf="@id/qta_ord_panel"
-                            android:text="@string/total_ordered"
-                            android:textColor="@android:color/black" />
+                            android:text="@string/total_ordered" />
 
                         <androidx.appcompat.widget.LinearLayoutCompat
                             android:id="@+id/qta_ord_panel"
@@ -124,61 +121,55 @@
                             android:orientation="horizontal">
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfOrd)}"
-                                android:textColor="@android:color/black"
                                 android:textStyle="bold" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
                                 android:layout_marginStart="4dp"
                                 android:text="@string/unt_mis_col"
-                                android:textColor="@android:color/black"
                                 android:textStyle="bold" />
 
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
                                 android:layout_marginStart="4dp"
                                 android:text="("
-                                android:textColor="@android:color/black"
                                 android:textStyle="bold" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="0dp"
                                 android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaOrd)}"
-                                android:textColor="@android:color/black"
                                 android:textStyle="bold" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
                                 android:layout_marginStart="2dp"
                                 android:text="@{viewmodel.mtbAart.untMis}"
-                                android:textColor="@android:color/black"
                                 android:textStyle="bold" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
                                 android:layout_marginStart="0dp"
                                 android:text=")"
-                                android:textColor="@android:color/black"
                                 android:textStyle="bold" />
 
 
@@ -214,7 +205,7 @@
                                 android:tint="@color/gray_600" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="4dp"
@@ -225,7 +216,7 @@
                                 tools:text="1" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
@@ -238,7 +229,7 @@
 
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
@@ -248,7 +239,7 @@
                                 android:visibility="@{view.currentTextNumPezziToTake > 0 &amp;&amp; view.currentTextNumCnfToTake > 0 ? View.VISIBLE : View.GONE}" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="4dp"
@@ -259,7 +250,7 @@
                                 tools:text="4" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
@@ -313,7 +304,7 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfInWarehouse, 1)}"
@@ -321,7 +312,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -342,7 +333,7 @@
 
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -352,7 +343,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_marginStart="0dp"
@@ -361,7 +352,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -371,7 +362,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -413,7 +404,7 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfCommitted, 1)}"
@@ -421,7 +412,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -441,7 +432,7 @@
 
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -451,7 +442,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_marginStart="0dp"
@@ -460,7 +451,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -470,7 +461,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -522,7 +513,7 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfToBeTaken)}"
@@ -530,7 +521,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -551,7 +542,7 @@
 
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -561,7 +552,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_marginStart="0dp"
@@ -570,7 +561,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -580,7 +571,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -621,7 +612,7 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfAvailable)}"
@@ -629,7 +620,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -649,7 +640,7 @@
 
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -659,7 +650,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_marginStart="0dp"
@@ -668,7 +659,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -678,7 +669,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -808,7 +799,8 @@
                                 android:hint="@string/qty_x_pck"
                                 android:imeOptions="actionDone"
                                 android:inputType="numberDecimal"
-                                app:binding="@{view.currentQtaCnf}" />
+                                app:binding="@{view.currentQtaCnf}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
@@ -831,7 +823,8 @@
                                 android:digits="0123456789"
                                 android:hint="@string/tot_qty"
                                 android:inputType="number"
-                                app:binding="@{view.currentQtaTot}" />
+                                app:binding="@{view.currentQtaTot}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
@@ -866,7 +859,8 @@
                                 android:hint="@string/tare_art"
                                 android:inputType="number"
                                 android:textColor="@color/gray_400"
-                                app:binding="@{view.currentTaraArticolo}" />
+                                app:binding="@{view.currentTaraArticolo}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
@@ -890,7 +884,8 @@
                                 android:imeOptions="actionDone"
                                 android:inputType="numberDecimal"
                                 android:textColor="@color/gray_400"
-                                app:binding="@{view.currentTaraTot}" />
+                                app:binding="@{view.currentTaraTot}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
@@ -912,9 +907,9 @@
                                 android:layout_height="wrap_content"
                                 android:hint="@string/LU_weight"
                                 android:inputType="number"
-                                android:textColor="@{ContextCompat.getColor(context, view.enabledQtaCnf ? android.R.color.black : R.color.gray_400)}"
                                 android:visibility="@{view.enabledNotes ? View.VISIBLE : View.GONE }"
-                                app:binding="@{view.currentPesoLordo}" />
+                                app:binding="@{view.currentPesoLordo}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
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 34084d5d..3f8eb194 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
@@ -130,7 +130,7 @@
                                     android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityDate.formatDate(view.currentOrder.dataOrd, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
-                                    android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                    android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                     tools:text="28 maggio 2021" />
 
                                 <TextView
@@ -233,7 +233,7 @@
                                         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:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                         android:textColor="@android:color/black"
                                         tools:text="GRUNDHOFER GBMH" />
 
@@ -276,7 +276,7 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text="@{UtilityDate.formatDate(view.currentOrder.getDataConsCommessaD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black"
                                             tools:text="01 Gen 2022" />
 
@@ -361,7 +361,7 @@
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
                                                 android:text="@{UtilityNumber.decimalToString(view.currentOrder.numPedane, 0)}"
-                                                android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                                android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                                 android:textColor="@android:color/black"
                                                 tools:text="0" />
 
@@ -370,7 +370,7 @@
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
                                                 android:text=" UL"
-                                                android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                                android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                                 android:textColor="@android:color/black" />
 
                                         </androidx.appcompat.widget.LinearLayoutCompat>
@@ -419,7 +419,7 @@
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
                                                 android:text="@{UtilityNumber.decimalToString(view.currentOrder.numCnf, 0)}"
-                                                android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                                android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                                 android:textColor="@android:color/black"
                                                 tools:text="0" />
 
@@ -428,7 +428,7 @@
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
                                                 android:text=" COL"
-                                                android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                                android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                                 android:textColor="@android:color/black" />
 
                                         </androidx.appcompat.widget.LinearLayoutCompat>
@@ -478,7 +478,7 @@
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
                                                 android:text="@{UtilityNumber.decimalToString(view.currentOrder.qtaProd, 0)}"
-                                                android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                                android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                                 android:textColor="@android:color/black"
                                                 tools:text="0" />
 
@@ -488,7 +488,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:layout_marginStart="4dp"
                                                 android:text="@{view.currentOrder.untOrd}"
-                                                android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                                android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                                 android:textColor="@android:color/black"
                                                 tools:text="KG" />
 
@@ -546,7 +546,7 @@
                                                 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:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                                 android:textColor="@android:color/black"
                                                 tools:text="0" />
 
@@ -555,7 +555,7 @@
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
                                                 android:text=" UL"
-                                                android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                                android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                                 android:textColor="@android:color/black" />
 
                                         </androidx.appcompat.widget.LinearLayoutCompat>
@@ -605,7 +605,7 @@
                                                 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:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                                 android:textColor="@android:color/black"
                                                 tools:text="0" />
 
@@ -615,7 +615,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:layout_marginStart="4dp"
                                                 android:text="COL"
-                                                android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                                android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                                 android:textColor="@android:color/black" />
 
                                         </androidx.appcompat.widget.LinearLayoutCompat>
@@ -662,7 +662,7 @@
                                                 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:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                                 android:textColor="@android:color/black"
                                                 tools:text="0" />
 
@@ -672,7 +672,7 @@
                                                 android:layout_height="wrap_content"
                                                 android:layout_marginStart="4dp"
                                                 android:text="KG"
-                                                android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                                android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                                 android:textColor="@android:color/black" />
 
 
@@ -680,14 +680,14 @@
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
                                                 android:text=" ("
-                                                android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                                android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                                 android:textColor="@android:color/black" />
 
                                             <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:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                                 android:textColor="@android:color/black"
                                                 tools:text="0" />
 
@@ -696,7 +696,7 @@
                                                 android:layout_width="wrap_content"
                                                 android:layout_height="wrap_content"
                                                 android:text=" KG)"
-                                                android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                                android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                                 android:textColor="@android:color/black" />
 
                                         </androidx.appcompat.widget.LinearLayoutCompat>
@@ -768,7 +768,7 @@
                                             android:ellipsize="end"
                                             android:maxLines="1"
                                             android:text="@{view.currentOrder.ragSocAnag + ` (` + view.currentOrder.codAnag + `)`}"
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black"
                                             android:visibility="@{view.currentOrder.ragSocAnag != null ? View.VISIBLE : View.GONE}"
                                             tools:text="FRUDIS S.R.L. (F0312)" />
@@ -813,7 +813,7 @@
                                             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:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black"
                                             tools:text="0" />
 
@@ -822,7 +822,7 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text=" UL"
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black" />
 
 
@@ -830,14 +830,14 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text=" ("
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             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:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black"
                                             tools:text="0" />
 
@@ -846,7 +846,7 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text=" COL)"
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black" />
 
                                     </androidx.appcompat.widget.LinearLayoutCompat>
@@ -906,7 +906,7 @@
                                         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:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                         android:textColor="@android:color/black"
                                         tools:text="GRUNDHOFER GBMH" />
 
@@ -949,7 +949,7 @@
                                             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:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black"
                                             tools:text="0" />
 
@@ -958,7 +958,7 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text=" KG"
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black" />
 
                                     </androidx.appcompat.widget.LinearLayoutCompat>
@@ -1024,7 +1024,7 @@
                                             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:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black"
                                             tools:text="11:00:00" />
 
@@ -1032,14 +1032,14 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text=" - "
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             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:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black"
                                             android:visibility="@{view.currentOrder.dataFineD != null ? View.VISIBLE : View.GONE}"
                                             tools:text="18:00:00" />
@@ -1048,7 +1048,7 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text="IN CORSO"
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black"
                                             android:visibility="@{view.currentOrder.dataFineD == null ? View.VISIBLE : View.GONE}"
                                             tools:text="IN CORSO"
@@ -1061,7 +1061,7 @@
                                         android:layout_height="wrap_content"
                                         android:text="Non avviato"
                                         android:textAllCaps="true"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                         android:textColor="@android:color/black"
                                         android:visibility="@{view.currentOrder.dataInizD == null ? View.VISIBLE : View.GONE}"
                                         tools:visibility="gone" />
@@ -1105,7 +1105,7 @@
                                             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:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black"
                                             tools:text="0" />
 
@@ -1114,7 +1114,7 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text=" KG"
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black" />
 
                                     </androidx.appcompat.widget.LinearLayoutCompat>
@@ -1176,7 +1176,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="Lista bancali"
-                                android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                 android:textColor="@android:color/black"
                                 android:textStyle="bold" />
 
@@ -1231,7 +1231,7 @@
                                         android:src="@drawable/ic_playlist_add_check_24dp" />
 
                                     <androidx.appcompat.widget.AppCompatTextView
-                                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                                        style="@style/TextAppearance.Material3.BodyLarge"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:gravity="center_horizontal"
diff --git a/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_header.xml b/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_header.xml
index 47146b87..408473da 100644
--- a/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_header.xml
+++ b/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_header.xml
@@ -10,7 +10,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/group_title"
-            style="@style/AppTheme.NewMaterial.Text.Medium"
+            style="@style/TextAppearance.Material3.BodyLarge"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
diff --git a/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_item.xml b/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_item.xml
index 590b41e2..0d7d0170 100644
--- a/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_item.xml
+++ b/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_item.xml
@@ -21,7 +21,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/badge1"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="@drawable/badge_round_corner"
@@ -57,7 +57,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/badge2"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textColor="@android:color/white"
@@ -87,7 +87,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/badge3"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -106,7 +106,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/qta_evasa"
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -115,7 +115,7 @@
                         tools:text="QTA" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text=" / "
@@ -124,7 +124,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/qta_tot"
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textColor="@android:color/black"
@@ -133,7 +133,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/unt_mis"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -155,7 +155,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/titolo"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentStart="true"
@@ -177,7 +177,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/sec_qta_evasa"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -186,7 +186,7 @@
                         tools:text="QTA" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text=" / "
@@ -194,7 +194,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/sec_qta_tot"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textStyle="bold"
@@ -216,7 +216,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/descrizione"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentStart="true"
diff --git a/app/src/main/res/layout/accettazione_main_list_group_clienti.xml b/app/src/main/res/layout/accettazione_main_list_group_clienti.xml
index 11b8cba3..1210d210 100644
--- a/app/src/main/res/layout/accettazione_main_list_group_clienti.xml
+++ b/app/src/main/res/layout/accettazione_main_list_group_clienti.xml
@@ -13,7 +13,7 @@
             android:ellipsize="end"
             android:paddingEnd="6dp"
             tools:text="TextView"
-            style="@style/AppTheme.NewMaterial.Text.Small" />
+            style="@style/TextAppearance.Material3.BodyMedium" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/accettazione_main_list_group_clienti_datacons"
@@ -21,6 +21,6 @@
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             tools:text="TextView"
-            style="@style/AppTheme.NewMaterial.Text.Small" />
+            style="@style/TextAppearance.Material3.BodyMedium" />
     </RelativeLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/accettazione_main_list_group_model.xml b/app/src/main/res/layout/accettazione_main_list_group_model.xml
index b4f75028..86fa7298 100644
--- a/app/src/main/res/layout/accettazione_main_list_group_model.xml
+++ b/app/src/main/res/layout/accettazione_main_list_group_model.xml
@@ -36,7 +36,7 @@
                 android:layout_height="wrap_content"
                 tools:text="Ord. Prod. 39 del 27 ott 2017"
                 android:textColor="#000"
-                style="@style/AppTheme.NewMaterial.Text.Small"/>
+                style="@style/TextAppearance.Material3.BodyMedium"/>
 
 
             <LinearLayout
diff --git a/app/src/main/res/layout/accettazione_main_list_model.xml b/app/src/main/res/layout/accettazione_main_list_model.xml
index 11ffd309..078c2513 100644
--- a/app/src/main/res/layout/accettazione_main_list_model.xml
+++ b/app/src/main/res/layout/accettazione_main_list_model.xml
@@ -15,7 +15,7 @@
 
         <TextView
             android:id="@+id/accettazione_main_list_group_header"
-            style="@style/AppTheme.NewMaterial.Text.Medium"
+            style="@style/TextAppearance.Material3.BodyLarge"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@android:color/white"
diff --git a/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_header.xml b/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_header.xml
index e2934bb0..87538c82 100644
--- a/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_header.xml
+++ b/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_header.xml
@@ -10,7 +10,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/group_title"
-            style="@style/AppTheme.NewMaterial.Text.Medium"
+            style="@style/TextAppearance.Material3.BodyLarge"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
diff --git a/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_item.xml b/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_item.xml
index bb2b26fa..5f3fe27e 100644
--- a/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_item.xml
+++ b/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_item.xml
@@ -21,7 +21,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/badge1"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="@drawable/badge_round_corner"
@@ -36,7 +36,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/badge2"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
@@ -72,7 +72,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/badge3"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -91,7 +91,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/qta_evasa"
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -100,7 +100,7 @@
                         tools:text="QTA" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text=" / "
@@ -109,7 +109,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/qta_tot"
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textColor="@android:color/black"
@@ -118,7 +118,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/unt_mis"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -137,7 +137,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/descrizione"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentStart="true"
@@ -149,7 +149,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/descrizione_sub_1"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentStart="true"
@@ -171,7 +171,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/sec_qta_evasa"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -180,7 +180,7 @@
                         tools:text="QTA" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text=" / "
@@ -188,7 +188,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/sec_qta_tot"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textStyle="bold"
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 2c5a9d4b..2aff0071 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
@@ -28,16 +28,13 @@
             android:id="@+id/linearLayout2"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/full_white"
             android:descendantFocusability="blocksDescendants"
             android:orientation="vertical">
 
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@color/full_white"
-                android:orientation="vertical"
-                android:paddingTop="8dp">
+                android:orientation="vertical">
 
                 <it.integry.integrywmsnative.ui.ElevatedToolbar
                     android:id="@+id/elevated_toolbar"
diff --git a/app/src/main/res/layout/activity_contab_doc_interno_row__list_single_item.xml b/app/src/main/res/layout/activity_contab_doc_interno_row__list_single_item.xml
index 69d0c69b..3c33addf 100644
--- a/app/src/main/res/layout/activity_contab_doc_interno_row__list_single_item.xml
+++ b/app/src/main/res/layout/activity_contab_doc_interno_row__list_single_item.xml
@@ -46,7 +46,6 @@
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:text="@{item.descrizione}"
-                android:textColor="@android:color/black"
                 android:textSize="16sp"
                 tools:text="Descrizione lunga item" />
 
@@ -64,10 +63,9 @@
 
         <RelativeLayout
             android:id="@+id/qta_box"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:paddingStart="12dp"
-            android:paddingEnd="12dp"
+            android:layout_marginStart="12dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent">
diff --git a/app/src/main/res/layout/activity_contenuto_bancale.xml b/app/src/main/res/layout/activity_contenuto_bancale.xml
index 44829935..a426f7fd 100644
--- a/app/src/main/res/layout/activity_contenuto_bancale.xml
+++ b/app/src/main/res/layout/activity_contenuto_bancale.xml
@@ -78,7 +78,7 @@
                             android:orientation="horizontal">
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Small"
+                                style="@style/TextAppearance.Material3.BodyMedium"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="Data creazione: "
@@ -86,7 +86,7 @@
                                 android:textSize="16sp" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Small"
+                                style="@style/TextAppearance.Material3.BodyMedium"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@{view.mtbColt.getDataColloHumanLong()}"
@@ -102,14 +102,14 @@
                             android:orientation="horizontal">
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Small"
+                                style="@style/TextAppearance.Material3.BodyMedium"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="Preparato da "
                                 android:textColor="@android:color/black" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Small"
+                                style="@style/TextAppearance.Material3.BodyMedium"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@{view.mtbColt.getPreparatoDa() != null ? view.mtbColt.getPreparatoDa() : `N/D`}"
@@ -125,14 +125,14 @@
                             android:orientation="horizontal">
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Small"
+                                style="@style/TextAppearance.Material3.BodyMedium"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="Posizione "
                                 android:textColor="@android:color/black" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Small"
+                                style="@style/TextAppearance.Material3.BodyMedium"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@{view.mtbColt.getPosizione() != null ? view.mtbColt.getPosizione() : `N/D`}"
@@ -147,14 +147,14 @@
                             android:orientation="horizontal">
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Small"
+                                style="@style/TextAppearance.Material3.BodyMedium"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="Deposito "
                                 android:textColor="@android:color/black" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Small"
+                                style="@style/TextAppearance.Material3.BodyMedium"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@{view.mtbColt.getCodMdep()}"
@@ -163,7 +163,7 @@
                                 tools:text="10" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Small"
+                                style="@style/TextAppearance.Material3.BodyMedium"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="4dp"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 693d9d75..4d564f97 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,7 +6,6 @@
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/full_white"
         android:fitsSystemWindows="false"
         tools:openDrawer="start">
 
@@ -22,7 +21,6 @@
             android:layout_height="match_parent"
             android:layout_gravity="start"
             android:fitsSystemWindows="true"
-            android:background="@android:color/white"
             app:headerLayout="@layout/nav_header_main" />
 
         <View
diff --git a/app/src/main/res/layout/activity_picking_inventario__list_item.xml b/app/src/main/res/layout/activity_picking_inventario__list_item.xml
index ea6b85ec..c87a44d0 100644
--- a/app/src/main/res/layout/activity_picking_inventario__list_item.xml
+++ b/app/src/main/res/layout/activity_picking_inventario__list_item.xml
@@ -38,7 +38,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/cod_mart"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@{item.codMart}"
@@ -47,7 +47,7 @@
 
 
 <!--                <androidx.appcompat.widget.AppCompatTextView-->
-<!--                    style="@style/AppTheme.NewMaterial.Text.Small"-->
+<!--                    style="@style/TextAppearance.Material3.BodyMedium"-->
 <!--                    android:layout_width="wrap_content"-->
 <!--                    android:layout_height="wrap_content"-->
 <!--                    android:layout_alignParentEnd="true"-->
@@ -66,7 +66,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
@@ -77,7 +77,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
@@ -88,7 +88,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
 
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_picking_resi.xml b/app/src/main/res/layout/activity_picking_resi.xml
index 65d33315..51c7dd76 100644
--- a/app/src/main/res/layout/activity_picking_resi.xml
+++ b/app/src/main/res/layout/activity_picking_resi.xml
@@ -86,14 +86,14 @@
                                 android:orientation="vertical">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@string/filtered_arts_in_list" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
                                     android:id="@+id/description_filter_text"
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:ellipsize="end"
diff --git a/app/src/main/res/layout/activity_prod_dettaglio_linea.xml b/app/src/main/res/layout/activity_prod_dettaglio_linea.xml
index 7deee321..739d66db 100644
--- a/app/src/main/res/layout/activity_prod_dettaglio_linea.xml
+++ b/app/src/main/res/layout/activity_prod_dettaglio_linea.xml
@@ -26,8 +26,7 @@
 
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#ebebeb">
+        android:layout_height="match_parent">
 
 
         <androidx.appcompat.widget.LinearLayoutCompat
@@ -57,284 +56,298 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent" />
 
-            <androidx.appcompat.widget.LinearLayoutCompat
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical"
-                android:background="@color/white"
-                android:padding="16dp">
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Headline"
-                        android:text="@{view.lineaLabel}"
-                        tools:text="L2 - Linea 2"
-
-                        />
-
-                    <androidx.appcompat.widget.AppCompatImageButton
-                        android:id="@+id/add_extra_items_toolbar"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_centerVertical="true"
-                        android:adjustViewBounds="true"
-                        android:background="?attr/selectableItemBackground"
-                        android:onClick="@{()->viewModel.settings()}"
-                        android:padding="6dp"
-                        android:src="@drawable/ic_settings_24dp"
-                        android:tint="@color/colorPrimaryGray" />
-
-
-                </RelativeLayout>
-
+                android:layout_margin="8dp">
 
                 <androidx.appcompat.widget.LinearLayoutCompat
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/image"
-                        android:layout_width="18dp"
-                        android:layout_height="18dp"
-                        android:layout_gravity="center_horizontal"
-                        android:src="@{ContextCompat.getDrawable(context, view.isStarted.get() ? R.drawable.ic_baseline_play_arrow_24 : view.isPaused.get() ? R.drawable.ic_baseline_pause_24 : R.drawable.ic_baseline_stop_24)}"
-                        app:tint="@{ContextCompat.getColor(context, view.isStarted.get() ? R.color.green_600 : view.isPaused.get() ? R.color.orange_600 : R.color.red_600)}"
-                        tools:tint="@color/green_600"
-                        tools:src="@drawable/ic_baseline_play_arrow_24" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/peso_lordo_collo"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        app:text="@{view.isStarted.get() ? R.string.in_progress : view.isPaused.get() ? R.string.stand_by : R.string.stopped}"
-                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
-                        app:textColor="@{ContextCompat.getColor(context, view.isStarted.get() ? R.color.green_600 : view.isPaused.get() ? R.color.orange_600 : R.color.red_600)}"
-                        tools:textColor="@color/green_600"
-                        android:textStyle="bold"
-                        tools:text="In lavorazione" />
-                </androidx.appcompat.widget.LinearLayoutCompat>
-
-                <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    app:visibility="@{view.isStarted}"
-                    android:layout_marginTop="16dp">
+                    android:orientation="vertical"
+                    android:padding="16dp">
 
-                    <androidx.appcompat.widget.AppCompatTextView
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@{view.lineaLabel}"
+                            android:textAppearance="@style/TextAppearance.AppCompat.Headline"
+                            tools:text="L2 - Linea 2"
+
+                            />
+
+                        <androidx.appcompat.widget.AppCompatImageButton
+                            android:id="@+id/add_extra_items_toolbar"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:layout_centerVertical="true"
+                            android:adjustViewBounds="true"
+                            android:background="?attr/selectableItemBackground"
+                            android:onClick="@{()->viewModel.settings()}"
+                            android:padding="6dp"
+                            android:src="@drawable/ic_settings_24dp"
+                            android:tint="?attr/colorControlNormal" />
+
+
+                    </RelativeLayout>
+
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/risorse_impostate"
-                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
-                        tools:text="Risorse assegnate" />
+                        android:orientation="horizontal">
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="wrap_content"
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:id="@+id/image"
+                            android:layout_width="18dp"
+                            android:layout_height="18dp"
+                            android:layout_gravity="center_horizontal"
+                            android:src="@{ContextCompat.getDrawable(context, view.isStarted.get() ? R.drawable.ic_baseline_play_arrow_24 : view.isPaused.get() ? R.drawable.ic_baseline_pause_24 : R.drawable.ic_baseline_stop_24)}"
+                            app:tint="@{ContextCompat.getColor(context, view.isStarted.get() ? R.color.green_600 : view.isPaused.get() ? R.color.orange_600 : R.color.red_600)}"
+                            tools:src="@drawable/ic_baseline_play_arrow_24"
+                            tools:tint="@color/green_600" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/peso_lordo_collo"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textStyle="bold"
+                            app:text="@{view.isStarted.get() ? R.string.in_progress : view.isPaused.get() ? R.string.stand_by : R.string.stopped}"
+                            app:textColor="@{ContextCompat.getColor(context, view.isStarted.get() ? R.color.green_600 : view.isPaused.get() ? R.color.orange_600 : R.color.red_600)}"
+                            tools:text="In lavorazione"
+                            tools:textColor="@color/green_600" />
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_centerVertical="true"
-                        app:text="@{view.hrNum}"
-                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
-                        android:textStyle="bold"
-                        tools:text="25" />
+                        android:layout_marginTop="16dp"
+                        app:visibility="@{view.isStarted}">
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/risorse_impostate"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                            tools:text="Risorse assegnate" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:layout_centerVertical="true"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+                            android:textStyle="bold"
+                            app:text="@{view.hrNum}"
+                            tools:text="25" />
 
 
-                </RelativeLayout>
+                    </RelativeLayout>
 
 
-            </androidx.appcompat.widget.LinearLayoutCompat>
+                </androidx.appcompat.widget.LinearLayoutCompat>
+            </com.google.android.material.card.MaterialCardView>
 
-
-            <androidx.appcompat.widget.LinearLayoutCompat
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="@color/white"
-                android:orientation="vertical"
-                app:visibility="@{view.flagShowProdInfo}"
+                android:layout_margin="8dp"
                 android:layout_marginTop="16dp"
-                android:padding="16dp">
+                app:visibility="@{view.flagShowProdInfo}">
 
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/production_in_progress"
-                    tools:text="Lavorazione in corso"
-                    android:textAppearance="@style/AppTheme.NewMaterial.Text.TextBoxGroupTitleDashboard" />
-
-                <com.google.android.material.divider.MaterialDivider
+                <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="8dp" />
+                    android:orientation="vertical"
+                    android:padding="16dp">
 
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
 
-                    <androidx.appcompat.widget.AppCompatTextView
+                    <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="@string/article"
-                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
-                        tools:text="Articolo" />
+                        android:text="@string/production_in_progress"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
+                        tools:text="Lavorazione in corso" />
 
-                    <androidx.appcompat.widget.AppCompatTextView
+                    <com.google.android.material.divider.MaterialDivider
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp" />
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/article"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            tools:text="Articolo" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:layout_centerVertical="true"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textStyle="bold"
+                            app:text="@{view.codMart}"
+                            tools:text="150150-09" />
+
+
+                    </RelativeLayout>
+
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/batch_lot"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            tools:text="Lotto" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:layout_centerVertical="true"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textStyle="bold"
+                            app:text="@{view.partitaMag}"
+                            tools:text="20220530" />
+
+
+                    </RelativeLayout>
+
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+
+                        >
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:id="@+id/label_descrizione"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/description"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            app:layout_constraintStart_toStartOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            tools:text="Descrizione" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            android:layout_width="0dp"
+                            android:layout_height="wrap_content"
+                            android:layout_alignParentEnd="true"
+                            android:layout_centerVertical="true"
+                            android:layout_marginStart="8dp"
+                            android:gravity="end"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                            android:textStyle="bold"
+                            app:layout_constraintEnd_toEndOf="parent"
+                            app:layout_constraintStart_toEndOf="@id/label_descrizione"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:text="@{view.productDescription}"
+                            tools:text="UVA VITTORIA IN CASSE " />
+
+
+                    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+                    <com.google.android.material.divider.MaterialDivider
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginBottom="8dp" />
+
+                    <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_centerVertical="true"
-                        app:text="@{view.codMart}"
-                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
-                        android:textStyle="bold"
-                        tools:text="150150-09" />
+                        android:text="@string/orders_in_progress"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                        tools:text="Ordini in lavorazione" />
 
-
-                </RelativeLayout>
-
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/batch_lot"
-                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
-                        tools:text="Lotto" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_centerVertical="true"
-                        app:text="@{view.partitaMag}"
-                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
-                        android:textStyle="bold"
-                        tools:text="20220530" />
-
-
-                </RelativeLayout>
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-
-                    >
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:id="@+id/label_descrizione"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/description"
-                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent"
-                        tools:text="Descrizione" />
-
-                    <androidx.appcompat.widget.AppCompatTextView
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        android:layout_centerVertical="true"
-                        android:gravity="end"
-                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
-                        android:textStyle="bold"
-                        android:layout_marginStart="8dp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toEndOf="@id/label_descrizione"
-                        app:layout_constraintTop_toTopOf="parent"
-                        app:text="@{view.productDescription}"
-                        tools:text="UVA VITTORIA IN CASSE " />
-
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-                <com.google.android.material.divider.MaterialDivider
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:layout_marginBottom="8dp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/orders_in_progress"
-                    tools:text="Ordini in lavorazione"
-                    android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium" />
-
-                <HorizontalScrollView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content">
-
-                    <com.google.android.material.chip.ChipGroup
-                        android:id="@+id/orders_list"
+                    <HorizontalScrollView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content">
 
+                        <com.google.android.material.chip.ChipGroup
+                            android:id="@+id/orders_list"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content">
 
-                    </com.google.android.material.chip.ChipGroup>
-                </HorizontalScrollView>
 
-            </androidx.appcompat.widget.LinearLayoutCompat>
+                        </com.google.android.material.chip.ChipGroup>
+                    </HorizontalScrollView>
 
-            <androidx.appcompat.widget.LinearLayoutCompat
+                </androidx.appcompat.widget.LinearLayoutCompat>
+            </com.google.android.material.card.MaterialCardView>
+
+
+            <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:padding="16dp"
-                android:background="@color/white"
-                android:orientation="vertical">
-
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/versamento_merce_fragment_title"
-                    android:textAppearance="@style/AppTheme.NewMaterial.Text.TextBoxGroupTitleDashboard" />
+                android:layout_margin="8dp"
+                android:layout_marginTop="16dp">
 
                 <androidx.appcompat.widget.LinearLayoutCompat
-                    android:id="@+id/scan_art_spinner"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="24dp"
-                    android:orientation="horizontal"
-                    android:visibility="visible"
-                    app:layout_constraintTop_toBottomOf="@id/header_content"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent">
+                    android:orientation="vertical"
+                    android:padding="16dp">
 
 
-                    <com.google.android.material.progressindicator.CircularProgressIndicator
-                        android:id="@+id/progressBar"
-                        style="?attr/circularProgressIndicatorStyle"
+                    <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:indeterminate="true"
-                        app:trackCornerRadius="4dp"/>
+                        android:text="@string/versamento_merce_fragment_title"
+                        android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text"
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/scan_art_spinner"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical"
-                        android:layout_marginStart="8dp"
-                        android:layout_marginEnd="12dp"
-                        android:gravity="center_horizontal"
-                        android:text="@string/scan_lu_to_deposit"
-                        android:textSize="16sp" />
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="24dp"
+                        android:orientation="horizontal"
+                        android:visibility="visible"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toBottomOf="@id/header_content">
+
+
+                        <com.google.android.material.progressindicator.CircularProgressIndicator
+                            android:id="@+id/progressBar"
+                            style="?attr/circularProgressIndicatorStyle"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:indeterminate="true"
+                            app:trackCornerRadius="4dp" />
+
+                        <androidx.appcompat.widget.AppCompatTextView
+                            style="@style/AppTheme.NewMaterial.Text"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center_vertical"
+                            android:layout_marginStart="8dp"
+                            android:layout_marginEnd="12dp"
+                            android:gravity="center_horizontal"
+                            android:text="@string/scan_lu_to_deposit"
+                            android:textSize="16sp" />
+                    </androidx.appcompat.widget.LinearLayoutCompat>
                 </androidx.appcompat.widget.LinearLayoutCompat>
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
+            </com.google.android.material.card.MaterialCardView>
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
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 30319a6b..364bbe39 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
@@ -80,7 +80,7 @@
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="ordine:"
@@ -89,7 +89,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/order_identifier"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -105,7 +105,7 @@
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="Griglia"
@@ -113,7 +113,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/cod_alis"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -130,7 +130,7 @@
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="N. articoli "
@@ -138,7 +138,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/count_art_ord"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textColor="@android:color/black"
diff --git a/app/src/main/res/layout/activity_spedizione.xml b/app/src/main/res/layout/activity_spedizione.xml
index 5f1843a2..09c86213 100644
--- a/app/src/main/res/layout/activity_spedizione.xml
+++ b/app/src/main/res/layout/activity_spedizione.xml
@@ -20,7 +20,6 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/full_white"
         android:fitsSystemWindows="false"
         tools:context=".gest.spedizione.SpedizioneActivity">
 
@@ -44,7 +43,6 @@
                         android:id="@+id/appbar"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:background="@color/full_white"
                         android:minHeight="?attr/actionBarSize">
 
                         <androidx.appcompat.widget.Toolbar
@@ -112,14 +110,14 @@
                                     android:orientation="vertical">
 
                                     <androidx.appcompat.widget.AppCompatTextView
-                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        style="@style/TextAppearance.Material3.BodyMedium"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:text="@string/filtered_arts_in_list" />
 
                                     <androidx.appcompat.widget.AppCompatTextView
                                         android:id="@+id/description_filter_text"
-                                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                                        style="@style/TextAppearance.Material3.BodyLarge"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:ellipsize="end"
@@ -200,6 +198,7 @@
                                 android:layout_width="72dp"
                                 android:layout_height="wrap_content"
                                 android:adjustViewBounds="true"
+                                android:tint="?attr/colorControlNormal"
                                 android:src="@drawable/ic_playlist_add_check_24dp" />
 
                             <androidx.appcompat.widget.AppCompatTextView
@@ -207,7 +206,6 @@
                                 android:layout_height="wrap_content"
                                 android:gravity="center_horizontal"
                                 android:text="@string/no_item_to_pick_text"
-                                android:textColor="@android:color/black"
                                 android:textSize="18sp" />
                         </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index 638dcf06..6eab359b 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -79,7 +79,7 @@
         android:textColor="@android:color/white"
         android:alpha="0.7"
         android:layout_marginTop="12dp"
-        style="@style/AppTheme.NewMaterial.Text.Small"/>
+        style="@style/TextAppearance.Material3.BodyMedium"/>
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/app_version_textview"
@@ -92,6 +92,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         android:textColor="@android:color/white"
         android:layout_marginBottom="24dp"
-        style="@style/AppTheme.NewMaterial.Text.Small"/>
+        style="@style/TextAppearance.Material3.BodyMedium"/>
 </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index da3cfa4c..1352bbac 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -13,17 +13,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-        <!--<it.integry.plugins.waterfalltoolbar.WaterfallToolbar-->
-            <!--android:id="@+id/waterfall_toolbar"-->
-            <!--android:layout_width="match_parent"-->
-            <!--android:layout_height="wrap_content">-->
-
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
-                android:gravity="center_horizontal"
-                app:popupTheme="@style/AppTheme.PopupOverlay">
+                android:gravity="center_horizontal">
 
                 <LinearLayout
                     android:id="@+id/toolbar_title_centered_layout"
@@ -45,7 +39,7 @@
                             android:layout_height="wrap_content"
                             android:text="@string/integry"
                             android:layout_marginStart="8dp"
-                            style="@style/AppTheme.NewMaterial.Text.ToolbarTitle"
+                            style="@style/TextAppearance.Material3.TitleLarge"
                             android:layout_gravity="center"/>
 
                     </LinearLayout>
@@ -59,7 +53,7 @@
                         android:visibility="gone"
                         android:layout_centerVertical="true"
                         android:gravity="start"
-                        style="@style/AppTheme.NewMaterial.Text.ToolbarTitle"/>
+                        style="@style/TextAppearance.Material3.TitleLarge"/>
 
                     <androidx.appcompat.widget.SearchView
                         android:id="@+id/main_search"
@@ -69,37 +63,32 @@
                         app:defaultQueryHint="@string/search"
                         app:iconifiedByDefault="true"
                         android:layout_gravity="end"
-                        android:layout_alignParentEnd="true"
-                        android:tint="@android:color/black"/>
+                        android:layout_alignParentEnd="true"/>
 
                     <androidx.appcompat.widget.AppCompatImageButton
                         android:id="@+id/main_filter"
                         android:layout_width="50dp"
                         android:layout_height="50dp"
                         android:layout_gravity="end"
-                        android:background="@android:color/transparent"
+                        android:background="?attr/selectableItemBackground"
                         android:adjustViewBounds="true"
                         android:visibility="gone"
                         android:layout_alignParentEnd="true"
-                        android:src="@drawable/ic_search_black_24dp"
-                        android:tint="@android:color/black"/>
+                        android:src="@drawable/ic_search_black_24dp"/>
 
                     <androidx.appcompat.widget.AppCompatImageButton
                         android:id="@+id/main_select_all"
                         android:layout_width="50dp"
                         android:layout_height="50dp"
                         android:layout_gravity="end"
-                        android:background="@android:color/transparent"
+                        android:background="?attr/selectableItemBackground"
                         android:adjustViewBounds="true"
                         android:visibility="gone"
                         android:layout_toStartOf="@id/main_filter"
-                        android:src="@drawable/ic_round_check_24"
-                        android:tint="@android:color/black"/>
+                        android:src="@drawable/ic_round_check_24"/>
 
             </androidx.appcompat.widget.Toolbar>
 
-        <!--</it.integry.plugins.waterfalltoolbar.WaterfallToolbar>-->
-
         </it.integry.integrywmsnative.ui.ElevatedToolbar>
 
         <include layout="@layout/content_main" />
diff --git a/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml b/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml
index 4bfa501c..9a800f4e 100644
--- a/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml
+++ b/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml
@@ -52,7 +52,7 @@
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
@@ -64,7 +64,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
@@ -83,13 +83,13 @@
                     android:visibility="@{UtilityString.isNullOrEmpty(viewModel.currentItem.zona) ? View.GONE : View.VISIBLE}">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="Zona: " />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{viewModel.currentItem.zona}"
@@ -99,7 +99,7 @@
 
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:enabled="false"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -143,7 +143,7 @@
                     android:tint="@color/green_600" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:duplicateParentState="true"
@@ -175,7 +175,7 @@
                     android:tint="@color/red_600" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/delete" />
diff --git a/app/src/main/res/layout/bottom_sheet__inventario_row_actions_view.xml b/app/src/main/res/layout/bottom_sheet__inventario_row_actions_view.xml
index 0b7ed174..af28914f 100644
--- a/app/src/main/res/layout/bottom_sheet__inventario_row_actions_view.xml
+++ b/app/src/main/res/layout/bottom_sheet__inventario_row_actions_view.xml
@@ -48,7 +48,7 @@
 
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@{viewModel.currentItem.codMart}"
@@ -57,7 +57,7 @@
 
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -84,7 +84,7 @@
                     android:orientation="horizontal">
 
                     <TextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -93,7 +93,7 @@
                         tools:text="250" />
 
                     <TextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -111,7 +111,7 @@
                     android:orientation="horizontal">
 
                     <TextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -120,7 +120,7 @@
                         tools:text="25" />
 
                     <TextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -168,7 +168,7 @@
                     android:tint="@color/green_600" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:duplicateParentState="true"
@@ -200,7 +200,7 @@
                     android:tint="@color/red_600" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/delete" />
diff --git a/app/src/main/res/layout/bottom_sheet__item_edit_view.xml b/app/src/main/res/layout/bottom_sheet__item_edit_view.xml
index c77bfb53..e42d0a7e 100644
--- a/app/src/main/res/layout/bottom_sheet__item_edit_view.xml
+++ b/app/src/main/res/layout/bottom_sheet__item_edit_view.xml
@@ -44,7 +44,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -58,7 +58,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_subtitle"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@{viewModel.currentItem.codMart}"
@@ -81,7 +81,7 @@
                     android:orientation="horizontal">
 
                     <TextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -90,7 +90,7 @@
                         tools:text="250" />
 
                     <TextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -108,7 +108,7 @@
                     android:orientation="horizontal">
 
                     <TextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -117,7 +117,7 @@
                         tools:text="250" />
 
                     <TextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -167,7 +167,7 @@
                     android:tint="@color/green_600" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:duplicateParentState="true"
@@ -201,7 +201,7 @@
                     android:tint="@color/red_600" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/delete" />
diff --git a/app/src/main/res/layout/bottom_sheet__mtb_colr_edit.xml b/app/src/main/res/layout/bottom_sheet__mtb_colr_edit.xml
index da29f62c..faa09460 100644
--- a/app/src/main/res/layout/bottom_sheet__mtb_colr_edit.xml
+++ b/app/src/main/res/layout/bottom_sheet__mtb_colr_edit.xml
@@ -41,7 +41,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -55,7 +55,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_subtitle"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@{view.inputMtbColr.codMart}"
@@ -78,7 +78,7 @@
                     android:orientation="horizontal">
 
                     <TextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -87,7 +87,7 @@
                         tools:text="250" />
 
                     <TextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -105,7 +105,7 @@
                     android:orientation="horizontal">
 
                     <TextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="end"
@@ -114,7 +114,7 @@
                         tools:text="250" />
 
                     <TextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -164,7 +164,7 @@
                     android:tint="@color/green_600" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:duplicateParentState="true"
@@ -198,7 +198,7 @@
                     android:tint="@color/red_600" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/delete" />
diff --git a/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml b/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml
index 77dcc4cb..5ba847bb 100644
--- a/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml
+++ b/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml
@@ -86,7 +86,7 @@
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/textview_art_counter"
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/TextAppearance.Material3.BodyLarge"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="8dp"
@@ -97,7 +97,7 @@
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/textview_art_description"
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/TextAppearance.Material3.BodyLarge"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="4dp"
@@ -478,7 +478,7 @@
                                         app:layout_constraintGuide_percent="0.40" />
 
                                     <androidx.appcompat.widget.AppCompatTextView
-                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        style="@style/TextAppearance.Material3.BodyMedium"
                                         android:layout_width="0dp"
                                         android:layout_height="wrap_content"
                                         android:layout_marginStart="8dp"
@@ -498,14 +498,14 @@
                                         app:layout_constraintTop_toTopOf="parent">
 
                                         <androidx.appcompat.widget.AppCompatTextView
-                                            style="@style/AppTheme.NewMaterial.Text.Small"
+                                            style="@style/TextAppearance.Material3.BodyMedium"
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text="@{viewModel.mtbColt.numCollo.toString()}"
                                             tools:text="TextView" />
 
                                         <androidx.appcompat.widget.AppCompatTextView
-                                            style="@style/AppTheme.NewMaterial.Text.Small"
+                                            style="@style/TextAppearance.Material3.BodyMedium"
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:layout_marginStart="4dp"
@@ -513,7 +513,7 @@
                                             android:textColor="#57535D" />
 
                                         <androidx.appcompat.widget.AppCompatTextView
-                                            style="@style/AppTheme.NewMaterial.Text.Small"
+                                            style="@style/TextAppearance.Material3.BodyMedium"
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text="@{viewModel.mtbColt.serCollo}"
@@ -522,7 +522,7 @@
                                             tools:text="TextView" />
 
                                         <androidx.appcompat.widget.AppCompatTextView
-                                            style="@style/AppTheme.NewMaterial.Text.Small"
+                                            style="@style/TextAppearance.Material3.BodyMedium"
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text=")"
@@ -543,7 +543,7 @@
                                         app:layout_constraintGuide_percent="0.40" />
 
                                     <androidx.appcompat.widget.AppCompatTextView
-                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        style="@style/TextAppearance.Material3.BodyMedium"
                                         android:layout_width="0dp"
                                         android:layout_height="wrap_content"
                                         android:layout_marginStart="8dp"
@@ -554,7 +554,7 @@
                                         app:layout_constraintTop_toTopOf="parent" />
 
                                     <androidx.appcompat.widget.AppCompatTextView
-                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        style="@style/TextAppearance.Material3.BodyMedium"
                                         android:layout_width="0dp"
                                         android:layout_height="0dp"
                                         android:text="@{viewModel.mtbColt.dataColloHumanLong}"
@@ -590,7 +590,7 @@
                                         app:layout_constraintTop_toTopOf="parent" />
 
                                     <androidx.appcompat.widget.AppCompatTextView
-                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        style="@style/TextAppearance.Material3.BodyMedium"
                                         android:layout_width="0dp"
                                         android:layout_height="0dp"
                                         android:text="@{viewModel.mtbColt.posizione}"
@@ -624,7 +624,7 @@
                                         app:layout_constraintTop_toTopOf="parent" />
 
                                     <androidx.appcompat.widget.AppCompatTextView
-                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        style="@style/TextAppearance.Material3.BodyMedium"
                                         android:layout_width="0dp"
                                         android:layout_height="0dp"
                                         android:text="@{viewModel.mtbColt.preparatoDa}"
@@ -661,7 +661,7 @@
                                         app:layout_constraintTop_toTopOf="parent" />
 
                                     <androidx.appcompat.widget.AppCompatTextView
-                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        style="@style/TextAppearance.Material3.BodyMedium"
                                         android:layout_width="0dp"
                                         android:layout_height="0dp"
                                         android:text="@{viewModel.mtbColt.ragSocCliente}"
@@ -696,7 +696,7 @@
                                         app:layout_constraintTop_toTopOf="parent" />
 
                                     <androidx.appcompat.widget.AppCompatTextView
-                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        style="@style/TextAppearance.Material3.BodyMedium"
                                         android:layout_width="0dp"
                                         android:layout_height="0dp"
                                         android:text="@{viewModel.pesoNettoKg}"
@@ -731,7 +731,7 @@
                                         app:layout_constraintTop_toTopOf="parent" />
 
                                     <androidx.appcompat.widget.AppCompatTextView
-                                        style="@style/AppTheme.NewMaterial.Text.Small"
+                                        style="@style/TextAppearance.Material3.BodyMedium"
                                         android:layout_width="0dp"
                                         android:layout_height="0dp"
                                         android:text="@{viewModel.pesoKg}"
@@ -786,20 +786,20 @@
                                         app:visibilityWhenNotNull="@{viewModel.mtbColt.mtbTcolProperty()}">
 
                                         <androidx.appcompat.widget.AppCompatTextView
-                                            style="@style/AppTheme.NewMaterial.Text.Small"
+                                            style="@style/TextAppearance.Material3.BodyMedium"
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text="@{viewModel.mtbColt.mtbTcolProperty().codTcol}"
                                             tools:text="Cod" />
 
                                         <androidx.appcompat.widget.AppCompatTextView
-                                            style="@style/AppTheme.NewMaterial.Text.Small"
+                                            style="@style/TextAppearance.Material3.BodyMedium"
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text=" - " />
 
                                         <androidx.appcompat.widget.AppCompatTextView
-                                            style="@style/AppTheme.NewMaterial.Text.Small"
+                                            style="@style/TextAppearance.Material3.BodyMedium"
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:ellipsize="end"
diff --git a/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml b/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
index 1e38e785..37fd3e81 100644
--- a/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
+++ b/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
@@ -56,7 +56,7 @@
                     android:layout_height="wrap_content">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{mtbColr.codMart}"
@@ -66,7 +66,7 @@
                         tools:text="COD MART" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -84,7 +84,7 @@
                 </RelativeLayout>
 
                 <TextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -98,7 +98,7 @@
 
 
                 <TextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}"
@@ -120,7 +120,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/qta_textview"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="@drawable/badge_round_corner"
diff --git a/app/src/main/res/layout/bottom_sheet_line_actions.xml b/app/src/main/res/layout/bottom_sheet_line_actions.xml
index 873ff9d3..ce2efdec 100644
--- a/app/src/main/res/layout/bottom_sheet_line_actions.xml
+++ b/app/src/main/res/layout/bottom_sheet_line_actions.xml
@@ -58,7 +58,7 @@
 
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Large"
+                        style="@style/TextAppearance.Material3.TitleLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{listModel.getLabel()}"
@@ -82,7 +82,8 @@
                         <androidx.appcompat.widget.AppCompatImageView
                             android:id="@+id/image"
                             android:layout_width="18dp"
-                            android:layout_height="19dp"
+                            android:layout_height="wrap_content"
+                            android:adjustViewBounds="true"
                             android:layout_gravity="center_horizontal"
                             android:src="@{ContextCompat.getDrawable(context, listModel.isStarted() ? R.drawable.ic_baseline_play_arrow_24 : listModel.isPaused() ? R.drawable.ic_baseline_pause_24 : R.drawable.ic_baseline_stop_24)}"
                             app:tint="@color/white"
@@ -92,10 +93,12 @@
                             android:id="@+id/peso_lordo_collo"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
+                            style="@style/TextAppearance.Material3.LabelLarge"
                             android:text="@{listModel.isStarted() ? R.string.in_progress : listModel.isPaused() ? R.string.stand_by : R.string.stopped}"
-                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
                             android:textColor="@android:color/white"
                             android:textStyle="bold"
+                            android:layout_marginStart="2dp"
                             tools:text="In lavorazione" />
                     </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -116,21 +119,20 @@
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="8dp"
                     android:text="@string/orders_in_progress"
-                    android:textColor="@android:color/black"
-                    android:textSize="14sp" />
+                    style="@style/TextAppearance.Material3.BodyMedium"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/lista_ords"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@{listModel.listaOrd}"
-                    android:textColor="@android:color/black"
-                    android:textSize="14sp"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:textStyle="bold"
                     tools:text="125|255" />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
+
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -139,18 +141,22 @@
                 android:focusable="true"
                 android:onClick="@{()->view.onResourcesClicked()}"
                 android:orientation="horizontal"
-                android:padding="16dp">
+                android:layout_marginTop="16dp"
+                android:paddingHorizontal="16dp"
+                android:paddingVertical="16dp"
+                android:gravity="center_vertical">
 
-                <androidx.appcompat.widget.AppCompatImageView
+                <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_baseline_person_add_24" />
+                    android:src="@drawable/ic_baseline_person_add_24"
+                    app:tint="?attr/colorOnSurface"
+                    android:layout_marginEnd="16dp"/>
 
-                <androidx.appcompat.widget.AppCompatTextView
+                <TextView
                     style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
                     android:text="@string/ridistribuisci_risorse" />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
@@ -163,18 +169,21 @@
                 android:focusable="true"
                 android:onClick="@{()->view.onPlayClicked()}"
                 android:orientation="horizontal"
-                android:padding="16dp">
+                android:paddingHorizontal="16dp"
+                android:paddingVertical="16dp"
+                android:gravity="center_vertical">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_baseline_play_arrow_24" />
+                    android:src="@drawable/ic_baseline_play_arrow_24"
+                    app:tint="?attr/colorOnSurface"
+                    android:layout_marginEnd="16dp" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
                     android:text="@string/avvia_nuova_produzione" />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
@@ -187,18 +196,21 @@
                 android:focusable="true"
                 android:onClick="@{()->view.onStopClicked()}"
                 android:orientation="horizontal"
-                android:padding="16dp">
+                android:paddingHorizontal="16dp"
+                android:paddingVertical="16dp"
+                android:gravity="center_vertical">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_baseline_stop_24" />
+                    android:src="@drawable/ic_baseline_stop_24"
+                    app:tint="?attr/colorOnSurface"
+                    android:layout_marginEnd="16dp" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
                     android:text="@string/arresta_produzione" />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
@@ -211,18 +223,21 @@
                 android:focusable="true"
                 android:onClick="@{()->view.onRecoverClicked()}"
                 android:orientation="horizontal"
-                android:padding="16dp">
+                android:paddingHorizontal="16dp"
+                android:paddingVertical="16dp"
+                android:gravity="center_vertical">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@drawable/ic_black_download" />
+                    android:src="@drawable/ic_black_download"
+                    app:tint="?attr/colorOnSurface"
+                    android:layout_marginEnd="16dp" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="32dp"
                     android:text="@string/prod_recupero_materiale_title_fragment" />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/dialog_ask_cliente__dropdown_item_destinatario.xml b/app/src/main/res/layout/dialog_ask_cliente__dropdown_item_destinatario.xml
index ac5fabc5..2c8859d0 100644
--- a/app/src/main/res/layout/dialog_ask_cliente__dropdown_item_destinatario.xml
+++ b/app/src/main/res/layout/dialog_ask_cliente__dropdown_item_destinatario.xml
@@ -22,7 +22,7 @@
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/subtitle"
-        style="@style/AppTheme.NewMaterial.Text.Small"
+        style="@style/TextAppearance.Material3.BodyMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:maxLines="1"
diff --git a/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml b/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml
index 76a632d1..1e1cb758 100644
--- a/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml
+++ b/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml
@@ -76,7 +76,7 @@
                     android:background="@drawable/badge_round_corner"
                     android:backgroundTint="@color/orange_600"
                     android:textColor="@android:color/white"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     tools:text="PESO KG" />
 
             </RelativeLayout>
@@ -100,7 +100,7 @@
                 android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}"
                 android:textSize="14sp"
                 android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.getPartitaMag()) ? View.GONE : View.VISIBLE}"
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 tools:text="Lotto: ABCDE" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_basket_lu__page1.xml b/app/src/main/res/layout/dialog_basket_lu__page1.xml
index 9bfb9f57..bb03cfdd 100644
--- a/app/src/main/res/layout/dialog_basket_lu__page1.xml
+++ b/app/src/main/res/layout/dialog_basket_lu__page1.xml
@@ -68,7 +68,7 @@
                     android:textColor="@android:color/black"
                     android:text="@string/no_lu_found_message"
                     android:layout_marginTop="16dp"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"/>
+                    style="@style/TextAppearance.Material3.BodyLarge"/>
             </androidx.appcompat.widget.LinearLayoutCompat>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
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 17a80322..e87885b6 100644
--- a/app/src/main/res/layout/dialog_basket_lu__page2.xml
+++ b/app/src/main/res/layout/dialog_basket_lu__page2.xml
@@ -78,7 +78,7 @@
                                 android:tint="@android:color/black" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="16dp"
diff --git a/app/src/main/res/layout/dialog_choose_arts_from_mtb_aart_list__item_model.xml b/app/src/main/res/layout/dialog_choose_arts_from_mtb_aart_list__item_model.xml
index df2d8991..a3149341 100644
--- a/app/src/main/res/layout/dialog_choose_arts_from_mtb_aart_list__item_model.xml
+++ b/app/src/main/res/layout/dialog_choose_arts_from_mtb_aart_list__item_model.xml
@@ -60,7 +60,7 @@
 
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/layout/dialog_choose_arts_from_mtb_colr_list__item_model.xml b/app/src/main/res/layout/dialog_choose_arts_from_mtb_colr_list__item_model.xml
index 6032a6ee..0db4d83b 100644
--- a/app/src/main/res/layout/dialog_choose_arts_from_mtb_colr_list__item_model.xml
+++ b/app/src/main/res/layout/dialog_choose_arts_from_mtb_colr_list__item_model.xml
@@ -65,7 +65,7 @@
 
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/layout/dialog_choose_batch_lot.xml b/app/src/main/res/layout/dialog_choose_batch_lot.xml
index 2c98b991..72c1922f 100644
--- a/app/src/main/res/layout/dialog_choose_batch_lot.xml
+++ b/app/src/main/res/layout/dialog_choose_batch_lot.xml
@@ -41,6 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="16dp"
                 android:gravity="center_horizontal"
+                android:maxLines="2"
                 android:text="@string/select_batch_lot" />
 
             <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/dialog_choose_batch_lot_item_model.xml b/app/src/main/res/layout/dialog_choose_batch_lot_item_model.xml
index b2326321..7a7ea4bf 100644
--- a/app/src/main/res/layout/dialog_choose_batch_lot_item_model.xml
+++ b/app/src/main/res/layout/dialog_choose_batch_lot_item_model.xml
@@ -42,7 +42,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@{UtilityString.isNull(mtbPartitaMag.partitaMag, &quot;Nessun lotto&quot;)}"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:textColor="?colorPrimary"
                     android:textStyle="bold"
                     tools:text="PARTITA MAG" />
@@ -75,8 +75,7 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:text="@{UtilityString.isNull(mtbPartitaMag.descrizione, &quot;Nessuna descrizione&quot;)}"
-                android:textColor="@android:color/black"
-                android:textSize="16sp"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 tools:text="Descrizione lunga articolo" />
 
 
diff --git a/app/src/main/res/layout/dialog_create_new_art.xml b/app/src/main/res/layout/dialog_create_new_art.xml
index 4133b5e7..c5af8a04 100644
--- a/app/src/main/res/layout/dialog_create_new_art.xml
+++ b/app/src/main/res/layout/dialog_create_new_art.xml
@@ -258,7 +258,8 @@
                                 android:inputType="numberDecimal"
                                 android:nextFocusDown="@id/input_default_pos_text"
                                 android:singleLine="true"
-                                app:binding="@{viewmodel.qtaCnf}" />
+                                app:binding="@{viewmodel.qtaCnf}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/dialog_device_end_of_life.xml b/app/src/main/res/layout/dialog_device_end_of_life.xml
new file mode 100644
index 00000000..1f33d9f0
--- /dev/null
+++ b/app/src/main/res/layout/dialog_device_end_of_life.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <import type="it.integry.integrywmsnative.R" />
+        <import type="androidx.core.content.ContextCompat" />
+        <import type="android.text.Html" />
+    </data>
+
+    <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical" android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        app:cardCornerRadius="16dp"
+        app:cardElevation="0dp">
+
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="16dp"
+            android:paddingVertical="16dp">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                style="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:src="@drawable/ic_baseline_warning_24"
+                app:tint="?attr/colorError" />
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/title_text"
+                style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:layout_marginBottom="16dp"
+                android:text="Fine supporto" />
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/description_text"
+                style="@style/TextAppearance.Material3.BodyLarge"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:text="@{Html.fromHtml(ContextCompat.getString(context, R.string.device_end_of_life_message))}"
+                tools:text="@string/device_end_of_life_message"/>
+
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+    </androidx.cardview.widget.CardView>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_info_giacenza_list_item.xml b/app/src/main/res/layout/dialog_info_giacenza_list_item.xml
index 491b3e73..92b858fd 100644
--- a/app/src/main/res/layout/dialog_info_giacenza_list_item.xml
+++ b/app/src/main/res/layout/dialog_info_giacenza_list_item.xml
@@ -37,7 +37,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{&quot;UL &quot; + item.numCollo.toString() + &quot; del &quot; + UtilityDate.formatDate(item.dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
@@ -86,7 +86,7 @@
                             app:layout_constraintTop_toTopOf="parent" />
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
+                            style="@style/TextAppearance.Material3.BodyMedium"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:textColor="@android:color/white"
@@ -126,7 +126,7 @@
                             android:tint="@android:color/black" />
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
+                            style="@style/TextAppearance.Material3.BodyMedium"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="4dp"
diff --git a/app/src/main/res/layout/dialog_info_giacenza_situazione_articolo.xml b/app/src/main/res/layout/dialog_info_giacenza_situazione_articolo.xml
index 316724ce..3b73c536 100644
--- a/app/src/main/res/layout/dialog_info_giacenza_situazione_articolo.xml
+++ b/app/src/main/res/layout/dialog_info_giacenza_situazione_articolo.xml
@@ -67,7 +67,7 @@
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{UtilityNumber.decimalToString(item.pedArrivo, 0)}"
@@ -75,7 +75,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -96,7 +96,7 @@
 
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -106,7 +106,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="0dp"
@@ -115,7 +115,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -125,7 +125,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -169,7 +169,7 @@
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{String.valueOf(item.pedMag)}"
@@ -177,7 +177,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -197,7 +197,7 @@
 
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -207,7 +207,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="0dp"
@@ -216,7 +216,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -226,7 +226,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml b/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml
index 810b1cfa..19c838fc 100644
--- a/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml
+++ b/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml
@@ -37,7 +37,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{&quot;UL &quot; + item.numCollo.toString() + &quot; del &quot; + UtilityDate.formatDate(item.dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
@@ -80,7 +80,7 @@
                         android:tint="@android:color/black" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -97,7 +97,7 @@
                         android:tint="@android:color/black" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -141,7 +141,7 @@
                             app:layout_constraintTop_toTopOf="parent" />
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
+                            style="@style/TextAppearance.Material3.BodyMedium"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="4dp"
@@ -179,7 +179,7 @@
                             android:tint="@android:color/black" />
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
+                            style="@style/TextAppearance.Material3.BodyMedium"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="4dp"
diff --git a/app/src/main/res/layout/dialog_info_situazione_articolo_incoming_list_item.xml b/app/src/main/res/layout/dialog_info_situazione_articolo_incoming_list_item.xml
index eca0c6ce..ed116c38 100644
--- a/app/src/main/res/layout/dialog_info_situazione_articolo_incoming_list_item.xml
+++ b/app/src/main/res/layout/dialog_info_situazione_articolo_incoming_list_item.xml
@@ -39,7 +39,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{UtilityDate.formatDate(item.dataCons, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
diff --git a/app/src/main/res/layout/dialog_input_general_content.xml b/app/src/main/res/layout/dialog_input_general_content.xml
index 4c0db888..ebeb5057 100644
--- a/app/src/main/res/layout/dialog_input_general_content.xml
+++ b/app/src/main/res/layout/dialog_input_general_content.xml
@@ -34,7 +34,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:selectAllOnFocus="true"
-                app:binding="@{view.inputValue}" />
+                app:binding="@{view.inputValue}"
+                app:useLocaleDecimalInput="@{true}" />
 
         </com.google.android.material.textfield.TextInputLayout>
 
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 1ebcc4b3..a3c5ac33 100644
--- a/app/src/main/res/layout/dialog_input_lu_prod.xml
+++ b/app/src/main/res/layout/dialog_input_lu_prod.xml
@@ -86,7 +86,7 @@
                 tools:text="COD MART (Partita mag)" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
@@ -203,7 +203,8 @@
                         android:hint="@string/kg_x_pck"
                         android:imeOptions="actionDone"
                         android:inputType="numberDecimal"
-                        app:binding="@{view.currentPesoCollo}" />
+                        app:binding="@{view.currentPesoCollo}"
+                        app:useLocaleDecimalInput="@{true}" />
 
                 </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/dialog_input_quantity_v2.xml b/app/src/main/res/layout/dialog_input_quantity_v2.xml
index 2acde1ca..23f3dcd6 100644
--- a/app/src/main/res/layout/dialog_input_quantity_v2.xml
+++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml
@@ -35,16 +35,15 @@
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/full_white"
-            android:orientation="vertical">
+            android:orientation="vertical"
+            android:background="?attr/colorSurface">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?attr/colorPrimary"
-                android:minHeight="?attr/actionBarSize"
-                app:titleTextColor="@android:color/white">
+                android:minHeight="?attr/actionBarSize">
 
 
             </androidx.appcompat.widget.Toolbar>
@@ -103,7 +102,7 @@
                         tools:text="DIACOD" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="4dp"
@@ -120,12 +119,11 @@
 
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/TextAppearance.Material3.BodyLarge"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_toStartOf="@id/qta_ord_panel"
-                            android:text="@string/total_ordered"
-                            android:textColor="@android:color/black" />
+                            android:text="@string/total_ordered" />
 
                         <androidx.appcompat.widget.LinearLayoutCompat
                             android:id="@+id/qta_ord_panel"
@@ -135,61 +133,55 @@
                             android:orientation="horizontal">
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfOrd)}"
-                                android:textColor="@android:color/black"
                                 android:textStyle="bold" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
                                 android:layout_marginStart="4dp"
                                 android:text="@string/unt_mis_col"
-                                android:textColor="@android:color/black"
                                 android:textStyle="bold" />
 
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
                                 android:layout_marginStart="4dp"
                                 android:text="("
-                                android:textColor="@android:color/black"
                                 android:textStyle="bold" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="0dp"
                                 android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaOrd)}"
-                                android:textColor="@android:color/black"
                                 android:textStyle="bold" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
                                 android:layout_marginStart="2dp"
                                 android:text="@{viewmodel.mtbAart.untMis}"
-                                android:textColor="@android:color/black"
                                 android:textStyle="bold" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
                                 android:layout_marginStart="0dp"
                                 android:text=")"
-                                android:textColor="@android:color/black"
                                 android:textStyle="bold" />
 
 
@@ -225,7 +217,7 @@
                                 android:tint="@color/gray_600" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="4dp"
@@ -236,7 +228,7 @@
                                 tools:text="1" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
@@ -249,7 +241,7 @@
 
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
@@ -259,7 +251,7 @@
                                 android:visibility="@{view.currentTextNumPezziToTake > 0 &amp;&amp; view.currentTextNumCnfToTake > 0 ? View.VISIBLE : View.GONE}" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="4dp"
@@ -270,7 +262,7 @@
                                 tools:text="4" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
@@ -324,7 +316,7 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfInWarehouse, 1)}"
@@ -332,7 +324,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -353,7 +345,7 @@
 
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -363,7 +355,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_marginStart="0dp"
@@ -372,7 +364,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -382,7 +374,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -424,7 +416,7 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfCommitted, 1)}"
@@ -432,7 +424,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -452,7 +444,7 @@
 
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -462,7 +454,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_marginStart="0dp"
@@ -471,7 +463,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -481,7 +473,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -533,7 +525,7 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfToBeTaken)}"
@@ -541,7 +533,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -562,7 +554,7 @@
 
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -572,7 +564,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_marginStart="0dp"
@@ -581,7 +573,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -591,7 +583,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -631,8 +623,9 @@
                                 android:layout_gravity="center"
                                 android:orientation="horizontal">
 
+
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfAvailable)}"
@@ -640,7 +633,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -660,7 +653,7 @@
 
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -670,7 +663,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_marginStart="0dp"
@@ -679,7 +672,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -689,7 +682,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -823,7 +816,8 @@
                                 android:inputType="numberDecimal"
                                 android:nextFocusForward="@+id/input_qta_tot_text"
                                 android:selectAllOnFocus="true"
-                                app:binding="@{view.currentQtaCnf}" />
+                                app:binding="@{view.currentQtaCnf}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
@@ -847,7 +841,8 @@
                                 android:imeOptions="actionDone"
                                 android:inputType="number"
                                 android:selectAllOnFocus="true"
-                                app:binding="@{view.currentQtaTot}" />
+                                app:binding="@{view.currentQtaTot}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
@@ -882,7 +877,8 @@
                                 android:hint="@string/tare_art"
                                 android:inputType="number"
                                 android:textColor="@color/gray_400"
-                                app:binding="@{view.currentTaraArticolo}" />
+                                app:binding="@{view.currentTaraArticolo}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
@@ -906,7 +902,8 @@
                                 android:imeOptions="actionDone"
                                 android:inputType="numberDecimal"
                                 android:textColor="@color/gray_400"
-                                app:binding="@{view.currentTaraTot}" />
+                                app:binding="@{view.currentTaraTot}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
@@ -929,8 +926,8 @@
                                 android:layout_height="wrap_content"
                                 android:hint="@string/LU_weight"
                                 android:inputType="number"
-                                android:textColor="@{ContextCompat.getColor(context, view.enabledQtaCnf ? android.R.color.black : R.color.gray_400)}"
-                                app:binding="@{view.currentPesoLordo}" />
+                                app:binding="@{view.currentPesoLordo}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
@@ -974,7 +971,7 @@
                         android:weightSum="11">
 
                         <Button
-                            style="@style/Widget.Material3.Button.TonalButton"
+                            style="@style/Widget.Material3.Button.OutlinedButton"
                             android:id="@+id/close_lu_btn"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
@@ -982,7 +979,7 @@
                             android:layout_weight="4"
                             android:onClick="@{() -> view.saveAndCloseLU()}"
                             android:text="@string/action_close_ul"
-                            app:strokeColor="?colorPrimary"
+                            app:strokeColor="?attr/colorPrimary"
                             app:visibility="@{view.enabledLUCloseButton}" />
 
 
@@ -1000,7 +997,7 @@
 
 
                         <Button
-                            style="@style/Widget.Material3.Button"
+                            style="@style/Widget.Material3.Button.TonalButton"
                             android:id="@+id/save_btn"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/dialog_pv_edit_articolo.xml b/app/src/main/res/layout/dialog_pv_edit_articolo.xml
index 41d490d8..4676cdc6 100644
--- a/app/src/main/res/layout/dialog_pv_edit_articolo.xml
+++ b/app/src/main/res/layout/dialog_pv_edit_articolo.xml
@@ -151,7 +151,7 @@
                 android:layout_marginTop="8dp">
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_toStartOf="@id/qta_ord_panel"
@@ -166,7 +166,7 @@
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{UtilityNumber.decimalToString(view.articolo.qtaCnfGiacenza)}"
@@ -175,7 +175,7 @@
                         tools:text="1" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -186,7 +186,7 @@
 
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -196,7 +196,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="0dp"
@@ -205,7 +205,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -215,7 +215,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -236,7 +236,7 @@
                 android:layout_marginTop="8dp">
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_toStartOf="@id/incoming_cnf"
@@ -251,7 +251,7 @@
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{UtilityNumber.decimalToString(view.articolo.getCnfDaRic())}"
@@ -260,7 +260,7 @@
                         tools:text="1" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -271,7 +271,7 @@
 
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -281,7 +281,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="0dp"
@@ -290,7 +290,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -300,7 +300,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -322,7 +322,7 @@
                 android:layout_marginTop="8dp">
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_toStartOf="@id/max_cnf"
@@ -337,7 +337,7 @@
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{UtilityNumber.decimalToString(view.articolo.ctMaxOrd)}"
@@ -346,7 +346,7 @@
                         tools:text="1" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -357,7 +357,7 @@
 
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -367,7 +367,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="0dp"
@@ -376,7 +376,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -386,7 +386,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -436,7 +436,7 @@
                         android:orientation="horizontal">
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/TextAppearance.Material3.BodyLarge"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@{UtilityNumber.decimalToString(view.articolo.qtaCnfPrevistaVendita)}"
@@ -445,7 +445,7 @@
                             android:textStyle="bold" />
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/TextAppearance.Material3.BodyLarge"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentEnd="true"
@@ -466,7 +466,7 @@
 
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
+                            style="@style/TextAppearance.Material3.BodyMedium"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentEnd="true"
@@ -476,7 +476,7 @@
                             android:textStyle="bold" />
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
+                            style="@style/TextAppearance.Material3.BodyMedium"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="0dp"
@@ -485,7 +485,7 @@
                             android:textStyle="bold" />
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
+                            style="@style/TextAppearance.Material3.BodyMedium"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentEnd="true"
@@ -495,7 +495,7 @@
                             android:textStyle="bold" />
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
+                            style="@style/TextAppearance.Material3.BodyMedium"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentEnd="true"
@@ -534,8 +534,9 @@
                         android:layout_gravity="center"
                         android:orientation="horizontal">
 
+
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/TextAppearance.Material3.BodyLarge"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@{UtilityNumber.decimalToString(view.articolo.qtaCnfProposta)}"
@@ -544,7 +545,7 @@
                             android:textStyle="bold" />
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/TextAppearance.Material3.BodyLarge"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentEnd="true"
@@ -564,7 +565,7 @@
 
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
+                            style="@style/TextAppearance.Material3.BodyMedium"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentEnd="true"
@@ -574,7 +575,7 @@
                             android:textStyle="bold" />
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
+                            style="@style/TextAppearance.Material3.BodyMedium"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="0dp"
@@ -583,7 +584,7 @@
                             android:textStyle="bold" />
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
+                            style="@style/TextAppearance.Material3.BodyMedium"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentEnd="true"
@@ -593,7 +594,7 @@
                             android:textStyle="bold" />
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
+                            style="@style/TextAppearance.Material3.BodyMedium"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentEnd="true"
@@ -665,7 +666,8 @@
                         android:hint="@string/qty_x_pck"
                         android:imeOptions="actionDone"
                         android:inputType="numberDecimal"
-                        app:binding="@{view.currentQtaCnf}" />
+                        app:binding="@{view.currentQtaCnf}"
+                        app:useLocaleDecimalInput="@{true}" />
 
                 </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml b/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml
index 936337a8..e40fc974 100644
--- a/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml
+++ b/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml
@@ -57,7 +57,7 @@
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:text="Linee di impegno"
                         android:layout_marginBottom="8dp"/>
 
diff --git a/app/src/main/res/layout/dialog_versamento_automatico_ul_done__not_completed_list_item.xml b/app/src/main/res/layout/dialog_versamento_automatico_ul_done__not_completed_list_item.xml
index ac7e4df6..e59d0988 100644
--- a/app/src/main/res/layout/dialog_versamento_automatico_ul_done__not_completed_list_item.xml
+++ b/app/src/main/res/layout/dialog_versamento_automatico_ul_done__not_completed_list_item.xml
@@ -75,7 +75,7 @@
 
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
@@ -97,7 +97,7 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/second_line"
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
@@ -111,7 +111,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{`Lotto: ` + item.getPartitaMag()}"
diff --git a/app/src/main/res/layout/doc_interni_list_model.xml b/app/src/main/res/layout/doc_interni_list_model.xml
index d1d26706..25840856 100644
--- a/app/src/main/res/layout/doc_interni_list_model.xml
+++ b/app/src/main/res/layout/doc_interni_list_model.xml
@@ -2,64 +2,52 @@
 <layout>
 
     <data>
-
         <import type="it.integry.integrywmsnative.R" />
     </data>
 
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginVertical="4dp"
         android:layout_marginTop="4dp"
-        android:layout_marginStart="4dp"
         android:layout_marginBottom="4dp"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:orientation="horizontal">
+        android:padding="8dp">
 
 
-        <RelativeLayout
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/doc_description"
+            style="@style/TextAppearance.Material3.BodyMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp">
+            android:layout_marginEnd="4dp"
+            android:layout_toStartOf="@id/data_doc"
+            android:ellipsize="end"
+            android:singleLine="true"
+            tools:text="#1 MOD.114 - PERDITE" />
 
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/data_doc"
+            style="@style/TextAppearance.Material3.BodyMedium"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentEnd="true"
+            android:textColor="@color/colorPrimaryGray"
+            android:textSize="14sp"
+            tools:text="13 Apr" />
 
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/doc_description"
-                style="@android:style/TextAppearance.Small"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="4dp"
-                android:layout_toStartOf="@id/data_doc"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textColor="@android:color/black"
-                tools:text="#1 MOD.114 - PERDITE" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/data_doc"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                style="@style/AppTheme.NewMaterial.Text"
-                android:textColor="@color/colorPrimaryGray"
-                android:layout_alignParentEnd="true"
-                android:textSize="14sp"
-                tools:text="13 Apr" />
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/num_rows"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                style="@android:style/TextAppearance.Small"
-                android:layout_marginTop="4dp"
-                android:layout_marginEnd="4dp"
-                android:layout_below="@id/doc_description"
-                android:singleLine="true"
-                android:ellipsize="end"
-                tools:text="0 Articoli" />
-        </RelativeLayout>
-    </LinearLayout>
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/num_rows"
+            style="@style/TextAppearance.Material3.BodySmall"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/doc_description"
+            android:layout_marginTop="4dp"
+            android:layout_marginEnd="4dp"
+            android:ellipsize="end"
+            android:singleLine="true"
+            tools:text="0 Articoli" />
+    </RelativeLayout>
 
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dropdown_simple_item_w_subtitle_bottom.xml b/app/src/main/res/layout/dropdown_simple_item_w_subtitle_bottom.xml
index 8937eda4..1fbe1765 100644
--- a/app/src/main/res/layout/dropdown_simple_item_w_subtitle_bottom.xml
+++ b/app/src/main/res/layout/dropdown_simple_item_w_subtitle_bottom.xml
@@ -22,7 +22,7 @@
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/subtitle"
-        style="@style/AppTheme.NewMaterial.Text.Small"
+        style="@style/TextAppearance.Material3.BodyMedium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:maxLines="1"
diff --git a/app/src/main/res/layout/fragment_articoli_in_giacenza.xml b/app/src/main/res/layout/fragment_articoli_in_giacenza.xml
index 3ff6ecd3..285bfe54 100644
--- a/app/src/main/res/layout/fragment_articoli_in_giacenza.xml
+++ b/app/src/main/res/layout/fragment_articoli_in_giacenza.xml
@@ -67,7 +67,7 @@
                     android:src="@drawable/ic_playlist_add_check_24dp" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
diff --git a/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml b/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml
index c3d9cb4c..cd885737 100644
--- a/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml
+++ b/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml
@@ -63,7 +63,7 @@
                 android:layout_height="wrap_content">
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@{Html.fromHtml(listModel.preDescriptionText)}"
@@ -74,7 +74,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/peso_kg"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
@@ -92,7 +92,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
@@ -102,7 +102,7 @@
                 tools:text="150303-010 CAVOLO VERZA 6 PZ PL NERA 604018" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
@@ -111,7 +111,7 @@
                 tools:text="Lotto: 35119F0038" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
@@ -134,7 +134,7 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/qta_textview"
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@drawable/badge_round_corner"
diff --git a/app/src/main/res/layout/fragment_doc_interni.xml b/app/src/main/res/layout/fragment_doc_interni.xml
index a3d5c315..460c82a3 100644
--- a/app/src/main/res/layout/fragment_doc_interni.xml
+++ b/app/src/main/res/layout/fragment_doc_interni.xml
@@ -32,7 +32,6 @@
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/full_white"
             android:orientation="vertical">
 
 
@@ -170,7 +169,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_marginTop="16dp"
-                    android:background="@color/full_white"
                     android:paddingStart="2dp"
                     android:paddingEnd="2dp"
                     tools:itemCount="5"
@@ -208,7 +206,6 @@
                         android:layout_height="wrap_content"
                         android:gravity="center_horizontal"
                         android:orientation="vertical"
-
                         app:layout_constraintEnd_toStartOf="@id/guideline_empty_right"
                         app:layout_constraintStart_toEndOf="@id/guideline_empty_left"
                         app:layout_constraintTop_toTopOf="@id/guideline_empty_top">
@@ -217,6 +214,7 @@
                             android:layout_width="72dp"
                             android:layout_height="wrap_content"
                             android:adjustViewBounds="true"
+                            android:tint="?attr/colorControlNormal"
                             android:src="@drawable/ic_playlist_add_check_24dp" />
 
                         <androidx.appcompat.widget.AppCompatTextView
@@ -224,7 +222,6 @@
                             android:layout_height="wrap_content"
                             android:gravity="center_horizontal"
                             android:text="@string/no_doc_found_message"
-                            android:textColor="@android:color/black"
                             android:textSize="18sp" />
                     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_elenco_inventario.xml b/app/src/main/res/layout/fragment_elenco_inventario.xml
index c820c97d..3f7cb91e 100644
--- a/app/src/main/res/layout/fragment_elenco_inventario.xml
+++ b/app/src/main/res/layout/fragment_elenco_inventario.xml
@@ -65,7 +65,7 @@
                     android:src="@drawable/ic_playlist_add_check_24dp" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
diff --git a/app/src/main/res/layout/fragment_linee_prod.xml b/app/src/main/res/layout/fragment_linee_prod.xml
index f289e450..e741eb64 100644
--- a/app/src/main/res/layout/fragment_linee_prod.xml
+++ b/app/src/main/res/layout/fragment_linee_prod.xml
@@ -11,8 +11,7 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/full_white">
+        android:layout_height="match_parent">
 
 
         <androidx.recyclerview.widget.RecyclerView
@@ -66,14 +65,14 @@
                     android:layout_width="72dp"
                     android:layout_height="wrap_content"
                     android:adjustViewBounds="true"
-                    android:src="@drawable/ic_playlist_add_check_24dp" />
+                    android:src="@drawable/ic_playlist_add_check_24dp"
+                    android:tint="?attr/colorControlNormal"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
                     android:text="@string/nessuna_linea_disponibile"
-                    android:textColor="@android:color/black"
                     android:textSize="18sp" />
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_linee_prod_main_list_model.xml b/app/src/main/res/layout/fragment_linee_prod_main_list_model.xml
index d417ee6d..562199ce 100644
--- a/app/src/main/res/layout/fragment_linee_prod_main_list_model.xml
+++ b/app/src/main/res/layout/fragment_linee_prod_main_list_model.xml
@@ -62,13 +62,11 @@
 
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Large"
+                            style="@style/TextAppearance.Material3.TitleMedium"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@{listModel.getLabel()}"
                             android:textColor="@{ContextCompat.getColor(context,listModel.isStarted() ? R.color.green_600 : listModel.isPaused() ? R.color.orange_600 : R.color.red_600)}"
-                            android:textSize="16sp"
-                            android:textStyle="bold"
                             tools:text="L2 - Linea 2"
                             tools:textColor="@color/green_600" />
 
@@ -81,13 +79,15 @@
                             android:backgroundTint="@{ContextCompat.getColor(context, listModel.isStarted() ? R.color.green_600 : listModel.isPaused() ? R.color.orange_600 : R.color.red_600)}"
                             android:orientation="horizontal"
                             android:weightSum="2"
+                            android:paddingHorizontal="4dp"
                             tools:backgroundTint="@color/green_600">
 
                             <androidx.appcompat.widget.AppCompatImageView
                                 android:id="@+id/image"
                                 android:layout_width="18dp"
-                                android:layout_height="19dp"
+                                android:layout_height="wrap_content"
                                 android:layout_gravity="center_horizontal"
+                                android:adjustViewBounds="true"
                                 android:src="@{ContextCompat.getDrawable(context, listModel.isStarted() ? R.drawable.ic_baseline_play_arrow_24 : listModel.isPaused() ? R.drawable.ic_baseline_pause_24 : R.drawable.ic_baseline_stop_24)}"
                                 app:tint="@color/white"
                                 tools:src="@drawable/ic_baseline_play_arrow_24" />
@@ -97,9 +97,10 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@{listModel.isStarted() ? R.string.in_progress : listModel.isPaused() ? R.string.stand_by : R.string.stopped}"
-                                android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
+                                android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
                                 android:textColor="@android:color/white"
                                 android:textStyle="bold"
+                                android:layout_marginHorizontal="2dp"
                                 tools:text="In lavorazione" />
                         </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -119,7 +120,6 @@
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="8dp"
                         android:text="@string/risorse_impostate"
-                        android:textColor="@android:color/black"
                         android:textSize="14sp" />
 
                     <androidx.appcompat.widget.AppCompatTextView
@@ -127,7 +127,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{listModel.getRisorseLabel()}"
-                        android:textColor="@android:color/black"
                         android:textSize="14sp"
                         android:textStyle="bold"
                         tools:text="5/25" />
@@ -146,7 +145,6 @@
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="8dp"
                         android:text="@string/orders_in_progress"
-                        android:textColor="@android:color/black"
                         android:textSize="14sp" />
 
                     <androidx.appcompat.widget.AppCompatTextView
@@ -154,7 +152,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{listModel.listaOrd}"
-                        android:textColor="@android:color/black"
                         android:textSize="14sp"
                         android:textStyle="bold"
                         tools:text="125|255" />
@@ -173,7 +170,6 @@
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="8dp"
                         android:text="@string/inizio_produzione"
-                        android:textColor="@android:color/black"
                         android:textSize="14sp" />
 
                     <androidx.appcompat.widget.AppCompatTextView
@@ -181,7 +177,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{UtilityDate.formatDate(listModel.datetimeStart, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH)}"
-                        android:textColor="@android:color/black"
                         android:textSize="14sp"
                         android:textStyle="bold"
                         tools:text="05/07/2022 14:00:00" />
@@ -200,7 +195,6 @@
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="8dp"
                         android:text="@string/ultima_produzione"
-                        android:textColor="@android:color/black"
                         android:textSize="14sp" />
 
                     <androidx.appcompat.widget.AppCompatTextView
@@ -208,7 +202,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{UtilityDate.formatDate(listModel.datetimeEnd, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH)}"
-                        android:textColor="@android:color/black"
                         android:textSize="14sp"
                         android:textStyle="bold"
                         tools:text="05/07/2022 23:59:59" />
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index aa3cd581..b86de747 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -8,6 +8,7 @@
             type="it.integry.integrywmsnative.gest.main.MainFragment" />
 
         <import type="android.view.View" />
+
         <import type="it.integry.integrywmsnative.core.settings.SettingsManager" />
     </data>
 
@@ -25,6 +26,162 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <androidx.cardview.widget.CardView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    app:cardCornerRadius="16dp"
+                    app:cardElevation="4dp">
+
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/profile_root_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="?colorPrimary"
+                        android:orientation="vertical"
+                        android:paddingHorizontal="16dp"
+                        android:paddingVertical="8dp">
+
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+
+                            <androidx.appcompat.widget.AppCompatImageView
+                                android:id="@+id/user_icon"
+                                android:layout_width="24dp"
+                                android:layout_height="wrap_content"
+                                android:layout_centerVertical="true"
+                                android:layout_marginEnd="16dp"
+                                android:adjustViewBounds="true"
+                                android:clickable="true"
+                                android:focusable="true"
+                                android:src="@drawable/ic_menu_24dp"
+                                android:tint="@android:color/white"
+                                android:background="?attr/selectableItemBackgroundBorderless"
+                                app:singleClick="@{() -> view.toggleDrawer() }"/>
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:id="@+id/user_detail_layout"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginEnd="16dp"
+                                android:layout_toStartOf="@id/switch_depo_button"
+                                android:layout_toEndOf="@id/user_icon"
+                                android:orientation="vertical">
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    android:id="@+id/current_user_name"
+                                    style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:textColor="@android:color/white"
+                                    tools:text="MARIO ROSSI" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    android:id="@+id/current_deposito"
+                                    style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="2dp"
+                                    tools:text="Deposito: 01 - Centrale" />
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                            <androidx.appcompat.widget.AppCompatImageView
+                                android:id="@+id/switch_depo_button"
+                                android:layout_width="30dp"
+                                android:layout_height="30dp"
+                                android:layout_alignParentEnd="true"
+                                android:layout_centerVertical="true"
+                                android:adjustViewBounds="true"
+                                android:clickable="true"
+                                android:focusable="true"
+                                android:onClick="@{() -> view.changeUserDepo()}"
+                                android:src="@drawable/ic_rounded_change_circle_24"
+                                android:tint="@android:color/white"
+                                android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() ? View.VISIBLE : View.GONE}" />
+
+                        </RelativeLayout>
+
+
+                        <net.cachapa.expandablelayout.ExpandableLayout
+                            android:id="@+id/recover_data_expandable_layout"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            app:el_duration="400"
+                            app:el_expanded="false">
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="16dp"
+                                android:layout_marginBottom="8dp"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <androidx.appcompat.widget.AppCompatImageView
+                                    android:layout_width="30dp"
+                                    android:layout_height="30dp"
+                                    android:layout_marginEnd="16dp"
+                                    android:adjustViewBounds="true"
+                                    android:src="@drawable/ic_black_recover"
+                                    android:tint="@android:color/white" />
+
+                                <androidx.appcompat.widget.LinearLayoutCompat
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="vertical">
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:text="@string/recovering_data"
+                                        android:textColor="@android:color/white" />
+
+                                    <com.google.android.material.progressindicator.LinearProgressIndicator
+                                        android:id="@+id/progressBar"
+                                        style="?attr/linearProgressIndicatorStyle"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="4dp"
+                                        android:indeterminate="true"
+                                        app:indicatorColor="@android:color/white"
+                                        app:trackColor="@color/colorPrimaryDark"
+                                        app:trackCornerRadius="4dp"
+                                        app:trackThickness="8dp" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="2dp"
+                                        android:text="@string/wait_a_moment" />
+
+                                </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+                        </net.cachapa.expandablelayout.ExpandableLayout>
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                </androidx.cardview.widget.CardView>
+
+            </RelativeLayout>
+
             <net.cachapa.expandablelayout.ExpandableLayout
                 android:id="@+id/no_connection_top_layout"
                 android:layout_width="match_parent"
@@ -36,7 +193,7 @@
 
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@color/red_600"
@@ -61,177 +218,6 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
 
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <androidx.cardview.widget.CardView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_margin="12dp"
-                            app:cardCornerRadius="16dp"
-                            app:cardElevation="4dp">
-
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:id="@+id/profile_root_container"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:background="?colorPrimary"
-                                android:orientation="vertical"
-                                android:padding="16dp">
-
-
-                                <RelativeLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="center_vertical"
-                                    android:orientation="horizontal">
-
-
-                                    <androidx.appcompat.widget.AppCompatImageView
-                                        android:id="@+id/user_icon"
-                                        android:layout_width="30dp"
-                                        android:layout_height="30dp"
-                                        android:layout_marginEnd="16dp"
-                                        android:layout_centerVertical="true"
-                                        android:adjustViewBounds="true"
-                                        android:clickable="true"
-                                        android:focusable="true"
-                                        app:multipleClick="@{() -> view.toggleEasterEggMode()}"
-                                        android:src="@drawable/ic_outline_account_circle_48px"
-                                        android:tint="@android:color/white" />
-
-                                    <androidx.appcompat.widget.LinearLayoutCompat
-                                        android:id="@+id/user_detail_layout"
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:orientation="vertical"
-                                        android:layout_marginEnd="16dp"
-                                        android:layout_toEndOf="@id/user_icon"
-                                        android:layout_toStartOf="@id/switch_depo_button">
-
-                                        <androidx.appcompat.widget.AppCompatTextView
-                                            android:id="@+id/current_user_name"
-                                            style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard"
-                                            android:layout_width="match_parent"
-                                            android:layout_height="wrap_content"
-                                            android:textColor="@android:color/white"
-                                            tools:text="MARIO ROSSI" />
-
-                                        <androidx.appcompat.widget.AppCompatTextView
-                                            android:id="@+id/current_deposito"
-                                            style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            android:layout_marginTop="2dp"
-                                            tools:text="Deposito: 01 - Centrale" />
-
-                                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-
-                                    <androidx.appcompat.widget.AppCompatImageView
-                                        android:id="@+id/switch_depo_button"
-                                        android:layout_width="30dp"
-                                        android:layout_height="30dp"
-                                        android:adjustViewBounds="true"
-                                        android:layout_centerVertical="true"
-                                        android:clickable="true"
-                                        android:focusable="true"
-                                        android:layout_alignParentEnd="true"
-                                        android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() ? View.VISIBLE : View.GONE}"
-                                        android:onClick="@{() -> view.changeUserDepo()}"
-                                        android:src="@drawable/ic_rounded_change_circle_24"
-                                        android:tint="@android:color/white" />
-
-                                </RelativeLayout>
-
-
-                                <net.cachapa.expandablelayout.ExpandableLayout
-                                    android:id="@+id/recover_data_expandable_layout"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    app:el_duration="400"
-                                    app:el_expanded="false">
-
-                                    <androidx.appcompat.widget.LinearLayoutCompat
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:layout_marginTop="16dp"
-                                        android:layout_marginBottom="8dp"
-                                        android:gravity="center_vertical"
-                                        android:orientation="horizontal">
-
-                                        <androidx.appcompat.widget.AppCompatImageView
-                                            android:layout_width="30dp"
-                                            android:layout_height="30dp"
-                                            android:layout_marginEnd="16dp"
-                                            android:adjustViewBounds="true"
-                                            android:src="@drawable/ic_black_recover"
-                                            android:tint="@android:color/white" />
-
-                                        <androidx.appcompat.widget.LinearLayoutCompat
-                                            android:layout_width="match_parent"
-                                            android:layout_height="wrap_content"
-                                            android:orientation="vertical">
-
-                                            <androidx.appcompat.widget.AppCompatTextView
-                                                style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard"
-                                                android:layout_width="match_parent"
-                                                android:layout_height="wrap_content"
-                                                android:text="@string/recovering_data"
-                                                android:textColor="@android:color/white" />
-
-                                            <com.google.android.material.progressindicator.LinearProgressIndicator
-                                                android:id="@+id/progressBar"
-                                                style="?attr/linearProgressIndicatorStyle"
-                                                android:layout_width="match_parent"
-                                                android:layout_height="wrap_content"
-                                                android:layout_marginTop="4dp"
-                                                android:indeterminate="true"
-                                                app:trackThickness="8dp"
-                                                app:trackCornerRadius="4dp"
-                                                app:indicatorColor="@android:color/white"
-                                                app:trackColor="@color/colorPrimaryDark"/>
-
-                                            <androidx.appcompat.widget.AppCompatTextView
-                                                style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:layout_marginTop="2dp"
-                                                android:text="@string/wait_a_moment" />
-
-                                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-                                </net.cachapa.expandablelayout.ExpandableLayout>
-
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                        </androidx.cardview.widget.CardView>
-
-
-                        <net.cachapa.expandablelayout.ExpandableLayout
-                            android:id="@+id/easter_egg__horror_blood_expandable_layout"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginHorizontal="16dp"
-                            android:layout_marginTop="50dp"
-                            app:el_expanded="false">
-
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:id="@+id/easter_egg__horror_blood"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:adjustViewBounds="true"
-                                android:src="@drawable/easter_egg__horror_blood" />
-                        </net.cachapa.expandablelayout.ExpandableLayout>
-
-                    </RelativeLayout>
 
                     <androidx.appcompat.widget.LinearLayoutCompat
                         android:id="@+id/menu_container"
diff --git a/app/src/main/res/layout/fragment_main_accettazione_bolla__list_group_model.xml b/app/src/main/res/layout/fragment_main_accettazione_bolla__list_group_model.xml
index 2d522cb1..ee57a3a0 100644
--- a/app/src/main/res/layout/fragment_main_accettazione_bolla__list_group_model.xml
+++ b/app/src/main/res/layout/fragment_main_accettazione_bolla__list_group_model.xml
@@ -56,7 +56,7 @@
                     tools:text="Cons 07 nov 2018"
                     android:layout_alignParentEnd="true"
                     android:textColor="#000"
-                    style="@style/AppTheme.NewMaterial.Text.Small" />
+                    style="@style/TextAppearance.Material3.BodyMedium" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/descrizione"
@@ -67,7 +67,7 @@
                     android:maxLines="1"
                     android:textColor="#000"
                     android:layout_alignParentStart="true"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_toStartOf="@id/descrizione"/>
 
 
@@ -78,7 +78,7 @@
                     tools:text="Cod Jcom"
                     android:layout_alignParentEnd="true"
                     android:layout_below="@id/descrizione"
-                    style="@style/AppTheme.NewMaterial.Text.Small" />
+                    style="@style/TextAppearance.Material3.BodyMedium" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/sub_descrizione"
@@ -88,7 +88,7 @@
                     android:ellipsize="end"
                     android:paddingEnd="6dp"
                     tools:text="TextView"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_below="@+id/descrizione"
                     android:layout_toStartOf="@id/right_sub_descrizione"/>
 
diff --git a/app/src/main/res/layout/fragment_main_menu_group_layout.xml b/app/src/main/res/layout/fragment_main_menu_group_layout.xml
index c553e1d7..91f00078 100644
--- a/app/src/main/res/layout/fragment_main_menu_group_layout.xml
+++ b/app/src/main/res/layout/fragment_main_menu_group_layout.xml
@@ -17,7 +17,10 @@
 
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/general_dashboard_group_title"
-        style="@style/AppTheme.NewMaterial.Text.TextBoxGroupTitleDashboard"
+        style="@style/TextAppearance.Material3.LabelLarge"
+        android:gravity="center_horizontal"
+        android:textAllCaps="true"
+        android:textStyle="bold"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintTop_toTopOf="parent"
@@ -28,6 +31,8 @@
         android:id="@+id/main_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        tools:listitem="@layout/fragment_main_menu_item_layout"
+        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
         app:layout_constraintTop_toBottomOf="@id/general_dashboard_group_title">
 
 
diff --git a/app/src/main/res/layout/fragment_main_menu_item_layout.xml b/app/src/main/res/layout/fragment_main_menu_item_layout.xml
index d6cf393a..e7fb76ee 100644
--- a/app/src/main/res/layout/fragment_main_menu_item_layout.xml
+++ b/app/src/main/res/layout/fragment_main_menu_item_layout.xml
@@ -32,10 +32,9 @@
                 android:layout_marginTop="16dp"
                 android:text="@string/accettazione_ordine_title_fragment"
                 android:textAllCaps="true"
-                android:textColor="@color/gray_700"
                 android:gravity="center_horizontal"
                 android:textStyle="bold"
-                style="@style/AppTheme.NewMaterial.Text.Small"/>
+                style="@style/TextAppearance.Material3.LabelMedium"/>
 
         </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/app/src/main/res/layout/fragment_main_ordini_uscita.xml b/app/src/main/res/layout/fragment_main_ordini_uscita.xml
index 7c86adde..ff4619ec 100644
--- a/app/src/main/res/layout/fragment_main_ordini_uscita.xml
+++ b/app/src/main/res/layout/fragment_main_ordini_uscita.xml
@@ -20,8 +20,7 @@
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@android:color/white">
+        android:layout_height="match_parent">
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
@@ -49,7 +48,9 @@
                 android:id="@+id/vendita_main_list"
                 android:scrollbars="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"/>
+                android:layout_height="match_parent"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/fragment_main_ordini_uscita__list_group_model"/>
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/ordini_vendita_empty_view"
@@ -91,14 +92,14 @@
                         android:layout_width="72dp"
                         android:layout_height="wrap_content"
                         android:adjustViewBounds="true"
-                        android:src="@drawable/ic_playlist_add_check_24dp" />
+                        android:src="@drawable/ic_playlist_add_check_24dp"
+                        android:tint="?attr/colorControlNormal" />
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="center_horizontal"
                         android:text="@string/no_orders_found_message"
-                        android:textColor="@android:color/black"
                         android:textSize="18sp" />
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml b/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml
index e68142ea..29c6b4be 100644
--- a/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml
+++ b/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:app="http://schemas.android.com/apk/res-auto">
     <data>
+        <import type="android.text.Html" />
+        <import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
         <import type="it.integry.integrywmsnative.core.di.BindableBoolean" />
         <variable
             name="selected"
@@ -15,8 +17,8 @@
         android:layout_height="wrap_content"
         android:paddingStart="4dp"
         android:paddingEnd="12dp"
-        android:paddingVertical="4dp"
-        android:background="@color/full_white">
+        android:paddingVertical="8dp"
+        android:background="?attr/selectableItemBackground">
 
         <!-- 2. Lo spazio di 8dp è ora gestito con constraint -->
         <View
@@ -39,57 +41,57 @@
             app:layout_constraintBottom_toBottomOf="parent" />
 
         <!-- 4. Descrizione principale a destra del checkbox -->
-        <androidx.appcompat.widget.AppCompatTextView
+        <TextView
+            style="@style/TextAppearance.Material3.BodyMedium"
             android:id="@+id/descrizione"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             tools:text="Ord. Ven. 39 del 27 ott 2017"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textColor="#000"
-            style="@style/AppTheme.NewMaterial.Text.Small"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
             app:layout_constraintStart_toEndOf="@id/checkbox"
             app:layout_constraintEnd_toStartOf="@id/right_descrizione"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"/>
+            app:layout_constraintTop_toTopOf="parent"/>
 
         <!-- 5. Descrizione secondaria a destra del checkbox, sotto la principale -->
-        <androidx.appcompat.widget.AppCompatTextView
+        <TextView
+            style="@style/TextAppearance.Material3.BodySmall"
             android:id="@+id/sub_descrizione"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:maxLines="1"
+            android:maxLines="2"
             android:ellipsize="end"
+            android:layout_marginEnd="8dp"
             tools:text="TextView"
-            style="@style/AppTheme.NewMaterial.Text.Small"
             app:layout_constraintStart_toStartOf="@id/descrizione"
             app:layout_constraintEnd_toStartOf="@id/right_sub_descrizione"
-            app:layout_constraintTop_toBottomOf="@+id/descrizione"
-            android:layout_marginEnd="8dp"/>
+            app:layout_constraintTop_toBottomOf="@+id/descrizione"/>
 
         <!-- 6. Right descrizione allineata a destra -->
-        <androidx.appcompat.widget.AppCompatTextView
+        <TextView
+            style="@style/TextAppearance.Material3.BodyMedium"
             android:id="@+id/right_descrizione"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             tools:text="Cons 07 nov 2018"
-            android:textColor="#000"
-            style="@style/AppTheme.NewMaterial.Text.Small"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBaseline_toBaselineOf="@id/descrizione" />
 
         <!-- 7. Right sub-descrizione allineata a destra -->
-        <androidx.appcompat.widget.AppCompatTextView
+        <TextView
+            style="@style/TextAppearance.Material3.BodySmall"
             android:id="@+id/right_sub_descrizione"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:background="@drawable/badge_round_corner"
+            android:backgroundTint="?attr/colorSecondaryContainer"
+            android:textColor="?attr/colorOnSecondaryContainer"
             tools:text="Cod Jcom"
-            style="@style/AppTheme.NewMaterial.Text.Small"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/right_descrizione"
-            app:layout_constraintBaseline_toBaselineOf="@id/sub_descrizione" />
+            app:layout_constraintTop_toBottomOf="@id/right_descrizione" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
index 465a1fa7..d88fab43 100644
--- a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
+++ b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
@@ -61,7 +61,7 @@
                             android:paddingBottom="8dp">
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@{Html.fromHtml(String.format(context.getString(R.string.lu_number_data_text), view.currentMtbColtObs.numCollo, UtilityDate.formatDate(view.currentMtbColtObs.getDataColloD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)))}"
@@ -76,14 +76,14 @@
                                 app:visibilityWhenNotNull="@{view.currentMtbColtObs.posizione}">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="Posizione: "
                                     android:textColor="@android:color/white"                                      />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{view.currentMtbColtObs.posizione}"
@@ -264,7 +264,7 @@
                                 android:src="@drawable/ic_playlist_add_check_24dp" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:gravity="center_horizontal"
diff --git a/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml
index ca819b22..2cd31553 100644
--- a/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml
+++ b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml
@@ -70,7 +70,7 @@
 <!--                    android:text="@{item.getDescrizioneAttivita()}"-->
 <!--                    tools:text="PRODUZIONE PASTA SECCA"-->
 <!--                    android:layout_alignParentEnd="true"-->
-<!--                    style="@style/AppTheme.NewMaterial.Text.Small" />-->
+<!--                    style="@style/TextAppearance.Material3.BodyMedium" />-->
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/descrizione"
@@ -83,7 +83,7 @@
                     android:textColor="#000"
                     android:layout_marginTop="4dp"
                     android:layout_alignParentStart="true"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_toStartOf="@id/descrizione"/>
 
 <!--                <androidx.appcompat.widget.AppCompatTextView-->
@@ -104,7 +104,7 @@
 <!--                    tools:text="SL01"-->
 <!--                    android:layout_alignParentEnd="true"-->
 <!--                    android:layout_below="@id/descrizione"-->
-<!--                    style="@style/AppTheme.NewMaterial.Text.Small" />-->
+<!--                    style="@style/TextAppearance.Material3.BodyMedium" />-->
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/sub_descrizione"
@@ -114,7 +114,7 @@
                     android:ellipsize="end"
                     android:text="@{item.getOrdineLavorazioneDTO().descrizioneProd}"
                     tools:text="BUCATINI P13,5EPA T.60623/24"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_below="@+id/descrizione"/>
 
             </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_prod_fabbisogno_linee_prod.xml b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_prod.xml
index 8d68963d..66e8e0a1 100644
--- a/app/src/main/res/layout/fragment_prod_fabbisogno_linee_prod.xml
+++ b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_prod.xml
@@ -66,7 +66,7 @@
                     android:src="@drawable/ic_playlist_add_check_24dp" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
diff --git a/app/src/main/res/layout/fragment_prod_ordine_produzione__list_group_clienti.xml b/app/src/main/res/layout/fragment_prod_ordine_produzione__list_group_clienti.xml
index 5db2422d..f432a144 100644
--- a/app/src/main/res/layout/fragment_prod_ordine_produzione__list_group_clienti.xml
+++ b/app/src/main/res/layout/fragment_prod_ordine_produzione__list_group_clienti.xml
@@ -12,7 +12,7 @@
             android:maxLines="1"
             android:ellipsize="end"
             android:paddingEnd="6dp"
-            style="@style/AppTheme.NewMaterial.Text.Small"
+            style="@style/TextAppearance.Material3.BodyMedium"
             tools:text="TextView" />
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -21,7 +21,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_weight="1"
-            style="@style/AppTheme.NewMaterial.Text.Small"
+            style="@style/TextAppearance.Material3.BodyMedium"
             tools:text="TextView" />
     </RelativeLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_prod_ordine_produzione__list_group_model.xml b/app/src/main/res/layout/fragment_prod_ordine_produzione__list_group_model.xml
index f406fde2..9778ce3c 100644
--- a/app/src/main/res/layout/fragment_prod_ordine_produzione__list_group_model.xml
+++ b/app/src/main/res/layout/fragment_prod_ordine_produzione__list_group_model.xml
@@ -36,7 +36,7 @@
                 android:layout_height="wrap_content"
                 tools:text="Ord. Prod. 39 del 27 ott 2017"
                 android:textColor="#000"
-                style="@style/AppTheme.NewMaterial.Text.Small"/>
+                style="@style/TextAppearance.Material3.BodyMedium"/>
 
 
             <LinearLayout
diff --git a/app/src/main/res/layout/fragment_prod_recupero_materiale.xml b/app/src/main/res/layout/fragment_prod_recupero_materiale.xml
index 1dce94ef..b24ed0e7 100644
--- a/app/src/main/res/layout/fragment_prod_recupero_materiale.xml
+++ b/app/src/main/res/layout/fragment_prod_recupero_materiale.xml
@@ -18,13 +18,22 @@
         tools:context=".gest.prod_recupero_materiale.ProdRecuperoMaterialeFragment">
 
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:background="@android:color/white"
-            android:id="@+id/prod_recupero_materiale_main_list"
+
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+            android:id="@+id/swiperefresh"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-            tools:listitem="@layout/prod_recupero_materiale_list_item"/>
+            android:layout_alignParentBottom="true"
+            app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/prod_recupero_materiale_main_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/prod_recupero_materiale_list_item" />
+
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/empty_view"
@@ -66,14 +75,14 @@
                     android:layout_width="72dp"
                     android:layout_height="wrap_content"
                     android:adjustViewBounds="true"
-                    android:src="@drawable/ic_playlist_add_check_24dp" />
+                    android:src="@drawable/ic_playlist_add_check_24dp"
+                    android:tint="?attr/colorControlNormal" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
                     android:text="@string/no_item_in_recupera_materiale"
-                    android:textColor="@android:color/black"
                     android:textSize="18sp" />
             </LinearLayout>
 
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 dfebdd42..35e6f088 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
@@ -124,7 +124,7 @@
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:text="@{UtilityDate.formatDate(view.currentOrder.dataOrd, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
-                                android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                 tools:text="28 maggio 2021" />
 
                             <TextView
@@ -228,7 +228,7 @@
                                     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:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                     android:textColor="@android:color/black"
                                     tools:text="GRUNDHOFER GBMH" />
 
@@ -271,7 +271,7 @@
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:text="@{UtilityDate.formatDate(view.currentOrder.getDataConsCommessaD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
-                                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                         android:textColor="@android:color/black"
                                         tools:text="01 Gen 2022" />
 
@@ -356,7 +356,7 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text="@{UtilityNumber.decimalToString(view.currentOrder.numPedane, 0)}"
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black"
                                             tools:text="0" />
 
@@ -365,7 +365,7 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text=" UL"
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black" />
 
                                     </androidx.appcompat.widget.LinearLayoutCompat>
@@ -414,7 +414,7 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text="@{UtilityNumber.decimalToString(view.currentOrder.numCnf, 0)}"
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black"
                                             tools:text="0" />
 
@@ -423,7 +423,7 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text=" COL"
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black" />
 
                                     </androidx.appcompat.widget.LinearLayoutCompat>
@@ -473,7 +473,7 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text="@{UtilityNumber.decimalToString(view.currentOrder.qtaProd, 0)}"
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black"
                                             tools:text="0" />
 
@@ -483,7 +483,7 @@
                                             android:layout_height="wrap_content"
                                             android:layout_marginStart="4dp"
                                             android:text="@{view.currentOrder.untOrd}"
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black"
                                             tools:text="KG" />
 
@@ -541,7 +541,7 @@
                                             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:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black"
                                             tools:text="0" />
 
@@ -550,7 +550,7 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text=" UL"
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black" />
 
                                     </androidx.appcompat.widget.LinearLayoutCompat>
@@ -600,7 +600,7 @@
                                             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:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black"
                                             tools:text="0" />
 
@@ -610,7 +610,7 @@
                                             android:layout_height="wrap_content"
                                             android:layout_marginStart="4dp"
                                             android:text="COL"
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black" />
 
                                     </androidx.appcompat.widget.LinearLayoutCompat>
@@ -657,7 +657,7 @@
                                             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:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black"
                                             tools:text="0" />
 
@@ -667,7 +667,7 @@
                                             android:layout_height="wrap_content"
                                             android:layout_marginStart="4dp"
                                             android:text="KG"
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black" />
 
 
@@ -675,14 +675,14 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text=" ("
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black" />
 
                                         <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:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black"
                                             tools:text="0" />
 
@@ -691,7 +691,7 @@
                                             android:layout_width="wrap_content"
                                             android:layout_height="wrap_content"
                                             android:text=" KG)"
-                                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                                             android:textColor="@android:color/black" />
 
                                     </androidx.appcompat.widget.LinearLayoutCompat>
@@ -757,7 +757,7 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="Lista bancali"
-                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                             android:textColor="@android:color/black"
                             android:textStyle="bold" />
 
@@ -812,7 +812,7 @@
                                     android:src="@drawable/ic_playlist_add_check_24dp" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:gravity="center_horizontal"
diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml
index c905122d..0fe1dd93 100644
--- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml
+++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml
@@ -44,7 +44,7 @@
                 android:paddingEnd="12dp">
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="@drawable/badge_round_corner"
@@ -60,7 +60,7 @@
                     tools:text="22222" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center"
@@ -95,7 +95,7 @@
                             android:layout_alignParentStart="true"
                             android:layout_toStartOf="@id/peso_lordo_collo"
                             android:text="@{mtbColt.getDataColloHumanLong()}"
-                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
                             android:textColor="@android:color/black"
                             android:textSize="16sp"
                             tools:text="28 ottobre 2018" />
@@ -107,7 +107,7 @@
                             android:layout_marginStart="4dp"
                             android:layout_toEndOf="@id/peso_lordo_collo"
                             android:text="@{mtbColt.timeVers}"
-                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                             android:textColor="@android:color/black"
                             tools:text="28 ottobre 2018" />
 
@@ -124,7 +124,7 @@
                         android:paddingStart="6dp"
                         android:paddingEnd="6dp"
                         android:text="@{UtilityNumber.decimalToString(mtbColt.pesoKg, 0) + ` KG`}"
-                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
                         android:textColor="@android:color/black"
                         android:textStyle="bold"
                         tools:text="658 KG" />
@@ -142,7 +142,7 @@
                         android:layout_alignParentStart="true"
                         android:layout_toStartOf="@id/peso_netto_collo"
                         android:text="@{`Linea: ` + mtbColt.codJfas}"
-                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                         android:visibility="@{UtilityString.isNullOrEmpty(mtbColt.codJfas) ? View.INVISIBLE : View.VISIBLE}"
                         tools:text="Linea: L3" />
 
@@ -153,7 +153,7 @@
                         android:layout_alignParentEnd="true"
                         android:layout_centerVertical="true"
                         android:text="@{UtilityNumber.decimalToString(mtbColt.pesoNettoKg, 0) + `KG netto`}"
-                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Small"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
                         android:textColor="@android:color/black"
                         tools:text="628KG netto" />
 
diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml
index e2de01df..6b56d54c 100644
--- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml
+++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml
@@ -48,7 +48,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/pre_first_row"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
@@ -60,7 +60,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/descrizione"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentStart="true"
@@ -73,7 +73,7 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/right_descrizione"
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
@@ -81,7 +81,7 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/sub_descrizione"
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
@@ -89,7 +89,7 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/right_sub_descrizione"
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
diff --git a/app/src/main/res/layout/fragment_prod_riposizionamento_da_prod.xml b/app/src/main/res/layout/fragment_prod_riposizionamento_da_prod.xml
index aa105a21..67760100 100644
--- a/app/src/main/res/layout/fragment_prod_riposizionamento_da_prod.xml
+++ b/app/src/main/res/layout/fragment_prod_riposizionamento_da_prod.xml
@@ -67,7 +67,7 @@
                     android:src="@drawable/ic_playlist_add_check_24dp" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
diff --git a/app/src/main/res/layout/fragment_prod_versamento_materiale.xml b/app/src/main/res/layout/fragment_prod_versamento_materiale.xml
index fb1bd7f7..4cdc0f2b 100644
--- a/app/src/main/res/layout/fragment_prod_versamento_materiale.xml
+++ b/app/src/main/res/layout/fragment_prod_versamento_materiale.xml
@@ -86,7 +86,7 @@
                         android:layout_height="wrap_content"
                         app:text="@{view.descrizionePrimaryArt}"
                         tools:text="CAVOLO VERZA"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:textColor="?colorPrimary"
                         android:textStyle="bold"
                         android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/fragment_prod_versamento_materiale_in_buffer.xml b/app/src/main/res/layout/fragment_prod_versamento_materiale_in_buffer.xml
index 165794cf..c103d22b 100644
--- a/app/src/main/res/layout/fragment_prod_versamento_materiale_in_buffer.xml
+++ b/app/src/main/res/layout/fragment_prod_versamento_materiale_in_buffer.xml
@@ -35,7 +35,7 @@
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="Data creazione: "
@@ -43,7 +43,7 @@
                         android:textSize="16sp" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{viewmodel.mtbColtMutable.getDataColloHumanLong()}"
@@ -59,14 +59,14 @@
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="Posizione "
                         android:textColor="@android:color/black" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{viewmodel.mtbColtMutable.posizione != null ? viewmodel.mtbColtMutable.posizione : `N/D`}"
@@ -81,14 +81,14 @@
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="Deposito "
                         android:textColor="@android:color/black" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{viewmodel.mtbColtMutable.codMdep}"
diff --git a/app/src/main/res/layout/fragment_pv_ordini_acquisto__list_header.xml b/app/src/main/res/layout/fragment_pv_ordini_acquisto__list_header.xml
index 726cef3e..5c79ca59 100644
--- a/app/src/main/res/layout/fragment_pv_ordini_acquisto__list_header.xml
+++ b/app/src/main/res/layout/fragment_pv_ordini_acquisto__list_header.xml
@@ -21,7 +21,7 @@
                 android:id="@+id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:textAllCaps="true"
                 android:layout_centerVertical="true"
                 android:layout_alignParentStart="true"
diff --git a/app/src/main/res/layout/fragment_verifica_giacenze.xml b/app/src/main/res/layout/fragment_verifica_giacenze.xml
index 5024a6c3..c92c668a 100644
--- a/app/src/main/res/layout/fragment_verifica_giacenze.xml
+++ b/app/src/main/res/layout/fragment_verifica_giacenze.xml
@@ -63,7 +63,7 @@
                     android:src="@drawable/ic_black_barcode_scanner" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
diff --git a/app/src/main/res/layout/layout_filter_agente.xml b/app/src/main/res/layout/layout_filter_agente.xml
index ef214486..47d5c9a8 100644
--- a/app/src/main/res/layout/layout_filter_agente.xml
+++ b/app/src/main/res/layout/layout_filter_agente.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,20 +47,18 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
                     android:maxLines="2"
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
-                    android:text="Seleziona l'agente che vuoi filtrare"
-                    android:textColor="#444" />
+                    android:text="Seleziona l'agente che vuoi filtrare" />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +66,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_agente__list_item.xml b/app/src/main/res/layout/layout_filter_agente__list_item.xml
index 15b3b0cf..b1000be6 100644
--- a/app/src/main/res/layout/layout_filter_agente__list_item.xml
+++ b/app/src/main/res/layout/layout_filter_agente__list_item.xml
@@ -41,7 +41,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="@{item.enabled}"
diff --git a/app/src/main/res/layout/layout_filter_automezzo.xml b/app/src/main/res/layout/layout_filter_automezzo.xml
index 086397ba..8aed8686 100644
--- a/app/src/main/res/layout/layout_filter_automezzo.xml
+++ b/app/src/main/res/layout/layout_filter_automezzo.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,12 +47,11 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -60,7 +59,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona l'automezzo che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +67,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white"/>
+                android:layout_alignParentEnd="true"/>
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_automezzo__list_item.xml b/app/src/main/res/layout/layout_filter_automezzo__list_item.xml
index 39902f3b..7c1dc6fa 100644
--- a/app/src/main/res/layout/layout_filter_automezzo__list_item.xml
+++ b/app/src/main/res/layout/layout_filter_automezzo__list_item.xml
@@ -41,7 +41,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="@{item.enabled}"
diff --git a/app/src/main/res/layout/layout_filter_cliente.xml b/app/src/main/res/layout/layout_filter_cliente.xml
index b024395c..4354cdd3 100644
--- a/app/src/main/res/layout/layout_filter_cliente.xml
+++ b/app/src/main/res/layout/layout_filter_cliente.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,12 +47,12 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona il cliente che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_cliente__list_item.xml b/app/src/main/res/layout/layout_filter_cliente__list_item.xml
index 8e97b6b7..87fa556a 100644
--- a/app/src/main/res/layout/layout_filter_cliente__list_item.xml
+++ b/app/src/main/res/layout/layout_filter_cliente__list_item.xml
@@ -41,7 +41,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="@{item.enabled}"
diff --git a/app/src/main/res/layout/layout_filter_cod_art.xml b/app/src/main/res/layout/layout_filter_cod_art.xml
index 1f83dcd4..d73e4597 100644
--- a/app/src/main/res/layout/layout_filter_cod_art.xml
+++ b/app/src/main/res/layout/layout_filter_cod_art.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,12 +47,12 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona il codice articolo che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_cod_art__list_item.xml b/app/src/main/res/layout/layout_filter_cod_art__list_item.xml
index c2ae8eae..bc458311 100644
--- a/app/src/main/res/layout/layout_filter_cod_art__list_item.xml
+++ b/app/src/main/res/layout/layout_filter_cod_art__list_item.xml
@@ -42,7 +42,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="@{item.enabled}"
diff --git a/app/src/main/res/layout/layout_filter_commessa.xml b/app/src/main/res/layout/layout_filter_commessa.xml
index 853037fb..0dc05489 100644
--- a/app/src/main/res/layout/layout_filter_commessa.xml
+++ b/app/src/main/res/layout/layout_filter_commessa.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,12 +47,12 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona la commessa che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_commessa__list_item.xml b/app/src/main/res/layout/layout_filter_commessa__list_item.xml
index a1773041..b81bce47 100644
--- a/app/src/main/res/layout/layout_filter_commessa__list_item.xml
+++ b/app/src/main/res/layout/layout_filter_commessa__list_item.xml
@@ -42,7 +42,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="@{item.enabled}"
@@ -51,7 +51,7 @@
                 android:clickable="false" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=" - "
@@ -61,7 +61,7 @@
                 android:clickable="false" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="@{item.enabled}"
diff --git a/app/src/main/res/layout/layout_filter_deposito.xml b/app/src/main/res/layout/layout_filter_deposito.xml
index 6dcced83..6edbc818 100644
--- a/app/src/main/res/layout/layout_filter_deposito.xml
+++ b/app/src/main/res/layout/layout_filter_deposito.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,12 +47,12 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona il deposito che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_deposito__list_item.xml b/app/src/main/res/layout/layout_filter_deposito__list_item.xml
index c6594137..a89a9d3b 100644
--- a/app/src/main/res/layout/layout_filter_deposito__list_item.xml
+++ b/app/src/main/res/layout/layout_filter_deposito__list_item.xml
@@ -42,7 +42,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="@{item.enabled}"
@@ -51,7 +51,7 @@
                 android:clickable="false" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=" - "
@@ -61,7 +61,7 @@
                 android:clickable="false" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="@{item.enabled}"
diff --git a/app/src/main/res/layout/layout_filter_descr.xml b/app/src/main/res/layout/layout_filter_descr.xml
index a266eb7b..1e3a6391 100644
--- a/app/src/main/res/layout/layout_filter_descr.xml
+++ b/app/src/main/res/layout/layout_filter_descr.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,12 +47,12 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona la descrizione articolo che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_descr__list_item.xml b/app/src/main/res/layout/layout_filter_descr__list_item.xml
index 39ee66af..040efbeb 100644
--- a/app/src/main/res/layout/layout_filter_descr__list_item.xml
+++ b/app/src/main/res/layout/layout_filter_descr__list_item.xml
@@ -42,7 +42,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="@{item.enabled}"
diff --git a/app/src/main/res/layout/layout_filter_gruppo_merc.xml b/app/src/main/res/layout/layout_filter_gruppo_merc.xml
index 41b4ae11..f4cd3c88 100644
--- a/app/src/main/res/layout/layout_filter_gruppo_merc.xml
+++ b/app/src/main/res/layout/layout_filter_gruppo_merc.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,12 +47,12 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona il gruppo merceologico che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_numero_ordine.xml b/app/src/main/res/layout/layout_filter_numero_ordine.xml
index 68b4d1df..bd3f8e03 100644
--- a/app/src/main/res/layout/layout_filter_numero_ordine.xml
+++ b/app/src/main/res/layout/layout_filter_numero_ordine.xml
@@ -38,7 +38,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -46,20 +46,18 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
                     android:maxLines="2"
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
-                    android:text="Seleziona il numero d'ordine che vuoi filtrare"
-                    android:textColor="#444" />
+                    android:text="Seleziona il numero d'ordine che vuoi filtrare" />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -67,8 +65,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_paese.xml b/app/src/main/res/layout/layout_filter_paese.xml
index 35a934f6..1068a7d9 100644
--- a/app/src/main/res/layout/layout_filter_paese.xml
+++ b/app/src/main/res/layout/layout_filter_paese.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,12 +47,12 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona l'automezzo che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_paese__list_item.xml b/app/src/main/res/layout/layout_filter_paese__list_item.xml
index 61f17363..373f14b3 100644
--- a/app/src/main/res/layout/layout_filter_paese__list_item.xml
+++ b/app/src/main/res/layout/layout_filter_paese__list_item.xml
@@ -41,7 +41,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="@{item.enabled}"
diff --git a/app/src/main/res/layout/layout_filter_posizione.xml b/app/src/main/res/layout/layout_filter_posizione.xml
index 44cee4bd..45ba9be6 100644
--- a/app/src/main/res/layout/layout_filter_posizione.xml
+++ b/app/src/main/res/layout/layout_filter_posizione.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,12 +47,12 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona la posizione che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_posizione__list_item.xml b/app/src/main/res/layout/layout_filter_posizione__list_item.xml
index dfa07d58..fd9237f6 100644
--- a/app/src/main/res/layout/layout_filter_posizione__list_item.xml
+++ b/app/src/main/res/layout/layout_filter_posizione__list_item.xml
@@ -42,7 +42,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="@{item.enabled}"
@@ -53,7 +53,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="@{item.enabled}"
diff --git a/app/src/main/res/layout/layout_filter_term_cons.xml b/app/src/main/res/layout/layout_filter_term_cons.xml
index 09bfbab1..93204c96 100644
--- a/app/src/main/res/layout/layout_filter_term_cons.xml
+++ b/app/src/main/res/layout/layout_filter_term_cons.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,12 +47,12 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona i termini di consegna che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_term_cons__list_item.xml b/app/src/main/res/layout/layout_filter_term_cons__list_item.xml
index 876a26d8..f6fc289d 100644
--- a/app/src/main/res/layout/layout_filter_term_cons__list_item.xml
+++ b/app/src/main/res/layout/layout_filter_term_cons__list_item.xml
@@ -41,7 +41,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="@{item.enabled}"
diff --git a/app/src/main/res/layout/layout_filter_vettore.xml b/app/src/main/res/layout/layout_filter_vettore.xml
index 875d9554..3dfe3b54 100644
--- a/app/src/main/res/layout/layout_filter_vettore.xml
+++ b/app/src/main/res/layout/layout_filter_vettore.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,12 +47,12 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona il vettore che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_vettore__list_item.xml b/app/src/main/res/layout/layout_filter_vettore__list_item.xml
index 15fa3d4d..b22a4468 100644
--- a/app/src/main/res/layout/layout_filter_vettore__list_item.xml
+++ b/app/src/main/res/layout/layout_filter_vettore__list_item.xml
@@ -41,7 +41,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="@{item.enabled}"
diff --git a/app/src/main/res/layout/layout_filter_viaggio.xml b/app/src/main/res/layout/layout_filter_viaggio.xml
index a2f6eefe..0e277fe7 100644
--- a/app/src/main/res/layout/layout_filter_viaggio.xml
+++ b/app/src/main/res/layout/layout_filter_viaggio.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,12 +47,12 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona il viaggio che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_viaggio__list_item.xml b/app/src/main/res/layout/layout_filter_viaggio__list_item.xml
index 5995be35..de5e10c2 100644
--- a/app/src/main/res/layout/layout_filter_viaggio__list_item.xml
+++ b/app/src/main/res/layout/layout_filter_viaggio__list_item.xml
@@ -41,7 +41,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:enabled="@{item.enabled}"
diff --git a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml
index 07b4338e..bce4c01c 100644
--- a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml
+++ b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml
@@ -78,7 +78,7 @@
 
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
@@ -100,7 +100,7 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/second_line"
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
@@ -114,7 +114,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}"
@@ -199,7 +199,7 @@
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/refs_title"
-                            style="@style/AppTheme.NewMaterial.Text.Small"
+                            style="@style/TextAppearance.Material3.BodyMedium"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="Prelevato da"
@@ -231,14 +231,14 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="Num: "
                                     android:textColor="@android:color/black" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{mtbColr.numColloRif.toString()}"
@@ -254,14 +254,14 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="Gest: "
                                     android:textColor="@android:color/black" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{mtbColr.gestioneRif}"
@@ -284,14 +284,14 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="Data: "
                                     android:textColor="@android:color/black" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityDate.formatDate(mtbColr.dataColloRifD, &quot;dd MMM yy&quot;)}"
@@ -307,14 +307,14 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="Serie: "
                                     android:textColor="@android:color/black" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{mtbColr.serColloRif}"
diff --git a/app/src/main/res/layout/lista_giacenze_per_posizione_model.xml b/app/src/main/res/layout/lista_giacenze_per_posizione_model.xml
index f5f57f4d..f53d73e0 100644
--- a/app/src/main/res/layout/lista_giacenze_per_posizione_model.xml
+++ b/app/src/main/res/layout/lista_giacenze_per_posizione_model.xml
@@ -62,7 +62,7 @@
 
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
@@ -84,7 +84,7 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/second_line"
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
@@ -98,7 +98,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{`Lotto: ` + item.getPartitaMag()}"
@@ -206,14 +206,14 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="Num: "
                                     android:textColor="@android:color/black" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{item.numCollo.toString()}"
@@ -229,14 +229,14 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="Gest: "
                                     android:textColor="@android:color/black" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{item.gestione}"
@@ -259,14 +259,14 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="Data: "
                                     android:textColor="@android:color/black" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityDate.formatDate(item.dataCollo, &quot;dd MMM yy&quot;)}"
@@ -282,14 +282,14 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="Serie: "
                                     android:textColor="@android:color/black" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Small"
+                                    style="@style/TextAppearance.Material3.BodyMedium"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{item.serCollo}"
diff --git a/app/src/main/res/layout/lista_picking_libero_list_model.xml b/app/src/main/res/layout/lista_picking_libero_list_model.xml
index 2c5ec710..e44862cd 100644
--- a/app/src/main/res/layout/lista_picking_libero_list_model.xml
+++ b/app/src/main/res/layout/lista_picking_libero_list_model.xml
@@ -39,7 +39,7 @@
                     android:textColor="?colorPrimary"
                     android:textSize="14sp"
                     android:textStyle="bold"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     tools:text="COD MART" />
 
                 <androidx.appcompat.widget.AppCompatTextView
@@ -55,7 +55,7 @@
                     android:background="@drawable/badge_round_corner"
                     android:backgroundTint="@color/orange_600"
                     android:textColor="@android:color/white"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     tools:text="PESO KG" />
 
             </RelativeLayout>
@@ -70,7 +70,7 @@
                 android:text="@{mtbColr.getDescrizione()}"
                 android:textColor="@android:color/black"
                 android:textSize="16sp"
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 tools:text="Descrizione lunga articolo" />
 
 
@@ -80,7 +80,7 @@
                 android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}"
                 android:textSize="14sp"
                 android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.getPartitaMag()) ? View.INVISIBLE : View.VISIBLE}"
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 tools:text="Lotto: ABCDE" />
 
         </LinearLayout>
@@ -111,7 +111,7 @@
                 android:textColor="@android:color/white"
                 android:textStyle="bold"
                 android:textAllCaps="true"
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 tools:text="280.45\nCONF" />
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml
index 8aa96ad4..ab8ce7e9 100644
--- a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml
+++ b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml
@@ -74,7 +74,7 @@
                     android:background="@drawable/badge_round_corner"
                     android:backgroundTint="@color/orange_600"
                     android:textColor="@android:color/white"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     tools:text="PESO KG" />
 
             </RelativeLayout>
@@ -98,7 +98,7 @@
                 android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}"
                 android:textSize="14sp"
                 android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.getPartitaMag()) ? View.GONE : View.VISIBLE}"
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 tools:text="Lotto: ABCDE" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>
diff --git a/app/src/main/res/layout/lista_verifica_giacenze_picked_item_list_model.xml b/app/src/main/res/layout/lista_verifica_giacenze_picked_item_list_model.xml
index 022b51eb..c388a94b 100644
--- a/app/src/main/res/layout/lista_verifica_giacenze_picked_item_list_model.xml
+++ b/app/src/main/res/layout/lista_verifica_giacenze_picked_item_list_model.xml
@@ -25,7 +25,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/cod_mart"
-            style="@style/AppTheme.NewMaterial.Text.Small"
+            style="@style/TextAppearance.Material3.BodyMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:text="@{item.codMart}"
@@ -38,7 +38,7 @@
 
 <!--        <androidx.appcompat.widget.AppCompatTextView-->
 <!--            android:id="@+id/peso"-->
-<!--            style="@style/AppTheme.NewMaterial.Text.Small"-->
+<!--            style="@style/TextAppearance.Material3.BodyMedium"-->
 <!--            android:layout_width="0dp"-->
 <!--            android:layout_height="wrap_content"-->
 <!--            android:background="@drawable/badge_round_corner"-->
@@ -55,7 +55,7 @@
 
         <TextView
             android:id="@+id/descrizione"
-            style="@style/AppTheme.NewMaterial.Text.Small"
+            style="@style/TextAppearance.Material3.BodyMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_alignParentStart="true"
@@ -72,7 +72,7 @@
 
 
         <TextView
-            style="@style/AppTheme.NewMaterial.Text.Small"
+            style="@style/TextAppearance.Material3.BodyMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@{`Lotto: ` + item.getPartitaMag()}"
@@ -84,7 +84,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/qta_box"
-            style="@style/AppTheme.NewMaterial.Text.Small"
+            style="@style/TextAppearance.Material3.BodyMedium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:background="@drawable/badge_round_corner"
diff --git a/app/src/main/res/layout/picking_resi_main_list__item.xml b/app/src/main/res/layout/picking_resi_main_list__item.xml
index cdf5a0b6..2c92b0d3 100644
--- a/app/src/main/res/layout/picking_resi_main_list__item.xml
+++ b/app/src/main/res/layout/picking_resi_main_list__item.xml
@@ -31,7 +31,7 @@
                 android:paddingLeft="6dp"
                 android:paddingRight="6dp"
                 android:textStyle="bold"
-                style="@style/AppTheme.NewMaterial.Text.Small"/>
+                style="@style/TextAppearance.Material3.BodyMedium"/>
 
 
             <LinearLayout
@@ -47,7 +47,7 @@
                     android:layout_marginStart="4dp"
                     android:textStyle="bold"
                     android:textColor="@color/green_700"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     tools:text="QTA"/>
 
                 <TextView
@@ -55,7 +55,7 @@
                     android:layout_height="wrap_content"
                     android:textStyle="bold"
                     android:textColor="@android:color/black"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:text=" / "/>
 
                 <TextView
@@ -64,7 +64,7 @@
                     android:layout_height="wrap_content"
                     android:textStyle="bold"
                     android:textColor="@android:color/black"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     tools:text="QTA"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
@@ -75,7 +75,7 @@
                     android:textColor="@android:color/black"
                     android:layout_marginStart="4dp"
                     android:textAllCaps="true"
-                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    style="@style/TextAppearance.Material3.BodyMedium"
                     tools:text="cnf"/>
 
             </LinearLayout>
@@ -89,7 +89,7 @@
             android:layout_marginTop="4dp"
             android:textSize="16sp"
             android:textColor="@android:color/black"
-            style="@style/AppTheme.NewMaterial.Text.Small"
+            style="@style/TextAppearance.Material3.BodyMedium"
             tools:text="DESCRIZIONE"/>
 
 
diff --git a/app/src/main/res/layout/picking_resi_main_list__item_header.xml b/app/src/main/res/layout/picking_resi_main_list__item_header.xml
index 6eecd206..db970488 100644
--- a/app/src/main/res/layout/picking_resi_main_list__item_header.xml
+++ b/app/src/main/res/layout/picking_resi_main_list__item_header.xml
@@ -14,7 +14,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     tools:text="DESCRIZIONE"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:padding="8dp"
                     android:textColor="@android:color/white"
                     android:textStyle="bold"
diff --git a/app/src/main/res/layout/prod_recupero_materiale_list_item.xml b/app/src/main/res/layout/prod_recupero_materiale_list_item.xml
index 87c9bf05..50897356 100644
--- a/app/src/main/res/layout/prod_recupero_materiale_list_item.xml
+++ b/app/src/main/res/layout/prod_recupero_materiale_list_item.xml
@@ -7,6 +7,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:background="?attr/selectableItemBackground"
         android:paddingVertical="8dp"
         android:paddingEnd="8dp">
 
@@ -29,7 +30,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:textColor="@android:color/black"
                 android:textSize="22sp"
                 android:textStyle="bold"
                 tools:text="22" />
@@ -63,7 +63,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
                     android:background="@drawable/badge_round_corner"
-                    android:backgroundTint="@color/green_200"
+                    android:backgroundTint="?attr/colorSecondaryContainer"
                     android:gravity="center_vertical"
                     android:orientation="horizontal"
                     android:layout_marginStart="4dp"
@@ -73,6 +73,7 @@
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/partita_mag"
                         style="@style/TextAppearance.Material3.TitleSmall"
+                        android:textColor="?attr/colorOnSecondaryContainer"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
@@ -138,7 +139,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="4dp"
                     android:background="@drawable/badge_round_corner"
-                    android:backgroundTint="@color/orange_300"
+                    android:backgroundTint="?attr/colorTertiaryContainer"
                     android:gravity="center_vertical"
                     android:orientation="horizontal"
                     android:layout_marginStart="4dp"
@@ -148,6 +149,7 @@
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/commessa"
                         style="@style/TextAppearance.Material3.TitleSmall"
+                        android:textColor="?attr/colorOnTertiaryContainer"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
diff --git a/app/src/main/res/layout/prod_riposizionamento_da_prod__list_item.xml b/app/src/main/res/layout/prod_riposizionamento_da_prod__list_item.xml
index dd474c2f..4da3f6fd 100644
--- a/app/src/main/res/layout/prod_riposizionamento_da_prod__list_item.xml
+++ b/app/src/main/res/layout/prod_riposizionamento_da_prod__list_item.xml
@@ -47,7 +47,7 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/badge1"
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@drawable/badge_round_corner"
@@ -63,7 +63,7 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/badge2"
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
@@ -81,7 +81,7 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/badge3"
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
@@ -107,7 +107,7 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/qta_tot"
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{String.valueOf(item.getCount())}"
@@ -117,7 +117,7 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/unt_mis"
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -129,7 +129,7 @@
                 tools:text="ped" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="4dp"
@@ -141,7 +141,7 @@
                 tools:text="(" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{UtilityNumber.decimalToString(item.getNumCnf(), 0)}"
@@ -152,7 +152,7 @@
                 tools:text="QTA" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyMedium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -166,7 +166,7 @@
                 tools:text="col" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=")"
@@ -201,7 +201,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/descrizione"
-            style="@style/AppTheme.NewMaterial.Text.Small"
+            style="@style/TextAppearance.Material3.BodyMedium"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
diff --git a/app/src/main/res/layout/spedizione_main_list__group_header.xml b/app/src/main/res/layout/spedizione_main_list__group_header.xml
index edc45a6f..5e7d77ba 100644
--- a/app/src/main/res/layout/spedizione_main_list__group_header.xml
+++ b/app/src/main/res/layout/spedizione_main_list__group_header.xml
@@ -12,7 +12,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/spedizione_group_title"
-            style="@style/AppTheme.NewMaterial.Text.Medium"
+            style="@style/TextAppearance.Material3.BodyLarge"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
diff --git a/app/src/main/res/layout/spedizione_main_list__group_item.xml b/app/src/main/res/layout/spedizione_main_list__group_item.xml
index 2d4cc35a..b99b32cf 100644
--- a/app/src/main/res/layout/spedizione_main_list__group_item.xml
+++ b/app/src/main/res/layout/spedizione_main_list__group_item.xml
@@ -5,8 +5,7 @@
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/full_white">
+        android:layout_height="wrap_content">
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/content_view_child"
@@ -32,7 +31,7 @@
                     android:paddingLeft="6dp"
                     android:paddingRight="6dp"
                     android:textStyle="bold"
-                    style="@style/AppTheme.NewMaterial.Text.Small" />
+                    style="@style/TextAppearance.Material3.BodyMedium" />
 
 
                 <androidx.appcompat.widget.LinearLayoutCompat
@@ -56,14 +55,13 @@
                         android:layout_marginStart="4dp"
                         android:textStyle="bold"
                         android:textColor="@color/green_700"
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         tools:text="QTA" />
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textStyle="bold"
-                        android:textColor="@android:color/black"
                         style="@android:style/TextAppearance.Medium"
                         android:text=" / " />
 
@@ -72,8 +70,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textStyle="bold"
-                        android:textColor="@android:color/black"
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         tools:text="QTA" />
 
                     <androidx.appcompat.widget.AppCompatTextView
@@ -81,11 +78,10 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textStyle="bold"
-                        android:textColor="@android:color/black"
                         android:layout_marginStart="4dp"
                         android:textAllCaps="true"
                         android:layout_gravity="center_vertical"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         tools:text="cnf" />
 
 
@@ -109,9 +105,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
-                android:textSize="16sp"
-                android:textColor="@android:color/black"
-                style="@style/AppTheme.NewMaterial.Text.Small"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 tools:text="DESCRIZIONE" />
 
             <RelativeLayout
@@ -129,8 +123,7 @@
                         android:id="@+id/subdescrizione1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textSize="14sp"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         tools:text="SUB DESCRIZIONE" />
 
 
@@ -138,8 +131,7 @@
                         android:id="@+id/subdescrizione2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textSize="14sp"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         tools:text="SUB DESCRIZIONE" />
 
                     <androidx.appcompat.widget.AppCompatTextView
@@ -147,7 +139,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textSize="14sp"
-                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        style="@style/TextAppearance.Material3.BodyMedium"
                         tools:text="QTA OMAGGIO 15 CNF" />
 
                 </LinearLayout>
@@ -167,7 +159,7 @@
                     android:layout_marginStart="8dp"
                     android:textStyle="bold"
                     android:layout_alignParentEnd="true"
-                    style="@style/AppTheme.NewMaterial.Text.Small" />
+                    style="@style/TextAppearance.Material3.BodyMedium" />
 
             </RelativeLayout>
 
@@ -181,7 +173,7 @@
             android:layout_alignTop="@id/content_view_child"
             android:layout_alignBottom="@id/content_view_child"
             android:alpha="0.15"
-            android:background="@android:color/black" />
+            android:background="?attr/colorDisabledSurface" />
 
     </RelativeLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ffc77c6a..706cc86c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -37,6 +37,7 @@
     <string name="ops">Ops</string>
     <string name="warning">Attenzione</string>
     <string name="ok">OK</string>
+    <string name="i_understand_action">Ho capito</string>
     <string name="abort">Annulla</string>
     <string name="reset">Resetta</string>
     <string name="dispatched_abbr">Evasi</string>
@@ -499,4 +500,8 @@
 
     <string name="switch_depo_title">Cambia deposito</string>
     <string name="switch_depo_description">Cambia il deposito principale su cui stai lavorando tra quelli a te disponibili</string>
+
+
+
+    <string name="device_end_of_life_message"><![CDATA[A partire dal <b>1 febbraio 2026</b>, i dispositivi con una versione di <b>Android inferiore alla 8.0 non saranno più supportati</b>. Per continuare a utilizzare l’app in modo sicuro e con tutte le funzionalità, ti consigliamo di aggiornare il tuo sistema operativo o utilizzare un dispositivo compatibile.]]></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index c817c91c..96508226 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -27,5 +27,7 @@
         <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
+        <item name="colorDisabledSurface">@android:color/white</item>
+        <item name="colorLetturaFacilitataSurface">@color/letturaFacilitataBGDark</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
index 318884eb..6a6cd4f5 100644
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.xml
@@ -26,4 +26,18 @@
 		<attr name="confirmTitle" format="string" />
 		<attr name="confirmMessage" format="string" />
 	</declare-styleable>
+
+
+    <attr name="colorSuccess" format="color" />
+    <attr name="colorSuccessContainer" format="color" />
+    <attr name="colorOnSuccess" format="color" />
+    <attr name="colorOnSuccessContainer" format="color" />
+
+    <attr name="colorWarning" format="color" />
+    <attr name="colorWarningContainer" format="color" />
+    <attr name="colorOnWarning" format="color" />
+    <attr name="colorOnWarningContainer" format="color" />
+
+    <attr name="colorDisabledSurface" format="color" />
+    <attr name="colorLetturaFacilitataSurface" format="color" />
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index c8ff0996..82bc2659 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,14 +1,14 @@
 
 <resources>
     <color name="seed">#4c4dcf</color>
-    <color name="md_theme_light_primary">@color/colorPrimary</color>
+    <color name="md_theme_light_primary">#1A73E8</color>
     <color name="md_theme_light_onPrimary">#FFFFFF</color>
     <color name="md_theme_light_primaryContainer">#E1DFFF</color>
     <color name="md_theme_light_onPrimaryContainer">#08006C</color>
     <color name="md_theme_light_secondary">#0059C5</color>
     <color name="md_theme_light_onSecondary">#FFFFFF</color>
-    <color name="md_theme_light_secondaryContainer">#D8E2FF</color>
-    <color name="md_theme_light_onSecondaryContainer">#001A43</color>
+    <color name="md_theme_light_secondaryContainer">#FFE0C2</color>
+    <color name="md_theme_light_onSecondaryContainer">#4C2700</color>
     <color name="md_theme_light_tertiary">#795369</color>
     <color name="md_theme_light_onTertiary">#FFFFFF</color>
     <color name="md_theme_light_tertiaryContainer">#FFD8EC</color>
@@ -17,6 +17,14 @@
     <color name="md_theme_light_errorContainer">#FFDAD6</color>
     <color name="md_theme_light_onError">#FFFFFF</color>
     <color name="md_theme_light_onErrorContainer">#410002</color>
+    <color name="md_theme_light_success">#006E1C</color>
+    <color name="md_theme_light_successContainer">#D1FADF</color>
+    <color name="md_theme_light_onSuccess">#FFFFFF</color>
+    <color name="md_theme_light_onSuccessContainer">#00210A</color>
+    <color name="md_theme_light_warning">#FFB300</color> <!-- Amber 700 -->
+    <color name="md_theme_light_warningContainer">#FFF8E1</color> <!-- Amber 50 -->
+    <color name="md_theme_light_onWarning">#212121</color> <!-- Grey 900 -->
+    <color name="md_theme_light_onWarningContainer">#664400</color> <!-- Deep amber -->
     <color name="md_theme_light_background">#F6FEFF</color>
     <color name="md_theme_light_onBackground">#001F24</color>
     <color name="md_theme_light_surface">#F6FEFF</color>
@@ -30,7 +38,7 @@
     <color name="md_theme_light_shadow">#000000</color>
     <color name="md_theme_light_surfaceTint">#4C4DCF</color>
     <color name="md_theme_light_surfaceTintColor">#4C4DCF</color>
-    <color name="md_theme_dark_primary">#C1C1FF</color>
+    <color name="md_theme_dark_primary">#1A73E8</color>
     <color name="md_theme_dark_onPrimary">#160AA2</color>
     <color name="md_theme_dark_primaryContainer">#3231B6</color>
     <color name="md_theme_dark_onPrimaryContainer">#E1DFFF</color>
@@ -46,6 +54,14 @@
     <color name="md_theme_dark_errorContainer">#93000A</color>
     <color name="md_theme_dark_onError">#690005</color>
     <color name="md_theme_dark_onErrorContainer">#FFDAD6</color>
+    <color name="md_theme_dark_success">#5FF59C</color>
+    <color name="md_theme_dark_successContainer">#00531A</color>
+    <color name="md_theme_dark_onSuccess">#003915</color>
+    <color name="md_theme_dark_onSuccessContainer">#85FFB8</color>
+    <color name="md_theme_dark_warning">#FFD54F</color> <!-- Amber 300, più visibile su sfondo scuro -->
+    <color name="md_theme_dark_warningContainer">#534300</color> <!-- Amber 900 -->
+    <color name="md_theme_dark_onWarning">#332200</color> <!-- Molto scuro per testo su warning -->
+    <color name="md_theme_dark_onWarningContainer">#FFF8E1</color> <!-- Amber 50 -->
     <color name="md_theme_dark_background">#001F24</color>
     <color name="md_theme_dark_onBackground">#97F0FF</color>
     <color name="md_theme_dark_surface">#001F24</color>
diff --git a/app/src/main/res/values/custom_colors.xml b/app/src/main/res/values/custom_colors.xml
index 72dab875..c940865c 100644
--- a/app/src/main/res/values/custom_colors.xml
+++ b/app/src/main/res/values/custom_colors.xml
@@ -13,7 +13,8 @@
 
     <color name="mainGreen">@color/green_500</color>
     <color name="mainOrange">@color/orange_700</color>
-    <color name="letturaFacilitataBG">#eeeeee</color>
+    <color name="letturaFacilitataBGLight">#eeeeee</color>
+    <color name="letturaFacilitataBGDark">#111111</color>
 
     <!-- FAB DEFINITIONS -->
     <color name="black_semi_transparent">#B2000000</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 75144049..5218b93c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,6 +85,7 @@
     <string name="ops">Ops</string>
     <string name="warning">Warning</string>
     <string name="ok">OK</string>
+    <string name="i_understand_action">Got it</string>
     <string name="abort">Abort</string>
     <string name="reset">Reset</string>
     <string name="dispatched_abbr">Dspch</string>
@@ -505,4 +506,6 @@
 
     <string name="switch_depo_title">Change deposit</string>
     <string name="switch_depo_description">Change the main deposit you are working on among those available to you</string>
+
+    <string name="device_end_of_life_message"><![CDATA[Starting from <b>February 1, 2026</b>, devices running <b>Android versions earlier than 8.0 will no longer be supported</b>.<br />To continue using the app securely and with full functionality, please update your operating system or switch to a compatible device.]]></string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e0c1d050..2260fae6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -18,14 +18,6 @@
         <item name="android:textColor">@drawable/material_text_color</item>
         <item name="android:textSize">12sp</item>
     </style>
-    <style name="AppTheme.NewMaterial.Text.Small" parent = "AppTheme.NewMaterial.Text">
-        <item name="android:textColor">@drawable/material_text_color</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-    <style name="AppTheme.NewMaterial.Text.Medium" parent = "AppTheme.NewMaterial.Text">
-        <item name="android:textColor">@drawable/material_text_color</item>
-        <item name="android:textSize">16sp</item>
-    </style>
     <style name="AppTheme.NewMaterial.Text.Large" parent = "AppTheme.NewMaterial.Text">
         <item name="android:textColor">@drawable/material_text_color</item>
         <item name="android:textSize">18sp</item>
@@ -42,18 +34,6 @@
         <item name="android:textStyle">normal</item>
     </style>
 
-    <style name="AppTheme.NewMaterial.Text.ToolbarTitle" parent="AppTheme.NewMaterial.Text">
-        <item name="android:textSize">20sp</item>
-        <!--<item name="android:textColor">#5F6368</item>-->
-        <item name="android:textColor">@android:color/black</item>
-    </style>
-
-    <style name="AppTheme.NewMaterial.Text.ToolbarTitle.DarkActionBar" parent="AppTheme.NewMaterial.Text">
-        <item name="android:textSize">20sp</item>
-        <!--<item name="android:textColor">#5F6368</item>-->
-        <item name="android:textColor">@android:color/white</item>
-    </style>
-
     <style name="AppTheme.NewMaterial.Text.ListDivider" parent="AppTheme.NewMaterial.Text">
         <item name="android:textSize">16sp</item>
         <item name="android:textColor">#5F6368</item>
@@ -110,14 +90,6 @@
 
 
 
-    <style name="OrangeFloatingLabel" parent="@android:style/TextAppearance">
-        <item name="colorAccent">@color/orange_600</item>
-        <item name="android:textColor">@color/orange_600</item>
-        <item name="android:textSize">12sp</item>
-        <item name="colorControlNormal">@color/orange_600</item>
-        <item name="colorControlActivated">@color/orange_600</item>
-        <item name="colorControlHighlight">@color/orange_600</item>
-    </style>
     <style name="ErrorFloatingLabel" parent="@android:style/TextAppearance">
         <item name="android:textColor">@color/red_500</item>
         <item name="android:textSize">12sp</item>
@@ -133,54 +105,14 @@
         <item name="colorControlHighlight">@color/colorPrimary</item>
     </style>
 
-    <!--<style name="AppTheme.AppCompat.Dark.NoActionBar" parent="Theme.AppCompat.Light.DarkActionBar">-->
-        <!--<item name="colorPrimary">@color/colorPrimary</item>-->
-        <!--<item name="colorPrimaryDark">@color/colorPrimaryDark</item>-->
-        <!--<item name="colorAccent">@color/colorAccent</item>-->
-
-        <!--<item name="windowActionBar">false</item>-->
-        <!--<item name="windowNoTitle">true</item>-->
-    <!--</style>-->
-
     <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark" />
 
-    <style name="white_button">
-        <item name="colorButtonNormal">@android:color/white</item>
-    </style>
-
-    <style name="transparent_button">
-        <item name="colorButtonNormal">@android:color/transparent</item>
-    </style>
-
-
-<!--    <style name="MaterialToolbar.Base" parent="">-->
-<!--        <item name="popupTheme">@style/AppTheme.PopupOverlay</item>-->
-<!--        <item name="theme">@style/Theme.Material3.Light</item>-->
-<!--    </style>-->
-
-<!--    <style name="MaterialToolbar" parent="MaterialToolbar.Base"/>-->
-
-<!--    <style name="MaterialToolbar.Event" parent="MaterialToolbar">-->
-<!--        <item name="titleTextAppearance">@style/AppTheme.NewMaterial.Text.ToolbarTitle</item>-->
-<!--    </style>-->
 
     <style name="CustomBottomSheetDialog" parent="@style/ThemeOverlay.Material3.BottomSheetDialog">
         <item name="bottomSheetStyle">@style/Widget.Material3.BottomSheet</item>
     </style>
 
-<!--    <style name="CustomBottomSheet" parent="Widget.Material3.BottomSheet">-->
-<!--        <item name="shapeAppearanceOverlay">@style/CustomShapeAppearanceBottomSheetDialog</item>-->
-<!--    </style>-->
-
-<!--    <style name="CustomShapeAppearanceBottomSheetDialog" parent="">-->
-<!--        <item name="cornerFamily">rounded</item>-->
-<!--        <item name="cornerSizeTopRight">16dp</item>-->
-<!--        <item name="cornerSizeTopLeft">16dp</item>-->
-<!--        <item name="cornerSizeBottomRight">0dp</item>-->
-<!--        <item name="cornerSizeBottomLeft">0dp</item>-->
-<!--    </style>-->
-
 
 </resources>
diff --git a/app/src/main/res/values/text_input_layout_style.xml b/app/src/main/res/values/text_input_layout_style.xml
index 6d8d6123..b41ae782 100644
--- a/app/src/main/res/values/text_input_layout_style.xml
+++ b/app/src/main/res/values/text_input_layout_style.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="TextInputLayout.NoLine" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+    <style name="TextInputLayout.NoLine" parent="Widget.Material3.TextInputLayout.OutlinedBox">
         <item name="fontFamily">@font/product_sans_regular</item> <!-- target android sdk versions < 26 and > 14 if theme other than AppCompat -->
         <item name="android:textColorHint">@color/colorPrimary</item>
         <item name="boxStrokeColor">@android:color/transparent</item>
     </style>
 
-    <style name="TextInputLayout.OutlinePrimary" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+    <style name="TextInputLayout.OutlinePrimary" parent="Widget.Material3.TextInputLayout.OutlinedBox">
         <item name="fontFamily">@font/product_sans_regular</item> <!-- target android sdk versions < 26 and > 14 if theme other than AppCompat -->
         <item name="android:textColorHint">@color/colorPrimary</item>
         <item name="boxStrokeColor">@color/colorPrimary</item>
     </style>
 
-    <style name="TextInputEditText.OutlinePrimary" parent="ThemeOverlay.MaterialComponents.TextInputEditText.OutlinedBox.Dense">
+    <style name="TextInputEditText.OutlinePrimary" parent="ThemeOverlay.Material3.TextInputEditText.OutlinedBox.Dense">
         <item name="fontFamily">@font/product_sans_regular</item> <!-- target android sdk versions < 26 and > 14 if theme other than AppCompat -->
-        <item name="android:textColor">@android:color/black</item>
     </style>
 
-    <style name="TextInputLayout.OutlineDefault" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+    <style name="TextInputLayout.OutlineDefault" parent="Widget.Material3.TextInputLayout.OutlinedBox">
         <item name="fontFamily">@font/product_sans_regular</item> <!-- target android sdk versions < 26 and > 14 if theme other than AppCompat -->
         <item name="android:textColorHint">@color/half_black</item>
         <item name="boxStrokeColor">@color/colorPrimary</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index eaa0adc1..e98060f6 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -27,6 +27,8 @@
         <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
+        <item name="colorDisabledSurface">@android:color/black</item>
+        <item name="colorLetturaFacilitataSurface">@color/letturaFacilitataBGLight</item>
 
 
         <item name="android:fontFamily">@font/google_sans_regular</item>