diff --git a/addons/website_slides/data/demo-thumbnails/5DPGnN9_uKU.jpg b/addons/website_slides/data/demo-thumbnails/5DPGnN9_uKU.jpg
new file mode 100644
index 00000000000..0d6c01c73dc
Binary files /dev/null and b/addons/website_slides/data/demo-thumbnails/5DPGnN9_uKU.jpg differ
diff --git a/addons/website_slides/data/demo-thumbnails/5PKqZpl0TcA.jpg b/addons/website_slides/data/demo-thumbnails/5PKqZpl0TcA.jpg
new file mode 100644
index 00000000000..bc7a2c6b03a
Binary files /dev/null and b/addons/website_slides/data/demo-thumbnails/5PKqZpl0TcA.jpg differ
diff --git a/addons/website_slides/data/demo-thumbnails/ILTPZUTWKhg.jpg b/addons/website_slides/data/demo-thumbnails/ILTPZUTWKhg.jpg
new file mode 100644
index 00000000000..b3b009f6ce9
Binary files /dev/null and b/addons/website_slides/data/demo-thumbnails/ILTPZUTWKhg.jpg differ
diff --git a/addons/website_slides/data/demo-thumbnails/L1Ye6ATzZXY.jpg b/addons/website_slides/data/demo-thumbnails/L1Ye6ATzZXY.jpg
new file mode 100644
index 00000000000..9f26fb0a4bd
Binary files /dev/null and b/addons/website_slides/data/demo-thumbnails/L1Ye6ATzZXY.jpg differ
diff --git a/addons/website_slides/data/demo-thumbnails/o0UM3Lg7K4Y.jpg b/addons/website_slides/data/demo-thumbnails/o0UM3Lg7K4Y.jpg
new file mode 100644
index 00000000000..5708a30e98f
Binary files /dev/null and b/addons/website_slides/data/demo-thumbnails/o0UM3Lg7K4Y.jpg differ
diff --git a/addons/website_slides/data/demo-thumbnails/pp7OCqWoRjQ.jpg b/addons/website_slides/data/demo-thumbnails/pp7OCqWoRjQ.jpg
new file mode 100644
index 00000000000..60b90129688
Binary files /dev/null and b/addons/website_slides/data/demo-thumbnails/pp7OCqWoRjQ.jpg differ
diff --git a/addons/website_slides/data/demo-thumbnails/qhSCMShJkTY.jpg b/addons/website_slides/data/demo-thumbnails/qhSCMShJkTY.jpg
new file mode 100644
index 00000000000..459d2a38ffc
Binary files /dev/null and b/addons/website_slides/data/demo-thumbnails/qhSCMShJkTY.jpg differ
diff --git a/addons/website_slides/data/demo-thumbnails/sEvZyNZCtOs.jpg b/addons/website_slides/data/demo-thumbnails/sEvZyNZCtOs.jpg
new file mode 100644
index 00000000000..0f51f626fdc
Binary files /dev/null and b/addons/website_slides/data/demo-thumbnails/sEvZyNZCtOs.jpg differ
diff --git a/addons/website_slides/data/demo-thumbnails/v2O0YZU19ms.jpg b/addons/website_slides/data/demo-thumbnails/v2O0YZU19ms.jpg
new file mode 100644
index 00000000000..4cf84bcdd0c
Binary files /dev/null and b/addons/website_slides/data/demo-thumbnails/v2O0YZU19ms.jpg differ
diff --git a/addons/website_slides/data/website_slides_demo.xml b/addons/website_slides/data/website_slides_demo.xml
index cd7e4fbd016..cb6edab0b59 100644
--- a/addons/website_slides/data/website_slides_demo.xml
+++ b/addons/website_slides/data/website_slides_demo.xml
@@ -36,74 +36,116 @@
         <record id="slide_0" model="slide.slide">
             <field name="name">Odoo Explained</field>
             <field name="url">http://www.youtube.com/watch?v=o0UM3Lg7K4Y</field>
+            <field name="document_id">o0UM3Lg7K4Y</field>
+            <field name="slide_type">video</field>
             <field name="channel_id" ref="channel_public"/>
             <field name="category_id" ref="category_1"/>
             <field name="website_published" eval="True"/>
             <field name="tag_ids" eval="[(4, ref('tag2'))]"/>
