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 6afa0a44..e4742f39 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>
@@ -113,8 +111,7 @@
                             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"
@@ -128,7 +125,6 @@
                                 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
@@ -138,7 +134,6 @@
                                 android:layout_alignParentEnd="true"
                                 android:layout_marginStart="4dp"
                                 android:text="@string/unt_mis_col"
-                                android:textColor="@android:color/black"
                                 android:textStyle="bold" />
 
 
@@ -149,7 +144,6 @@
                                 android:layout_alignParentEnd="true"
                                 android:layout_marginStart="4dp"
                                 android:text="("
-                                android:textColor="@android:color/black"
                                 android:textStyle="bold" />
 
                             <androidx.appcompat.widget.AppCompatTextView
@@ -158,7 +152,6 @@
                                 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
@@ -168,7 +161,6 @@
                                 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
@@ -178,7 +170,6 @@
                                 android:layout_alignParentEnd="true"
                                 android:layout_marginStart="0dp"
                                 android:text=")"
-                                android:textColor="@android:color/black"
                                 android:textStyle="bold" />
 
 
@@ -912,7 +903,6 @@
                                 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}" />
 
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 c6ef1391..38955285 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>
@@ -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" />
 
 
@@ -929,7 +921,6 @@
                                 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}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
@@ -974,7 +965,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 +973,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 +991,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/fragment_prod_recupero_materiale.xml b/app/src/main/res/layout/fragment_prod_recupero_materiale.xml
index be293fda..b24ed0e7 100644
--- a/app/src/main/res/layout/fragment_prod_recupero_materiale.xml
+++ b/app/src/main/res/layout/fragment_prod_recupero_materiale.xml
@@ -30,7 +30,6 @@
                 android:id="@+id/prod_recupero_materiale_main_list"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:background="@android:color/white"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
                 tools:listitem="@layout/prod_recupero_materiale_list_item" />
 
@@ -76,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/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/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>