diff --git a/openerp/addons/base/res/res_partner.py b/openerp/addons/base/res/res_partner.py
index 93d12228ebe..f282466b989 100644
--- a/openerp/addons/base/res/res_partner.py
+++ b/openerp/addons/base/res/res_partner.py
@@ -227,10 +227,35 @@ class res_partner(osv.osv):
 
     def _get_default_image(self, cr, uid, is_company, context=None):
         if is_company:
-            image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png')
+            image = open(openerp.modules.get_module_resource('base', 'static/src/img', 'company_image.png')).read()
         else:
-            image_path = openerp.modules.get_module_resource('base', 'static/src/img', 'partner_image.png')
-        return tools.image_resize_image_big(open(image_path, 'rb').read().encode('base64'))
+<<<<<<< TREE
+            from PIL import Image
+            from StringIO import StringIO
+            from random import random
+            color = (int(random() * 192 + 32), int(random() * 192 + 32), int(random() * 192 + 32))
+            face = Image.open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png'))
+            avatar = Image.new('RGB', face.size)
+            avatar.paste(color)
+            avatar.paste(face, mask=face)
+            buffer = StringIO()
+            avatar.save(buffer, 'PNG')
+            image = buffer.getvalue()
+        return tools.image_resize_image_big(image.encode('base64'))
+=======
+            from PIL import Image
+            from StringIO import StringIO
+            from random import random
+            color = (int(random() * 256), int(random() * 256), int(random() * 256))
+            face = open(openerp.modules.get_module_resource('base', 'static/src/img', 'avatar.png')).read()
+            avatar = Image.new('RGB', face.size)
+            avatar.paste(color)
+            avatar.paste(face, mask=face)
+            buffer = StringIO()
+            avatar.save(buffer, 'PNG')
+            image = buffer.getvalue()
+        return tools.image_resize_image_big(image.encode('base64'))
+>>>>>>> MERGE-SOURCE
 
     _defaults = {
         'active': True,
diff --git a/openerp/addons/base/static/src/img/avatar.png b/openerp/addons/base/static/src/img/avatar.png
new file mode 100644
index 00000000000..93235db8afa
Binary files /dev/null and b/openerp/addons/base/static/src/img/avatar.png differ
diff --git a/openerp/addons/base/static/src/img/avatar0.png b/openerp/addons/base/static/src/img/avatar0.png
deleted file mode 100644
index 2bcc7c8d2e4..00000000000
Binary files a/openerp/addons/base/static/src/img/avatar0.png and /dev/null differ
diff --git a/openerp/addons/base/static/src/img/avatar1.png b/openerp/addons/base/static/src/img/avatar1.png
deleted file mode 100644
index 4f6d2f7e818..00000000000
Binary files a/openerp/addons/base/static/src/img/avatar1.png and /dev/null differ
diff --git a/openerp/addons/base/static/src/img/avatar2.png b/openerp/addons/base/static/src/img/avatar2.png
deleted file mode 100644
index 70d5df7ee60..00000000000
Binary files a/openerp/addons/base/static/src/img/avatar2.png and /dev/null differ
diff --git a/openerp/addons/base/static/src/img/avatar3.png b/openerp/addons/base/static/src/img/avatar3.png
deleted file mode 100644
index 053768aa035..00000000000
Binary files a/openerp/addons/base/static/src/img/avatar3.png and /dev/null differ
diff --git a/openerp/addons/base/static/src/img/avatar4.png b/openerp/addons/base/static/src/img/avatar4.png
deleted file mode 100644
index 1b2a99f05c3..00000000000
Binary files a/openerp/addons/base/static/src/img/avatar4.png and /dev/null differ
diff --git a/openerp/addons/base/static/src/img/avatar5.png b/openerp/addons/base/static/src/img/avatar5.png
deleted file mode 100644
index 0f6c416ecf0..00000000000
Binary files a/openerp/addons/base/static/src/img/avatar5.png and /dev/null differ
diff --git a/openerp/addons/base/static/src/img/avatar6.png b/openerp/addons/base/static/src/img/avatar6.png
deleted file mode 100644
index d6a18c2779e..00000000000
Binary files a/openerp/addons/base/static/src/img/avatar6.png and /dev/null differ
diff --git a/openerp/addons/base/static/src/img/partner_image.png b/openerp/addons/base/static/src/img/partner_image.png
deleted file mode 100644
index 87fdbc5af55..00000000000
Binary files a/openerp/addons/base/static/src/img/partner_image.png and /dev/null differ