diff --git a/templates/creation/courierMailAccount.xml b/templates/creation/courierMailAccount.xml
index 10e311e..43bd3cb 100644
--- a/templates/creation/courierMailAccount.xml
+++ b/templates/creation/courierMailAccount.xml
@@ -39,7 +39,7 @@
 </attribute>
 <attribute id="uid">
 	<display>User ID</display>
-	<icon>uid.png</icon>
+	<icon>ldap-uid.png</icon>
 	<!--<onchange>=autoFill(homeDirectory;/home/users/%uid%)</onchange>-->
 	<onchange>=autoFill(homeDirectory;/home/users/%gidNumber|0-0/T%/%uid|3-%)</onchange>
 	<order>4</order>
diff --git a/templates/creation/inetOrgPerson.xml b/templates/creation/inetOrgPerson.xml
index fc545a6..6469221 100644
--- a/templates/creation/inetOrgPerson.xml
+++ b/templates/creation/inetOrgPerson.xml
@@ -18,7 +18,7 @@
 <attributes>
 <attribute id="givenName">
 	<display>First name</display>
-	<icon>uid.png</icon>
+	<icon>ldap-uid.png</icon>
 	<onchange>=autoFill(cn;%givenName% %sn%)</onchange>
 	<order>1</order>
 	<page>1</page>
diff --git a/templates/creation/kolabPerson.xml b/templates/creation/kolabPerson.xml
index a1d80c9..8be2e6b 100644
--- a/templates/creation/kolabPerson.xml
+++ b/templates/creation/kolabPerson.xml
@@ -18,7 +18,7 @@
 <attributes>
 <attribute id="givenName">
 	<display>First name</display>
-	<icon>uid.png</icon>
+	<icon>ldap-uid.png</icon>
 	<onchange>=autoFill(cn;%givenName% %sn%)</onchange>
 	<order>1</order>
 </attribute>
diff --git a/templates/creation/posixAccount.xml b/templates/creation/posixAccount.xml
index 07952e8..1d6c5a9 100644
--- a/templates/creation/posixAccount.xml
+++ b/templates/creation/posixAccount.xml
@@ -19,7 +19,7 @@
 <attributes>
 <attribute id="givenName">
 	<display>First name</display>
-	<icon>uid.png</icon>
+	<icon>ldap-uid.png</icon>
 	<onchange>=autoFill(cn;%givenName% %sn%)</onchange>
 	<onchange>=autoFill(uid;%givenName|0-1/l%%sn/l%)</onchange>
 	<order>1</order>
diff --git a/templates/creation/sambaSamAccount.xml b/templates/creation/sambaSamAccount.xml
index f69ed4b..548e415 100644
--- a/templates/creation/sambaSamAccount.xml
+++ b/templates/creation/sambaSamAccount.xml
@@ -20,7 +20,7 @@
 <attributes>
 <attribute id="givenName">
 	<display>First name</display>
-	<icon>uid.png</icon>
+	<icon>ldap-uid.png</icon>
 	<onchange>=autoFill(cn;%givenName% %sn%)</onchange>
 	<order>1</order>
 	<page>1</page>
diff --git a/templates/creation/simpleSecurityObject.xml b/templates/creation/simpleSecurityObject.xml
index 9422d55..2cb2000 100644
--- a/templates/creation/simpleSecurityObject.xml
+++ b/templates/creation/simpleSecurityObject.xml
@@ -19,7 +19,7 @@
 <attributes>
 <attribute id="userid">
 	<display>User Name</display>
-	<icon>uid.png</icon>
+	<icon>ldap-uid.png</icon>
 	<order>1</order>
 	<page>1</page>
 	<spacer>1</spacer>
diff --git a/templates/modification/inetOrgPerson.xml b/templates/modification/inetOrgPerson.xml
index 30fea97..13ced3e 100644
--- a/templates/modification/inetOrgPerson.xml
+++ b/templates/modification/inetOrgPerson.xml
@@ -18,7 +18,7 @@
 <attributes>
 <attribute id="givenName">
 	<display>First name</display>
-	<icon>uid.png</icon>
+	<icon>ldap-uid.png</icon>
 	<onchange>=autoFill(cn;%givenName% %sn%)</onchange>
 	<order>1</order>
 </attribute>