+            <field name="image" type="base64" file="website_slides/data/demo-thumbnails/o0UM3Lg7K4Y.jpg"/>
+            <field name="description">Run your business with a comprehensive suite of business apps. Do it easily with Odoo!</field>
         </record>
         <record id="slide_1" model="slide.slide">
             <field name="name">Open Source Website Builder and eCommerce: Odoo</field>
             <field name="url">https://www.youtube.com/watch?v=pp7OCqWoRjQ</field>
+            <field name="document_id">pp7OCqWoRjQ</field>
+            <field name="slide_type">video</field>
             <field name="channel_id" ref="channel_public"/>
             <field name="category_id" ref="category_1"/>
             <field name="website_published" eval="True"/>
             <field name="tag_ids" eval="[(4, ref('tag1'))]"/>
+            <field name="image" type="base64" file="website_slides/data/demo-thumbnails/pp7OCqWoRjQ.jpg"/>
+            <field name="description">Create enterprise grade website with our super easy builder. Use finely designed building blocks and edit everything inline. Benefit from out-of-the-box business features; e-Commerce, events, blogs, jobs announces, customer references, call-to-actions, etc.
+
+This is a new open source application in Python/Javascript based on Bootstrap and OpenERP.</field>
         </record>
         <record id="slide_2" model="slide.slide">
             <field name="name">Odoo Open Days 2014</field>
             <field name="url">https://www.youtube.com/watch?v=ILTPZUTWKhg&amp;list=UUkQPikELWZFLgQNHd73jkdg</field>
+            <field name="document_id">ILTPZUTWKhg</field>
+            <field name="slide_type">video</field>
             <field name="channel_id" ref="channel_public"/>
             <field name="category_id" ref="category_2"/>
             <field name="website_published" eval="True"/>
             <field name="tag_ids" eval="[(4, ref('tag3'))]"/>
+            <field name="image" type="base64" file="website_slides/data/demo-thumbnails/ILTPZUTWKhg.jpg"/>
+            <field name="description">Odoo Experience - Register now https://experience.odoo.com</field>
         </record>
         <record id="slide_3" model="slide.slide">
             <field name="name">Odoo - The Voice of the Customer: Alpinter</field>
             <field name="url">https://www.youtube.com/watch?v=5DPGnN9_uKU&amp;list=UUkQPikELWZFLgQNHd73jkdg</field>
+            <field name="document_id">5DPGnN9_uKU</field>
+            <field name="slide_type">video</field>
             <field name="channel_id" ref="channel_public"/>
             <field name="category_id" ref="category_2"/>
             <field name="website_published" eval="True"/>
             <field name="tag_ids" eval="[(4, ref('tag4'))]"/>
+            <field name="image" type="base64" file="website_slides/data/demo-thumbnails/5DPGnN9_uKU.jpg"/>
+            <field name="description">Interview with Guy Christiaens, Finance Manager at Alpinter, about their use of Odoo.
+Discover more about Odoo at www.odoo.com</field>
         </record>
         <record id="slide_4" model="slide.slide">
             <field name="name">Odoo SEO - Boost Your Website Trafic</field>
             <field name="url">https://www.youtube.com/watch?v=5PKqZpl0TcA</field>
+            <field name="document_id">5PKqZpl0TcA</field>
+            <field name="slide_type">video</field>
             <field name="channel_id" ref="channel_public"/>
             <field name="category_id" ref="category_1"/>
             <field name="website_published" eval="True"/>
             <field name="tag_ids" eval="[(4, ref('tag1'))]"/>
+            <field name="image" type="base64" file="website_slides/data/demo-thumbnails/5PKqZpl0TcA.jpg"/>
+            <field name="description">The open source OpenERP Promote tool suggests keywords according to Google most searched terms. Search Engine Optimization tools are ready to use, with no configuration required.</field>
         </record>
         <record id="slide_5" model="slide.slide">
             <field name="name">Awesome Timesheet by Odoo</field>
             <field name="url">https://www.youtube.com/watch?v=v2O0YZU19ms</field>
+            <field name="document_id">v2O0YZU19ms</field>
+            <field name="slide_type">video</field>
             <field name="channel_id" ref="channel_public"/>
             <field name="category_id" ref="category_1"/>
             <field name="website_published" eval="True"/>
             <field name="tag_ids" eval="[(4, ref('tag3'))]"/>
