Index: pi1/class.tx_commerce_pi1.php
===================================================================
--- pi1/class.tx_commerce_pi1.php	(revision 33328)
+++ pi1/class.tx_commerce_pi1.php	(working copy)
@@ -642,14 +644,9 @@
 						//disable the icon mode by default
 						$iconMode = FALSE;
 						
-						// $attributeArray[$attrUid] = '';
-						
-
 						//if the icon mode is enabled in TS check if the iconMode is also enabled for this attribute
 						if ($this->conf[$this->handle . '.']['products.']['productAttributes.']['iconMode'] == '1') {
-							if ($myAttribute['iconmode']) {
-								$iconMode = TRUE;
-							}
+							$iconMode = $attributeObj->isIconmode();
 						}
 						if ($iconMode) {
 							$templateAttrSelector = $templateAttrSelectorRadiobutton;
Index: lib/class.tx_commerce_attribute.php
===================================================================
--- lib/class.tx_commerce_attribute.php	(revision 33328)
+++ lib/class.tx_commerce_attribute.php	(working copy)
@@ -115,7 +115,7 @@
    {
 		 $uid = intval($uid);
 		 $lang_uid = intval($lang_uid);
-		 $this->fieldlist=array('title','unit','has_valuelist','l18n_parent');
+		 $this->fieldlist=array('title','unit','iconmode','has_valuelist','l18n_parent');
 		 $this->database_class='tx_commerce_db_attribute';
 		 if ($uid>0)
 		 {
@@ -259,12 +274,17 @@
   		return false;
   	}
 
-
-
-
-
-
-  }
+  	/**
+  	 * Check if it is an Iconmode Attribute
+  	 * @return boolean 
+  	 */
+  	function isIconmode() {
+  		if($this->iconmode == "1") {
+  			return true;
+  		}
+  		return false;
+	}
+}
 
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/commerce/lib/class.tx_commerce_attribute.php']) {
 	include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/commerce/lib/class.tx_commerce_attribute.php']);