12 files changed, 224 insertions, 142 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index 6be5420e13..1340bbadd0 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -24,7 +24,8 @@
 
 //
 // Define some basic configuration arrays this also prevents
-// malicious rewriting of language array values via URI params
+// malicious rewriting of language and otherarray values via
+// URI params
 //
 $board_config = Array();
 $userdata = Array();
@@ -47,31 +48,6 @@ include($phpbb_root_path . 'includes/functions.'.$phpEx);
 include($phpbb_root_path . 'includes/db.'.$phpEx);
 
 //
-// This would probably be best moved to a template 
-// specific file, eg "images.tpl"
-//
-$url_images = "images";
-
-$images['quote'] = "$url_images/icon_quote.gif";
-$images['edit'] = "$url_images/icon_edit.gif";
-$images['search_icon'] = "$url_images/icon_search.gif";
-$images['profile'] = "$url_images/icon_profile.gif";
-$images['privmsg'] = "$url_images/icon_pm.gif";
-$images['email'] = "$url_images/icon_email.gif";
-$images['delpost'] = "$url_images/icon_delete.gif";
-$images['ip'] = "$url_images/icon_ip.gif";
-$images['www'] = "$url_images/icon_www.gif";
-$images['icq'] = "$url_images/icon_icq_add.gif";
-$images['aim'] = "$url_images/icon_aim.gif";
-$images['yim'] = "$url_images/icon_yim.gif";
-$images['msnm'] = "$url_images/icon_msnm.gif";
-$images['posticon'] = "$url_images/icon_minipost.gif";
-$images['folder'] = "$url_images/folder.gif";
-$images['new_folder'] = "$url_images/folder_new.gif";
-$images['latest_reply'] = "$url_images/icon_latest_reply.gif";
-$images['locked_folder'] = "$url_images/folder_lock.gif";
-
-//
 // Obtain and encode users IP
 //
 if(!empty($HTTP_CLIENT_IP))
@@ -148,7 +124,7 @@ else
 
 //
 // This doesn't need to be here, it's only neccesary
-// for the following if loop because a language file
+// for the following if... loop because a language file
 // will be loaded post-session initialisation (or the default
 // English one will load if a CRITICAL_ERROR occurs)
 //
diff --git a/phpBB/groupcp.php b/phpBB/groupcp.php
index b408374980..1db56614cd 100644
--- a/phpBB/groupcp.php
+++ b/phpBB/groupcp.php
@@ -52,10 +52,10 @@ include($phpbb_root_path . 'includes/page_header.'.$phpEx);
 //
 // What shall we do? hhmmmm
 //
