diff --git a/download.php b/download.php
index b8a06472b..a8d71feb8 100644
--- a/download.php
+++ b/download.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/download.php,v $
-|     $Revision: 1.23 $ 
-|     $Date: 2008-10-19 11:35:00 $
-|     $Author: e107steved $
+|     $Revision: 1.24 $ 
+|     $Date: 2008-11-16 09:11:59 $
+|     $Author: e107coders $
 |
 +----------------------------------------------------------------------------+
 */
@@ -36,8 +36,8 @@ if(!defined("USER_WIDTH")) { define("USER_WIDTH","width:100%"); }
 //$pref['download_incinfo'] = '1';
 
 /* define images */
-define("IMAGE_DOWNLOAD", (file_exists(THEME."images/download.png") ? THEME."images/download.png" : e_IMAGE.'packs/'.$imode."/generic/download.png"));
-define("IMAGE_NEW", (file_exists(THEME."images/new.png") ? THEME."images/new.png" : e_IMAGE.'packs/'.$imode."/generic/new.png"));
+define("IMAGE_DOWNLOAD", (file_exists(THEME."images/download.png") ? THEME."images/download.png" : e_IMAGE."generic/download.png"));
+define("IMAGE_NEW", (file_exists(THEME."images/new.png") ? THEME."images/new.png" : e_IMAGE."generic/new.png"));
 
 $template_load_core = '
   $template_name = $load_template.".php";