+            <field name="image" type="base64" file="website_slides/data/demo-thumbnails/v2O0YZU19ms.jpg"/>
+            <field name="description">Download Awesome Timesheet by Odoo and discover how easy time tracking and employee management can be!
+
+Chrome: http://bit.ly/2613LcY
+iOS: http://bit.ly/1ZUZsZD</field>
         </record>
         <record id="slide_6" model="slide.slide">
             <field name="name">Odoo Marketing - part 1: ATTRACT</field>
             <field name="url">https://www.youtube.com/watch?v=qhSCMShJkTY&amp;list=UUkQPikELWZFLgQNHd73jkdg</field>
+            <field name="document_id">qhSCMShJkTY</field>
+            <field name="slide_type">video</field>
             <field name="channel_id" ref="channel_public"/>
             <field name="category_id" ref="category_1"/>
             <field name="website_published" eval="True"/>
             <field name="tag_ids" eval="[(4, ref('tag1')), (4, ref('tag2'))]"/>
+            <field name="image" type="base64" file="website_slides/data/demo-thumbnails/qhSCMShJkTY.jpg"/>
+            <field name="description">Odoo's fully-integrated marketing app will help you to attract, convert and close new leads. Check out our three-part video and discover more at www.odoo.com</field>
         </record>
         <record id="slide_7" model="slide.slide">
             <field name="name">Odoo Marketing - part 1: ATTRACT_2</field>
             <field name="url">https://www.youtube.com/watch?v=L1Ye6ATzZXY&amp;list=UUkQPikELWZFLgQNHd73jkdg</field>
+            <field name="document_id">L1Ye6ATzZXY</field>
+            <field name="slide_type">video</field>
             <field name="channel_id" ref="channel_public"/>
             <field name="category_id" ref="category_1"/>
             <field name="website_published" eval="True"/>
             <field name="tag_ids" eval="[(4, ref('tag1')), (4, ref('tag2'))]"/>
+            <field name="image" type="base64" file="website_slides/data/demo-thumbnails/L1Ye6ATzZXY.jpg"/>
+            <field name="description">Odoo's fully-integrated marketing app will help you to attract, convert and close new leads. Check out our three-part video and discover more at www.odoo.com</field>
         </record>
         <record id="slide_8" model="slide.slide">
             <field name="name">Odoo Marketing - part 1: ATTRACT_3</field>
             <field name="url">https://www.youtube.com/watch?v=sEvZyNZCtOs&amp;list=UUkQPikELWZFLgQNHd73jkdg</field>
+            <field name="document_id">sEvZyNZCtOs</field>
+            <field name="slide_type">video</field>
             <field name="channel_id" ref="channel_public"/>
             <field name="category_id" ref="category_1"/>
             <field name="website_published" eval="True"/>
             <field name="tag_ids" eval="[(4, ref('tag1')), (4, ref('tag2'))]"/>
+            <field name="image" type="base64" file="website_slides/data/demo-thumbnails/sEvZyNZCtOs.jpg"/>
+            <field name="description">Odoo's fully-integrated marketing app will help you to attract, convert and close new leads. Check out our three-part video and discover more at www.odoo.com</field>
         </record>
 
         <record id="slide_9" model="slide.slide">
diff --git a/addons/website_slides/models/slides.py b/addons/website_slides/models/slides.py
index ed913a83938..bf3e0b229b8 100644
--- a/addons/website_slides/models/slides.py
+++ b/addons/website_slides/models/slides.py
@@ -362,7 +362,7 @@ class Slide(models.Model):
             values['image'] = values['datas']
         if values.get('website_published') and not values.get('date_published'):
             values['date_published'] = datetime.datetime.now()
-        if values.get('url'):
+        if values.get('url') and not values.get('document_id'):
             doc_data = self._parse_document_url(values['url']).get('values', dict())
             for key, value in doc_data.iteritems():
                 values.setdefault(key, value)
@@ -376,7 +376,7 @@ class Slide(models.Model):
 
     @api.multi
     def write(self, values):
-        if values.get('url'):
+        if values.get('url') and values['url'] != self.url:
             doc_data = self._parse_document_url(values['url']).get('values', dict())
             for key, value in doc_data.iteritems():
                 values.setdefault(key, value)