diff --git a/htdocs/css/default/style.css b/htdocs/css/default/style.css
index ea5868d..a5b2d5a 100644
--- a/htdocs/css/default/style.css
+++ b/htdocs/css/default/style.css
@@ -565,7 +565,7 @@ span.hint {
 
 /* Login Box */
 #login {
-	background: url('../../images/default/uid.png') no-repeat 0 1px;
+	background: url('../../images/default/ldap-uid.png') no-repeat 0 1px;
 	background-color: #FAFAFF;
 	color: #000000;
 	padding-left: 17px;
diff --git a/htdocs/images/default/address-book.png b/htdocs/images/default/address-book.png
new file mode 100644
index 0000000..907d939
Binary files /dev/null and b/htdocs/images/default/address-book.png differ
diff --git a/htdocs/images/default/star.png b/htdocs/images/default/create.png
similarity index 100%
rename from htdocs/images/default/star.png
rename to htdocs/images/default/create.png
diff --git a/htdocs/images/default/export-big.png b/htdocs/images/default/export-big.png
new file mode 100644
index 0000000..6bb2ec6
Binary files /dev/null and b/htdocs/images/default/export-big.png differ
diff --git a/htdocs/images/default/forum-big.png b/htdocs/images/default/forum-big.png
new file mode 100644
index 0000000..674a8e9
Binary files /dev/null and b/htdocs/images/default/forum-big.png differ
diff --git a/htdocs/images/default/import.png b/htdocs/images/default/import-big.png
similarity index 100%
rename from htdocs/images/default/import.png
rename to htdocs/images/default/import-big.png
diff --git a/htdocs/images/default/go.png b/htdocs/images/default/ldap-alias.png
similarity index 100%
rename from htdocs/images/default/go.png
rename to htdocs/images/default/ldap-alias.png
diff --git a/htdocs/images/default/dc.png b/htdocs/images/default/ldap-dc.png
similarity index 100%
rename from htdocs/images/default/dc.png
rename to htdocs/images/default/ldap-dc.png
diff --git a/htdocs/images/default/object.png b/htdocs/images/default/ldap-default.png
similarity index 100%
rename from htdocs/images/default/object.png
rename to htdocs/images/default/ldap-default.png
diff --git a/htdocs/images/default/o.png b/htdocs/images/default/ldap-o.png
similarity index 100%
rename from htdocs/images/default/o.png
rename to htdocs/images/default/ldap-o.png
diff --git a/htdocs/images/default/ou.png b/htdocs/images/default/ldap-ou.png
similarity index 100%
rename from htdocs/images/default/ou.png
rename to htdocs/images/default/ldap-ou.png
diff --git a/htdocs/images/default/uid.png b/htdocs/images/default/ldap-uid.png
similarity index 100%
rename from htdocs/images/default/uid.png
rename to htdocs/images/default/ldap-uid.png
diff --git a/htdocs/images/default/uniquegroup.png b/htdocs/images/default/ldap-uniquegroup.png
similarity index 100%
rename from htdocs/images/default/uniquegroup.png
rename to htdocs/images/default/ldap-uniquegroup.png
diff --git a/htdocs/images/default/user.png b/htdocs/images/default/ldap-user.png
similarity index 100%
rename from htdocs/images/default/user.png
rename to htdocs/images/default/ldap-user.png
diff --git a/htdocs/images/default/login.png b/htdocs/images/default/login.png
new file mode 100644
index 0000000..7be48fb
Binary files /dev/null and b/htdocs/images/default/login.png differ
diff --git a/htdocs/images/default/logout.png b/htdocs/images/default/logout-big.png
similarity index 100%
rename from htdocs/images/default/logout.png
rename to htdocs/images/default/logout-big.png
diff --git a/htdocs/images/default/monitorserver-big.png b/htdocs/images/default/monitorserver-big.png
new file mode 100644
index 0000000..d40900d
Binary files /dev/null and b/htdocs/images/default/monitorserver-big.png differ
diff --git a/htdocs/images/default/request-feature.png b/htdocs/images/default/request-feature-big.png
similarity index 100%
rename from htdocs/images/default/request-feature.png
rename to htdocs/images/default/request-feature-big.png
diff --git a/htdocs/images/default/schema.png b/htdocs/images/default/schema-big.png
similarity index 100%
rename from htdocs/images/default/schema.png
rename to htdocs/images/default/schema-big.png
diff --git a/htdocs/images/default/search.png b/htdocs/images/default/search-big.png
similarity index 100%
rename from htdocs/images/default/search.png
rename to htdocs/images/default/search-big.png
diff --git a/htdocs/images/default/switch.png b/htdocs/images/default/switch.png
new file mode 100644
index 0000000..907d939
Binary files /dev/null and b/htdocs/images/default/switch.png differ
diff --git a/htdocs/modify_member_form.php b/htdocs/modify_member_form.php
index 4511755..29aea39 100644
--- a/htdocs/modify_member_form.php
+++ b/htdocs/modify_member_form.php
@@ -89,8 +89,8 @@ else
 echo '<table class="modify_members">';
 
 echo '<tr>';
-printf('<td><img src="%s/user.png" alt="Users" /> %s</td>',IMGDIR,_('Available members'));
-printf('<td><img src="%s/uniquegroup.png" alt="Members" /> %s</td>',IMGDIR,_('Group members'));
+printf('<td><img src="%s/ldap-user.png" alt="Users" /> %s</td>',IMGDIR,_('Available members'));
+printf('<td><img src="%s/ldap-uniquegroup.png" alt="Members" /> %s</td>',IMGDIR,_('Group members'));
 echo '</tr>';
 
 # Generate select box from all possible members
diff --git a/lib/AJAXTree.php b/lib/AJAXTree.php
index 8d49313..5d72897 100644
--- a/lib/AJAXTree.php
+++ b/lib/AJAXTree.php
@@ -261,7 +261,7 @@ class AJAXTree extends HTMLTree {
 		$output .= $this->get_indentation($level);
 		$output .= sprintf('<img align="top" border="0" class="imgs" src="%s" alt="--" />',$img);
 		$output .= sprintf('<a href="%s" title="%s">',htmlspecialchars($href),$entry->getDN());
-		$output .= sprintf('<img align="top" border="0" class="imgs" src="%s/star.png" alt="->" />',IMGDIR);
+		$output .= sprintf('<img align="top" border="0" class="imgs" src="%s/create.png" alt="->" />',IMGDIR);
 		$output .= '</a>';
 		$output .= '&nbsp;';
 
diff --git a/lib/HTMLTree.php b/lib/HTMLTree.php
index e40c3f1..7e2be73 100644
--- a/lib/HTMLTree.php
+++ b/lib/HTMLTree.php
@@ -151,7 +151,7 @@ class HTMLTree extends Tree {
 		if (! is_null($server->inactivityTime())) {
 			$m = sprintf(_('Inactivity will log you off at %s'),
 				strftime('%H:%M',$server->inactivityTime()));
-			printf(' <img width=14 height=14 src="%s/timeout.png" title="%s" alt="%s"/>',IMGDIR,$m,$m);
+			printf(' <img width=14 height=14 src="%s/timeout.png" title="%s" alt="%s"/>',IMGDIR,$m,'Timeout');
 		}
 		echo '</td></tr>';
 	}
@@ -193,7 +193,7 @@ class HTMLTree extends Tree {
 				$menu['ajax'] = _('Loading Schema');
 				$menu['div'] = 'BODY';
 				$menu['title'] = _('View schema for');
-				$menu['img'] = 'schema.png';
+				$menu['img'] = 'schema-big.png';
 				$menu['name'] = _('schema');
 				break;
 
@@ -205,7 +205,7 @@ class HTMLTree extends Tree {
 				$menu['ajax'] = _('Loading Search');
 				$menu['div'] = 'BODY';
 				$menu['title'] = _('Search');
-				$menu['img'] = 'search.png';
+				$menu['img'] = 'search-big.png';
 				$menu['name'] = _('search');
 				break;
 
@@ -230,7 +230,7 @@ class HTMLTree extends Tree {
 				$menu['ajax'] = _('Loading Info');
 				$menu['div'] = 'BODY';
 				$menu['title'] = _('Info');
-				$menu['img'] = 'info.png';
+				$menu['img'] = 'info-big.png';
 				$menu['name'] = _('info');
 				break;
 
@@ -257,7 +257,7 @@ class HTMLTree extends Tree {
 				$menu['ajax'] = _('Loading Monitor Info');
 				$menu['div'] = 'BODY';
 				$menu['title'] = _('Monitor');
-				$menu['img'] = 'ldap-server.png';
+				$menu['img'] = 'monitorserver-big.png';
 				$menu['name'] = _('monitor');
 				break;
 
@@ -269,7 +269,7 @@ class HTMLTree extends Tree {
 				$menu['ajax'] = _('Loading Import');
 				$menu['div'] = 'BODY';
 				$menu['title'] = _('Import');
-				$menu['img'] = 'import.png';
+				$menu['img'] = 'import-big.png';
 				$menu['name'] = _('import');
 				break;
 
@@ -281,7 +281,7 @@ class HTMLTree extends Tree {
 				$menu['ajax'] = _('Loading Export');
 				$menu['div'] = 'BODY';
 				$menu['title'] = _('Export');
-				$menu['img'] = 'export.png';
+				$menu['img'] = 'export-big.png';
 				$menu['name'] = _('export');
 				break;
 
@@ -292,7 +292,7 @@ class HTMLTree extends Tree {
 				$href = sprintf('cmd.php?cmd=logout&server_id=%s',$server->getIndex());
 
 				return sprintf('<a href="%s" title="%s"><img src="%s/%s" alt="%s" /><br />%s</a>',
-					htmlspecialchars($href),_('Logout of this server'),IMGDIR,'logout.png',_('logout'),_('logout'));
+					htmlspecialchars($href),_('Logout of this server'),IMGDIR,'logout-big.png',_('logout'),_('logout'));
 
 			default:
 				return false;
@@ -465,7 +465,7 @@ class HTMLTree extends Tree {
 
 		echo '<tr>';
 		printf('<td class="spacer" colspan=%s></td>',$level+3);
-		printf('<td class="icon"><a href="%s"><img src="%s/star.png" alt="%s" /></a></td>',$href,IMGDIR,_('new'));
+		printf('<td class="icon"><a href="%s"><img src="%s/create.png" alt="%s" /></a></td>',$href,IMGDIR,_('new'));
 		printf('<td class="link" colspan="%s"><a href="%s" title="%s %s">%s</a></td>',
 			$this->getDepth()+3-$level,$href,_('Create a new entry in'),$rdn,_('Create new entry here'));
 		echo '</tr>';
@@ -486,12 +486,12 @@ class HTMLTree extends Tree {
 
 		if (isAjaxEnabled()) {
 			printf('<td class="icon"><a href="cmd.php?%s" onclick="return displayAJ(\'BODY\',\'%s\',\'%s\');" title="%s %s"><img src="%s/%s" alt="%s" /></a></td>',
-				$href_parm,$href_parm,_('Loading Login'),_('Login to'),$server->getName(),IMGDIR,'uid.png',_('login'));
+				$href_parm,$href_parm,_('Loading Login'),_('Login to'),$server->getName(),IMGDIR,'login.png',_('login'));
 			printf('<td class="logged_in" colspan="%s"><a href="cmd.php?%s" onclick="return displayAJ(\'BODY\',\'%s\',\'%s\');" title="%s %s">%s</a></td>',
 				$this->getDepth()+3-2,$href_parm,$href_parm,_('Loading Login'),_('Login to'),$server->getName(),_('login'));
 
 		} else {
-			printf('<td class="icon"><a href="cmd.php?%s"><img src="%s/%s" alt="%s" /></a></td>',$href_parm,IMGDIR,'uid.png',_('login'));
+			printf('<td class="icon"><a href="cmd.php?%s"><img src="%s/%s" alt="%s" /></a></td>',$href_parm,IMGDIR,'login.png',_('login'));
 			printf('<td class="logged_in" colspan="%s"><a href="cmd.php?%s">%s...</a></td>',$this->getDepth()+3-2,$href_parm,_('Login'));
 		}
 
diff --git a/lib/TemplateRender.php b/lib/TemplateRender.php
index 8331247..4f58bff 100644
--- a/lib/TemplateRender.php
+++ b/lib/TemplateRender.php
@@ -623,7 +623,7 @@ class TemplateRender extends PageRender {
 			echo '<tr>';
 
 			if ($isInValid)
-				printf('<td class="icon"><img src="%s/disabled.png" alt="Error" /></td>',IMGDIR);
+				printf('<td class="icon"><img src="%s/disabled.png" alt="Disabled" /></td>',IMGDIR);
 
 			else {
 				if (isAjaxEnabled())
@@ -669,7 +669,7 @@ class TemplateRender extends PageRender {
 			else
 				echo '<td><input type="radio" name="template" value="none" id="none" onclick="document.forms.template_choice_form.submit()" /></td>';
 
-			printf('<td class="icon"><label for="none"><img src="%s/object.png" alt="" /></label></td>',IMGDIR);
+			printf('<td class="icon"><label for="none"><img src="%s/ldap-default.png" alt="" /></label></td>',IMGDIR);
 			printf('<td class="label"><label for="none">%s</label></td>',_('Default'));
 			echo '</tr>';
 		}
@@ -1114,10 +1114,10 @@ class TemplateRender extends PageRender {
 		$href = sprintf('cmd=template_engine&%s&template=',$this->url_base);
 
 		if (isAjaxEnabled())
-			return sprintf($this->layout['actionajax'],IMGDIR,'catalog.png',_('Switch Template'),
+			return sprintf($this->layout['actionajax'],IMGDIR,'switch.png',_('Switch Template'),
 				htmlspecialchars($href),_('Change to another template'),htmlspecialchars($href),_('Loading'),_('Switch Template'));
 		else
-			return sprintf($this->layout['action'],IMGDIR,'catalog.png',_('Switch Template'),
+			return sprintf($this->layout['action'],IMGDIR,'switch.png',_('Switch Template'),
 				htmlspecialchars($href),_('Change to another template'),_('Switch Template'));
 	}
 
@@ -1127,10 +1127,10 @@ class TemplateRender extends PageRender {
 		$href = sprintf('cmd=export_form&%s&scope=base',$this->url_base);
 
 		if (isAjaxEnabled())
-			return sprintf($this->layout['actionajax'],IMGDIR,'save.png',_('Export'),
+			return sprintf($this->layout['actionajax'],IMGDIR,'export.png',_('Export'),
 				htmlspecialchars($href),_('Save a dump of this object'),htmlspecialchars($href),_('Loading'),_('Export'));
 		else
-			return sprintf($this->layout['action'],IMGDIR,'save.png',_('Export'),
+			return sprintf($this->layout['action'],IMGDIR,'export.png',_('Export'),
 				htmlspecialchars($href),_('Save a dump of this object'),_('Export'));
 	}
 
@@ -1213,11 +1213,11 @@ class TemplateRender extends PageRender {
 		$href = sprintf('cmd=template_engine&server_id=%s&container=%s',$this->getServerID(),rawurlencode($this->template->getDN()));
 
 		if (isAjaxEnabled())
-			return sprintf($this->layout['actionajax'],IMGDIR,'star.png',_('Create'),
+			return sprintf($this->layout['actionajax'],IMGDIR,'create.png',_('Create'),
 				htmlspecialchars($href),_('Create a child entry'),
 				htmlspecialchars($href),_('Loading'),_('Create a child entry'));
 		else
-			return sprintf($this->layout['action'],IMGDIR,'star.png',_('Create'),
+			return sprintf($this->layout['action'],IMGDIR,'create.png',_('Create'),
 				htmlspecialchars($href),_('Create a child entry'),_('Create a child entry'));
 	}
 
@@ -1262,11 +1262,11 @@ class TemplateRender extends PageRender {
 		$href = sprintf('cmd=export_form&%s&scope=%s',$this->url_base,'sub');
 
 		if (isAjaxEnabled())
-			return sprintf($this->layout['actionajax'],IMGDIR,'save.png',_('Save'),
+			return sprintf($this->layout['actionajax'],IMGDIR,'export.png',_('Save'),
 				htmlspecialchars($href),_('Save a dump of this object and all of its children'),
 				htmlspecialchars($href),_('Loading'),_('Export subtree'));
 		else
-			return sprintf($this->layout['action'],IMGDIR,'save.png',_('Save'),
+			return sprintf($this->layout['action'],IMGDIR,'export.png',_('Save'),
 				htmlspecialchars($href),_('Save a dump of this object and all of its children'),_('Export subtree'));
 	}
 
@@ -1830,9 +1830,9 @@ function fillRec(id,value) {
 		if (DEBUGTMP) printf('<font size=-2>%s</font><br />',__METHOD__);
 
 		if (strlen($val) <= 0)
-			printf('<img src="%s/go.png" alt="Go" align="top" />&nbsp;',IMGDIR);
+			printf('<img src="%s/ldap-alias.png" alt="Go" align="top" />&nbsp;',IMGDIR);
 		elseif ($this->getServer()->dnExists($val))
-			printf('<a href="cmd.php?cmd=template_engine&amp;server_id=%s&amp;dn=%s" title="%s %s"><img src="%s/go.png" alt="Go" /></a>&nbsp;',
+			printf('<a href="cmd.php?cmd=template_engine&amp;server_id=%s&amp;dn=%s" title="%s %s"><img src="%s/ldap-alias.png" alt="Go" /></a>&nbsp;',
 				$this->getServerID(),rawurlencode($val),_('Go to'),$val,IMGDIR);
 		else
 			printf('<a title="%s %s"><img src="%s/nogo.png" alt="Go" /></a>&nbsp;',_('DN not available'),$val,IMGDIR);
@@ -1852,7 +1852,7 @@ function fillRec(id,value) {
 	protected function drawUrlValueIconAttribute($attribute,$val) {
 		if (DEBUGTMP) printf('<font size=-2>%s</font><br />',__METHOD__);
 
-		$img = sprintf('<img src="%s/dc.png" alt="%s" align="top" />',IMGDIR,_('URL'));
+		$img = sprintf('<img src="%s/ldap-dc.png" alt="%s" align="top" />',IMGDIR,_('URL'));
 		$url = explode(' +',$val,2);
 
 		if (strlen($val) <= 0)
diff --git a/lib/functions.php b/lib/functions.php
index 390da72..b85d268 100644
--- a/lib/functions.php
+++ b/lib/functions.php
@@ -384,12 +384,12 @@ function cmd_control_pane($type) {
 				'external_links:forum'=>array(
 					'title'=>_('Forum'),
 					'link'=>sprintf('href="%s" title="%s" target="_blank"',get_href('forum'),_('Forum')),
-					'image'=>sprintf('<img src="%s/help.png" alt="%s" />',IMGDIR,_('Forum'))),
+					'image'=>sprintf('<img src="%s/forum-big.png" alt="%s" />',IMGDIR,_('Forum'))),
 
 				'external_links:feature'=>array(
 					'title'=>_('Request feature'),
 					'link'=>sprintf('href="%s" title="%s" target="_blank"',get_href('add_rfe'),_('Request feature')),
-					'image'=>sprintf('<img src="%s/request-feature.png" alt="%s" />',IMGDIR,_('Request feature'))),
+					'image'=>sprintf('<img src="%s/request-feature-big.png" alt="%s" />',IMGDIR,_('Request feature'))),
 
 				'external_links:bug'=>array(
 					'title'=>_('Report a bug'),
@@ -1579,26 +1579,26 @@ function get_icon($server_id,$dn,$object_classes=array()) {
 		in_array('account',$object_classes) ||
 		in_array('posixaccount',$object_classes))
 
-		return 'user.png';
+		return 'ldap-user.png';
 
 	elseif (in_array('organization',$object_classes))
-		return 'o.png';
+		return 'ldap-o.png';
 
 	elseif (in_array('organizationalunit',$object_classes))
-		return 'ou.png';
+		return 'ldap-ou.png';
 
 	elseif (in_array('organizationalrole',$object_classes))
-		return 'uid.png';
+		return 'ldap-uid.png';
 
 	elseif (in_array('dcobject',$object_classes) ||
 		in_array('domainrelatedobject',$object_classes) ||
 		in_array('domain',$object_classes) ||
 		in_array('builtindomain',$object_classes))
 
-		return 'dc.png';
+		return 'ldap-dc.png';
 
 	elseif (in_array('alias',$object_classes))
-		return 'go.png';
+		return 'ldap-alias.png';
 
 	elseif (in_array('room',$object_classes))
 		return 'door.png';
@@ -1632,13 +1632,13 @@ function get_icon($server_id,$dn,$object_classes=array()) {
 		in_array('groupofnames',$object_classes) ||
 		in_array('group',$object_classes))
 
-		return 'ou.png';
+		return 'ldap-ou.png';
 
 	elseif (in_array('applicationprocess',$object_classes))
 		return 'process.png';
 
 	elseif (in_array('groupofuniquenames',$object_classes))
-		return 'uniquegroup.png';
+		return 'ldap-uniquegroup.png';
 
 	elseif (in_array('iphost',$object_classes))
 		return 'host.png';
@@ -1671,7 +1671,7 @@ function get_icon($server_id,$dn,$object_classes=array()) {
 		return 'ldap-server.png';
 
 	elseif (in_array('rbscollection',$object_classes))
-		return 'ou.png';
+		return 'ldap-ou.png';
 
 	elseif (in_array('dfsconfiguration',$object_classes))
 		return 'nt_machine.png';
@@ -1713,11 +1713,11 @@ function get_icon($server_id,$dn,$object_classes=array()) {
 		return 'lock.png';
 
 	elseif (strcasecmp($rdn_value,'MicrosoftDNS') == 0)
-		return 'dc.png';
+		return 'ldap-dc.png';
 
 	# Oh well, I don't know what it is. Use a generic icon.
 	else
-		return 'object.png';
+		return 'ldap-default.png';
 }
 
 /**
diff --git a/queries/SambaUsers.xml b/queries/SambaUsers.xml
index 2018a62..7fcb1e4 100644
--- a/queries/SambaUsers.xml
+++ b/queries/SambaUsers.xml
@@ -7,7 +7,7 @@
 </bases>
 <filter><![CDATA[(&(|(objectClass=sambaAccount)(objectClass=sambaSamAccount))(objectClass=posixAccount)(!(uid=*$)))]]></filter>
 <description>Samba Users</description>
-<icon>user.png</icon>
+<icon>ldap-user.png</icon>
 <scope>sub</scope>
 <visible>1</visible>
 
diff --git a/queries/UserList.xml b/queries/UserList.xml
index 4b8767e..4d54c1e 100644
--- a/queries/UserList.xml
+++ b/queries/UserList.xml
@@ -7,7 +7,7 @@
 </bases>
 <filter><![CDATA[(&(objectClass=posixAccount)(uid=*))]]></filter>
 <description>User List</description>
-<icon>user.png</icon>
+<icon>ldap-user.png</icon>
 <scope>sub</scope>
 <visible>1</visible>
 
diff --git a/templates/creation/alias.xml b/templates/creation/alias.xml
index c7f83d6..1cc7555 100644
--- a/templates/creation/alias.xml
+++ b/templates/creation/alias.xml
@@ -5,7 +5,7 @@
 <template>
 <askcontainer>1</askcontainer>
 <description>New LDAP Alias</description>
-<icon>go.png</icon>
+<icon>ldap-alias.png</icon>
 <invalid>0</invalid>
 <rdn>uid</rdn>
 <!--<regexp>^ou=People,o=.*,</regexp>-->
diff --git a/templates/creation/dNSDomain.xml b/templates/creation/dNSDomain.xml
index 2b6d38d..4a98054 100644
--- a/templates/creation/dNSDomain.xml
+++ b/templates/creation/dNSDomain.xml
@@ -4,7 +4,7 @@
 <template>
 <askcontainer>1</askcontainer>
 <description>New DNS Entry</description>
-<icon>dc.png</icon>
+<icon>ldap-dc.png</icon>
 <invalid>0</invalid>
 <rdn>dc</rdn>
 <!--<regexp>^ou=People,o=.*,</regexp>-->
diff --git a/templates/creation/example.xml b/templates/creation/example.xml
index bf525ab..812b707 100644
--- a/templates/creation/example.xml
+++ b/templates/creation/example.xml
@@ -19,7 +19,7 @@
 <attribute id="attribute1">
 	<display>Attribute 1</display>
 	<hint>This is an example</hint>
-	<icon>user.png</icon>
+	<icon>ldap-uid.png</icon>
 	<order>1</order>
 	<page>1</page>
 </attribute>
diff --git a/templates/creation/inetOrgPerson.xml b/templates/creation/inetOrgPerson.xml
index 70a342c..fc545a6 100644
--- a/templates/creation/inetOrgPerson.xml
+++ b/templates/creation/inetOrgPerson.xml
@@ -4,7 +4,7 @@
 <template>
 <askcontainer>1</askcontainer>
 <description>New Address Book Entry</description>
-<icon>user.png</icon>
+<icon>address-book.png</icon>
 <invalid>0</invalid>
 <rdn>cn</rdn>
 <!--<regexp>^ou=People,o=.*,</regexp>-->
diff --git a/templates/creation/kolabPerson.xml b/templates/creation/kolabPerson.xml
index 4b38dd3..a1d80c9 100644
--- a/templates/creation/kolabPerson.xml
+++ b/templates/creation/kolabPerson.xml
@@ -4,7 +4,7 @@
 <template>
 <askcontainer>1</askcontainer>
 <description>New Address Book Entry</description>
-<icon>user.png</icon>
+<icon>address-book.png</icon>
 <invalid>0</invalid>
 <rdn>cn</rdn>
 <!--<regexp>^ou=People,o=.*,</regexp>-->
@@ -45,7 +45,7 @@
 </attribute>
 <attribute id="title">
 	<display>Title</display>
-	<icon>ou.png</icon>
+	<icon>ldap-ou.png</icon>
 	<order>6</order>
 </attribute>
 <attribute id="alias">
diff --git a/templates/creation/mozillaOrgPerson.xml b/templates/creation/mozillaOrgPerson.xml
index c3d72f1..dc39a73 100644
--- a/templates/creation/mozillaOrgPerson.xml
+++ b/templates/creation/mozillaOrgPerson.xml
@@ -4,7 +4,7 @@
 <template>
 <askcontainer>1</askcontainer>
 <description>New Thunderbird Address Book Entry</description>
-<icon>user.png</icon>
+<icon>address-book.png</icon>
 <invalid>0</invalid>
 <rdn>cn</rdn>
 <!--<regexp>^ou=People,o=.*,</regexp>-->
diff --git a/templates/creation/organizationalRole.xml b/templates/creation/organizationalRole.xml
index f016af8..85e595a 100644
--- a/templates/creation/organizationalRole.xml
+++ b/templates/creation/organizationalRole.xml
@@ -4,7 +4,7 @@
 <template>
 <askcontainer>1</askcontainer>
 <description>New Organisational Role</description>
-<icon>o.png</icon>
+<icon>ldap-o.png</icon>
 <invalid>0</invalid>
 <rdn>cn</rdn>
 <!--<regexp>^ou=People,o=.*,</regexp>-->
@@ -39,7 +39,7 @@
 </attribute>
 <attribute id="roleOccupant">
 	<display>Occupant</display>
-	<icon>object.png</icon>
+	<icon>ldap-default.png</icon>
 	<order>5</order>
 	<spacer>1</spacer>
 </attribute>
diff --git a/templates/creation/ou.xml b/templates/creation/ou.xml
index eba56a7..6e0f45a 100644
--- a/templates/creation/ou.xml
+++ b/templates/creation/ou.xml
@@ -4,7 +4,7 @@
 <template>
 <askcontainer>1</askcontainer>
 <description>New Organisational Unit</description>
-<icon>ou.png</icon>
+<icon>ldap-ou.png</icon>
 <invalid>0</invalid>
 <rdn>ou</rdn>
 <!-- <regexp>^o=.*,</regexp> -->
diff --git a/templates/creation/posixAccount.xml b/templates/creation/posixAccount.xml
index 85889b4..07952e8 100644
--- a/templates/creation/posixAccount.xml
+++ b/templates/creation/posixAccount.xml
@@ -4,7 +4,7 @@
 <template>
 <askcontainer>1</askcontainer>
 <description>New User Account</description>
-<icon>user.png</icon>
+<icon>ldap-user.png</icon>
 <invalid>0</invalid>
 <rdn>cn</rdn>
 <!--<regexp>^ou=People,o=.*,</regexp>-->
diff --git a/templates/creation/posixGroup.xml b/templates/creation/posixGroup.xml
index b55484e..6f8d26b 100644
--- a/templates/creation/posixGroup.xml
+++ b/templates/creation/posixGroup.xml
@@ -4,7 +4,7 @@
 <template>
 <askcontainer>1</askcontainer>
 <description>New Posix Group</description>
-<icon>ou.png</icon>
+<icon>ldap-ou.png</icon>
 <invalid>0</invalid>
 <rdn>cn</rdn>
 <!-- <regexp>^ou=.*,</regexp> -->
diff --git a/templates/creation/sambaDomain.xml b/templates/creation/sambaDomain.xml
index af14340..563828e 100644
--- a/templates/creation/sambaDomain.xml
+++ b/templates/creation/sambaDomain.xml
@@ -4,7 +4,7 @@
 <template>
 <askcontainer>1</askcontainer>
 <description>New Samba Domain</description>
-<icon>dc.png</icon>
+<icon>ldap-dc.png</icon>
 <invalid>0</invalid>
 <rdn>sambaDomainName</rdn>
 <!--<regexp>^ou=People,o=.*,</regexp>-->
diff --git a/templates/creation/sambaGroupMapping.xml b/templates/creation/sambaGroupMapping.xml
index bea7cb9..c288f95 100644
--- a/templates/creation/sambaGroupMapping.xml
+++ b/templates/creation/sambaGroupMapping.xml
@@ -4,7 +4,7 @@
 <template>
 <askcontainer>1</askcontainer>
 <description>New Samba3 Group Mapping</description>
-<icon>ou.png</icon>
+<icon>ldap-ou.png</icon>
 <invalid>0</invalid>
 <rdn>cn</rdn>
 <!-- <regexp>^ou=.*,</regexp> -->
diff --git a/templates/creation/sambaSamAccount.xml b/templates/creation/sambaSamAccount.xml
index 77f292f..f69ed4b 100644
--- a/templates/creation/sambaSamAccount.xml
+++ b/templates/creation/sambaSamAccount.xml
@@ -4,7 +4,7 @@
 <template>
 <askcontainer>1</askcontainer>
 <description>New Samba3 Account</description>
-<icon>user.png</icon>
+<icon>ldap-user.png</icon>
 <invalid>0</invalid>
 <rdn>cn</rdn>
 <!--<regexp>^ou=People,o=.*,</regexp>-->
diff --git a/templates/creation/sendmailMTAAliasObject.xml b/templates/creation/sendmailMTAAliasObject.xml
index 6e733d2..86688b6 100644
--- a/templates/creation/sendmailMTAAliasObject.xml
+++ b/templates/creation/sendmailMTAAliasObject.xml
@@ -18,7 +18,7 @@
 <attributes>
 <attribute id="sendmailMTACluster">
 	<display>Sendmail Cluster Name</display>
-	<icon>object.png</icon>
+	<icon>ldap-default.png</icon>
 	<order>1</order>
 	<page>1</page>
 </attribute>
diff --git a/templates/creation/sendmailMTAClass.xml b/templates/creation/sendmailMTAClass.xml
index 2e17874..9bbde8e 100644
--- a/templates/creation/sendmailMTAClass.xml
+++ b/templates/creation/sendmailMTAClass.xml
@@ -18,7 +18,7 @@
 <attributes>
 <attribute id="sendmailMTACluster">
 	<display>Sendmail Cluster Name</display>
-	<icon>object.png</icon>
+	<icon>ldap-default.png</icon>
 	<order>1</order>
 	<page>1</page>
 </attribute>
diff --git a/templates/creation/sendmailMTAMapObject.xml b/templates/creation/sendmailMTAMapObject.xml
index 0d35382..5f4afd5 100644
--- a/templates/creation/sendmailMTAMapObject.xml
+++ b/templates/creation/sendmailMTAMapObject.xml
@@ -22,7 +22,7 @@
 <attributes>
 <attribute id="sendmailMTACluster">
 	<display>Sendmail Cluster Name</display>
-	<icon>object.png</icon>
+	<icon>ldap-default.png</icon>
 	<order>1</order>
 	<page>1</page>
 </attribute>
diff --git a/templates/creation/sendmailVirtualDomain.xml b/templates/creation/sendmailVirtualDomain.xml
index bcbb72d..b2c1047 100644
--- a/templates/creation/sendmailVirtualDomain.xml
+++ b/templates/creation/sendmailVirtualDomain.xml
@@ -18,7 +18,7 @@
 <attributes>
 <attribute id="sendmailMTACluster">
 	<display>Sendmail Cluster Name</display>
-	<icon>object.png</icon>
+	<icon>ldap-default.png</icon>
 	<order>1</order>
 	<page>1</page>
 </attribute>
diff --git a/templates/creation/sendmailVirtualUser.xml b/templates/creation/sendmailVirtualUser.xml
index 5b5374c..c046991 100644
--- a/templates/creation/sendmailVirtualUser.xml
+++ b/templates/creation/sendmailVirtualUser.xml
@@ -22,7 +22,7 @@
 <attributes>
 <attribute id="sendmailMTACluster">
 	<display>Sendmail Cluster Name</display>
-	<icon>object.png</icon>
+	<icon>ldap-default.png</icon>
 	<order>1</order>
 	<page>1</page>
 </attribute>
diff --git a/templates/creation/simpleSecurityObject.xml b/templates/creation/simpleSecurityObject.xml
index 5e9f6a4..9422d55 100644
--- a/templates/creation/simpleSecurityObject.xml
+++ b/templates/creation/simpleSecurityObject.xml
@@ -4,7 +4,7 @@
 <template>
 <askcontainer>1</askcontainer>
 <description>New Simple Security Object</description>
-<icon>user.png</icon>
+<icon>ldap-user.png</icon>
 <invalid>0</invalid>
 <rdn>userid</rdn>
 <!--<regexp>^ou=People,o=.*,</regexp>-->
diff --git a/templates/modification/inetOrgPerson.xml b/templates/modification/inetOrgPerson.xml
index d20d564..30fea97 100644
--- a/templates/modification/inetOrgPerson.xml
+++ b/templates/modification/inetOrgPerson.xml
@@ -3,7 +3,7 @@
 
 <template>
 <description>Address Book Entry</description>
-<icon>user.png</icon>
+<icon>address-book.png</icon>
 <invalid>0</invalid>
 <rdn>cn</rdn>
 <!-- <regexp>^uid=.*,</regexp> -->
diff --git a/templates/modification/posixGroup.xml b/templates/modification/posixGroup.xml
index e020a67..14cf7c3 100644
--- a/templates/modification/posixGroup.xml
+++ b/templates/modification/posixGroup.xml
@@ -4,7 +4,7 @@
 <template>
 <askcontainer>1</askcontainer>
 <description>New Posix Group</description>
-<icon>ou.png</icon>
+<icon>ldap-ou.png</icon>
 <invalid>0</invalid>
 <rdn>cn</rdn>
 <!-- <regexp>^ou=.*,</regexp> -->