diff --git a/classes/helper/Helper.php b/classes/helper/Helper.php
index 0693a4c9a..a79f9be83 100755
--- a/classes/helper/Helper.php
+++ b/classes/helper/Helper.php
@@ -384,7 +384,7 @@ class HelperCore
 			if (!isset($context->controller->multishop_context) || $context->controller->multishop_context & Shop::CONTEXT_SHOP)
 				foreach ($group_data['shops'] as $sID => $shopData)
 					if ($shopData['active'])
-						$html .= '<option value="s-'.$sID.'" class="shop" '.(($value == 's-'.$sID) ? 'selected="selected"' : '').'>&raquo; '.$shopData['name'].'</option>';
+						$html .= '<option value="s-'.$sID.'" class="shop" '.(($value == 's-'.$sID) ? 'selected="selected"' : '').'>&raquo; '.($context->controller->multishop_context_group == false ? htmlspecialchars($group_data['name']).' - ' : '').$shopData['name'].'</option>';
 
 			if (!(!isset($context->controller->multishop_context) || $context->controller->multishop_context & Shop::CONTEXT_GROUP))
 				$html .= '</optgroup>';
diff --git a/classes/helper/HelperList.php b/classes/helper/HelperList.php
index 49d2ce89b..c018df2cd 100644
--- a/classes/helper/HelperList.php
+++ b/classes/helper/HelperList.php
@@ -256,15 +256,7 @@ class HelperListCore extends Helper
 				{
 					// item_id is the product id in a product image context, else it is the image id.
 					$item_id = isset($params['image_id']) ? $tr[$params['image_id']] : $id;
-					// If it's a product image
-					if (isset($tr['id_image']))
-					{
-						$image = new Image((int)$tr['id_image']);
-						$path_to_image = _PS_IMG_DIR_.$params['image'].'/'.$image->getExistingImgPath().'.'.$this->imageType;
-					}
-					else
-						$path_to_image = _PS_IMG_DIR_.$params['image'].'/'.$item_id.(isset($tr['id_image']) ? '-'.(int)$tr['id_image'] : '').'.'.$this->imageType;
-
+					$path_to_image = _PS_IMG_DIR_.$params['image'].'/'.$item_id.(isset($tr['id_image']) ? '-'.(int)$tr['id_image'] : '').'.'.$this->imageType;
 					$this->_list[$index][$key] = ImageManager::thumbnail($path_to_image, $this->table.'_mini_'.$item_id.'.'.$this->imageType, 45, $this->imageType);
 				}
 				else if (isset($params['icon']) && (isset($params['icon'][$tr[$key]]) || isset($params['icon']['default'])))
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 53ce4ead7..fcfc8215e 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -156,13 +156,14 @@ class AdminProductsControllerCore extends AdminController
 			'type' => 'bool',
 			'orderby' => false
 		);
-		$this->fields_list['position'] = array(
-			'title' => $this->l('Position'),
-			'width' => 70,
-			'filter_key' => 'cp!position',
-			'align' => 'center',
-			'position' => 'position'
-		);
+		if ((int)Tools::getValue('id_category'))
+			$this->fields_list['position'] = array(
+				'title' => $this->l('Position'),
+				'width' => 70,
+				'filter_key' => 'cp!position',
+				'align' => 'center',
+				'position' => 'position'
+			);
 
 
 		// @since 1.5 : translations for tabs
@@ -2116,10 +2117,6 @@ class AdminProductsControllerCore extends AdminController
 		$this->addRowAction('edit');
 		$this->addRowAction('duplicate');
 		$this->addRowAction('delete');
-
-		if (!Tools::getValue('id_category'))
-			unset($this->fields_list['position']);
-
 		return parent::renderList();
 	}