diff --git a/e107_images/generic/arrow.png b/e107_images/generic/arrow.png
new file mode 100644
index 000000000..24a89b543
Binary files /dev/null and b/e107_images/generic/arrow.png differ
diff --git a/e107_images/generic/download.png b/e107_images/generic/download.png
new file mode 100644
index 000000000..0bd2ab262
Binary files /dev/null and b/e107_images/generic/download.png differ
diff --git a/e107_images/generic/edit.png b/e107_images/generic/edit.png
new file mode 100644
index 000000000..4a52bb1c5
Binary files /dev/null and b/e107_images/generic/edit.png differ
diff --git a/e107_images/generic/new.png b/e107_images/generic/new.png
new file mode 100644
index 000000000..3e9562c4a
Binary files /dev/null and b/e107_images/generic/new.png differ
diff --git a/e107_images/generic/search_basic.png b/e107_images/generic/search_basic.png
new file mode 100644
index 000000000..6dd193158
Binary files /dev/null and b/e107_images/generic/search_basic.png differ
diff --git a/e107_images/generic/warning.png b/e107_images/generic/warning.png
new file mode 100644
index 000000000..2b3d4f05b
Binary files /dev/null and b/e107_images/generic/warning.png differ
diff --git a/error.php b/error.php
index eb2ae8310..f89c638c3 100644
--- a/error.php
+++ b/error.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/error.php,v $
-|     $Revision: 1.6 $
-|     $Date: 2008-07-25 20:12:31 $
-|     $Author: e107steved $
+|     $Revision: 1.7 $
+|     $Date: 2008-11-16 09:11:59 $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -35,22 +35,22 @@ switch($errorNumber)
 {
   case 400 :
 	$errorHeader = "HTTP/1.1 400 Bad Request";
-	$errorText = "<div class='installe'><img src='".e_IMAGE_ABS."packs/".$imode."/generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_35."</div><br /><div class='installh'>".LAN_ERROR_36."</div><br /><div class='smalltext'>".LAN_ERROR_3."</div>
+	$errorText = "<div class='installe'><img src='".e_IMAGE_ABS."generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_35."</div><br /><div class='installh'>".LAN_ERROR_36."</div><br /><div class='smalltext'>".LAN_ERROR_3."</div>
 		<br /><div class='installh'>".LAN_ERROR_2."<br /><a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
     break;
   case 401:
 	$errorHeader = "HTTP/1.1 401 Unauthorized";
-	$errorText = "<div class='installe'><img src='".e_IMAGE_ABS."packs/".$imode."/generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_1."</div><br /><div class='installh'>".LAN_ERROR_2."</div><br /><div class='smalltext'>".LAN_ERROR_3."</div>
+	$errorText = "<div class='installe'><img src='".e_IMAGE_ABS."generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_1."</div><br /><div class='installh'>".LAN_ERROR_2."</div><br /><div class='smalltext'>".LAN_ERROR_3."</div>
 		<br /><div class='installh'>".LAN_ERROR_2."<br /><a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
 	break;
   case 403:
 	$errorHeader = "HTTP/1.1 403 Forbidden";
-	$errorText = "<div class='installe'><img src='".e_IMAGE_ABS."packs/".$imode."/generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_4."</div><br /><div class='installh'>".LAN_ERROR_5."</div><br /><div class='smalltext'>".LAN_ERROR_6."</div>
+	$errorText = "<div class='installe'><img src='".e_IMAGE_ABS."generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_4."</div><br /><div class='installh'>".LAN_ERROR_5."</div><br /><div class='smalltext'>".LAN_ERROR_6."</div>
 		<br /><div class='installh'>".LAN_ERROR_2."<br /><a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
 	break;
   case 404:
 	$errorHeader = "HTTP/1.1 404 Not Found";
-	$errorText = "<h3><img src='".e_IMAGE_ABS."packs/".$imode."/generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_7."</h3><br />".LAN_ERROR_21."<br /><br />".LAN_ERROR_23."<b>{$errTo}</b>".LAN_ERROR_24."<br /><br />";
+	$errorText = "<h3><img src='".e_IMAGE_ABS."generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_7."</h3><br />".LAN_ERROR_21."<br /><br />".LAN_ERROR_23."<b>{$errTo}</b>".LAN_ERROR_24."<br /><br />";
 
 	if (strlen($errFrom)) $text .= LAN_ERROR_9." ( <a href='{$errFrom}' rel='external'>{$errFrom}</a> ) -- ".LAN_ERROR_19."<br />";
 
@@ -60,7 +60,7 @@ switch($errorNumber)
 	break;
   case 500:
 	$errorHeader = "HTTP/1.1 500 Internal Server Error";
-	$errorText = "<div class='installe'><img src='".e_IMAGE_ABS."packs/".$imode."/generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_10."</div><br /><div class='installh'>".LAN_ERROR_11."</div><br /><div class='smalltext'>".LAN_ERROR_12."</div>
+	$errorText = "<div class='installe'><img src='".e_IMAGE_ABS."generic/warning.png' alt='".LAN_ERROR_37."' /> ".LAN_ERROR_10."</div><br /><div class='installh'>".LAN_ERROR_11."</div><br /><div class='smalltext'>".LAN_ERROR_12."</div>
 		<br /><div class='installh'>".LAN_ERROR_2."<br /><a href='{$base_path}index.php'>".LAN_ERROR_20."</a></div>";
 	break;
   case 999:
diff --git a/page.php b/page.php
index a1c01c39f..b7404bddb 100644
--- a/page.php
+++ b/page.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/page.php,v $
-|     $Revision: 1.16 $
-|     $Date: 2008-04-07 20:29:24 $
-|     $Author: secretr $
+|     $Revision: 1.17 $
+|     $Date: 2008-11-16 09:11:59 $
+|     $Author: e107coders $
 |
 +----------------------------------------------------------------------------+
 */
@@ -313,7 +313,6 @@ class pageClass
 
 	function pageRating($page_rating_flag)
 	{
-		global $imode;
 		$rate_text = '';      // Notice removal
 		if($page_rating_flag)
 		{
@@ -327,7 +326,7 @@ class pageClass
 				{
 					$ratearray[2] = 0;
 				}
-				$rate_text .= "<img src='".e_IMAGE."packs/".$imode."/rate/box/box".$ratearray[1].".png' alt='' style='vertical-align:middle;' />\n";
+				$rate_text .= "<img src='".e_IMAGE."rate/box/box".$ratearray[1].".png' alt='' style='vertical-align:middle;' />\n";
 				$rate_text .= "&nbsp;".$ratearray[1].".".$ratearray[2]." - ".$ratearray[0]."&nbsp;";
 				$rate_text .= ($ratearray[0] == 1 ? "vote" : "votes");
 			}
@@ -430,7 +429,7 @@ class pageClass
 		<tr>
 		<td class='forumheader3' style='width:20%;'>".LAN_PAGE_9.":</td>
 		<td class='forumheader3' style='width: 60%;'><input type='password' id='page_pw' name='page_pw' style='width: 90%;'/></td>
-		<td class='forumheader3' style='width:20%; vertical-align:middle; margin-left:auto; margin-right:auto; text-align:center;'><img src='".e_IMAGE."generic/".IMODE."/password.png' alt='' /></td>
+		<td class='forumheader3' style='width:20%; vertical-align:middle; margin-left:auto; margin-right:auto; text-align:center;'><img src='".e_IMAGE."generic/password.png' alt='' /></td>
 		</tr>
 		<tr>
 		<td class='forumheader' colspan='3' style='text-align:center;'><input class='button' type='submit' name='submit_page_pw' value='".LAN_PAGE_10."' /></td>