diff --git a/addons/lunch/models/lunch_order.py b/addons/lunch/models/lunch_order.py
index 7d39c25b151..121ddb110c0 100644
--- a/addons/lunch/models/lunch_order.py
+++ b/addons/lunch/models/lunch_order.py
@@ -48,13 +48,19 @@ class LunchOrder(models.Model):
     topping_quantity_1 = fields.Selection(related='product_id.category_id.topping_quantity_1')
     topping_quantity_2 = fields.Selection(related='product_id.category_id.topping_quantity_2')
     topping_quantity_3 = fields.Selection(related='product_id.category_id.topping_quantity_3')
-    image_1920 = fields.Image(related='product_id.image_1920')
-    image_128 = fields.Image(related='product_id.image_128')
+    image_1920 = fields.Image(compute='_compute_product_images')
+    image_128 = fields.Image(compute='_compute_product_images')
 
     available_toppings_1 = fields.Boolean(help='Are extras available for this product', compute='_compute_available_toppings')
     available_toppings_2 = fields.Boolean(help='Are extras available for this product', compute='_compute_available_toppings')
     available_toppings_3 = fields.Boolean(help='Are extras available for this product', compute='_compute_available_toppings')
 
+    @api.depends('product_id')
+    def _compute_product_images(self):
+        for line in self:
+            line.image_1920 = line.product_id.image_1920 or line.category_id.image_1920
+            line.image_128 = line.product_id.image_128 or line.category_id.image_128
+
     @api.depends('category_id')
     def _compute_available_toppings(self):
         for line in self:
@@ -191,6 +197,8 @@ class LunchOrder(models.Model):
                 raise ValidationError(_('Your wallet does not contain enough money to order that. To add some money to your wallet, please contact your lunch manager.'))
 
     def action_order(self):
+        if self.filtered(lambda line: not line.product_id.active):
+            raise ValidationError(_('Product is no longer available.'))
         self.write({'state': 'ordered'})
         self._check_wallet()
 
diff --git a/addons/lunch/models/lunch_product.py b/addons/lunch/models/lunch_product.py
index 7c7419101b3..5f06283062c 100644
--- a/addons/lunch/models/lunch_product.py
+++ b/addons/lunch/models/lunch_product.py
@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+import base64
 
-from odoo import api, fields, models
-
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError
+from odoo.modules.module import get_module_resource
 from odoo.tools import formatLang
 
 
@@ -12,8 +14,13 @@ class LunchProductCategory(models.Model):
     _inherit = 'image.mixin'
     _description = 'Lunch Product Category'
 
+    @api.model
+    def _default_image(self):
+        image_path = get_module_resource('lunch', 'static/img', 'lunch.png')
+        return base64.b64encode(open(image_path, 'rb').read())
+
     name = fields.Char('Product Category', required=True, translate=True)
-    company_id = fields.Many2one('res.company', default=lambda self: self.env.company)
+    company_id = fields.Many2one('res.company')
     currency_id = fields.Many2one('res.currency', related='company_id.currency_id')
     topping_label_1 = fields.Char('Extra 1 Label', required=True, default='Extras')
     topping_label_2 = fields.Char('Extra 2 Label', required=True, default='Beverages')
@@ -34,6 +41,8 @@ class LunchProductCategory(models.Model):
         ('1_more', 'One or More'),
         ('1', 'Only One')], 'Extra 3 Quantity', default='0_more', required=True)
     product_count = fields.Integer(compute='_compute_product_count', help="The number of products related to this category")
+    active = fields.Boolean(string='Active', default=True)
+    image_1920 = fields.Image(default=_default_image)
 
     def _compute_product_count(self):
         product_data = self.env['lunch.product'].read_group([('category_id', 'in', self.ids)], ['category_id'], ['category_id'])
@@ -60,6 +69,16 @@ class LunchProductCategory(models.Model):
                 topping_values.update({'topping_category': 3})
         return super(LunchProductCategory, self).write(vals)
 
+    def toggle_active(self):
+        """ Archiving related lunch product """
+        res = super().toggle_active()
+        Product = self.env['lunch.product'].with_context(active_test=False)
+        all_products = Product.search([('category_id', 'in', self.ids)])
+        for category in self:
+            all_products.filtered(
+                lambda p: p.category_id == category and p.active != category.active
+            ).toggle_active()
+        return res
 
 class LunchTopping(models.Model):
     """"""
@@ -88,16 +107,22 @@ class LunchProduct(models.Model):
     _description = 'Lunch Product'
     _inherit = 'image.mixin'
     _order = 'name'
+    _check_company_auto = True
 
     name = fields.Char('Product Name', required=True, translate=True)
-    category_id = fields.Many2one('lunch.product.category', 'Product Category', required=True)
+    category_id = fields.Many2one('lunch.product.category', 'Product Category', check_company=True, required=True)
     description = fields.Text('Description', translate=True)
     price = fields.Float('Price', digits='Account', required=True)
-    supplier_id = fields.Many2one('lunch.supplier', 'Vendor', required=True)
+    supplier_id = fields.Many2one('lunch.supplier', 'Vendor', check_company=True, required=True)
     active = fields.Boolean(default=True)
 
