diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
index 017c3468..b9404630 100644
--- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
+++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
@@ -12,13 +12,9 @@
 
     <section id="share-contact" role="region"> 
         
-        <#-- Thumbnail -->
-        <#if individual.thumbUrl??>
-            <a href="${individual.imageUrl}"><img class="individual-photo2" src="${individual.thumbUrl}" title="click to view larger image" alt="${individual.name}" width="115" /></a>
-        <#else>
-            <img class="individual-photo2" src="${urls.images}/placeholders/person.thumbnail.jpg" title = "no image" alt="placeholder image" width="115" />                                                        
-        </#if>
-        
+        <#-- Image -->
+        <@p.imageLinks individual propertyGroups editing "${urls.images}/placeholders/person.thumbnail.jpg" />
+
         <nav role="navigation">
             <ul id ="individual-tools-people" role="list">
                 <#--<li role="listitem"><a class="picto-font picto-uri" href="#">j</a></li>
diff --git a/productMods/templates/freemarker/body/individual/individual.ftl b/productMods/templates/freemarker/body/individual/individual.ftl
index 1ee163b5..093cb796 100644
--- a/productMods/templates/freemarker/body/individual/individual.ftl
+++ b/productMods/templates/freemarker/body/individual/individual.ftl
@@ -10,12 +10,8 @@
 
 <section id="individual-intro" class="vcard" role="region">
     <section id="share-contact" role="region"> 
-        <#-- Thumbnail -->
-        <#if individual.thumbUrl??>
-            <a href="${individual.imageUrl}"><img class="individual-photo2" src="${individual.thumbUrl}" title="click to view larger image" alt="${individual.name}" width="115" /></a>
-        <#--<#elseif individual.person>
-            <img class="individual-photo2" src="${urls.images}/placeholders/person.thumbnail.jpg" title = "no image" alt="placeholder image" width="115" />-->                                                       
-        </#if>
+        <#-- Image -->
+        <@p.imageLinks individual propertyGroups editing />
     </section>
 
     <section id="individual-info" role="region">
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-setup.ftl b/productMods/templates/freemarker/body/partials/individual/individual-setup.ftl
index 5f2bb2cd..6500e021 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-setup.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-setup.ftl
@@ -5,12 +5,12 @@
 <#import "lib-list.ftl" as l>
 <#import "lib-properties.ftl" as p>
 
-<#assign core = "http://vivoweb.org/ontology/core#">
-
 <#assign editing = individual.showEditingLinks>
 
 <#assign editingClass>
     <#if editing>editing</#if>
 </#assign>
 
-<#assign propertyGroups = individual.propertyList>
\ No newline at end of file
+<#assign propertyGroups = individual.propertyList>
+
+<#assign core = "http://vivoweb.org/ontology/core#">
\ No newline at end of file