diff --git a/e107_core/shortcodes/single/user_avatar.php b/e107_core/shortcodes/single/user_avatar.php
index e07cf8509..73af5a300 100644
--- a/e107_core/shortcodes/single/user_avatar.php
+++ b/e107_core/shortcodes/single/user_avatar.php
@@ -7,6 +7,8 @@ function user_avatar_shortcode($parm='')
 	
 	
 	$tp 		= e107::getParser();
+	$width 		= $tp->thumbWidth;
+	$height 	= ($tp->thumbHeight !== 0) ? $tp->thumbHeight : "";
 	
 	if(intval($loop_uid) > 0 && trim($parm) == "")
 	{
@@ -47,8 +49,7 @@ function user_avatar_shortcode($parm='')
 		if(strpos($image,"://")!==false) // Remove Image
 		{
 			$img = $image;	
-			$height = $tp->thumbHeight;
-			$width = $tp->thumbWidth;
+
 			
 			//$height 	= e107::getPref("im_height",100); // these prefs are too limiting for local images.  
 			//$width 		= e107::getPref("im_width",100);
@@ -58,7 +59,7 @@ function user_avatar_shortcode($parm='')
 			$image = substr($image,8); // strip the -upload- from the beginning. 
 			if(file_exists(e_AVATAR_UPLOAD.$image)) // Local Default Image
 			{
-				$img =	$tp->thumbUrl(e_AVATAR_UPLOAD.$image,"w=".$width."&h=".$height,true);	
+				$img =	$tp->thumbUrl(e_AVATAR_UPLOAD.$image,"w=".$width."&h=".$height);	
 			}	
 			else 
 			{
@@ -67,7 +68,7 @@ function user_avatar_shortcode($parm='')
 		}
 		elseif(file_exists(e_AVATAR_DEFAULT.$image))  // User-Uplaoded Image
 		{
-			$img =	$tp->thumbUrl(e_AVATAR_DEFAULT.$image,"w=".$width."&h=".$height,true);		
+			$img =	$tp->thumbUrl(e_AVATAR_DEFAULT.$image,"w=".$width."&h=".$height);		
 		}
 		else // Image Missing. 
 		{
diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php
index eafd3a440..f21ff7e03 100644
--- a/e107_handlers/sitelinks_class.php
+++ b/e107_handlers/sitelinks_class.php
@@ -561,7 +561,29 @@ class e_navigation
 	{
 		if(defined('E_32_MAIN')) // basic check so that it's not loaded on the front-end. 
 		{
-			$this->iconArray = array(
+			$this->setIconArray();	
+		}
+		
+		
+	}
+
+	function getIconArray()
+	{
+		return $this->iconArray;	
+	}
+	
+	
+	
+	
+	function setIconArray()
+	{
+		if(!defined('E_32_MAIN'))
+		{
+			e107::getCoreTemplate('admin_icons');
+		}
+		
+		
+		$this->iconArray = array(
 				'main' 			=> E_32_MAIN,
 				'admin' 		=> E_32_ADMIN,
 				'admin_pass' 	=> E_32_ADPASS,
@@ -603,15 +625,8 @@ class e_navigation
 				'user_extended' => E_32_USER_EXTENDED,
 				'users' 		=> E_32_USER,
 				'wmessage' 		=> E_32_WELCOME 
-			);	
-		}
+			);		
 		
-		
-	}
-
-	function getIconArray()
-	{
-		return $this->iconArray;	
 	}
 
 	
@@ -695,9 +710,13 @@ class e_navigation
         if($mode == 'plugin')
         {
              return $this->pluginLinks(E_16_PLUGMANAGER, "array") ;   
-        }	
-			if($mode=='sub')
-			{
+        }
+		
+		$this->setIconArray();	
+		
+			
+		if($mode=='sub')
+		{
 				
 				//FIXME  array structure suitable for e_admin_menu - see shortcodes/admin_navigation.php
 				/*
@@ -719,7 +738,7 @@ class e_navigation
 				$array_sub_functions[17][] = array(e_ADMIN.'newspost.php?pref', LAN_PREFS, ADLAN_4, 'H', 3, E_16_SETTINGS, E_32_SETTINGS);	
 				
 				return $array_sub_functions;
-			}
+		}
 		
 		
 			//FIXME array structure suitable for e_admin_menu (NOW admin() below) - see shortcodes/admin_navigation.php
diff --git a/e107_plugins/forum/newforumposts_menu.php b/e107_plugins/forum/newforumposts_menu.php
index 4ef3408e0..9824d894f 100755
--- a/e107_plugins/forum/newforumposts_menu.php
+++ b/e107_plugins/forum/newforumposts_menu.php
@@ -16,6 +16,7 @@ $e107 = e107::getInstance();
 $tp = e107::getParser();
 $sql = e107::getDb();
 $gen = new convert;
+$pref = e107::getPref();
 
 include_lan(e_PLUGIN.'forum/languages/'.e_LANGUAGE.'/lan_newforumposts_menu.php');
 include_once(e_PLUGIN.'forum/forum_class.php');