diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index 085a6e6ce..fff4b5745 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -2008,7 +2008,7 @@ EOF
 					}
 					else
 					{
-						$sUrl = $sDefaultUrl;
+						$sUrl = null;
 					}
 
 					$sHTMLValue = "<div class=\"field_input_zone field_input_image\"><div id=\"edit_$iInputId\" class=\"edit-image\"></div></div>\n";
diff --git a/core/attributedef.class.inc.php b/core/attributedef.class.inc.php
index 6e22a32e6..f2772e7a3 100644
--- a/core/attributedef.class.inc.php
+++ b/core/attributedef.class.inc.php
@@ -7284,10 +7284,13 @@ class AttributeImage extends AttributeBlob
 	 * @param bool $bLocalize
 	 *
 	 * @return string
+	 *
+	 * @see edit_image.js for JS generated markup in form edition
 	 */
 	public function GetAsHTML($value, $oHostObject = null, $bLocalize = true)
 	{
 		$sRet = '';
+		$bIsCustomImage = false;
 
 		$iMaxWidthPx = $this->Get('display_max_width').'px';
 		$iMaxHeightPx = $this->Get('display_max_height').'px';
@@ -7299,10 +7302,14 @@ class AttributeImage extends AttributeBlob
 
 		$sCustomImageUrl = $this->GetAttributeImageFileUrl($value, $oHostObject);
 		if ($sCustomImageUrl !== null) {
+			$bIsCustomImage = true;
 			$sRet = $this->GetHtmlForImageUrl($sCustomImageUrl, $iMaxWidthPx, $iMaxHeightPx);
 		}
 
-		return '<div class="view-image" style="width: '.$iMaxWidthPx.'; height: '.$iMaxHeightPx.';"><span class="helper-middle"></span>'.$sRet.'</div>';
+		$sCssClasses = 'view-image attribute-image';
+		$sCssClasses .= ' '.(($bIsCustomImage) ? 'attribute-image-custom' : 'attribute-image-default');
+
+		return '<div class="'.$sCssClasses.'" style="width: '.$iMaxWidthPx.'; height: '.$iMaxHeightPx.';"><span class="helper-middle"></span>'.$sRet.'</div>';
 	}
 
 	private function GetHtmlForImageUrl($sUrl, $iMaxWidthPx, $iMaxHeightPx) {
diff --git a/js/edit_image.js b/js/edit_image.js
index 667fd2873..3d094423c 100644
--- a/js/edit_image.js
+++ b/js/edit_image.js
@@ -32,9 +32,25 @@ $(function()
 
 				var sMarkup = '';
 				sMarkup += '<input type="hidden" id="do_remove_' + me.options.input_name + '" name="' + me.options.input_name + '[remove]" value="0"/>';
-				sMarkup += '<div id="preview_' + me.options.input_name + '" class="view-image" style="width: ' + me.options.max_width_px + 'px; height: ' + me.options.max_height_px + 'px;">';
+
+				var sCssClasses = "view-image attribute-image";
+				console.debug("edit_image", me.options.current_image_url);
+				var sCssClassToAdd, sImageUrl;
+				if (me.options.current_image_url === null)
+				{
+					sCssClassToAdd = "attribute-image-default";
+					sImageUrl = me.options.default_image_url;
+				}
+				else
+				{
+					sCssClassToAdd = "attribute-image-custom";
+					sImageUrl = me.options.current_image_url;
+				}
+				sCssClasses += ' '+sCssClassToAdd;
+				sMarkup += '<div id="preview_'+me.options.input_name+'" class="'+sCssClasses+'" style="width: '+me.options.max_width_px+'px; height: '+me.options.max_height_px+'px;">';
+
 				sMarkup += '<span class="helper-middle"></span>';
-				sMarkup += '<img src="' + me.options.current_image_url + '" data-original-src="' + me.options.current_image_url + '" data-default-src="' + me.options.default_image_url + '" style="max-width: ' + me.options.max_width_px + 'px; max-height: ' + me.options.max_height_px + 'px">';
+				sMarkup += '<img src="'+sImageUrl+'" data-original-src="'+sImageUrl+'" data-default-src="'+me.options.default_image_url+'" style="max-width: '+me.options.max_width_px+'px; max-height: '+me.options.max_height_px+'px">';
 				sMarkup += '</div>';
 				sMarkup += '<div id="buttons_' + me.options.input_name + '" class="edit-buttons">';
 				sMarkup += '<div title="' + me.options.labels.reset_button + '" id="reset_' + me.options.input_name + '" class="button disabled"><div class="ui-icon ui-icon-arrowreturnthick-1-w"></div></div>';