diff --git a/app/build.gradle b/app/build.gradle
index f2ccdbd3..448c1a30 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 191
-    def appVersionName = '1.16.9'
+    def appVersionCode = 192
+    def appVersionName = '1.16.10'
 
     signingConfigs {
         release {
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
index 84cdd772..5570812b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
@@ -277,6 +277,11 @@ public class MainActivity extends BaseActivity
                 mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.VISIBLE);
                 return false;
             });
+
+            ((ISearcableFragment) fragment).addOnPreDestroy(() -> {
+                mBinding.appBarMain.mainSearch.setIconified(true);
+                mBinding.appBarMain.mainSearch.setVisibility(View.GONE);
+            });
         } else {
             mBinding.appBarMain.mainSearch.setOnQueryTextListener(null);
             mBinding.appBarMain.mainSearch.setVisibility(View.GONE);
@@ -289,7 +294,7 @@ public class MainActivity extends BaseActivity
             mBinding.appBarMain.toolbarTitleCenteredLayout.setVisibility(View.GONE);
             mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.VISIBLE);
             ((ITitledFragment) fragment).onCreateActionBar(mBinding.appBarMain.toolbarTitleLeft, this);
-            ((IScrollableFragment) fragment).addOnPreDestroy(() -> {
+            ((ITitledFragment) fragment).addOnPreDestroy(() -> {
                 mBinding.appBarMain.toolbarTitleCenteredLayout.setVisibility(View.VISIBLE);
                 mBinding.appBarMain.toolbarTitleLeft.setVisibility(View.GONE);
             });
@@ -313,7 +318,7 @@ public class MainActivity extends BaseActivity
                     ((ISelectAllFragment)fragment).onSelectAll();
                 }
             });
-            ((ISelectAllFragment) fragment).setSelectAllOnPreDestroy(() -> {
+            ((ISelectAllFragment) fragment).addOnPreDestroy(() -> {
                 mBinding.appBarMain.mainSelectAll.setVisibility(View.GONE);
                 mBinding.appBarMain.mainSelectAll.setOnClickListener(null);
             });
@@ -327,6 +332,11 @@ public class MainActivity extends BaseActivity
                     ((IFilterableFragment)fragment).onFilterClick();
                 }
             });
+
+            ((IFilterableFragment)fragment).addOnPreDestroy(() -> {
+                mBinding.appBarMain.mainFilter.setVisibility(View.GONE);
+                mBinding.appBarMain.mainFilter.setOnClickListener(null);
+            });
         } else {
             mBinding.appBarMain.mainFilter.setVisibility(View.GONE);
             mBinding.appBarMain.mainFilter.setOnClickListener(null);
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IFilterableFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IFilterableFragment.java
index 499017bd..45bd211a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IFilterableFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IFilterableFragment.java
@@ -1,6 +1,6 @@
 package it.integry.integrywmsnative.core.interfaces;
 
-public interface IFilterableFragment {
+public interface IFilterableFragment extends IDestroyableFragment {
 
     void onFilterClick();
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISearcableFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISearcableFragment.java
index 80db5057..1e6bd842 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISearcableFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISearcableFragment.java
@@ -2,7 +2,7 @@ package it.integry.integrywmsnative.core.interfaces;
 
 import androidx.appcompat.widget.SearchView;
 
-public interface ISearcableFragment extends SearchView.OnQueryTextListener {
+public interface ISearcableFragment extends SearchView.OnQueryTextListener, IDestroyableFragment {
 
     void onSearchEnabled();
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISelectAllFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISelectAllFragment.java
index 2e70f4b8..c31e0311 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISelectAllFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ISelectAllFragment.java
@@ -1,11 +1,9 @@
 package it.integry.integrywmsnative.core.interfaces;
 
-public interface ISelectAllFragment {
+public interface ISelectAllFragment extends IDestroyableFragment {
 
     boolean isSelectAllButtonEnabled();
 
     void onSelectAll();
 
-    void setSelectAllOnPreDestroy(Runnable onPreDestroy);
-
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
index 16b6fc43..714bb9c4 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java
@@ -359,11 +359,6 @@ public class OrdiniUscitaElencoFragment extends Fragment implements ITitledFragm
                 .forEach(x -> x.getSelectedObservable().set(!allSelected));
     }
 
-    @Override
-    public void setSelectAllOnPreDestroy(Runnable onPreDestroy) {
-        this.mOnPreDestroyList.add(onPreDestroy);
-    }
-
 
     private DialogVenditaFiltroAvanzatoViewModel mAppliedFilterViewModel;