-if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
+if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) || ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) && isset($HTTP_POST_VARS['viewinfo']) ) )
 {
 
-	$group_id = $HTTP_GET_VARS[POST_GROUPS_URL];
+	$group_id = ( isset($HTTP_POST_VARS[POST_GROUPS_URL]) ) ? $HTTP_POST_VARS[POST_GROUPS_URL] : $HTTP_GET_VARS[POST_GROUPS_URL];
 
 	$sql = "SELECT * 
 		FROM " . GROUPS_TABLE . " 
@@ -108,7 +108,6 @@ if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
 	//
 	$template->pparse("info");
 
-
 	//
 	// Generate memberlist if there any!
 	//
@@ -145,26 +144,17 @@ if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
 
 			$posts = ($group_members[$i]['user_posts']) ? $group_members[$i]['user_posts'] : 0;
 		
-			if($group_members[$i]['user_avatar'] != "")
-			{
-				$poster_avatar = (strstr("http", $group_members[$i]['user_avatar']) && $board_config['allow_avatar_remote']) ? "<img src=\"" . $group_members[$i]['user_avatar'] . "\">" : "<img src=\"" . $board_config['avatar_path'] . "/" . $group_members[$i]['user_avatar'] . "\">";
-			}
-			else
-			{
-				$poster_avatar = "";
-			}
-
 			if( !empty($group_members[$i]['user_viewemail']) )
 			{
 				$altered_email = str_replace("@", " at ", $group_members[$i]['user_email']);
-				$email_img = "<a href=\"mailto:$altered_email\"><img src=\"" . $images['email'] . "\" border=\"0\" alt=\"" . $lang['Send_an_email'] . "\"></a>";
+				$email_img = "<a href=\"mailto:$altered_email\"><img src=\"" . $images['icon_email'] . "\" border=\"0\" alt=\"" . $lang['Send_an_email'] . "\"></a>";
 			}
 			else
 			{
 				$email_img = "&nbsp;";
 			}
 
-			$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=" . $group_members[$i]['user_id']) . "\"><img src=\"" . $images['privmsg'] . "\" border=\"0\" alt=\"" . $lang['Send_private_message'] . "\"></a>";
+			$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=" . $group_members[$i]['user_id']) . "\"><img src=\"" . $images['icon_pm'] . "\" border=\"0\" alt=\"" . $lang['Send_private_message'] . "\"></a>";
 		
 			if($group_members[$i]['user_website'] != "")
 			{
@@ -176,7 +166,7 @@ if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
 				{
 					$website_url = stripslashes($group_members[$i]['user_website']);
 				}
-				$www_img = "<a href=\"$website_url\" target=\"_userwww\"><img src=\"" . $images['www'] . "\" border=\"0\"/></a>";
+				$www_img = "<a href=\"$website_url\" target=\"_userwww\"><img src=\"" . $images['icon_www'] . "\" border=\"0\"/></a>";
 			}
 			else
 			{
@@ -185,9 +175,9 @@ if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
 
 			if($group_members[$i]['user_icq'])
 			{
-				$icq_status_img = "<a href=\"http://wwp.icq.com/" . $group_members[$i]['user_icq'] . "#pager\"><img src=\"http://online.mirabilis.com/scripts/online.dll?icq=" . $group_members[$i]['user_icq'] . "&img=5\" alt=\"$l_icqstatus\" border=\"0\"></a>";
+				$icq_status_img = "<a href=\"http://wwp.icq.com/" . $group_members[$i]['user_icq'] . "#pager\"><img src=\"http://online.mirabilis.com/scripts/online.dll?icq=" . $group_members[$i]['user_icq'] . "&img=5\" border=\"0\"></a>";
 
-				$icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $group_members[$i]['user_icq'] . "\"><img src=\"" . $images['icq'] . "\" alt=\"$l_icq\" border=\"0\"></a>";
+				$icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $group_members[$i]['user_icq'] . "\"><img src=\"" . $images['icq'] . "\" alt=\"". $lang['ICQ'] . "\" border=\"0\"></a>";
 			}
 			else
 			{
@@ -195,13 +185,13 @@ if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
 				$icq_add_img = "&nbsp;";
 			}
 	
-			$aim_img = ($group_members[$i]['user_aim']) ? "<a href=\"aim:goim?screenname=" . $group_members[$i]['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['aim'] . "\" border=\"0\"></a>" : "&nbsp;";
+			$aim_img = ($group_members[$i]['user_aim']) ? "<a href=\"aim:goim?screenname=" . $group_members[$i]['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\"></a>" : "&nbsp;";
 
-			$msn_img = ($group_members[$i]['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['msnm'] . "\" border=\"0\"></a>" : "&nbsp;";
+			$msn_img = ($group_members[$i]['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\"></a>" : "&nbsp;";
 
-			$yim_img = ($group_members[$i]['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $group_members[$i]['user_yim'] . "&.src=pg\"><img src=\"" . $images['yim'] . "\" border=\"0\"></a>" : "&nbsp;";
+			$yim_img = ($group_members[$i]['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $group_members[$i]['user_yim'] . "&.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\"></a>" : "&nbsp;";
 
-			$search_img = "<a href=\"" . append_sid("search.$phpEx?a=" . urlencode($group_members[$i]['username']) . "&f=all&b=0&d=DESC&c=100&dosearch=1") . "\"><img src=\"" . $images['search_icon'] . "\" border=\"0\"></a>";
+			$search_img = "<a href=\"" . append_sid("search.$phpEx?a=" . urlencode($group_members[$i]['username']) . "&f=all&b=0&d=DESC&c=100&dosearch=1") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\"></a>";
 
 			if(!($i % 2))
 			{
@@ -222,6 +212,7 @@ if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
 					"MOD_FROM" => $from,
 					"MOD_JOINED" => $joined,
 					"MOD_POSTS" => $posts,
+
 					"MOD_EMAIL_IMG" => $email_img,
 					"MOD_PM_IMG" => $pm_img,
 					"MOD_WWW_IMG" => $www_img,
@@ -243,6 +234,7 @@ if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
 					"FROM" => $from,
 					"JOINED" => $joined,
 					"POSTS" => $posts,
+
 					"EMAIL_IMG" => $email_img,
 					"PM_IMG" => $pm_img,
 					"WWW_IMG" => $www_img,
@@ -279,7 +271,89 @@ if( isset($HTTP_GET_VARS[POST_GROUPS_URL]) )
 	}
 
 }
+else 
+{
+
+	$sql = "SELECT group_id, group_name  
+		FROM " . GROUPS_TABLE . "  
+		WHERE group_single_user <> " . TRUE . " 
+		ORDER BY group_name";
+	if(!$result = $db->sql_query($sql))
+	{
+		message_die(GENERAL_ERROR, "Error getting group information", "", __LINE__, __FILE__, $sql);
+	}
+	if( !$db->sql_numrows($result) )
+	{
+		message_die(GENERAL_MESSAGE, "No groups exist");
+	}
+	$group_list = $db->sql_fetchrowset($result);
+
+	$sql = "SELECT g.group_id, g.group_name, ug.user_pending 
+		FROM " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug 
+		WHERE ug.user_id = " . $userdata['user_id'] . "
+			AND g.group_id = ug.group_id 
+			AND g.group_single_user <> " . TRUE . " 
+		ORDER BY g.group_name";
+	if(!$result = $db->sql_query($sql))
+	{
+		message_die(GENERAL_ERROR, "Error getting group information", "", __LINE__, __FILE__, $sql);
+	}
+	if($db->sql_numrows($result))
+	{
+		$membergroup_list = $db->sql_fetchrowset($result);
+	}
+
+	$template->set_filenames(array(
+		"user" => "groupcp_user_body.tpl",
+		"jumpbox" => "jumpbox.tpl")
+	);
+
+	$jumpbox = make_jumpbox();
+	$template->assign_vars(array(
+		"JUMPBOX_LIST" => $jumpbox,
+		"SELECT_NAME" => POST_FORUM_URL)
+	);
+	$template->assign_var_from_handle("JUMPBOX", "jumpbox");
+
 
+	$s_group_list = '<select name="' . POST_GROUPS_URL . '">';
+	for($i = 0; $i < count($group_list); $i++)
+	{
+		$s_group_list .= '<option value="' . $group_list[$i]['group_id'] . '">' . $group_list[$i]['group_name'] . '</option>';
+	}
+	$s_group_list .= "</select>";
+
+	$s_member_groups = '<select name="' . POST_GROUPS_URL . '">';
+	$s_pending_groups = '<select name="' . POST_GROUPS_URL . '">';
+	for($i = 0; $i < count($membergroup_list); $i++)
+	{
+		if($membergroup_list[$i]['user_pending'])
+		{
+			$s_pending_groups .= '<option value="' . $membergroup_list[$i]['group_id'] . '">' . $membergroup_list[$i]['group_name'] . '</option>';
+		}
+		else
+		{
+			$s_member_groups .= '<option value="' . $membergroup_list[$i]['group_id'] . '">' . $membergroup_list[$i]['group_name'] . '</option>';
+		}
+	}
+	$s_pending_groups .= "</select>";
+	$s_member_groups .= "</select>";
+
+
+	$template->assign_vars(array(
+		"L_YOU_BELONG_GROUPS" => "You belong to the following usergroups", 
+		"L_SELECT_A_GROUP" => "To join a usergroup select one from the list", 
+		"L_PENDING_GROUPS" => "You have memberships pending on these groups", 
+
+		"GROUP_LIST_SELECT" => $s_group_list,
+		"GROUP_PENDING_SELECT" => $s_pending_groups,
+		"GROUP_MEMBER_SELECT" => $s_member_groups)
+	);
+
+	$template->pparse("user");
+
+
+}
 
 //
 // Page footer
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 5608b2f252..ac4aed3dd9 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -225,7 +225,7 @@ function make_forum_box($box_name, $default_forum = -1)
 // Initialise user settings on page load
 function init_userprefs($userdata)
 {
-	global $board_config, $theme, $template, $lang, $phpEx, $phpbb_root_path;
+	global $board_config, $theme, $images, $template, $lang, $phpEx, $phpbb_root_path;
 
 	if(!$board_config['override_user_themes'])
 	{
@@ -272,6 +272,17 @@ function init_userprefs($userdata)
 
 	$template = new Template($phpbb_root_path . "templates/" . $board_config['default_template']);
 
+	if($template)
+	{
+		@include($phpbb_root_path . "templates/" . $board_config['default_template'] . "/" . $board_config['default_template'] . ".cfg");
+
+		if( !defined("TEMPLATE_CONFIG") )
+		{
+			message_die(CRITICAL_MESSAGE, "Couldn't open " . $board_config['default_template'] . " template config file");
+		}
+
+	}
+
 	if(file_exists("language/lang_".$board_config['default_lang'].".".$phpEx) )
 	{
 		include($phpbb_root_path . 'language/lang_'.$board_config['default_lang'].'.'.$phpEx);
diff --git a/phpBB/index.php b/phpBB/index.php
index 7664f79576..e0857a2f90 100644
--- a/phpBB/index.php
+++ b/phpBB/index.php
@@ -135,28 +135,6 @@ if($total_categories = $db->sql_numrows($q_categories))
 	//
 	// Obtain list of moderators of each forum
 	//
-/*	$sql = "SELECT f.forum_id, u.username, u.user_id
-		FROM " . FORUMS_TABLE . " f, " . USERS_TABLE . " u, " . USER_GROUP_TABLE . " ug, " . AUTH_ACCESS_TABLE . " aa
-		WHERE aa.forum_id = f.forum_id 
-			AND aa.auth_mod = " . TRUE . " 
-			AND ug.group_id = aa.group_id
-			AND u.user_id = ug.user_id  
-		ORDER BY f.forum_id, u.user_id";
-	if(!$q_forum_mods = $db->sql_query($sql))
-	{
-		message_die(GENERAL_ERROR, "Could not query forum moderator information", "", __LINE__, __FILE__, $sql);
-	}
-	$forum_mods_list = $db->sql_fetchrowset($q_forum_mods);
-
-	for($i = 0; $i < count($forum_mods_list); $i++)
-	{
-		$forum_mods_name[$forum_mods_list[$i]['forum_id']][] = $forum_mods_list[$i]['username'];
-		$forum_mods_id[$forum_mods_list[$i]['forum_id']][] = $forum_mods_list[$i]['user_id'];
-
-		$forum_mods_single_user[$forum_mods_list[$i]['forum_id']][] = 1;
-	}*/
-
-
 	$sql = "SELECT f.forum_id, g.group_name, g.group_id, g.group_single_user, ug.user_id
 		FROM " . FORUMS_TABLE . " f, " . GROUPS_TABLE . " g, " . USER_GROUP_TABLE . " ug, " . AUTH_ACCESS_TABLE . " aa
 		WHERE aa.forum_id = f.forum_id 
@@ -237,11 +215,11 @@ if($total_categories = $db->sql_numrows($q_categories))
 
 				if($userdata['session_start'] >= $userdata['session_time'] - 300)
 				{
-					$folder_image = ($forum_rows[$j]['post_time'] > $userdata['session_last_visit']) ? "<img src=\"" . $images['new_folder'] . "\">" : "<img src=\"" . $images['folder'] . "\">";
+					$folder_image = ($forum_rows[$j]['post_time'] > $userdata['session_last_visit']) ? "<img src=\"" . $images['folder_new'] . "\">" : "<img src=\"" . $images['folder'] . "\">";
 				}
 				else
 				{
-					$folder_image = ($forum_rows[$j]['post_time'] >= $userdata['session_time'] - 300) ? "<img src=\"" . $images['new_folder'] . "\">" : "<img src=\"" . $images['folder'] . "\">";
+					$folder_image = ($forum_rows[$j]['post_time'] >= $userdata['session_time'] - 300) ? "<img src=\"" . $images['folder_new'] . "\">" : "<img src=\"" . $images['folder'] . "\">";
 				}
 
 				$posts = $forum_rows[$j]['forum_posts'];
@@ -262,7 +240,7 @@ if($total_categories = $db->sql_numrows($q_categories))
 					$last_post = $last_post_time . "<br />by ";
 					$last_post .= "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "="  . $forum_rows[$j]['user_id']) . "\">" . $last_poster . "</a>&nbsp;";
 
-					$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?"  . POST_POST_URL . "=" . $forum_rows[$j]['topic_last_post_id']) . "#" . $forum_rows[$j]['topic_last_post_id'] . "\"><img src=\"" . $images['latest_reply'] . "\" width=\"20\" height=\"11\" border=\"0\" alt=\"" . $lang['View_latest_post'] . "\"></a>";
+					$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?"  . POST_POST_URL . "=" . $forum_rows[$j]['topic_last_post_id']) . "#" . $forum_rows[$j]['topic_last_post_id'] . "\"><img src=\"" . $images['icon_latest_reply'] . "\" width=\"20\" height=\"11\" border=\"0\" alt=\"" . $lang['View_latest_post'] . "\"></a>";
 				}
 				else
 				{
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index fe6e41cae7..4237f0a195 100644
--- a/phpBB/memberlist.php
+++ b/phpBB/memberlist.php
@@ -173,7 +173,7 @@ if(($selected_members = $db->sql_numrows($result)) > 0)
 
 		$posts = ($members[$i]['user_posts']) ? $members[$i]['user_posts'] : 0;
 		
-		if($members[$i]['user_avatar'] != "" && $userdata['user_id'] != ANONYMOUS)
+		if($members[$i]['user_avatar'] != "" && $user_id != ANONYMOUS)
 		{
 			$poster_avatar = (strstr("http", $members[$i]['user_avatar']) && $board_config['allow_avatar_remote']) ? "<img src=\"" . $members[$i]['user_avatar'] . "\">" : "<img src=\"" . $board_config['avatar_path'] . "/" . $members[$i]['user_avatar'] . "\">";
 		}
@@ -185,14 +185,14 @@ if(($selected_members = $db->sql_numrows($result)) > 0)
 		if( !empty($members[$i]['user_viewemail']) )
 		{
 			$altered_email = str_replace("@", " at ", $members[$i]['user_email']);
-			$email_img = "<a href=\"mailto:$altered_email\"><img src=\"" . $images['email'] . "\" border=\"0\" alt=\"" . $lang['Send_an_email'] . "\"></a>";
+			$email_img = "<a href=\"mailto:$altered_email\"><img src=\"" . $images['icon_email'] . "\" border=\"0\" alt=\"" . $lang['Send_an_email'] . "\"></a>";
 		}
 		else
 		{
 			$email_img = "&nbsp;";
 		}
 
-		$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=" . $members[$i]['user_id']) . "\"><img src=\"" . $images['privmsg'] . "\" border=\"0\" alt=\"" . $lang['Send_private_message'] . "\"></a>";
+		$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=" . $members[$i]['user_id']) . "\"><img src=\"" . $images['icon_pm'] . "\" border=\"0\" alt=\"" . $lang['Send_private_message'] . "\"></a>";
 		
 		if($members[$i]['user_website'] != "")
 		{
@@ -204,7 +204,7 @@ if(($selected_members = $db->sql_numrows($result)) > 0)
 			{
 				$website_url = stripslashes($members[$i]['user_website']);
 			}
-			$www_img = "<a href=\"$website_url\" target=\"_userwww\"><img src=\"" . $images['www'] . "\" border=\"0\"/></a>";
+			$www_img = "<a href=\"$website_url\" target=\"_userwww\"><img src=\"" . $images['icon_www'] . "\" border=\"0\"/></a>";
 		}
 		else
 		{
@@ -213,9 +213,9 @@ if(($selected_members = $db->sql_numrows($result)) > 0)
 
 		if($members[$i]['user_icq'])
 		{
-			$icq_status_img = "<a href=\"http://wwp.icq.com/" . $members[$i]['user_icq'] . "#pager\"><img src=\"http://online.mirabilis.com/scripts/online.dll?icq=" . $members[$i]['user_icq'] . "&img=5\" alt=\"$l_icqstatus\" border=\"0\"></a>";
+			$icq_status_img = "<a href=\"http://wwp.icq.com/" . $members[$i]['user_icq'] . "#pager\"><img src=\"http://online.mirabilis.com/scripts/online.dll?icq=" . $members[$i]['user_icq'] . "&img=5\" border=\"0\"></a>";
 
-			$icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $members[$i]['user_icq'] . "\"><img src=\"" . $images['icq'] . "\" alt=\"$l_icq\" border=\"0\"></a>";
+			$icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $members[$i]['user_icq'] . "\"><img src=\"" . $images['icq'] . "\" alt=\"" . $lang['ICQ'] . "\" border=\"0\"></a>";
 		}
 		else
 		{
@@ -223,13 +223,13 @@ if(($selected_members = $db->sql_numrows($result)) > 0)
 			$icq_add_img = "&nbsp;";
 		}
 
-		$aim_img = ($members[$i]['user_aim']) ? "<a href=\"aim:goim?screenname=" . $members[$i]['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['aim'] . "\" border=\"0\"></a>" : "&nbsp;";
+		$aim_img = ($members[$i]['user_aim']) ? "<a href=\"aim:goim?screenname=" . $members[$i]['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\"></a>" : "&nbsp;";
 
-		$msn_img = ($members[$i]['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['msnm'] . "\" border=\"0\"></a>" : "&nbsp;";
+		$msn_img = ($members[$i]['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\"></a>" : "&nbsp;";
 
-		$yim_img = ($members[$i]['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $members[$i]['user_yim'] . "&.src=pg\"><img src=\"" . $images['yim'] . "\" border=\"0\"></a>" : "&nbsp;";
+		$yim_img = ($members[$i]['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $members[$i]['user_yim'] . "&.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\"></a>" : "&nbsp;";
 
-		$search_img = "<a href=\"" . append_sid("search.$phpEx?a=" . urlencode($members[$i]['username']) . "&f=all&b=0&d=DESC&c=100&dosearch=1") . "\"><img src=\"" . $images['search_icon'] . "\" border=\"0\"></a>";
+		$search_img = "<a href=\"" . append_sid("search.$phpEx?a=" . urlencode($members[$i]['username']) . "&f=all&b=0&d=DESC&c=100&dosearch=1") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\"></a>";
 
 		if(!($i % 2))
 		{
@@ -248,6 +248,8 @@ if(($selected_members = $db->sql_numrows($result)) > 0)
 			"FROM" => $from,
 			"JOINED" => $joined,
 			"POSTS" => $posts,
+
+			"AVATAR_IMG" => $poster_avatar, 
 			"EMAIL_IMG" => $email_img,
 			"PM_IMG" => $pm_img,
 			"WWW_IMG" => $www_img,
diff --git a/phpBB/modcp.php b/phpBB/modcp.php
index efece27466..a51f0e285d 100644
--- a/phpBB/modcp.php
+++ b/phpBB/modcp.php
@@ -608,7 +608,7 @@ switch($mode)
 		{	
 			if($topics[$x]['topic_status'] == TOPIC_LOCKED)
 			{	
-				$folder_image = "<img src=\"" . $images['locked_folder'] . "\" alt=\"Topic Locked\">";
+				$folder_image = "<img src=\"" . $images['folder_locked'] . "\" alt=\"Topic Locked\">";
 			}
 			else
 			{
diff --git a/phpBB/privmsg.php b/phpBB/privmsg.php
index bf74825002..f4bc503ba9 100644
--- a/phpBB/privmsg.php
+++ b/phpBB/privmsg.php
@@ -219,17 +219,17 @@ if($mode == "read")
 
 	$poster_avatar = ($privmsg['user_avatar'] != "" && $userdata['user_id'] != ANONYMOUS) ? "<img src=\"" . $board_config['avatar_path'] . "/" . $privmsg['user_avatar'] . "\">" : "";
 
-	$profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"" . $images['profile'] . "\" alt=\"" . $lang['Profile'] . "\" border=\"0\"></a>";
+	$profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Profile'] . "\" border=\"0\"></a>";
 
-	$email_img = ($privmsg['user_viewemail'] == 1) ? "<a href=\"mailto:" . $privmsg['user_email'] . "\"><img src=\"" .$images['email'] . "\" alt=\"" . $lang['Email'] . "\" border=\"0\"></a>" : "";
+	$email_img = ($privmsg['user_viewemail'] == 1) ? "<a href=\"mailto:" . $privmsg['user_email'] . "\"><img src=\"" .$images['icon_email'] . "\" alt=\"" . $lang['Email'] . "\" border=\"0\"></a>" : "";
 
-	$www_img = ($privmsg['user_website']) ? "<a href=\"" . $privmsg['user_website'] . "\"><img src=\"" . $images['www'] . "\" alt=\"" . $lang['Website'] . "\" border=\"0\"></a>" : "";
+	$www_img = ($privmsg['user_website']) ? "<a href=\"" . $privmsg['user_website'] . "\"><img src=\"" . $images['icon_www'] . "\" alt=\"" . $lang['Website'] . "\" border=\"0\"></a>" : "";
 
 	if($privmsg['user_icq'])
 	{
-		$icq_status_img = "<a href=\"http://wwp.icq.com/" . $privmsg['user_icq'] . "#pager\"><img src=\"http://online.mirabilis.com/scripts/online.dll?icq=" . $privmsg['user_icq'] . "&img=5\" alt=\"" . $lang['Page_ICQ'] . "\" border=\"0\"></a>";
+		$icq_status_img = "<a href=\"http://wwp.icq.com/" . $privmsg['user_icq'] . "#pager\"><img src=\"http://online.mirabilis.com/scripts/online.dll?icq=" . $privmsg['user_icq'] . "&img=5\" border=\"0\"></a>";
 
-		$icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $privmsg['user_icq'] . "\"><img src=\"" . $images['icq'] . "\" alt=\"" . $lang['ICQ'] . "\" border=\"0\"></a>";
+		$icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $privmsg['user_icq'] . "\"><img src=\"" . $images['icon_icq'] . "\" alt=\"" . $lang['ICQ'] . "\" border=\"0\"></a>";
 	}
 	else
 	{
@@ -237,20 +237,20 @@ if($mode == "read")
 		$icq_add_img = "";
 	}
 
-	$aim_img = ($privmsg['user_aim']) ? "<a href=\"aim:goim?screenname=" . $privmsg['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['aim'] . "\" border=\"0\"></a>" : "";
+	$aim_img = ($privmsg['user_aim']) ? "<a href=\"aim:goim?screenname=" . $privmsg['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\"></a>" : "";
 
-	$msn_img = ($privmsg['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['msnm'] . "\" border=\"0\"></a>" : "";
+	$msn_img = ($privmsg['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\"></a>" : "";
 
-	$yim_img = ($privmsg['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $privmsg['user_yim'] . "&.src=pg\"><img src=\"" . $images['yim'] . "\" border=\"0\"></a>" : "";
+	$yim_img = ($privmsg['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $privmsg['user_yim'] . "&.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\"></a>" : "";
 
 	if($folder == "inbox")
 	{
-		$quote_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=reply&quote=true&" . POST_POST_URL . "=" . $privmsgs_id) . "\"><img src=\"" . $images['quote'] . "\" alt=\"\" border=\"0\"></a>";
+		$quote_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=reply&quote=true&" . POST_POST_URL . "=" . $privmsgs_id) . "\"><img src=\"" . $images['icon_quote'] . "\" alt=\"\" border=\"0\"></a>";
 	}
 
 	if($folder == "outbox")
 	{
-		$edit_img = "<a href=\"" . append_sid("privmsg.$phpEx?folder=$folder&mode=edit&" . POST_POST_URL . "=" . $privmsgs_id) . "\"><img src=\"" . $images['edit'] . "\" alt=\"\" border=\"0\"></a>";
+		$edit_img = "<a href=\"" . append_sid("privmsg.$phpEx?folder=$folder&mode=edit&" . POST_POST_URL . "=" . $privmsgs_id) . "\"><img src=\"" . $images['icon_edit'] . "\" alt=\"\" border=\"0\"></a>";
 	}
 
 	$post_subject = stripslashes($privmsg['privmsgs_subject']);
diff --git a/phpBB/profile.php b/phpBB/profile.php
index 2d321f96c9..ea6adb1787 100644
--- a/phpBB/profile.php
+++ b/phpBB/profile.php
@@ -257,9 +257,9 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 
 		if($members[$i]['user_icq'])
 		{
-			$icq_status = "<a href=\"http://wwp.icq.com/" . $members[$i]['user_icq'] . "#pager\"><img src=\"http://online.mirabilis.com/scripts/online.dll?icq=" . $members[$i]['user_icq'] . "&img=5\" alt=\"$l_icqstatus\" border=\"0\"></a>";
+			$icq_status = "<a href=\"http://wwp.icq.com/" . $members[$i]['user_icq'] . "#pager\"><img src=\"http://online.mirabilis.com/scripts/online.dll?icq=" . $members[$i]['user_icq'] . "&img=5\" border=\"0\"></a>";
 
-			$icq_add = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $members[$i]['user_icq'] . "\"><img src=\"" . $images['icq'] . "\" alt=\"$l_icq\" border=\"0\"></a>";
+			$icq_add = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $members[$i]['user_icq'] . "\"><img src=\"" . $images['icon_icq'] . "\" alt=\"" . $lang['ICQ'] . "\" border=\"0\"></a>";
 		}
 		else
 		{
@@ -267,13 +267,13 @@ if(isset($HTTP_GET_VARS['mode']) || isset($HTTP_POST_VARS['mode']))
 			$icq_add = "&nbsp;";
 		}
 
-		$aim = ($members[$i]['user_aim']) ? "<a href=\"aim:goim?screenname=" . $members[$i]['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['aim'] . "\" border=\"0\"></a>" : "&nbsp;";
+		$aim = ($members[$i]['user_aim']) ? "<a href=\"aim:goim?screenname=" . $members[$i]['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\"></a>" : "&nbsp;";
 
-		$msnm = ($members[$i]['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['msnm'] . "\" border=\"0\"></a>" : "&nbsp;";
+		$msnm = ($members[$i]['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\"></a>" : "&nbsp;";
 
-		$yim = ($members[$i]['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $members[$i]['user_yim'] . "&.src=pg\"><img src=\"" . $images['yim'] . "\" border=\"0\"></a>" : "&nbsp;";
+		$yim = ($members[$i]['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $members[$i]['user_yim'] . "&.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\"></a>" : "&nbsp;";
 
-		$search = "<a href=\"" . append_sid("search.$phpEx?a=" . urlencode($members[$i]['username']) . "&f=all&b=0&d=DESC&c=100&dosearch=1") . "\"><img src=\"" . $images['search_icon'] . "\" border=\"0\"></a>";
+		$search = "<a href=\"" . append_sid("search.$phpEx?a=" . urlencode($members[$i]['username']) . "&f=all&b=0&d=DESC&c=100&dosearch=1") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\"></a>";
 
 		$template->assign_vars(array(
 			"USERNAME" => stripslashes($profiledata['username']),
diff --git a/phpBB/templates/Default/Default.cfg b/phpBB/templates/Default/Default.cfg
new file mode 100644
index 0000000000..7c30d60993
--- /dev/null
+++ b/phpBB/templates/Default/Default.cfg
@@ -0,0 +1,40 @@
+<?php
+
+//
+// Do not alter this line!
+//
+define(TEMPLATE_CONFIG, TRUE);
+
+//
+// Configuration file for PSO template
+//
+// This contains (at present) an array, images which
+// points to the location of individiual images used
+// by the template
+//
+
+$images['icon_quote'] = "images/icon_quote.gif";
+$images['icon_edit'] = "images/icon_edit.gif";
+$images['icon_search'] = "images/icon_search.gif";
+$images['icon_profile'] = "images/icon_profile.gif";
+$images['icon_pm'] = "images/icon_pm.gif";
+$images['icon_email'] = "images/icon_email.gif";
+$images['icon_delpost'] = "images/icon_delete.gif";
+$images['icon_ip'] = "images/icon_ip.gif";
+$images['icon_www'] = "images/icon_www.gif";
+$images['icon_icq'] = "images/icon_icq_add.gif";
+$images['icon_aim'] = "images/icon_aim.gif";
+$images['icon_yim'] = "images/icon_yim.gif";
+$images['icon_msnm'] = "images/icon_msnm.gif";
+$images['icon_minipost'] = "images/icon_minipost.gif";
+$images['icon_latest_reply'] = "images/icon_latest_reply.gif";
+
+$images['folder'] = "images/folder.gif";
+$images['folder_new'] = "images/folder_new.gif";
+$images['folder_locked'] = "images/folder_lock.gif";
+
+$images['topic_new'] = "templates/PSO/images/post.gif";
+$images['topic_reply'] = "templates/PSO/images/reply.gif";
+$images['topic_locked'] = "templates/PSO/images/reply-locked.gif";
+
+?>
+\ No newline at end of file
diff --git a/phpBB/templates/PSO/PSO.cfg b/phpBB/templates/PSO/PSO.cfg
index 052464fe2d..7c30d60993 100644
--- a/phpBB/templates/PSO/PSO.cfg
+++ b/phpBB/templates/PSO/PSO.cfg
@@ -13,28 +13,28 @@ define(TEMPLATE_CONFIG, TRUE);
 // by the template
 //
 
-$images['quote'] = "images/icon_quote.gif";
-$images['edit'] = "images/icon_edit.gif";
+$images['icon_quote'] = "images/icon_quote.gif";
+$images['icon_edit'] = "images/icon_edit.gif";
 $images['icon_search'] = "images/icon_search.gif";
-$images['profile'] = "images/icon_profile.gif";
-$images['privmsg'] = "images/icon_pm.gif";
-$images['email'] = "images/icon_email.gif";
-$images['delpost'] = "images/icon_delete.gif";
-$images['ip'] = "images/icon_ip.gif";
-$images['www'] = "images/icon_www.gif";
-$images['icq'] = "images/icon_icq_add.gif";
-$images['aim'] = "images/icon_aim.gif";
-$images['yim'] = "images/icon_yim.gif";
-$images['msnm'] = "images/icon_msnm.gif";
-$images['posticon'] = "images/icon_minipost.gif";
-$images['latest_reply'] = "images/icon_latest_reply.gif";
+$images['icon_profile'] = "images/icon_profile.gif";
+$images['icon_pm'] = "images/icon_pm.gif";
+$images['icon_email'] = "images/icon_email.gif";
+$images['icon_delpost'] = "images/icon_delete.gif";
+$images['icon_ip'] = "images/icon_ip.gif";
+$images['icon_www'] = "images/icon_www.gif";
+$images['icon_icq'] = "images/icon_icq_add.gif";
+$images['icon_aim'] = "images/icon_aim.gif";
+$images['icon_yim'] = "images/icon_yim.gif";
+$images['icon_msnm'] = "images/icon_msnm.gif";
+$images['icon_minipost'] = "images/icon_minipost.gif";
+$images['icon_latest_reply'] = "images/icon_latest_reply.gif";
 
 $images['folder'] = "images/folder.gif";
-$images['new_folder'] = "images/folder_new.gif";
-$images['locked_folder'] = "images/folder_lock.gif";
+$images['folder_new'] = "images/folder_new.gif";
+$images['folder_locked'] = "images/folder_lock.gif";
 
-$images['new_topic'] = "";
-$images['reply_topic'] = "";
-$images['locked_topic'] = "";
+$images['topic_new'] = "templates/PSO/images/post.gif";
+$images['topic_reply'] = "templates/PSO/images/reply.gif";
+$images['topic_locked'] = "templates/PSO/images/reply-locked.gif";
 
 ?>
 \ No newline at end of file
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index ba100a7d70..e6cc2d07e7 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -254,7 +254,8 @@ $template->assign_vars(array(
 	"FORUM_ID" => $forum_id,
 	"FORUM_NAME" => $forum_name,
 	"MODERATORS" => $forum_moderators,
-	"USERS_BROWSING" => $users_browsing)
+	
+	"IMG_POST" => $images['topic_new'])
 );
 //
 // End header
@@ -292,7 +293,7 @@ if($total_topics)
 
 		if($replies > $board_config['posts_per_page'])
 		{
-			$goto_page = "&nbsp;&nbsp;&nbsp;(<img src=\"" . $images['posticon'] . "\">" . $lang['Goto_page'] . ": ";
+			$goto_page = "&nbsp;&nbsp;&nbsp;(<img src=\"" . $images['icon_minipost'] . "\">" . $lang['Goto_page'] . ": ";
 
 			$times = 1;
 			for($j = 0; $j < $replies + 1; $j += $board_config['posts_per_page'])
@@ -323,17 +324,17 @@ if($total_topics)
 
 		if($topic_rowset[$i]['topic_status'] == TOPIC_LOCKED)
 		{	
-			$folder_image = "<img src=\"" . $images['locked_folder'] . "\" alt=\"Topic Locked\">";
+			$folder_image = "<img src=\"" . $images['folder_locked'] . "\" alt=\"Topic Locked\">";
 		}
 		else
 		{
 			if($userdata['session_start'] >= $userdata['session_time'] - 300)
 			{
-				$folder_image = ($topic_rowset[$i]['post_time'] > $userdata['session_last_visit']) ? "<img src=\"" . $images['new_folder'] . "\">" : "<img src=\"" . $images['folder'] . "\">";
+				$folder_image = ($topic_rowset[$i]['post_time'] > $userdata['session_last_visit']) ? "<img src=\"" . $images['folder_new'] . "\">" : "<img src=\"" . $images['folder'] . "\">";
 			}
 			else
 			{
-				$folder_image = ($topic_rowset[$i]['post_time'] > $userdata['session_time'] - 300) ? "<img src=\"" . $images['new_folder'] . "\">" : "<img src=\"" . $images['folder'] . "\">";
+				$folder_image = ($topic_rowset[$i]['post_time'] > $userdata['session_time'] - 300) ? "<img src=\"" . $images['folder_new'] . "\">" : "<img src=\"" . $images['folder'] . "\">";
 			}
 		}
 			
@@ -355,7 +356,7 @@ if($total_topics)
 
 		$last_post = $last_post_time . "<br />by ";
 		$last_post .= "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "="  . $topic_rowset[$i]['id2']) . "\">" . $last_post_user . "</a>&nbsp;";
-		$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?"  . POST_POST_URL . "=" . $topic_rowset[$i]['topic_last_post_id']) . "#" . $topic_rowset[$i]['topic_last_post_id'] . "\"><img src=\"" . $images['latest_reply'] . "\" width=\"20\" height=\"11\" border=\"0\" alt=\"View Latest Post\"></a>";
+		$last_post .= "<a href=\"" . append_sid("viewtopic.$phpEx?"  . POST_POST_URL . "=" . $topic_rowset[$i]['topic_last_post_id']) . "#" . $topic_rowset[$i]['topic_last_post_id'] . "\"><img src=\"" . $images['icon_latest_reply'] . "\" width=\"20\" height=\"11\" border=\"0\" alt=\"View Latest Post\"></a>";
 
 		$views = $topic_rowset[$i]['topic_views'];
 
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 4af1e24c27..68583b57c3 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -243,8 +243,8 @@ $template->assign_vars(array(
 	"L_VIEW_NEXT_TOPIC" => $lang['View_next_topic'],
 	"L_VIEW_PREVIOUS_TOPIC" => $lang['View_previous_topic'],
 
-	"IMG_POST" => $images['new_topic'], 
-	"IMG_REPLY" => ( ($forum_row[0]['topic_status'] == TOPIC_LOCKED) ? $images['locked_topic'] : $images['reply_topic'] ), 
+	"IMG_POST" => $images['topic_new'], 
+	"IMG_REPLY" => ( ($forum_row[0]['topic_status'] == TOPIC_LOCKED) ? $images['topic_locked'] : $images['topic_reply'] ), 
 
 	"U_VIEW_FORUM" => $view_forum_url,
 	"U_VIEW_OLDER_TOPIC" => $view_prev_topic_url,
@@ -333,19 +333,19 @@ for($i = 0; $i < $total_posts; $i++)
 
 	if($poster_id != ANONYMOUS)
 	{
-		$profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"" . $images['profile'] . "\" alt=\"" . $lang['Read_profile'] . " $poster\" border=\"0\"></a>";
+		$profile_img = "<a href=\"" . append_sid("profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"" . $images['icon_profile'] . "\" alt=\"" . $lang['Read_profile'] . " $poster\" border=\"0\"></a>";
 
-		$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"". $images['privmsg'] . "\" alt=\"" . $lang['Private_messaging'] . "\" border=\"0\"></a>";
+		$pm_img = "<a href=\"" . append_sid("privmsg.$phpEx?mode=post&" . POST_USERS_URL . "=$poster_id") . "\"><img src=\"". $images['icon_pm'] . "\" alt=\"" . $lang['Private_messaging'] . "\" border=\"0\"></a>";
 
-		$email_img = ($postrow[$i]['user_viewemail'] == 1) ? "<a href=\"mailto:" . $postrow[$i]['user_email'] . "\"><img src=\"" . $images['email'] . "\" alt=\"" . $lang['Send_email'] . " $poster\" border=\"0\"></a>" : "";
+		$email_img = ($postrow[$i]['user_viewemail'] == 1) ? "<a href=\"mailto:" . $postrow[$i]['user_email'] . "\"><img src=\"" . $images['icon_email'] . "\" alt=\"" . $lang['Send_email'] . " $poster\" border=\"0\"></a>" : "";
 
-		$www_img = ($postrow[$i]['user_website']) ? "<a href=\"" . $postrow[$i]['user_website'] . "\"><img src=\"" . $images['www'] . "\" alt=\"" . $lang['Visit_website'] . "\" border=\"0\"></a>" : "";
+		$www_img = ($postrow[$i]['user_website']) ? "<a href=\"" . $postrow[$i]['user_website'] . "\"><img src=\"" . $images['icon_www'] . "\" alt=\"" . $lang['Visit_website'] . "\" border=\"0\"></a>" : "";
 
 		if($postrow[$i]['user_icq'])
 		{
-			$icq_status_img = "<a href=\"http://wwp.icq.com/" . $postrow[$i]['user_icq'] . "#pager\"><img src=\"http://online.mirabilis.com/scripts/online.dll?icq=" . $postrow[$i]['user_icq'] . "&img=5\" alt=\"" . $lang['ICQ_status'] . "\" border=\"0\"></a>";
+			$icq_status_img = "<a href=\"http://wwp.icq.com/" . $postrow[$i]['user_icq'] . "#pager\"><img src=\"http://online.mirabilis.com/scripts/online.dll?icq=" . $postrow[$i]['user_icq'] . "&img=5\" border=\"0\"></a>";
 
-			$icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $postrow[$i]['user_icq'] . "\"><img src=\"" . $images['icq'] . "\" alt=\"" . $lang['ICQ'] . "\" border=\"0\"></a>";
+			$icq_add_img = "<a href=\"http://wwp.icq.com/scripts/search.dll?to=" . $postrow[$i]['user_icq'] . "\"><img src=\"" . $images['icon_icq'] . "\" alt=\"" . $lang['ICQ'] . "\" border=\"0\"></a>";
 		}
 		else
 		{
@@ -353,11 +353,11 @@ for($i = 0; $i < $total_posts; $i++)
 			$icq_add_img = "";
 		}
 
-		$aim_img = ($postrow[$i]['user_aim']) ? "<a href=\"aim:goim?screenname=" . $postrow[$i]['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['aim'] . "\" border=\"0\" alt=\"" . $lang['AIM'] . "\"></a>" : "";
+		$aim_img = ($postrow[$i]['user_aim']) ? "<a href=\"aim:goim?screenname=" . $postrow[$i]['user_aim'] . "&message=Hello+Are+you+there?\"><img src=\"" . $images['icon_aim'] . "\" border=\"0\" alt=\"" . $lang['AIM'] . "\"></a>" : "";
 
-		$msn_img = ($postrow[$i]['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\"></a>" : "";
+		$msn_img = ($postrow[$i]['user_msnm']) ? "<a href=\"profile.$phpEx?mode=viewprofile&" . POST_USERS_URL . "=$poster_id\"><img src=\"" . $images['icon_msnm'] . "\" border=\"0\" alt=\"" . $lang['MSNM'] . "\"></a>" : "";
 
-		$yim_img = ($postrow[$i]['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $postrow[$i]['user_yim'] . "&.src=pg\"><img src=\"" . $images['yim'] . "\" border=\"0\" alt=\"" . $lang['YIM'] . "\"></a>" : "";
+		$yim_img = ($postrow[$i]['user_yim']) ? "<a href=\"http://edit.yahoo.com/config/send_webmesg?.target=" . $postrow[$i]['user_yim'] . "&.src=pg\"><img src=\"" . $images['icon_yim'] . "\" border=\"0\" alt=\"" . $lang['YIM'] . "\"></a>" : "";
 	}
 	else
 	{
@@ -372,17 +372,17 @@ for($i = 0; $i < $total_posts; $i++)
 		$yim_img = "";
 	}
 
-	$search_img = "<a href=\"" . append_sid("search.$phpEx?a=" . urlencode($poster) . "&f=all&b=0&d=DESC&c=100&dosearch=1") . "\"><img src=\"" . $images['search_icon'] . "\" border=\"0\"></a>";
+	$search_img = "<a href=\"" . append_sid("search.$phpEx?a=" . urlencode($poster) . "&f=all&b=0&d=DESC&c=100&dosearch=1") . "\"><img src=\"" . $images['icon_search'] . "\" border=\"0\"></a>";
 
-	$edit_img = "<a href=\"" . append_sid("posting.$phpEx?mode=editpost&" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&" . POST_TOPIC_URL . "=$topic_id") . "\"><img src=\"" . $images['edit'] . "\" alt=\"" . $lang['Edit_delete_post'] . "\" border=\"0\"></a>";
+	$edit_img = "<a href=\"" . append_sid("posting.$phpEx?mode=editpost&" . POST_POST_URL . "=" . $postrow[$i]['post_id'] . "&" . POST_TOPIC_URL . "=$topic_id") . "\"><img src=\"" . $images['icon_edit'] . "\" alt=\"" . $lang['Edit_delete_post'] . "\" border=\"0\"></a>";
 
-	$quote_img = "<a href=\"" . append_sid("posting.$phpEx?mode=quote&" . POST_POST_URL . "=" . $postrow[$i]['post_id']) . "\"><img src=\"" . $images['quote'] . "\" alt=\"" . $lang['Reply_with_quote'] ."\" border=\"0\"></a>";
+	$quote_img = "<a href=\"" . append_sid("posting.$phpEx?mode=quote&" . POST_POST_URL . "=" . $postrow[$i]['post_id']) . "\"><img src=\"" . $images['icon_quote'] . "\" alt=\"" . $lang['Reply_with_quote'] ."\" border=\"0\"></a>";
 
 	if($is_auth['auth_mod'] || $userdata['user_level'] == ADMIN)
 	{
-		$ip_img = "<a href=\"" . append_sid("modcp.$phpEx?mode=viewip&" . POST_POST_URL . "=" . $post_id) . "\"><img src=\"" . $images['ip'] . "\" alt=\"" . $lang['View_IP'] . "\" border=\"0\"></a>";
+		$ip_img = "<a href=\"" . append_sid("modcp.$phpEx?mode=viewip&" . POST_POST_URL . "=" . $post_id) . "\"><img src=\"" . $images['icon_ip'] . "\" alt=\"" . $lang['View_IP'] . "\" border=\"0\"></a>";
 
-		$delpost_img = "<a href=\"" . append_sid("topicadmin.$phpEx?mode=delpost&" . POST_POST_URL . "=" . $postrow[$i]['post_id']) . "\"><img src=\"" . $images['delpost'] . "\" alt=\"" . $lang['Delete_post'] . "\" border=\"0\"></a>";
+		$delpost_img = "<a href=\"" . append_sid("topicadmin.$phpEx?mode=delpost&" . POST_POST_URL . "=" . $postrow[$i]['post_id']) . "\"><img src=\"" . $images['icon_delpost'] . "\" alt=\"" . $lang['Delete_post'] . "\" border=\"0\"></a>";
 	}
 
 	$post_subject = ($postrow[$i]['post_subject'] != "") ? stripslashes($postrow[$i]['post_subject']) : $topic_title;