diff --git a/phpBB/modcp.php b/phpBB/modcp.php
index de56cfb5d4..9e95544e7b 100644
--- a/phpBB/modcp.php
+++ b/phpBB/modcp.php
@@ -275,6 +275,7 @@ switch($mode)
 		}
 		
 	break;
+
 	default:
 
 		$template->set_filenames(array("body" => "modcp_body.tpl"));
@@ -308,8 +309,29 @@ switch($mode)
 		
 		for($x = 0; $x < $total_topics; $x++)
 		{	
+			if($topics[$x]['topic_status'] == TOPIC_LOCKED)
+			{	
+				$folder_image = "<img src=\"" . $images['locked_folder'] . "\" alt=\"Topic Locked\">";
+			}
+			else
+			{
+				$folder_image = "<img src=\"" . $images['folder'] . "\">";
+			}
+			
 			$topic_id = $topics[$x]['topic_id'];
-			$topic_title = stripslashes($topics[$x]['topic_title']);
+			
+			$topic_title = "";
+			
+			if($topics[$x]['topic_type'] == POST_STICKY)
+			{
+				$topic_title = $lang['Sticky'] . " ";
+			}
+			else if($topics[$x]['topic_type'] == POST_ANNOUNCE)
+			{
+				$topic_title = $lang['Annoucement'] . " ";
+			}
+			
+			$topic_title .= stripslashes($topics[$x]['topic_title']);
 			$u_view_topic = append_sid("viewtopic.$phpEx?".POST_TOPIC_URL."=$topic_id");
 			$topic_replies = $topics[$x]['topic_replies'];
 			$last_post_time = create_date($board_config['default_dateformat'], $topics[$x]['post_time'], $board_config['default_timezone']);
@@ -317,6 +339,7 @@ switch($mode)
 			
 			$template->assign_block_vars("topicrow", array(
 													"U_VIEW_TOPIC" => $u_view_topic,
+													"FOLDER_IMG" => $folder_image,
 													"TOPIC_TITLE" => $topic_title,
 													"REPLIES" => $topic_replies,
 													"LAST_POST" => $last_post_time,
@@ -338,4 +361,4 @@ switch($mode)
 
 include('includes/page_tail.'.$phpEx);
 	
-?>
+?>
\ No newline at end of file
diff --git a/phpBB/templates/Default/modcp_body.tpl b/phpBB/templates/Default/modcp_body.tpl
index 87569c810d..fb652176ba 100644
--- a/phpBB/templates/Default/modcp_body.tpl
+++ b/phpBB/templates/Default/modcp_body.tpl
@@ -16,6 +16,7 @@
 	        	<td>
 	        		<table width="100%" border="0" cellspacing="1" cellpadding="2">
 	        			<tr class="tableheader">
+	        				<td width="5%">&nbsp;</td>
 	        				<td align="center" width="25%">{L_TOPICS}</td>
 	        				<td align="center" width="5%">{L_REPLIES}</td>
 	        				<td align="center" width="15%">{L_LASTPOST}</td>
@@ -23,6 +24,7 @@
 	        			</tr>
 	        			<!-- BEGIN topicrow -->
 	        			<tr class="tablebody">
+	        				<td width="3%" bgcolor="#DDDDDD">{topicrow.FOLDER_IMG}</td>
 	        				<td bgcolor="#CCCCCC"><a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></td>
 	        				<td bgcolor="#DDDDDD" align="center">{topicrow.REPLIES}</td>
 	        				<td bgcolor="#CCCCCC" align="center">{topicrow.LAST_POST}</td>
@@ -30,7 +32,7 @@
 	        			</tr>		
 	        			<!-- END topicrow -->
 	        			<tr class="tablebody">
-	        				<td bgcolor="#CCCCCC" colspan="4">
+	        				<td bgcolor="#CCCCCC" colspan="5">
 	        				<table border="0" width="100%">
 	        					<tr>
 	        						<td>{L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></td>
@@ -40,7 +42,7 @@
 	        				</td>
 	        			</tr>
 	        			<tr class="tableheader">
-	 	       			<td colspan="4" align="right">
+	 	       			<td colspan="5" align="right">
 	 	       				<input type="hidden" name="{POST_FORUM_URL}" value="{FORUM_ID}">
 	 	       				<input type="submit" name="delete" value="{L_DELETE}">&nbsp;&nbsp;
 	 	       				<input type="submit" name="move" value="{L_MOVE}">&nbsp;&nbsp;
diff --git a/phpBB/templates/PSO/modcp_body.tpl b/phpBB/templates/PSO/modcp_body.tpl
index 1892fe27ea..4b377dfa2f 100644
--- a/phpBB/templates/PSO/modcp_body.tpl
+++ b/phpBB/templates/PSO/modcp_body.tpl
@@ -8,9 +8,10 @@
 	<tr><form method="post" action="{S_MODCP_URL}">
 		<td class="tablebg"><table border="0" cellpadding="4" cellspacing="1" width="100%">
 			<tr>
-				<td class="cat" colspan="4" align="center"><span class="cattitle">Moderator Contol Panel</span></td>
+				<td class="cat" colspan="5" align="center"><span class="cattitle">Moderator Contol Panel</span></td>
 			</tr>
 			<tr>
+				<th>&nbsp;</th>
 				<th>&nbsp;{L_TOPICS}&nbsp;</th>
 				<th width="8%">&nbsp;{L_REPLIES}&nbsp;</th>
 				<th width="17%">&nbsp;{L_LASTPOST}&nbsp;</th>
@@ -18,6 +19,7 @@
 			</tr>
 			<!-- BEGIN topicrow -->
 			<tr>
+				<td class="row1" align="center" valign="middle">{topicrow.FOLDER_IMG}</td>
 				<td class="row2">&nbsp;<span class="gensmall"><a href="{topicrow.U_VIEW_TOPIC}">{topicrow.TOPIC_TITLE}</a></span></td>
 				<td class="row1" align="center" valign="middle"><span class="gen">{topicrow.REPLIES}</span></td>
 				<td class="row2" align="center" valign="middle"><span class="gensmall">{topicrow.LAST_POST}</span></td>
@@ -25,10 +27,10 @@
 			</tr>
 			<!-- END topicrow -->
 			<tr>
-				<th colspan="4" align="right">&nbsp;&nbsp;<input type="hidden" name="{POST_FORUM_URL}" value="{FORUM_ID}">&nbsp;<input type="submit" name="delete" value="{L_DELETE}">&nbsp;<input type="submit" name="move" value="{L_MOVE}">&nbsp;<input type="submit" name="lock" value="{L_LOCK}">&nbsp;<input type="submit" name="unlock" value="{L_UNLOCK}">&nbsp;</th>
+				<th colspan="5" align="right">&nbsp;&nbsp;<input type="hidden" name="{POST_FORUM_URL}" value="{FORUM_ID}">&nbsp;<input type="submit" name="delete" value="{L_DELETE}">&nbsp;<input type="submit" name="move" value="{L_MOVE}">&nbsp;<input type="submit" name="lock" value="{L_LOCK}">&nbsp;<input type="submit" name="unlock" value="{L_UNLOCK}">&nbsp;</th>
 			</tr>
 			<tr>
-				<td class="cat" colspan="4"><table width="100%" cellspacing="0" cellpadding="0" border="0">
+				<td class="cat" colspan="5"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 					<tr>
 						<td align="left" valign="middle">&nbsp;<span class="gen">{L_PAGE} <b>{ON_PAGE}</b> {L_OF} <b>{TOTAL_PAGES}</b></span>&nbsp;</td>
 						<td align="right" valign="middle"><span class="gen">{PAGINATION}&nbsp;</span>&nbsp;</td>