diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java
index afa0905b..e88a2ea2 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java
@@ -1,6 +1,7 @@
 package it.integry.integrywmsnative.gest.accettazione_picking;
 
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.text.SpannableString;
@@ -10,6 +11,7 @@ import android.view.MenuItem;
 import androidx.appcompat.app.AlertDialog;
 import androidx.databinding.DataBindingUtil;
 import androidx.databinding.ObservableArrayList;
+import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 
 import com.annimon.stream.Stream;
@@ -72,7 +74,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
     private BottomSheetFragmentLUContentViewModel mBottomSheetFragmentLUContentViewModel;
 
-    private ObservableArrayList<AccettazioneListModel> mAccettazioneMutableData = new ObservableArrayList<>();
+    private final ObservableArrayList<AccettazioneListModel> mAccettazioneMutableData = new ObservableArrayList<>();
 
 
     public BindableBoolean noItemsToPick = new BindableBoolean(false);
@@ -89,6 +91,8 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
     private final int PICK_UL_REQUEST = 1;
 
+    private boolean mShowSecondaryUntMis = true;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -115,11 +119,13 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
         setSupportActionBar(this.mBindings.toolbar);
 
+        SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
+        mShowSecondaryUntMis = sharedPreferences.getBoolean("picking_enable_sec_unt_mis", true);
+
         this.initVars();
         this.initBarcodeReader();
         this.initRecyclerView();
 
-
         String codMdep = SettingsManager.i().getUserSession().getDepo().getCodMdep();
 
         mViewModel.setListeners(this);
@@ -180,7 +186,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     }
 
     private void initRecyclerView() {
-        AccettazioneListAdapter accettazioneListAdapter = new AccettazioneListAdapter(this, mAccettazioneMutableData, true);
+        AccettazioneListAdapter accettazioneListAdapter = new AccettazioneListAdapter(this, mAccettazioneMutableData, mShowSecondaryUntMis);
         this.mBindings.accettazionePickingList.setAdapter(accettazioneListAdapter);
         this.mBindings.accettazionePickingList.setLayoutManager(new LinearLayoutManager(this));
 
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 2d2e612a..aded4d53 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
@@ -6,12 +6,14 @@ import android.os.Bundle;
 import androidx.appcompat.widget.AppCompatTextView;
 import androidx.preference.PreferenceFragmentCompat;
 
+import java.util.ArrayList;
+
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 
 public class MainSettingsFragment extends PreferenceFragmentCompat implements ITitledFragment {
 
-
+    private final ArrayList<Runnable> onPreDestroyList = new ArrayList<>();
 
     @Override
     public void onCreateActionBar(AppCompatTextView titleText, Context context) {
@@ -25,6 +27,16 @@ public class MainSettingsFragment extends PreferenceFragmentCompat implements IT
 
     @Override
     public void addOnPreDestroy(Runnable onPreDestroy) {
+        onPreDestroyList.add(onPreDestroy);
+    }
 
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+
+        for (Runnable onPreDestroy :
+                onPreDestroyList) {
+            onPreDestroy.run();
+        }
     }
 }
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 7dc7047e..22f2e6cc 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -66,7 +66,7 @@
     <string name="warehouse">Magazzino</string>
 
     <!-- SETTINGS -->
-    <string name="general_settings">Settaggi generali</string>
+    <string name="general_settings">Impostazioni</string>
 
     <plurals name="references">
         <item quantity="one">referenza</item>
diff --git a/app/src/main/res/xml/app_preferences.xml b/app/src/main/res/xml/app_preferences.xml
index 9444647f..4f3eef8a 100644
--- a/app/src/main/res/xml/app_preferences.xml
+++ b/app/src/main/res/xml/app_preferences.xml
@@ -1,30 +1,34 @@
 <androidx.preference.PreferenceScreen
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <PreferenceCategory
+        app:title="@string/accettazione_title_fragment"/>
+
     <SwitchPreferenceCompat
-        app:key="notifications"
-        app:title="Enable message notifications"/>
+        app:key="picking_enable_sec_unt_mis"
+        app:title="Abilita seconda unità di misura"
+        app:defaultValue="true"/>
 
-    <Preference
-        app:key="feedback"
-        app:title="Send feedback"
-        app:summary="Report technical issues or suggest new features"/>
+<!--    <Preference-->
+<!--        app:key="feedback"-->
+<!--        app:title="Send feedback"-->
+<!--        app:summary="Report technical issues or suggest new features"/>-->
 
 
-    <ListPreference
-        app:key="check_in_printer"
-        app:title="@string/check_in_printer"
-        app:summary="%s"
-        app:entries="@array/printerTypes"
-        app:entryValues="@array/printerTypes"
-        app:defaultValue="0" />
+<!--    <ListPreference-->
+<!--        app:key="check_in_printer"-->
+<!--        app:title="@string/check_in_printer"-->
+<!--        app:summary="%s"-->
+<!--        app:entries="@array/printerTypes"-->
+<!--        app:entryValues="@array/printerTypes"-->
+<!--        app:defaultValue="0" />-->
 
-    <ListPreference
-        app:key="check_out_printer"
-        app:title="@string/check_out_printer"
-        app:summary="%s"
-        app:entries="@array/printerTypes"
-        app:entryValues="@array/printerTypes"
-        app:defaultValue="0" />
+<!--    <ListPreference-->
+<!--        app:key="check_out_printer"-->
+<!--        app:title="@string/check_out_printer"-->
+<!--        app:summary="%s"-->
+<!--        app:entries="@array/printerTypes"-->
+<!--        app:entryValues="@array/printerTypes"-->
+<!--        app:defaultValue="0" />-->
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file