diff --git a/phpBB/admin/admin_smilies.php b/phpBB/admin/admin_smilies.php
index 5a200b7401..d867d1ce81 100644
--- a/phpBB/admin/admin_smilies.php
+++ b/phpBB/admin/admin_smilies.php
@@ -310,9 +310,14 @@ switch($mode)
 		//
 		// Loop throuh the rows of smilies setting block vars for the template.
 		//
-		for( $i = 0; $i < count($smilies); $i++ )
+		for($i = 0; $i < count($smilies); $i++)
 		{
+			$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
+			$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
+
 			$template->assign_block_vars("smiles", array(
+				"ROW_COLOR" => "#" . $row_color,
+				"ROW_CLASS" => $row_class,
 				"SMILEY_IMG" =>  $phpbb_root_path . '/' . $board_config['smilies_path'] . '/' . $smilies[$i]['smile_url'], 
 				"CODE" => $smilies[$i]['code'],
 				"EMOT" => $smilies[$i]['emoticon'],
diff --git a/phpBB/admin/admin_words.php b/phpBB/admin/admin_words.php
index 5d660a78c0..2b53198b49 100644
--- a/phpBB/admin/admin_words.php
+++ b/phpBB/admin/admin_words.php
@@ -209,7 +209,12 @@ else
 		$replacement = $word_rows[$i]['replacement'];
 		$word_id = $word_rows[$i]['word_id'];
 
+		$row_color = ( !($i % 2) ) ? $theme['td_color1'] : $theme['td_color2'];
+		$row_class = ( !($i % 2) ) ? $theme['td_class1'] : $theme['td_class2'];
+
 		$template->assign_block_vars("words", array(
+			"ROW_COLOR" => "#" . $row_color,
+			"ROW_CLASS" => $row_class,
 			"WORD" => $word,
 			"REPLACEMENT" => $replacement,
 			"U_WORD_EDIT" => append_sid("admin_words.$phpEx?mode=edit&id=$word_id"),
diff --git a/phpBB/templates/PSO/admin/smile_list_body.tpl b/phpBB/templates/PSO/admin/smile_list_body.tpl
index f2a5ed4b95..645ce4a6a4 100644
--- a/phpBB/templates/PSO/admin/smile_list_body.tpl
+++ b/phpBB/templates/PSO/admin/smile_list_body.tpl
@@ -5,7 +5,7 @@
 
 <P>{L_SMILEY_TEXT}</p>
 
-<form method="GET" action="{S_SMILEY_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center">
+<form method="get" action="{S_SMILEY_ACTION}"><table cellspacing="1" cellpadding="4" border="0" align="center">
 	<tr>
 		<th>{L_CODE}</th>
 		<th>{L_SMILE}</th>
@@ -14,11 +14,11 @@
 	</tr>
 	<!-- BEGIN smiles -->
 	<tr>
-		<td class="row2">{smiles.CODE}</td>
-		<td class="row2"><img src="{smiles.SMILEY_IMG}" alt="{smiles.CODE}" /></td>
-		<td class="row2">{smiles.EMOT}</td>
-		<td class="row2"><a href="{smiles.U_SMILEY_EDIT}">{L_EDIT}</a></td>
-		<td class="row2"><a href="{smiles.U_SMILEY_DELETE}">{L_DELETE}</a></td>
+		<td class="{smiles.ROW_CLASS}">{smiles.CODE}</td>
+		<td class="{smiles.ROW_CLASS}"><img src="{smiles.SMILEY_IMG}" alt="{smiles.CODE}" /></td>
+		<td class="{smiles.ROW_CLASS}">{smiles.EMOT}</td>
+		<td class="{smiles.ROW_CLASS}"><a href="{smiles.U_SMILEY_EDIT}">{L_EDIT}</a></td>
+		<td class="{smiles.ROW_CLASS}"><a href="{smiles.U_SMILEY_DELETE}">{L_DELETE}</a></td>
 	</tr>
 	<!-- END smiles -->
 	<tr>
diff --git a/phpBB/templates/PSO/admin/words_list_body.tpl b/phpBB/templates/PSO/admin/words_list_body.tpl
index 1e39edb767..74db85cfc2 100755
--- a/phpBB/templates/PSO/admin/words_list_body.tpl
+++ b/phpBB/templates/PSO/admin/words_list_body.tpl
@@ -13,10 +13,10 @@
 	</tr>
 	<!-- BEGIN words -->
 	<tr>
-		<td class="row2" align="center">{words.WORD}</td>
-		<td class="row2" align="center">{words.REPLACEMENT}</td>
-		<td class="row2"><a href="{words.U_WORD_EDIT}">{L_EDIT}</a></td>
-		<td class="row2"><a href="{words.U_WORD_DELETE}">{L_DELETE}</a></td>
+		<td class="{words.ROW_CLASS}" align="center">{words.WORD}</td>
+		<td class="{words.ROW_CLASS}" align="center">{words.REPLACEMENT}</td>
+		<td class="{words.ROW_CLASS}"><a href="{words.U_WORD_EDIT}">{L_EDIT}</a></td>
+		<td class="{words.ROW_CLASS}"><a href="{words.U_WORD_DELETE}">{L_DELETE}</a></td>
 	</tr>
 	<!-- END words -->
 	<tr>