diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 47aa599c..8361116e 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/build.gradle b/app/build.gradle
index 945ef389..ba345f1e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 39
-    def appVersionName = '1.0.36'
+    def appVersionCode = 40
+    def appVersionName = '1.0.37'
 
     signingConfigs {
         release {
@@ -83,7 +83,7 @@ android {
         abortOnError false
     }
 
-    dynamicFeatures = [":dynamic__base"]
+    dynamicFeatures = [":dynamic_vgalimenti"]
 
 
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
index 0cf64998..077425f2 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
@@ -121,7 +121,7 @@ public class MainActivity extends AppCompatActivity
     @Override
     public boolean onNavigationItemSelected(MenuItem item) {
 
-        mBinding.appBarMain.waterfallToolbar.resetAll();
+//        mBinding.appBarMain.waterfallToolbar.resetAll();
 
         // Handle navigation view item clicks here.
         Fragment fragment = null;
@@ -205,7 +205,8 @@ public class MainActivity extends AppCompatActivity
         }
 
         if(fragment instanceof IScrollableFragment) {
-            ((IScrollableFragment) fragment).setWaterfallToolbar(mBinding.appBarMain.waterfallToolbar);
+            ((IScrollableFragment) fragment).setScrollToolbar(mBinding.appBarMain.elevatedToolbar);
+            // ((IScrollableFragment) fragment).setWaterfallToolbar(mBinding.appBarMain.waterfallToolbar);
         }
 
         if(fragment instanceof ISelectAllFragment && ((ISelectAllFragment)fragment).isEnabled()) {
@@ -235,6 +236,7 @@ public class MainActivity extends AppCompatActivity
             if(addToBackStack) ft.addToBackStack(fragment.getTag());
 
             ft.commit();
+            fragmentManager.executePendingTransactions();
 
         }
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IScrollableFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IScrollableFragment.java
index 9bf27421..7fde4694 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IScrollableFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IScrollableFragment.java
@@ -1,9 +1,9 @@
 package it.integry.integrywmsnative.core.interfaces;
 
-import it.integry.plugins.waterfalltoolbar.WaterfallToolbar;
+import it.integry.integrywmsnative.ui.ElevatedToolbar;
 
 public interface IScrollableFragment {
 
-    void setWaterfallToolbar(WaterfallToolbar waterfallToolbar);
+    void setScrollToolbar(ElevatedToolbar toolbar);
 
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java
index 43419a88..1c527bc4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java
@@ -6,6 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 
 import androidx.appcompat.widget.AppCompatTextView;
+import androidx.appcompat.widget.Toolbar;
 import androidx.databinding.DataBindingUtil;
 import android.os.Bundle;
 import androidx.fragment.app.Fragment;
@@ -45,12 +46,12 @@ import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneDTO;
 import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneGroupedInevasoDTO;
 import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO;
 import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.AccettazioneOrdineInevasoActivity;
+import it.integry.integrywmsnative.ui.ElevatedToolbar;
 import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper;
-import it.integry.plugins.waterfalltoolbar.WaterfallToolbar;
 
 public class MainAccettazioneFragment extends Fragment implements ISearcableFragment, ITitledFragment, IScrollableFragment {
 
-    private static WaterfallToolbar mWaterfallToolbar;
+    private ElevatedToolbar mToolbar;
 
     private FragmentMainAccettazioneBinding mBinding;
 
@@ -108,7 +109,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
 
         ButterKnife.bind(this, mBinding.getRoot());
 
-        if(mWaterfallToolbar != null) mWaterfallToolbar.setRecyclerView(mBinding.accettazioneMainList);
+        mToolbar.setRecyclerView(mBinding.accettazioneMainList);
 
         return mBinding.getRoot();
     }
@@ -347,9 +348,8 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag
         return true;
 
     }
-
     @Override
-    public void setWaterfallToolbar(WaterfallToolbar waterfallToolbar) {
-        mWaterfallToolbar = waterfallToolbar;
+    public void setScrollToolbar(ElevatedToolbar toolbar) {
+        mToolbar = toolbar;
     }
 }
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 7a61c7d3..2353a371 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
@@ -39,9 +39,8 @@ import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityString;
-import it.integry.integrywmsnative.core.wifi.WiFiCheckerViewHolder;
 import it.integry.integrywmsnative.databinding.FragmentMainBinding;
-import it.integry.plugins.waterfalltoolbar.WaterfallToolbar;
+import it.integry.integrywmsnative.ui.ElevatedToolbar;
 
 /**
  * A simple {@link Fragment} subclass.
@@ -52,7 +51,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
     private FragmentMainBinding mBindings;
 
-    private WaterfallToolbar mWaterfallToolbar;
+    private ElevatedToolbar mToolbar;
 
     public MainFragment() {
     }
@@ -78,7 +77,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
         ButterKnife.bind(this, mBindings.getRoot());
 
-        if(mWaterfallToolbar != null) mWaterfallToolbar.setNestedScrollView(mBindings.fragmentMainScrollview);
+        mToolbar.setNestedScrollView(mBindings.fragmentMainScrollview);
 
         init();
         return mBindings.getRoot();
@@ -206,7 +205,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
     }
 
     @Override
-    public void setWaterfallToolbar(WaterfallToolbar waterfallToolbar) {
-        mWaterfallToolbar = waterfallToolbar;
+    public void setScrollToolbar(ElevatedToolbar toolbar) {
+        mToolbar = toolbar;
     }
 }
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 0a080c34..8f3fb264 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
@@ -11,25 +11,15 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import androidx.preference.PreferenceFragmentCompat;
 import butterknife.ButterKnife;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.databinding.FragmentMainSettingsBinding;
 import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 
-public class MainSettingsFragment extends Fragment implements ITitledFragment {
+public class MainSettingsFragment extends PreferenceFragmentCompat implements ITitledFragment {
 
-    private FragmentMainSettingsBinding mBinding;
 
-    public MainSettingsFragment() {
-        // Required empty public constructor
-    }
-
-    public static MainSettingsFragment newInstance() {
-        MainSettingsFragment fragment = new MainSettingsFragment();
-        Bundle args = new Bundle();
-        fragment.setArguments(args);
-        return fragment;
-    }
 
     @Override
     public void onCreateActionBar(AppCompatTextView titleText, Context context) {
@@ -37,20 +27,8 @@ public class MainSettingsFragment extends Fragment implements ITitledFragment {
     }
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-                             Bundle savedInstanceState) {
-
-        mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_main_settings, container, false);
-
-        ButterKnife.bind(this, mBinding.getRoot());
-
-        return mBinding.getRoot();
-
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        setPreferencesFromResource(R.xml.app_preferences, rootKey);
     }
 
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
index 35186e42..c271c3bf 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java
@@ -50,12 +50,12 @@ import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
 import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO;
 import it.integry.integrywmsnative.gest.vendita.viewmodel.VenditaViewModel;
 import it.integry.integrywmsnative.gest.vendita_ordine_inevaso.VenditaOrdineInevasoActivity;
+import it.integry.integrywmsnative.ui.ElevatedToolbar;
 import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper;
-import it.integry.plugins.waterfalltoolbar.WaterfallToolbar;
 
 public class MainVenditaFragment extends Fragment implements ITitledFragment, IScrollableFragment, ISelectAllFragment, IFilterableFragment {
 
-    private WaterfallToolbar mWaterfallToolbar;
+    private ElevatedToolbar mToolbar;
 
     private VenditaHelper mHelper;
     private FragmentMainVenditaBinding mBinding = null;
@@ -118,7 +118,8 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IS
 
         ButterKnife.bind(this, mBinding.getRoot());
 
-        if(mWaterfallToolbar != null) mWaterfallToolbar.setRecyclerView(mBinding.venditaMainList);
+//        if(mWaterfallToolbar != null) mWaterfallToolbar.setRecyclerView(mBinding.venditaMainList);
+        mToolbar.setRecyclerView(mBinding.venditaMainList);
 
         return mBinding.getRoot();
     }
@@ -269,7 +270,7 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IS
         mAdapter.updateItems(groupedOrdiniInevasi);
     }
 
-    RunnableArgs<OrdineVenditaGroupedInevasoDTO.Ordine> onSingleSelectionChanged = dto -> {
+    private RunnableArgs<OrdineVenditaGroupedInevasoDTO.Ordine> onSingleSelectionChanged = dto -> {
         List<OrdineVenditaGroupedInevasoDTO> selectedOrders = mHelper.getSelectedOrders(groupedOrdiniInevasi);
 
         if(!SettingsManager.iDB().isFlagMultiClienteOrdV()){
@@ -379,11 +380,9 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IS
         });
     }
 
-
-
     @Override
-    public void setWaterfallToolbar(WaterfallToolbar waterfallToolbar) {
-        mWaterfallToolbar = waterfallToolbar;
+    public void setScrollToolbar(ElevatedToolbar toolbar) {
+        mToolbar = toolbar;
     }
 
     @Override
diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/ElevatedToolbar.java b/app/src/main/java/it/integry/integrywmsnative/ui/ElevatedToolbar.java
new file mode 100644
index 00000000..51f3494c
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/ui/ElevatedToolbar.java
@@ -0,0 +1,69 @@
+package it.integry.integrywmsnative.ui;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.widget.ScrollView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.ViewCompat;
+import androidx.core.widget.NestedScrollView;
+import androidx.recyclerview.widget.RecyclerView;
+
+public class ElevatedToolbar extends Toolbar {
+
+    public ElevatedToolbar(Context context) {
+        super(context);
+    }
+
+    public ElevatedToolbar(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public ElevatedToolbar(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public void setRecyclerView(RecyclerView recyclerView) {
+
+        final ElevatedToolbar currentInstance = this;
+
+        if(recyclerView != null) {
+
+            recyclerView.setOnScrollListener(new RecyclerView.OnScrollListener() {
+                @Override
+                public void onScrolled(@NonNull RecyclerView recyclerView, int dx, int dy) {
+                    super.onScrolled(recyclerView, dx, dy);
+
+                    if(!recyclerView.canScrollVertically(-1)) {
+//                        currentInstance.setElevation(0f);
+                        ViewCompat.setElevation(currentInstance, 0f);
+                    } else {
+//                        currentInstance.setElevation(50f);
+                        ViewCompat.setElevation(currentInstance, 50f);
+                    }
+                }
+            });
+
+        } else {
+            Log.e("ElevatedToolbar", "RecyclerView is NULL");
+        }
+
+    }
+
+
+
+    public void setScrollView(ScrollView scrollView) {
+
+    }
+
+
+    public void setNestedScrollView(NestedScrollView nestedScrollView) {
+
+    }
+
+
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
index 2a46c6d0..7de9ea3f 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java
@@ -634,6 +634,10 @@ public class DialogInputQuantity {
 
         } else {
 
+            if(quantityDTO.batchLot != null && !quantityDTO.batchLot.isEmpty()) {
+                quantityDTO.batchLot.set(quantityDTO.batchLot.get().toUpperCase());
+            }
+
             dialogCallback.onResult(quantityDTO);
             currentAlert.dismiss();
 
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index f358133f..522ff40a 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -8,11 +8,16 @@
         android:orientation="vertical"
         tools:context="it.integry.integrywmsnative.MainActivity">
 
-        <it.integry.plugins.waterfalltoolbar.WaterfallToolbar
-            android:id="@+id/waterfall_toolbar"
+        <it.integry.integrywmsnative.ui.ElevatedToolbar
+            android:id="@+id/elevated_toolbar"
             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"
@@ -91,7 +96,9 @@
 
             </androidx.appcompat.widget.Toolbar>
 
-        </it.integry.plugins.waterfalltoolbar.WaterfallToolbar>
+        <!--</it.integry.plugins.waterfalltoolbar.WaterfallToolbar>-->
+
+        </it.integry.integrywmsnative.ui.ElevatedToolbar>
 
         <include layout="@layout/content_main" />
 
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 4b54e6c3..19361543 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -184,4 +184,9 @@
     <string name="recovering_data">Recupero dati</string>
     <string name="wait_a_moment">Attendi qualche istante</string>
 
+
+
+    <string name="check_in_printer">Stampante Accettazione</string>
+    <string name="check_out_printer">Stampante Vendita</string>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 22962968..612ad49d 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -14,4 +14,9 @@
         <item>@color/green_500</item> <!-- Accettazione -->
     </array>
 
+    <array name="printerTypes">
+        <item>Primary</item>
+        <item>Secondary</item>
+    </array>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fd6dccd0..aa7803ff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -188,4 +188,9 @@
     <string name="title_dynamic_vgalimenti">VGAlimenti customization</string>
     <string name="title_dynamic__base">Base customization</string>
 
+
+
+    <string name="check_in_printer">Check In printer</string>
+    <string name="check_out_printer">Check Out printer</string>
+
 </resources>
diff --git a/app/src/main/res/xml/app_preferences.xml b/app/src/main/res/xml/app_preferences.xml
index fcf353ac..9444647f 100644
--- a/app/src/main/res/xml/app_preferences.xml
+++ b/app/src/main/res/xml/app_preferences.xml
@@ -1,27 +1,30 @@
 <androidx.preference.PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <androidx.preference.PreferenceCategory
-        android:title="@string/general_settings">
+    <SwitchPreferenceCompat
+        app:key="notifications"
+        app:title="Enable message notifications"/>
 
-        <android.support.v7.preference.SwitchPreferenceCompat
-            android:key="key1"
-            android:title="Switch Preference"
-            android:summary="Switch Summary"
-            android:defaultValue="true" />
+    <Preference
+        app:key="feedback"
+        app:title="Send feedback"
+        app:summary="Report technical issues or suggest new features"/>
 
-        <android.support.v7.preference.EditTextPreference
-            android:key="key2"
-            android:title="EditText Preference"
-            android:summary="EditText Summary"
-            android:dialogMessage="Dialog Message"
-            android:defaultValue="Default value" />
 
-        <android.support.v7.preference.CheckBoxPreference
-            android:key="key3"
-            android:title="CheckBox Preference"
-            android:summary="CheckBox Summary"
-            android:defaultValue="true"/>
-    </androidx.preference.PreferenceCategory>
+    <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" />
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt b/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt
index 28cae7d8..95511285 100644
--- a/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt
+++ b/waterfall_toolbar/src/main/java/it/integry/plugins/waterfalltoolbar/WaterfallToolbar.kt
@@ -310,6 +310,7 @@ open class WaterfallToolbar : androidx.cardview.widget.CardView {
             post {
                 // it's safe to use "!!" here, since savedState will
                 // always store values properly set in onSaveInstanceState()
+
                 cardElevation = state.elevation!!.toFloat()
                 orthodoxPosition = state.orthodoxPosition!!
                 realPosition = state.realPosition!!