diff --git a/fs_product/README.rst b/fs_product/README.rst
new file mode 100644
index 00000000..441640ee
--- /dev/null
+++ b/fs_product/README.rst
@@ -0,0 +1,57 @@
+====================
+File Storage Product
+====================
+
+.. 
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! This file is generated by oca-gen-addon-readme !!
+   !! changes will be overwritten.                   !!
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+   !! source digest: sha256:52c640f52b9abc156f6a42b7f9109cafcff0ed98bc477e81c404fb10ac023b8a
+   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png
+    :target: https://odoo-community.org/page/development-status
+    :alt: Beta
+.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+.. |badge3| image:: https://img.shields.io/badge/github-Akretion%2Fak--odoo--incubator-lightgray.png?logo=github
+    :target: https://github.com/Akretion/ak-odoo-incubator/tree/16.0/fs_product
+    :alt: Akretion/ak-odoo-incubator
+
+|badge1| |badge2| |badge3|
+
+Usability additional module for File Storage module
+
+    - filters on products
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/Akretion/ak-odoo-incubator/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us to smash it by providing a detailed and welcomed
+`feedback <https://github.com/Akretion/ak-odoo-incubator/issues/new?body=module:%20fs_product%0Aversion:%2016.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* Akretion
+
+Maintainers
+~~~~~~~~~~~
+
+This module is part of the `Akretion/ak-odoo-incubator <https://github.com/Akretion/ak-odoo-incubator/tree/16.0/fs_product>`_ project on GitHub.
+
+You are welcome to contribute.
diff --git a/fs_product/__init__.py b/fs_product/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/fs_product/__manifest__.py b/fs_product/__manifest__.py
new file mode 100644
index 00000000..9ec385e8
--- /dev/null
+++ b/fs_product/__manifest__.py
@@ -0,0 +1,16 @@
+{
+    "name": "File Storage Product",
+    "version": "16.0.1.0.0",
+    "author": "Akretion",
+    "category": "Product",
+    "depends": [
+        "fs_product_multi_image",  # OCA/storage
+    ],
+    "website": "https://github.com/akretion/ak-odoo-incubator",
+    "data": [
+        "views/product_template.xml",
+    ],
+    "maintainer": ["bealdav"],
+    "license": "AGPL-3",
+    "installable": True,
+}
diff --git a/fs_product/readme/DESCRIPTION.rst b/fs_product/readme/DESCRIPTION.rst
new file mode 100644
index 00000000..74cfb4b3
--- /dev/null
+++ b/fs_product/readme/DESCRIPTION.rst
@@ -0,0 +1,3 @@
+Usability additional module for File Storage module
+
+    - filters on products
diff --git a/fs_product/views/product_template.xml b/fs_product/views/product_template.xml
new file mode 100644
index 00000000..7583ba33
--- /dev/null
+++ b/fs_product/views/product_template.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+
+    <record id="product_template_search_view" model="ir.ui.view">
+        <field name="model">product.template</field>
+        <field name="inherit_id" ref="product.product_template_search_view" />
+        <field name="arch" type="xml">
+            <filter name="favorites" position="after">
+                <filter
+                    string="With Image"
+                    name="with_image"
+                    domain="[('main_image_id', '!=', False)]"
+                />
+                <filter
+                    string="Without Image"
+                    name="without_image"
+                    domain="[('main_image_id', '=', False)]"
+                />
+            </filter>
+        </field>
+    </record>
+
+</odoo>
diff --git a/oca_dependencies.txt b/oca_dependencies.txt
index dc1481f2..dadd890b 100644
--- a/oca_dependencies.txt
+++ b/oca_dependencies.txt
@@ -2,3 +2,4 @@
 sale-workflow
 stock-logistics-workflow
 account-reconcile
+storage
diff --git a/setup/fs_product/odoo/addons/fs_product b/setup/fs_product/odoo/addons/fs_product
new file mode 120000
index 00000000..88cac4e4
--- /dev/null
+++ b/setup/fs_product/odoo/addons/fs_product
@@ -0,0 +1 @@
+../../../../fs_product
\ No newline at end of file
diff --git a/setup/fs_product/setup.py b/setup/fs_product/setup.py
new file mode 100644
index 00000000..28c57bb6
--- /dev/null
+++ b/setup/fs_product/setup.py
@@ -0,0 +1,6 @@
+import setuptools
+
+setuptools.setup(
+    setup_requires=['setuptools-odoo'],
+    odoo_addon=True,
+)