diff --git a/phpBB/images/topic_delete.gif b/phpBB/images/topic_delete.gif
index c277eb220f..b632ece566 100644
Binary files a/phpBB/images/topic_delete.gif and b/phpBB/images/topic_delete.gif differ
diff --git a/phpBB/images/topic_lock.gif b/phpBB/images/topic_lock.gif
index 93a96987f8..0bb887bbd0 100644
Binary files a/phpBB/images/topic_lock.gif and b/phpBB/images/topic_lock.gif differ
diff --git a/phpBB/images/topic_move.gif b/phpBB/images/topic_move.gif
index 3b0b3fd54f..77a965ff0b 100644
Binary files a/phpBB/images/topic_move.gif and b/phpBB/images/topic_move.gif differ
diff --git a/phpBB/images/topic_split.gif b/phpBB/images/topic_split.gif
new file mode 100644
index 0000000000..bf9d99ec35
Binary files /dev/null and b/phpBB/images/topic_split.gif differ
diff --git a/phpBB/images/topic_unlock.gif b/phpBB/images/topic_unlock.gif
index 13a53b57ee..17e5510162 100644
Binary files a/phpBB/images/topic_unlock.gif and b/phpBB/images/topic_unlock.gif differ
diff --git a/phpBB/language/lang_english.php b/phpBB/language/lang_english.php
index 5ac132463b..0b09e8d676 100755
--- a/phpBB/language/lang_english.php
+++ b/phpBB/language/lang_english.php
@@ -218,6 +218,7 @@ $lang['Lock_topic'] = "Lock this topic";
 $lang['Unlock_topic'] = "Unlock this topic";
 $lang['Move_topic'] = "Move this topic";
 $lang['Delete_topic'] = "Delete this topic";
+$lang['Split_topic'] = "Split this topic";
 
 
 //
diff --git a/phpBB/templates/Default/Default.cfg b/phpBB/templates/Default/Default.cfg
index efb7b0eec4..11e53f9025 100644
--- a/phpBB/templates/Default/Default.cfg
+++ b/phpBB/templates/Default/Default.cfg
@@ -37,8 +37,21 @@ $images['folder_sticky_new'] = "images/folder_sticky_new.gif";
 $images['folder_announce'] = "images/folder_announce.gif";
 $images['folder_announce_new'] = "images/folder_announce_new.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";
+$images['post_new'] = "templates/PSO/images/post.gif";
+$images['post_locked'] = "templates/PSO/images/post-locked.gif";
+$images['reply_new'] = "templates/PSO/images/reply.gif";
+$images['reply_locked'] = "templates/PSO/images/reply-locked.gif";
+
+$images['topic_mod_lock'] = "images/topic_lock.gif";
+$images['topic_mod_unlock'] = "images/topic_unlock.gif";
+$images['topic_mod_split'] = "images/topic_split.gif";
+$images['topic_mod_move'] = "images/topic_move.gif";
+$images['topic_mod_delete'] = "images/topic_delete.gif";
+
+//
+// Default theme to use (can be blank if
+// themes aren't supported by this template)
+//
+$template_default_theme = "Default-Default";
 
 ?>
\ No newline at end of file
diff --git a/phpBB/templates/PSO/PSO.cfg b/phpBB/templates/PSO/PSO.cfg
index 7fed3f3202..c94eb7311f 100644
--- a/phpBB/templates/PSO/PSO.cfg
+++ b/phpBB/templates/PSO/PSO.cfg
@@ -44,6 +44,12 @@ $images['post_locked'] = "templates/PSO/images/post-locked.gif";
 $images['reply_new'] = "templates/PSO/images/reply.gif";
 $images['reply_locked'] = "templates/PSO/images/reply-locked.gif";
 
+$images['topic_mod_lock'] = "images/topic_lock.gif";
+$images['topic_mod_unlock'] = "images/topic_unlock.gif";
+$images['topic_mod_split'] = "images/topic_split.gif";
+$images['topic_mod_move'] = "images/topic_move.gif";
+$images['topic_mod_delete'] = "images/topic_delete.gif";
+
 //
 // Default theme to use (can be blank if
 // themes aren't supported by this template)
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 7fb63e1f10..eb8269466e 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -521,19 +521,19 @@ if( $is_auth['auth_mod'] )
 {
 	$s_auth_can .= $lang['You'] . " " . $lang['can'] . " <a href=\"" . append_sid("modcp.$phpEx?" . POST_FORUM_URL . "=$forum_id") . "\">" . $lang['moderate_forum'] . "</a><br />";
 
-	$topic_mod = "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=delete&quick_op=1") . "\"><img src=\"images/topic_delete.gif\" alt = \"" . $lang['Delete_topic'] . "\" border=\"0\"></a>&nbsp;&nbsp;";
+	$topic_mod = "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=delete&quick_op=1") . "\"><img src=\"" . $images['topic_mod_delete'] . "\" alt = \"" . $lang['Delete_topic'] . "\" border=\"0\"></a>&nbsp;";
 
-	$topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=move&quick_op=1"). "\"><img src=\"images/topic_move.gif\" alt = \"" . $lang['Move_topic'] . "\" border=\"0\"></a>&nbsp;&nbsp;";
+	$topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=move&quick_op=1"). "\"><img src=\"" . $images['topic_mod_move'] . "\" alt = \"" . $lang['Move_topic'] . "\" border=\"0\"></a>&nbsp;";
 
 	if($forum_row['topic_status'] == TOPIC_UNLOCKED)
 	{
-		$topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=lock&quick_op=1") . "\"><img src=\"images/topic_lock.gif\" alt = \"" . $lang['Lock_topic'] . "\" border=\"0\"></a>&nbsp;&nbsp;";
+		$topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=lock&quick_op=1") . "\"><img src=\"" . $images['topic_mod_lock'] . "\" alt = \"" . $lang['Lock_topic'] . "\" border=\"0\"></a>&nbsp;";
 	}
 	else
 	{
-		$topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=unlock&quick_op=1") . "\"><img src=\"images/topic_unlock.gif\" alt = \"" . $lang['Unlock_topic'] . "\" border=\"0\"></a>&nbsp;&nbsp;";
+		$topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=unlock&quick_op=1") . "\"><img src=\"" . $images['topic_mod_unlock'] . "\" alt = \"" . $lang['Unlock_topic'] . "\" border=\"0\"></a>&nbsp;";
 	}
-	$topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=split") . "\">Split Topic</a>";
+	$topic_mod .= "<a href=\"" . append_sid("modcp.$phpEx?" . POST_TOPIC_URL . "=$topic_id&mode=split") . "\"><img src=\"" . $images['topic_mod_split'] . "\" alt = \"" . $lang['Split_topic'] . "\" border=\"0\"></a>&nbsp;";
 }
 
 $template->assign_vars(array(