diff --git a/src/header.pug b/src/header.pug
index 7301712c20c14f751f72004ff6a225177e13dbf8..7daab268af90f82c1e6d2894d255a163f530dfab 100644
--- a/src/header.pug
+++ b/src/header.pug
@@ -16,8 +16,8 @@ details
     include page-notifications.pug
 
 sib-display#profile(
-  data-fields='first_name,profile.picture',
-  widget-profile.picture='sib-display-img',
+  data-fields='first_name,account.picture',
+  widget-account.picture='sib-display-img',
   bind-user
   )
 
diff --git a/src/page-group-profile.pug b/src/page-group-profile.pug
index 00fbf4c9b860e10426a55df7458d5429d207d552..f51fa725e3c8272e217433de79354f5b17e5fc06 100644
--- a/src/page-group-profile.pug
+++ b/src/page-group-profile.pug
@@ -8,8 +8,8 @@
   sib-display(
     id-suffix='team',
     data-fields='user-thumb',
-    set-user-thumb='profile.picture, first_name, last_name',
-    widget-profile.picture='sib-display-img',
+    set-user-thumb='account.picture, first_name, last_name',
+    widget-account.picture='sib-display-img',
     bind-resources
   )
 
diff --git a/src/page-job-offers.pug b/src/page-job-offers.pug
index 2a62996d80295100aa425379644f4f62365be7fe..061c10bf730b43da0d86c0d74b68bed666853bf0 100644
--- a/src/page-job-offers.pug
+++ b/src/page-job-offers.pug
@@ -7,8 +7,8 @@ div.grid-layer
       data-fields='status, user-thumb, creation, title, description, skills, send',
       set-status='closingDate',
       widget-closingDate='hdapp-closing-date',
-      set-user-thumb='author.profile.picture, author.first_name, author.member.roles.ldp:contains.name',
-      widget-author.profile.picture='sib-display-img',
+      set-user-thumb='author.account.picture, author.first_name, author.member.roles.ldp:contains.name',
+      widget-author.account.picture='sib-display-img',
       set-creation='creationDate',
       widget-skills='sib-display-lookuplist',
       set-send='before-send-link, send-link',
diff --git a/src/page-member-edit.pug b/src/page-member-edit.pug
index 6fbc111b842f32998339974b10d35b21dabbc3ad..c4a6c70297aa2bcffbe1de8fd84e5bd077edf1eb 100644
--- a/src/page-member-edit.pug
+++ b/src/page-member-edit.pug
@@ -1,8 +1,8 @@
 .form-view
   sib-form.block(
-    data-fields='user, picture, bio, cell, jabberID, phone, pseudo, skills, website',
+    data-fields='user, picture, bio, groups, jabberID, phone, pseudo, skills, website',
     widget-user='hdapp-usereditinfo',
-    range-cell=`${sdn}/cells/`, widget-skills='sib-form-multiple-dropdown',
+    range-groups=`${sdn}/groups/`, widget-skills='sib-form-multiple-dropdown',
     range-skills=`${sdn}/skills/`,
     bind-resources
   )
diff --git a/src/page-member-profile.pug b/src/page-member-profile.pug
index 48a856caace73f89861b4350c5f8ab02030bfb16..3095ec232e950e987d6f603c541ac94c1b7e162b 100644
--- a/src/page-member-profile.pug
+++ b/src/page-member-profile.pug
@@ -2,7 +2,7 @@ template#chat-link
   sib-link(next="member-chat") ${value}
 sib-display#member-info(
   data-fields='available, header, name, pseudonym, infos, user.skills',
-  set-header='picture',
+  set-header='user.account.picture',
   set-infos='city, country, user.roles, user.email, send, phone, foaf:homepage, ',
   set-name='user.first_name, user.last_name',
   set-pseudonym='before-pseudo, pseudo',
@@ -10,7 +10,7 @@ sib-display#member-info(
   value-send='SEND A MESSAGE',
   template-send='chat-link',
   widget-available='hdapp-available',
-  widget-picture='sib-display-img',
+  widget-user.account.picture='sib-display-img',
   widget-user='hdapp-userinfo',
   widget-phone='sib-display-tel',
   widget-foaf:homepage='hdapp-hyperlink',
diff --git a/src/page-members.pug b/src/page-members.pug
index 403d1a7178a7858f603b40ef2eeb4c01dc470e0f..14f7f927f1ea7914d0602f7e84f8e699f307c0f0 100644
--- a/src/page-members.pug
+++ b/src/page-members.pug
@@ -6,14 +6,14 @@ div.grid-layer
     sib-display#profiles-list(
       data-src=`${sdn}/members/`,
       data-fields='header, infos, groups',
-      set-header='picture, user, pseudonym, bio, send',
-      set-infos='cell, user.roles, user.email, phone, user.skills',
+      set-header='user.account.picture, user, pseudonym, bio, send',
+      set-infos='user.roles, user.email, phone, user.skills',
       set-pseudonym='before-pseudo,pseudo',
       value-before-pseudo='@',
       value-send='SEND A MESSAGE',
       template-send='chat-link',
       counter-template='${counter} members',
-      widget-picture='sib-display-img',
+      widget-user.account.picture='sib-display-img',
       widget-roles='sib-display-lookuplist',
       widget-user='hdapp-userinfo',
       widget-user.skills='sib-display-lookuplist',
diff --git a/src/page-project-profile.pug b/src/page-project-profile.pug
index c7cc89b011c56e6b37bfd314bdb3b0564e92475a..f538ab4c4dc410d2fb13c9cb4c40beda02513c8c 100644
--- a/src/page-project-profile.pug
+++ b/src/page-project-profile.pug
@@ -29,8 +29,8 @@
   div.containerH
     sib-display.members-list-condensed(
       id-suffix='team',
-      data-fields='profile.picture, profile.user, groups',
-      widget-profile.picture='sib-display-img',
+      data-fields='account.picture, profile.user, groups',
+      widget-account.picture='sib-display-img',
       widget-profile.user='hdapp-userinfo',
       widget-groups='sib-display-lookuplist',
       next='profile',