diff --git a/business/itop.business.class.inc.php b/business/itop.business.class.inc.php
index 41498b733..3059da87f 100644
--- a/business/itop.business.class.inc.php
+++ b/business/itop.business.class.inc.php
@@ -73,7 +73,7 @@ class Location extends cmdbAbstractObject
 			"db_table" => "location",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"icon" => "../business/templates/location.png",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -146,7 +146,7 @@ class Person extends Contact
 			"db_table" => "person",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"icon" => "../business/templates/person.png",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -175,7 +175,7 @@ class Team extends Contact
 			"db_table" => "team",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"icon" => "../business/templates/team.png",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -202,7 +202,7 @@ abstract class Document extends cmdbAbstractObject
 			"db_table" => "document",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"icon" => "../business/templates/document.png",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -236,7 +236,7 @@ class ExternalDoc extends Document
 			"db_table" => "externaldoc",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"icon" => "../business/templates/document.png",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -264,7 +264,7 @@ class Note extends Document
 			"db_table" => "note",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"icon" => "../business/templates/document.png",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -292,7 +292,7 @@ class FileDoc extends Document
 			"db_table" => "filedoc",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"icon" => "../business/templates/document.png",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -421,7 +421,7 @@ class Application extends cmdbAbstractObject
 			"db_table" => "application",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"icon" => "../business/templates/software.png",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -515,7 +515,7 @@ class ApplicationInstance extends FunctionalCI
 			"db_table" => "applicationinstance",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"icon" => "../business/templates/application.png",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -550,7 +550,7 @@ class DatabaseInstance extends FunctionalCI
 			"db_table" => "databaseinstance",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"icon" => "../business/templates/database-instance.png",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -562,8 +562,8 @@ class DatabaseInstance extends FunctionalCI
 		MetaModel::Init_AddAttribute(new AttributeWikiText("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 
 		MetaModel::Init_SetZListItems('details', array('name', 'status', 'owner_id', 'importance', 'application_id', 'admin_login', 'admin_password', 'description'));
-		MetaModel::Init_SetZListItems('advanced_search', array('name', 'status', 'owner_id', 'importance', 'application_id', 'admin_login', 'admin_password', 'description'));
-		MetaModel::Init_SetZListItems('standard_search', array('name', 'status', 'owner_id', 'importance', 'application_id', 'admin_login', 'admin_password', 'description'));
+		MetaModel::Init_SetZListItems('advanced_search', array('name', 'status', 'owner_id', 'importance', 'application_id', 'description'));
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'status', 'owner_id', 'importance', 'application_id', 'description'));
 		MetaModel::Init_SetZListItems('list', array('status', 'owner_id', 'importance', 'application_id', 'admin_login', 'admin_password', 'description'));
 	}
 }
@@ -582,7 +582,7 @@ class ApplicationSolution extends FunctionalCI
 			"db_table" => "applicationsolution",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"icon" => "../business/templates/",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -612,7 +612,7 @@ class BusinessProcess extends FunctionalCI
 			"db_table" => "businessprocess",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"icon" => "../business/templates/business-process.png",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -739,7 +739,7 @@ class PC extends Device
 			"db_table" => "pc",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"icon" => "../business/templates/computer.png",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -771,7 +771,7 @@ class MobileCI extends Device
 			"db_table" => "mobileci",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"icon" => "../business/templates/mobile-phone.png",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -873,8 +873,8 @@ class NetworkDevice extends InfrastructureCI
 		MetaModel::Init_AddAttribute(new AttributePassword("snmp_write", array("allowed_values"=>null, "sql"=>"snmp_write", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array())));
 
 		MetaModel::Init_SetZListItems('details', array('name', 'status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref', 'description', 'location_id', 'location_details', 'management_ip', 'default_gateway', 'type', 'ios_version', 'ram', 'snmp_read', 'snmp_write'));
