diff --git a/e107_files/shortcode/email_item.sc b/e107_files/shortcode/email_item.sc
index 0480222da..55a300ceb 100644
--- a/e107_files/shortcode/email_item.sc
+++ b/e107_files/shortcode/email_item.sc
@@ -1,4 +1,3 @@
-global $imode;
 
 if (defined("ICONMAIL") && file_exists(THEME."images/".ICONMAIL)) 
 {
@@ -6,7 +5,7 @@ if (defined("ICONMAIL") && file_exists(THEME."images/".ICONMAIL))
 }
 else
 {
-	$icon = e_IMAGE_ABS."packs/".$imode."/generic/email.png";
+	$icon = e_IMAGE_ABS."generic/email.png";
 }
 $parms = explode("^",$parm);
 // message^source^other_parms
diff --git a/e107_files/shortcode/imode.sc b/e107_files/shortcode/imode.sc
deleted file mode 100644
index a38f75f8c..000000000
--- a/e107_files/shortcode/imode.sc
+++ /dev/null
@@ -1,2 +0,0 @@
-global $imode;
-$imode = $parm;
\ No newline at end of file
diff --git a/e107_files/shortcode/newsfile.sc b/e107_files/shortcode/newsfile.sc
index e62125289..58c04bdff 100644
--- a/e107_files/shortcode/newsfile.sc
+++ b/e107_files/shortcode/newsfile.sc
@@ -1,5 +1,5 @@
-global $imode;
 
-$image = (file_exists(THEME."images/download.png") ? THEME."images/download.png" : e_IMAGE."packs/".$imode."/generic/download.png");
+
+$image = (file_exists(THEME."images/download.png") ? THEME."images/download.png" : e_IMAGE."generic/download.png");
 return "<img src='$image' alt='' style='vertical-align: middle;' /> <a href='".e_FILE."downloads/".$parm."'>".$parm."</a>";
 
diff --git a/e107_files/shortcode/print_item.sc b/e107_files/shortcode/print_item.sc
index 7d5d6cf26..ba4b4b307 100644
--- a/e107_files/shortcode/print_item.sc
+++ b/e107_files/shortcode/print_item.sc
@@ -1,4 +1,4 @@
-global $imode;
+
 
 if (defined("ICONPRINT") && file_exists(THEME."images/".ICONPRINT))
 {
@@ -6,7 +6,7 @@ if (defined("ICONPRINT") && file_exists(THEME."images/".ICONPRINT))
 }
 else
 {
-	$icon = e_IMAGE_ABS."packs/".$imode."/generic/printer.png";
+	$icon = e_IMAGE_ABS."generic/printer.png";
 }
 $parms = explode("^",$parm);
 return "<a href='".e_HTTP."print.php?{$parms[1]}'><img src='".$icon."' style='border:0' alt='{$parms[0]}' title='{$parms[0]}' /></a>";
\ No newline at end of file
diff --git a/e107_files/shortcode/sitelinks_alt.sc b/e107_files/shortcode/sitelinks_alt.sc
index 25f00e57d..715f041be 100644
--- a/e107_files/shortcode/sitelinks_alt.sc
+++ b/e107_files/shortcode/sitelinks_alt.sc
@@ -3,18 +3,18 @@
 |     e107 website system
 |
 |     $Source: /cvs_backup/e107_0.8/e107_files/shortcode/sitelinks_alt.sc,v $
-|     $Revision: 1.5 $
-|     $Date: 2007-05-23 19:56:55 $
-|     $Author: e107steved $
+|     $Revision: 1.6 $
+|     $Date: 2009-07-07 07:39:35 $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
-
-	global $sql, $pref, $imode;
+                              
+	global $sql, $pref;
 	$params = explode('+', $parm);
 	if (isset($params[0]) && $params[0] && $params[0] != 'no_icons' && $params[0] != 'default') {
 		$icon = $params[0];
 	} else {
-		$icon = e_IMAGE."packs/".$imode."/generic/arrow.png";
+		$icon = e_IMAGE."generic/arrow.png";
 	}
 
 	function adnav_cat($cat_title, $cat_link, $cat_img, $cat_id=FALSE, $cat_open=FALSE) {
diff --git a/e107_files/shortcode/user_extended.sc b/e107_files/shortcode/user_extended.sc
index 69d1cd433..42b071963 100644
--- a/e107_files/shortcode/user_extended.sc
+++ b/e107_files/shortcode/user_extended.sc
@@ -2,7 +2,7 @@
 //EXAMPLE: {USER_EXTENDED=user_gender.value.5}  will show the value of the extended field user_gender for user #5
 include(e_LANGUAGEDIR.e_LANGUAGE."/lan_user_extended.php");
 $parms = explode(".", $parm);
-global $currentUser, $tp, $loop_uid, $e107, $imode, $sc_style;
+global $currentUser, $tp, $loop_uid, $e107, $sc_style;
 if(isset($loop_uid) && intval($loop_uid) == 0) { return ""; }
 $key = $parms[0].".".$parms[1];
 $sc_style['USER_EXTENDED']['pre'] = (isset($sc_style['USER_EXTENDED'][$key]['pre']) ? $sc_style['USER_EXTENDED'][$key]['pre'] : "");
@@ -81,9 +81,9 @@ if ($parms[1] == 'icon')
 	{
 		return constant(strtoupper($parms[0])."_ICON");
 	}
-	elseif(file_exists(e_IMAGE."packs/".$imode."/user_icons/{$parms[0]}.png"))
+	elseif(file_exists(e_IMAGE."user_icons/{$parms[0]}.png"))
 	{
-		return "<img src='".e_IMAGE."packs/".$imode."/user_icons/{$parms[0]}.png' style='width:16px; height:16px' alt='' />";
+		return "<img src='".e_IMAGE."user_icons/{$parms[0]}.png' style='width:16px; height:16px' alt='' />";
 	}
 	return "";
 }
diff --git a/e107_plugins/links_page/link_defines.php b/e107_plugins/links_page/link_defines.php
index 56541256f..458042532 100644
--- a/e107_plugins/links_page/link_defines.php
+++ b/e107_plugins/links_page/link_defines.php
@@ -11,16 +11,14 @@
 |    GNU    General Public  License (http://gnu.org).
 |
 |    $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/link_defines.php,v $
-|    $Revision: 1.3 $
-|    $Date: 2009-07-07 07:33:00 $
+|    $Revision: 1.4 $
+|    $Date: 2009-07-07 07:39:35 $
 |    $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
 if (!defined('e107_INIT')) { exit; }
 
-global $imode;
-
 $imagedir = e_IMAGE."admin_images/";
 if (!defined("IMAGE_NEW")){ define("IMAGE_NEW", (file_exists(THEME."images/new.png") ? THEME."images/new.png" : e_IMAGE."generic/new.png")); }
 if (!defined('LINK_ICON_EDIT')) { define("LINK_ICON_EDIT", "<img src='".$imagedir."edit_16.png' alt='' style='border:0; cursor:pointer;' />"); }