diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 78342100fa3..483d356891c 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -316,6 +316,13 @@ class Form
 						$arraylist[$tmp[0]] = $tmp[1];
 					}
 					$ret .= $arraylist[$value];
+					if ($htmlname == 'fk_product_type') {
+						if ($value == 0) {
+							$ret = img_picto($langs->trans("Product"), 'product', 'class="paddingleftonly paddingrightonly colorgrey"').$ret;
+						} else {
+							$ret = img_picto($langs->trans("Service"), 'service', 'class="paddingleftonly paddingrightonly colorgrey"').$ret;
+						}
+					}
 				} elseif (preg_match('/^ckeditor/', $typeofdata)) {
 					$tmpcontent = dol_htmlentitiesbr($value);
 					if (!empty($conf->global->MAIN_DISABLE_NOTES_TAB)) {
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 55c29aa1381..abf99c1b921 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1813,7 +1813,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
 			// Type
 			if (!empty($conf->product->enabled) && !empty($conf->service->enabled))
 			{
-				// TODO change for compatibility with edit in place
 				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
 				print '<tr><td class="titlefield">';
 				print (empty($conf->global->PRODUCT_DENY_CHANGE_PRODUCT_TYPE)) ? $form->editfieldkey("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat) : $langs->trans('Type');
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index f7999860185..ff035dcdb9c 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -1113,17 +1113,10 @@ if ($resql)
 		{
 			print '<td class="center">';
 			$s = '';
-			if ($obj->fk_product_type == 0)
-			{
-				//$s .= '<a class="product-type-back" title="'.$langs->trans("Product").'">';
+			if ($obj->fk_product_type == 0) {
 				$s .= img_picto($langs->trans("Product"), 'product', 'class="paddingleftonly paddingrightonly colorgrey"');
-				//$s .= dol_substr($langs->trans("Product"), 0, 1);
-				//$s .= '</a>';
 			} else {
-				//$s .= '<span class="service-type-back" title="'.$langs->trans("Service").'">';
 				$s .= img_picto($langs->trans("Service"), 'service', 'class="paddingleftonly paddingrightonly colorgrey"');
-				//$s .= dol_substr($langs->trans("Service"), 0, 1);
-				//$s .= '</a>';
 			}
 			print $s;
 			print '</td>';