diff --git a/addressbook/inc/class.addressbook_egw_record.inc.php b/addressbook/inc/class.addressbook_egw_record.inc.php
index ab153c19c9..6d5117cdb4 100644
--- a/addressbook/inc/class.addressbook_egw_record.inc.php
+++ b/addressbook/inc/class.addressbook_egw_record.inc.php
@@ -118,7 +118,7 @@ class addressbook_egw_record implements importexport_iface_egw_record
 		$ui->type_icon($this->owner, $this->private, $this->tid, $icon, $label);
 		
 		// Specific photo
-		return $this->jpegphoto ? egw_framework::link('/index.php',$ui->photo_src($this->identifier,$this->jpegphoto)):'addressbook/'.$icon;
+		return $this->jpegphoto ? egw_framework::link('/index.php',$ui->photo_src($this->identifier,$this->jpegphoto)):$icon;
 	}
 	/**
 	 * saves record into backend
diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index b9abf5fe1f..708e96ad1f 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -1741,6 +1741,12 @@ window.egw_LAB.wait(function() {
 			$label = $owner == $this->user ? lang('personal') : common::grab_owner_name($owner);
 		}
 		// show tid icon for tid!='n' AND only if one is defined
+		if ($tid != 'n' && common::image('addressbook',$this->content_types[$tid]['name']))
+		{
+			$icon = common::image('addressbook',$this->content_types[$tid]['name']);
+		}
+		
+		// Legacy - from when icons could be anywhere
 		if ($tid != 'n' && $this->content_types[$tid]['options']['icon'])
 		{
 			$icon = $this->content_types[$tid]['options']['icon'];
diff --git a/addressbook/templates/default/admin.types.xet b/addressbook/templates/default/admin.types.xet
index cc12edff5f..39cea87aea 100644
--- a/addressbook/templates/default/admin.types.xet
+++ b/addressbook/templates/default/admin.types.xet
@@ -4,32 +4,6 @@
 	<template id="addressbook.admin.types" template="" lang="" group="0" version="">
 		<vbox>
 			<template id="admin.customfields.types" content="content_types"/>
-			<grid id="content_type_options">
-				<columns>
-					<column/>
-					<column/>
-					<column/>
-				</columns>
-				<rows>
-					<row>
-						<hbox span="all">
-							<description value="Options for type " class="header"/>
-							<description id="type" no_lang="1" font_style="b"/>
-							<description/>
-						</hbox>
-					</row>
-					<row>
-						<description value="Icon"/>
-						<textbox id="icon" size="40"/>
-						<description value="Choose an icon for this contact type"/>
-					</row>
-					<row>
-						<description value="Template"/>
-						<textbox id="template" size="40"/>
-						<description value="Chosse an eTemplate for this contact type"/>
-					</row>
-				</rows>
-			</grid>
 			<button label="Save" id="save"/>
 		</vbox>
 		<styles>.header{