Index: branches/2.8.x/CHANGELOG
===================================================================
--- branches/2.8.x/CHANGELOG	(revision 1684)
+++ branches/2.8.x/CHANGELOG	(revision 1685)
@@ -11,7 +11,9 @@
 ! = Update/Change
 ===============================================================================
 
-03 May-2012 Build 1684 Dietmar Woellbrink (Luisehahne)
+06 May-2012 Build 1685 Werner v.d.Decken(DarkViper)
+! last fixes for use of page_icon s.o.
+06 May-2012 Build 1684 Dietmar Woellbrink (Luisehahne)
 ! update upgrade-script, now don't overwrite existings values in settings
 + add field tooltip to table pages in installer
 ! change some module tool_icon.png (Tks to Stefek) 
Index: branches/2.8.x/wb/admin/pages/settings.php
===================================================================
--- branches/2.8.x/wb/admin/pages/settings.php	(revision 1684)
+++ branches/2.8.x/wb/admin/pages/settings.php	(revision 1685)
@@ -164,7 +164,8 @@
 		$oIterator = new DirectoryIterator(WB_PATH.$sIconDir);
 		foreach ($oIterator as $fileinfo) {
 			if(preg_match('/'.$sAllowedImageTypes.'$/i', $fileinfo->getFilename())) {
-				$sItem = str_replace(WB_PATH, '', str_replace('\\', '/', $fileinfo->getPathname()));
+				$sItem = str_replace(str_replace('\\', '/', WB_PATH), '',
+						             str_replace('\\', '/', $fileinfo->getPathname()));
 //				$sItem = WB_REL.$sItem;
 				$aPageIcons[] = array('VALUE'=>$sItem, 'NAME'=>$fileinfo->getFilename());
 			}
Index: branches/2.8.x/wb/admin/interface/version.php
===================================================================
--- branches/2.8.x/wb/admin/interface/version.php	(revision 1684)
+++ branches/2.8.x/wb/admin/interface/version.php	(revision 1685)
@@ -51,5 +51,5 @@
 
 // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled)
 if(!defined('VERSION')) define('VERSION', '2.8.3');
-if(!defined('REVISION')) define('REVISION', '1684');
+if(!defined('REVISION')) define('REVISION', '1685');
 if(!defined('SP')) define('SP', '');
Index: branches/2.8.x/wb/framework/class.frontend.php
===================================================================
--- branches/2.8.x/wb/framework/class.frontend.php	(revision 1684)
+++ branches/2.8.x/wb/framework/class.frontend.php	(revision 1685)
@@ -35,9 +35,9 @@
 	// page database row
 	public $page;
 	public $page_id,$page_title,$menu_title,$parent,$root_parent,$level,$position,$visibility;
-	public $page_description,$page_keywords,$page_link;
+	public $page_description,$page_keywords,$page_link, $page_icon, $menu_icon_0, $menu_icon_1, $tooltip;
 	public $page_trail=array();
-	
+
 	public $page_access_denied;
 	public $page_no_active_sections;
 	
@@ -157,6 +157,10 @@
 				if(!defined('MENU_TITLE')) {define('MENU_TITLE', PAGE_TITLE);}
 			}
 			$this->menu_title = MENU_TITLE;
+			$this->page_icon = $this->page['page_icon'];
+			$this->menu_icon_0 = $this->page['menu_icon_0'];
+			$this->menu_icon_1 = $this->page['menu_icon_1'];
+			$this->tooltip = $this->page['tooltip'];
 			// Page parent
 			if(!defined('PARENT')) {define('PARENT', $this->page['parent']);}
 			$this->parent=$this->page['parent'];
Index: branches/2.8.x/wb/modules/droplets/example/iParentPageIcon.php
===================================================================
--- branches/2.8.x/wb/modules/droplets/example/iParentPageIcon.php	(revision 1684)
+++ branches/2.8.x/wb/modules/droplets/example/iParentPageIcon.php	(revision 1685)
@@ -13,7 +13,6 @@
 {
 	$icon_url = WB_REL.'/'.TEMPLATE.'/'.$icon;
 }
-if( !isset($wb->page_icon) ) { return $icon_url; }
 $tmp_trail = $wb->page_trail;
 $tmp_trail = array_reverse($tmp_trail);
 foreach($tmp_trail as $pid)