-		MetaModel::Init_SetZListItems('advanced_search', array('name', 'status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref', 'description', 'location_id', 'location_details', 'management_ip', 'default_gateway', 'type', 'ios_version', 'ram', 'snmp_read', 'snmp_write'));
-		MetaModel::Init_SetZListItems('standard_search', array('name', 'status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref', 'description', 'location_id', 'location_details', 'management_ip', 'default_gateway', 'type', 'ios_version', 'ram', 'snmp_read', 'snmp_write'));
+		MetaModel::Init_SetZListItems('advanced_search', array('name', 'status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref', 'description', 'location_id', 'location_details', 'management_ip', 'default_gateway', 'type', 'ios_version', 'ram'));
+		MetaModel::Init_SetZListItems('standard_search', array('name', 'status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref', 'description', 'location_id', 'location_details', 'management_ip', 'default_gateway', 'type', 'ios_version', 'ram'));
 		MetaModel::Init_SetZListItems('list', array('status', 'owner_id', 'importance', 'brand', 'model', 'serial_number', 'asset_ref', 'description', 'location_id', 'location_details', 'management_ip', 'default_gateway', 'type', 'ios_version', 'ram', 'snmp_read', 'snmp_write'));
 	}
 }
@@ -893,7 +893,7 @@ class Server extends InfrastructureCI
 			"db_table" => "server",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"icon" => "../business/templates/server.png",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -925,7 +925,7 @@ class Printer extends InfrastructureCI
 			"db_table" => "printer",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"icon" => "../business/templates/printer.png",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -985,7 +985,7 @@ class lnkCIToContact extends cmdbAbstractObject
 			"db_table" => "lnkcitocontact",
 			"db_key_field" => "id",
 			"db_finalclass_field" => "",
-			"display_template" => "",
+			"icon" => "../business/templates/contact.png",
 		);
 		MetaModel::Init_Params($aParams);
 		MetaModel::Init_InheritAttributes();
@@ -1829,7 +1829,7 @@ $oConfigManagementGroup = new MenuGroup('Menu:ConfigManagement', 1 /* fRank */);
 new TemplateMenuNode('Menu:ConfigManagement/Overview', '../business/templates/configuration_management_menu.html', $oConfigManagementGroup->GetIndex(), 0 /* fRank */);
 
 
-$oContactNode = new TemplateMenuNode('Menu:Class:Contact/Name', '../business/templates/configuration_management_menu.html', $oConfigManagementGroup->GetIndex(), 1 /* fRank */);
+$oContactNode = new TemplateMenuNode('Menu:Class:Contact/Name', '../business/templates/contacts_menu.html', $oConfigManagementGroup->GetIndex(), 1 /* fRank */);
 new OQLMenuNode('Menu:Class:Person/Name', 'Menu:Class:Person/Title', 'SELECT Person', $oContactNode->GetIndex(), 1 /* fRank */);
 new OQLMenuNode('Menu:Class:Team/Name', 'Menu:Class:Team/Title', 'SELECT Team', $oContactNode->GetIndex(), 2 /* fRank */);
 
