diff --git a/addons/website/static/src/img/library/shutterstock_131909891.jpg b/addons/website/static/src/img/library/baby.jpg
similarity index 100%
rename from addons/website/static/src/img/library/shutterstock_131909891.jpg
rename to addons/website/static/src/img/library/baby.jpg
diff --git a/addons/website/static/src/img/library/shutterstock_121837102.jpg b/addons/website/static/src/img/library/business_conference.jpg
similarity index 100%
rename from addons/website/static/src/img/library/shutterstock_121837102.jpg
rename to addons/website/static/src/img/library/business_conference.jpg
diff --git a/addons/website/static/src/img/library/shutterstock_108327197.jpg b/addons/website/static/src/img/library/business_hands.jpg
similarity index 100%
rename from addons/website/static/src/img/library/shutterstock_108327197.jpg
rename to addons/website/static/src/img/library/business_hands.jpg
diff --git a/addons/website/static/src/img/library/shutterstock_134150393.jpg b/addons/website/static/src/img/library/business_stats.jpg
similarity index 100%
rename from addons/website/static/src/img/library/shutterstock_134150393.jpg
rename to addons/website/static/src/img/library/business_stats.jpg
diff --git a/addons/website/static/src/img/library/shutterstock_133550600.jpg b/addons/website/static/src/img/library/engineer.jpg
similarity index 100%
rename from addons/website/static/src/img/library/shutterstock_133550600.jpg
rename to addons/website/static/src/img/library/engineer.jpg
diff --git a/addons/website/static/src/img/library/shutterstock_129132983.jpg b/addons/website/static/src/img/library/flight.jpg
similarity index 100%
rename from addons/website/static/src/img/library/shutterstock_129132983.jpg
rename to addons/website/static/src/img/library/flight.jpg
diff --git a/addons/website/static/src/img/library/shutterstock_64576072.jpg b/addons/website/static/src/img/library/gears.jpg
similarity index 100%
rename from addons/website/static/src/img/library/shutterstock_64576072.jpg
rename to addons/website/static/src/img/library/gears.jpg
diff --git a/addons/website/static/src/img/library/shutterstock_141778333.jpg b/addons/website/static/src/img/library/helpdesk.jpg
similarity index 100%
rename from addons/website/static/src/img/library/shutterstock_141778333.jpg
rename to addons/website/static/src/img/library/helpdesk.jpg
diff --git a/addons/website/static/src/img/library/shutterstock_94652485.jpg b/addons/website/static/src/img/library/landscape_tree.jpg
similarity index 100%
rename from addons/website/static/src/img/library/shutterstock_94652485.jpg
rename to addons/website/static/src/img/library/landscape_tree.jpg
diff --git a/addons/website/static/src/img/library/shutterstock_142426168.jpg b/addons/website/static/src/img/library/lazagne.jpg
similarity index 100%
rename from addons/website/static/src/img/library/shutterstock_142426168.jpg
rename to addons/website/static/src/img/library/lazagne.jpg
diff --git a/addons/website/static/src/img/library/shutterstock_146957396.jpg b/addons/website/static/src/img/library/manufacturing.jpg
similarity index 100%
rename from addons/website/static/src/img/library/shutterstock_146957396.jpg
rename to addons/website/static/src/img/library/manufacturing.jpg
diff --git a/addons/website/static/src/img/library/shutterstock_138302168.jpg b/addons/website/static/src/img/library/personal_laptop.jpg
similarity index 100%
rename from addons/website/static/src/img/library/shutterstock_138302168.jpg
rename to addons/website/static/src/img/library/personal_laptop.jpg
diff --git a/addons/website/static/src/img/library/shutterstock_144566138.jpg b/addons/website/static/src/img/library/school_kids.jpg
similarity index 100%
rename from addons/website/static/src/img/library/shutterstock_144566138.jpg
rename to addons/website/static/src/img/library/school_kids.jpg
diff --git a/addons/website/static/src/img/library/shutterstock_94642732.jpg b/addons/website/static/src/img/library/ship_sea.jpg
similarity index 100%
rename from addons/website/static/src/img/library/shutterstock_94642732.jpg
rename to addons/website/static/src/img/library/ship_sea.jpg
diff --git a/addons/website/static/src/img/library/shutterstock_88218493.jpg b/addons/website/static/src/img/library/vegetables.jpg
similarity index 100%
rename from addons/website/static/src/img/library/shutterstock_88218493.jpg
rename to addons/website/static/src/img/library/vegetables.jpg
diff --git a/addons/website/static/src/img/library/shutterstock_107930255.jpg b/addons/website/static/src/img/library/world.jpg
similarity index 100%
rename from addons/website/static/src/img/library/shutterstock_107930255.jpg
rename to addons/website/static/src/img/library/world.jpg
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index a28a3dc37d9..c2495e30d9c 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -727,7 +727,7 @@
                 method: 'search_read',
                 args: [],
                 kwargs: {
-                    fields: ['name'],
+                    fields: ['name', 'website_url'],
                     domain: [['res_model', '=', 'ir.ui.view']],
                     order: 'name',
                     context: website.get_context(),
diff --git a/addons/website/static/src/xml/website.editor.xml b/addons/website/static/src/xml/website.editor.xml
index fb5b0977671..f17a5335e4c 100644
--- a/addons/website/static/src/xml/website.editor.xml
+++ b/addons/website/static/src/xml/website.editor.xml
@@ -151,8 +151,7 @@
             </ul>
             <div class="row mt16" t-foreach="rows" t-as="row">
                 <div class="col-sm-2" t-foreach="row" t-as="attachment">
-                    <t t-set="url">/website/attachment/<t t-esc="attachment.id"/></t>
-                    <img t-att-src="url" t-att-alt="attachment.name" class="img img-responsive"/>
+                    <img t-att-src="attachment.website_url" t-att-alt="attachment.name" class="img img-responsive"/>
                 </div>
             </div>
         </div>
diff --git a/addons/website/website.py b/addons/website/website.py
index 02b43ff2ae0..3b97edc9751 100644
--- a/addons/website/website.py
+++ b/addons/website/website.py
@@ -263,6 +263,21 @@ class website(osv.osv):
             html += request.website.render(template, {'object_id': object_id})
         return html
 
+class ir_attachment(osv.osv):
+    _inherit = "ir.attachment"
+    def _website_url_get(self, cr, uid, ids, name, arg, context=None):
+        context = context or {}
+        result = {}
+        for attach in self.browse(cr, uid, ids, context=context):
+            if attach.type=='url':
+                result[attach.id] = attach.url
+            else:
+                result[attach.id] = "/website/attachment/"+str(attach.id)
+        return result
+    _columns = {
+        'website_url': fields.function(_website_url_get, string="Attachment URL", type='char')
+    }
+
 class res_partner(osv.osv):
     _inherit = "res.partner"
 
diff --git a/addons/website/website_data.xml b/addons/website/website_data.xml
index 5a252fb4dbb..796eb3ea9f1 100644
--- a/addons/website/website_data.xml
+++ b/addons/website/website_data.xml
@@ -50,5 +50,127 @@
             <field name="state">open</field>
         </record>
 
+        <!-- Pre loaded images -->
+
+        <record model="ir.attachment">
+            <field name="name">business_conference</field>
+            <field name="datas_fname">business_conference.jpg</field>
+            <field name="res_model">ir.ui.view</field>
+            <field name="type">url</field>
+            <field name="url">/website/static/src/img/library/business_conference.jpg</field>
+        </record>
+
+        <record model="ir.attachment">
+            <field name="name">business_hands</field>
+            <field name="datas_fname">business_hands.jpg</field>
+            <field name="res_model">ir.ui.view</field>
+            <field name="type">url</field>
+            <field name="url">/website/static/src/img/library/business_hands.jpg</field>
+        </record>
+
+        <record model="ir.attachment">
+            <field name="name">business_stats</field>
+            <field name="datas_fname">business_stats.jpg</field>
+            <field name="res_model">ir.ui.view</field>
+            <field name="type">url</field>
+            <field name="url">/website/static/src/img/library/business_stats.jpg</field>
+        </record>
+
+        <record model="ir.attachment">
+            <field name="name">engineer</field>
+            <field name="datas_fname">engineer.jpg</field>
+            <field name="res_model">ir.ui.view</field>
+            <field name="type">url</field>
+            <field name="url">/website/static/src/img/library/engineer.jpg</field>
+        </record>
+
+        <record model="ir.attachment">
+            <field name="name">flight</field>
+            <field name="datas_fname">flight.jpg</field>
+            <field name="res_model">ir.ui.view</field>
+            <field name="type">url</field>
+            <field name="url">/website/static/src/img/library/flight.jpg</field>
+        </record>
+
+        <record model="ir.attachment">
+            <field name="name">gears</field>
+            <field name="datas_fname">gears.jpg</field>
+            <field name="res_model">ir.ui.view</field>
+            <field name="type">url</field>
+            <field name="url">/website/static/src/img/library/gears.jpg</field>
+        </record>
+
+        <record model="ir.attachment">
+            <field name="name">helpdesk</field>
+            <field name="datas_fname">helpdesk.jpg</field>
+            <field name="res_model">ir.ui.view</field>
+            <field name="type">url</field>
+            <field name="url">/website/static/src/img/library/helpdesk.jpg</field>
+        </record>
+
+        <record model="ir.attachment">
+            <field name="name">landscape_tree</field>
+            <field name="datas_fname">landscape_tree.jpg</field>
+            <field name="res_model">ir.ui.view</field>
+            <field name="type">url</field>
+            <field name="url">/website/static/src/img/library/landscape_tree.jpg</field>
+        </record>
+
+        <record model="ir.attachment">
+            <field name="name">lazagne</field>
+            <field name="datas_fname">lazagne.jpg</field>
+            <field name="res_model">ir.ui.view</field>
+            <field name="type">url</field>
+            <field name="url">/website/static/src/img/library/lazagne.jpg</field>
+        </record>
+
+        <record model="ir.attachment">
+            <field name="name">manufacturing</field>
+            <field name="datas_fname">manufacturing.jpg</field>
+            <field name="res_model">ir.ui.view</field>
+            <field name="type">url</field>
+            <field name="url">/website/static/src/img/library/manufacturing.jpg</field>
+        </record>
+
+        <record model="ir.attachment">
+            <field name="name">personal_laptop</field>
+            <field name="datas_fname">personal_laptop.jpg</field>
+            <field name="res_model">ir.ui.view</field>
+            <field name="type">url</field>
+            <field name="url">/website/static/src/img/library/personal_laptop.jpg</field>
+        </record>
+
+        <record model="ir.attachment">
+            <field name="name">school_kids</field>
+            <field name="datas_fname">school_kids.jpg</field>
+            <field name="res_model">ir.ui.view</field>
+            <field name="type">url</field>
+            <field name="url">/website/static/src/img/library/school_kids.jpg</field>
+        </record>
+
+        <record model="ir.attachment">
+            <field name="name">ship_sea</field>
+            <field name="datas_fname">ship_sea.jpg</field>
+            <field name="res_model">ir.ui.view</field>
+            <field name="type">url</field>
+            <field name="url">/website/static/src/img/library/ship_sea.jpg</field>
+        </record>
+
+        <record model="ir.attachment">
+            <field name="name">vegetables</field>
+            <field name="datas_fname">vegetables.jpg</field>
+            <field name="res_model">ir.ui.view</field>
+            <field name="type">url</field>
+            <field name="url">/website/static/src/img/library/vegetables.jpg</field>
+        </record>
+
+        <record model="ir.attachment">
+            <field name="name">world</field>
+            <field name="datas_fname">world.jpg</field>
+            <field name="res_model">ir.ui.view</field>
+            <field name="type">url</field>
+            <field name="url">/website/static/src/img/library/world.jpg</field>
+        </record>
+
     </data>
 </openerp>