-    company_id = fields.Many2one('res.company', related='supplier_id.company_id', store=True)
+    company_id = fields.Many2one('res.company', related='supplier_id.company_id', readonly=False, store=True)
     currency_id = fields.Many2one('res.currency', related='company_id.currency_id')
 
     new_until = fields.Date('New Until')
-    favorite_user_ids = fields.Many2many('res.users', 'lunch_product_favorite_user_rel', 'product_id', 'user_id')
+    favorite_user_ids = fields.Many2many('res.users', 'lunch_product_favorite_user_rel', 'product_id', 'user_id', check_company=True)
+
+    def toggle_active(self):
+        if self.filtered(lambda product: not product.active and not product.category_id.active):
+            raise UserError(_("The product category is archived. The user have to unarchive the category or change the category of the product."))
+        return super().toggle_active()
diff --git a/addons/lunch/report/lunch_product_report.py b/addons/lunch/report/lunch_product_report.py
index 44953be8930..4fd2a52f9fe 100644
--- a/addons/lunch/report/lunch_product_report.py
+++ b/addons/lunch/report/lunch_product_report.py
@@ -33,7 +33,7 @@ class LunchProductReport(models.Model):
     def _compute_image_128(self):
         for product_r in self:
             product = product_r.product_id
-            category = product_r.category_id
+            category = product_r.sudo().category_id
             if product.image_128:
                 product_r.image_128 = product.image_128
             elif category.image_128:
diff --git a/addons/lunch/security/lunch_security.xml b/addons/lunch/security/lunch_security.xml
index 4da736313e8..4bf129e1104 100644
--- a/addons/lunch/security/lunch_security.xml
+++ b/addons/lunch/security/lunch_security.xml
@@ -77,6 +77,12 @@
             <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
         </record>
 
+        <record id="ir_rule_lunch_product_category_multi_company" model="ir.rule">
+            <field name="name">Lunch product category: Multi Company</field>
+            <field name="model_id" ref="model_lunch_product_category"/>
+            <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
+        </record>
+
         <record id="ir_rule_lunch_location_multi_company" model="ir.rule">
             <field name="name">Lunch location: Multi Company</field>
             <field name="model_id" ref="model_lunch_location"/>
@@ -86,7 +92,7 @@
         <record id="ir_rule_lunch_product_report_multi_company" model="ir.rule">
             <field name="name">Lunch product report: Multi Company</field>
             <field name="model_id" ref="model_lunch_product_report"/>
-            <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
+            <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids), '|', ('category_id.company_id', '=', False), ('category_id.company_id', 'in', company_ids)]</field>
         </record>
     </data>
 </odoo>
diff --git a/addons/lunch/views/lunch_product_views.xml b/addons/lunch/views/lunch_product_views.xml
index d7aa38839e3..b84f1d6b933 100644
--- a/addons/lunch/views/lunch_product_views.xml
+++ b/addons/lunch/views/lunch_product_views.xml
@@ -85,6 +85,7 @@
                         <group>
                             <field name="new_until"/>
                             <field name='description'/>
+                            <field name="company_id" groups="base.group_multi_company"/>
                         </group>
                     </group>
                 </sheet>
@@ -125,8 +126,8 @@
                 <templates>
                     <t t-name="kanban-box">
                         <div class="oe_kanban_global_click o_kanban_record_has_image_fill o_kanban_record">
-                            <field name="image_128" class="o_lunch_image o_kanban_image_fill_left d-none d-md-block" options="{'placeholder': '/lunch/static/img/lunch.png'}" widget="image"/>
-                            <div class="oe_kanban_details">
+                            <field name="image_128" class="o_lunch_image o_kanban_image_fill_left d-none d-md-block" options="{'placeholder': '/lunch/static/img/lunch.png', 'size': [94, 94]}" widget="image"/>
+                            <div class="oe_kanban_details ml8">
                                 <div class="o_kanban_record_top">
                                     <div class="o_kanban_record_headings">
                                         <strong class="o_kanban_record_title">
@@ -247,8 +248,11 @@
                             <field name="name"/>
                         </h1>
                     </div>
+                    <label for="company_id" groups="base.group_multi_company"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                     <group>
                         <group>
+                            <field name="active" invisible="1"/>
                             <field name="topping_label_1"/>
                             <field name="topping_quantity_1"/>
                         </group>
@@ -329,6 +333,17 @@
         </field>
     </record>
 
+    <record id="lunch_product_category_view_search" model="ir.ui.view">
+        <field name="name">lunch.product.category.search</field>
+        <field name="model">lunch.product.category</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="name"/>
+                <filter string="Archived" name="inactive" domain="[('active', '=', False)]"/>
+            </search>
+        </field>
+    </record>
+
     <record id="lunch_product_action" model="ir.actions.act_window">
         <field name="name">Products</field>
         <field name="res_model">lunch.product</field>
@@ -362,6 +377,7 @@
         <field name="name">Product Categories</field>
         <field name="res_model">lunch.product.category</field>
         <field name="view_mode">tree,form,kanban</field>
+        <field name="search_view_id" ref="lunch_product_category_view_search"/>
         <field name="help" type="html">
             <p class="o_view_nocontent_smiling_face">
             Create a new product category