@@ -1837,7 +1837,7 @@ new OQLMenuNode('Menu:Class:FileDoc/Name', 'Menu:Class:FileDoc/Title', 'SELECT F
 new OQLMenuNode('Menu:Class:Location/Name', 'Menu:Class:Location/Title', 'SELECT Location', $oConfigManagementGroup->GetIndex(), 3 /* fRank */);
 
 
-$oCINode = new TemplateMenuNode('Menu:ConfigManagement:CI', '../business/templates/configuration_management_menu.html', $oConfigManagementGroup->GetIndex(), 2 /* fRank */);
+$oCINode = new TemplateMenuNode('Menu:ConfigManagement:CI', '../business/templates/configuration_items_menu.html', $oConfigManagementGroup->GetIndex(), 2 /* fRank */);
 
 new OQLMenuNode('Menu:Class:BusinessProcess/Name', 'Menu:Class:BusinessProcess/Title', 'SELECT BusinessProcess', $oCINode->GetIndex(), 0 /* fRank */);
 new OQLMenuNode('Menu:Class:ApplicationSolution/Name', 'Menu:Class:ApplicationSolution/Title', 'SELECT ApplicationSolution', $oCINode->GetIndex(), 1 /* fRank */);
diff --git a/business/templates/application.png b/business/templates/application.png
new file mode 100644
index 000000000..f1512d137
Binary files /dev/null and b/business/templates/application.png differ
diff --git a/business/templates/business-process.png b/business/templates/business-process.png
new file mode 100644
index 000000000..a2359860f
Binary files /dev/null and b/business/templates/business-process.png differ
diff --git a/business/templates/computer.png b/business/templates/computer.png
new file mode 100644
index 000000000..2e88eacb3
Binary files /dev/null and b/business/templates/computer.png differ
diff --git a/business/templates/configuration_items_menu.html b/business/templates/configuration_items_menu.html
index 94f9c5766..54920014e 100644
--- a/business/templates/configuration_items_menu.html
+++ b/business/templates/configuration_items_menu.html
@@ -2,17 +2,18 @@
 <table border="0" padding="5" class="layout" width="100%">
 <tr>
 <td class="dashboard">
-<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:pie;chart_title:UI-ConfigurationItemsMenu-ServersByCriticity;group_by:severity" asynchronous="false" encoding="text/oql">SELECT bizServer</itopblock>
+<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:pie;chart_title:UI-ConfigurationItemsMenu-ServersByCriticity;group_by:importance" asynchronous="false" encoding="text/oql">SELECT Server</itopblock>
 </td>
 <td class="dashboard">
-<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:pie;chart_title:UI-ConfigurationItemsMenu-PCsByCriticity;group_by:severity" asynchronous="false" encoding="text/oql">SELECT bizPC</itopblock>
+<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:pie;chart_title:UI-ConfigurationItemsMenu-PCsByCriticity;group_by:importance" asynchronous="false" encoding="text/oql">SELECT PC</itopblock>
 </td>
-</tr><tr>
+</tr>
+<tr>
 <td class="dashboard">
-<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:pie;chart_title:UI-ConfigurationItemsMenu-NWDevicesByCriticity;group_by:severity" asynchronous="false" encoding="text/oql">SELECT bizNetworkDevice</itopblock>
+<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:pie;chart_title:UI-ConfigurationItemsMenu-NWDevicesByCriticity;group_by:importance" asynchronous="false" encoding="text/oql">SELECT NetworkDevice</itopblock>
 </td>
 <td class="dashboard">
-<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:pie;chart_title:UI-ConfigurationItemsMenu-ApplicationsByCriticity;group_by:severity" asynchronous="false" encoding="text/oql">SELECT bizApplication</itopblock>
+<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:pie;chart_title:UI-ConfigurationItemsMenu-ApplicationsByCriticity;group_by:importance" asynchronous="false" encoding="text/oql">SELECT ApplicationSolution</itopblock>
 </td>
 </tr>
 </table>
diff --git a/business/templates/configuration_management_menu.html b/business/templates/configuration_management_menu.html
index c5c2a82a7..22b7d4ad0 100644
--- a/business/templates/configuration_management_menu.html
+++ b/business/templates/configuration_management_menu.html
@@ -2,16 +2,16 @@
 <table border="0" padding="5" class="layout" width="100%">
 <tr>
 <td class="dashboard">
-<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:pie;group_by:status;chart_title:UI-ConfigurationManagementMenu-InfraByStatus" asynchronous="false" encoding="text/oql">SELECT logInfra</itopblock>
+<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:pie;group_by:status;chart_title:UI-ConfigurationManagementMenu-InfraByStatus" asynchronous="false" encoding="text/oql">SELECT FunctionalCI</itopblock>
 </td>
 <td class="dashboard">
-<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:bars;group_by:finalclass;chart_title:UI-ConfigurationManagementMenu-InfraByType" asynchronous="false" encoding="text/oql">SELECT logInfra</itopblock>
+<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:bars;group_by:finalclass;chart_title:UI-ConfigurationManagementMenu-InfraByType" asynchronous="false" encoding="text/oql">SELECT FunctionalCI</itopblock>
 </td>
 </tr>
 <tr>
 <td class="dashboard">
 <h2><itopstring>UI-ConfigurationManagementMenu-InfraByType</itopstring></h2>
-<itopblock BlockClass="DisplayBlock" type="count" parameters="group_by:finalclass" asynchronous="false" encoding="text/oql">SELECT logInfra</itopblock>
+<itopblock BlockClass="DisplayBlock" type="count" parameters="group_by:finalclass" asynchronous="false" encoding="text/oql">SELECT FunctionalCI</itopblock>
 </td>
 <td>
 &nbsp;
diff --git a/business/templates/contact.png b/business/templates/contact.png
new file mode 100644
index 000000000..0694d18f9
Binary files /dev/null and b/business/templates/contact.png differ
diff --git a/business/templates/contacts_menu.html b/business/templates/contacts_menu.html
index b9e6cee7b..267a9c438 100644
--- a/business/templates/contacts_menu.html
+++ b/business/templates/contacts_menu.html
@@ -3,20 +3,20 @@
 <tr>
 <td class="dashboard">
 <h2><itopstring>UI-ContactsMenu-ContactsByLocation</itopstring></h2>
-<itopblock BlockClass="DisplayBlock" type="count" parameters="group_by:location_name" asynchronous="false" encoding="text/oql">SELECT bizContact</itopblock>
+<itopblock BlockClass="DisplayBlock" type="count" parameters="group_by:location_id" asynchronous="false" encoding="text/oql">SELECT Contact</itopblock>
 </td>
 <td class="dashboard">
-<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:pie;chart_title:UI-ContactsMenu-ContactsByLocation;group_by:location_name" asynchronous="false" encoding="text/oql">SELECT bizContact</itopblock>
+<itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:pie;chart_title:UI-ContactsMenu-ContactsByLocation;group_by:location_name" asynchronous="false" encoding="text/oql">SELECT Contact</itopblock>
 </td>
 </tr>
 <tr>
 <td class="dashboard">
 <h2><itopstring>UI-ContactsMenu-ContactsByType</itopstring></h2>
-<itopblock BlockClass="DisplayBlock" type="count" parameters="group_by:finalclass" asynchronous="false" encoding="text/oql">SELECT bizContact</itopblock>
+<itopblock BlockClass="DisplayBlock" type="count" parameters="group_by:finalclass" asynchronous="false" encoding="text/oql">SELECT Contact</itopblock>
 </td>
 <td class="dashboard">
 <h2><itopstring>UI-ContactsMenu-ContactsByStatus</itopstring></h2>
-<itopblock BlockClass="DisplayBlock" type="count" parameters="group_by:status" asynchronous="false" encoding="text/oql">SELECT bizContact</itopblock>
+<itopblock BlockClass="DisplayBlock" type="count" parameters="group_by:status" asynchronous="false" encoding="text/oql">SELECT Contact</itopblock>
 </td>
 </tr>
 </table>
diff --git a/business/templates/database-instance.png b/business/templates/database-instance.png
new file mode 100644
index 000000000..634895539
Binary files /dev/null and b/business/templates/database-instance.png differ
diff --git a/business/templates/database.png b/business/templates/database.png
new file mode 100644
index 000000000..1c5a2e039
Binary files /dev/null and b/business/templates/database.png differ
diff --git a/business/templates/document.png b/business/templates/document.png
new file mode 100644
index 000000000..04de88f8f
Binary files /dev/null and b/business/templates/document.png differ
diff --git a/business/templates/laptop.png b/business/templates/laptop.png
new file mode 100644
index 000000000..9cce218db
Binary files /dev/null and b/business/templates/laptop.png differ
diff --git a/business/templates/location.png b/business/templates/location.png
new file mode 100644
index 000000000..529a4516e
Binary files /dev/null and b/business/templates/location.png differ
diff --git a/business/templates/mobile-phone.png b/business/templates/mobile-phone.png
new file mode 100644
index 000000000..545b84346
Binary files /dev/null and b/business/templates/mobile-phone.png differ
diff --git a/business/templates/person.png b/business/templates/person.png
new file mode 100644
index 000000000..ff8313e79
Binary files /dev/null and b/business/templates/person.png differ
diff --git a/business/templates/printer.png b/business/templates/printer.png
new file mode 100644
index 000000000..24bcb9678
Binary files /dev/null and b/business/templates/printer.png differ
diff --git a/business/templates/server.png b/business/templates/server.png
new file mode 100644
index 000000000..b21caca7e
Binary files /dev/null and b/business/templates/server.png differ
diff --git a/business/templates/software.png b/business/templates/software.png
new file mode 100644
index 000000000..4f629eaf3
Binary files /dev/null and b/business/templates/software.png differ
diff --git a/business/templates/team.png b/business/templates/team.png
new file mode 100644
index 000000000..329be879d
Binary files /dev/null and b/business/templates/team.png differ