diff --git a/core/modules/forum/forum-icon.tpl.php b/core/modules/forum/forum-icon.tpl.php
index fd1cd13..8b70eb3 100644
--- a/core/modules/forum/forum-icon.tpl.php
+++ b/core/modules/forum/forum-icon.tpl.php
@@ -16,7 +16,7 @@
  * @ingroup themeable
  */
 ?>
-<div class="topic-status-<?php print $icon_class ?>" title="<?php print $icon_title ?>">
+<div class="icon topic-status-<?php print $icon_class ?>" title="<?php print $icon_title ?>">
 <?php if ($first_new): ?>
   <a id="new"></a>
 <?php endif; ?>
diff --git a/core/modules/forum/forum-topic-list.tpl.php b/core/modules/forum/forum-topic-list.tpl.php
index 6427814..4e22223 100644
--- a/core/modules/forum/forum-topic-list.tpl.php
+++ b/core/modules/forum/forum-topic-list.tpl.php
@@ -44,12 +44,12 @@
   <tbody>
   <?php foreach ($topics as $topic): ?>
     <tr class="<?php print $topic->zebra;?>">
-      <td class="icon"><?php print $topic->icon; ?></td>
-      <td class="title">
-        <div>
-          <?php print $topic->title; ?>
-        </div>
-        <div>
+      <td class="topic">
+        <?php print $topic->icon; ?>
+        <div class="topic">
+          <div class="title">
+            <?php print $topic->title; ?>
+          </div>
           <?php print $topic->created; ?>
         </div>
       </td>
diff --git a/core/modules/forum/forum.css b/core/modules/forum/forum.css
index a758bc6..5918c5e 100644
--- a/core/modules/forum/forum.css
+++ b/core/modules/forum/forum.css
@@ -15,8 +15,7 @@
 #forum td.pager {
   white-space: nowrap;
 }
-
-#forum td.forum .icon {
+#forum .icon{
   background-image: url(../../misc/forum-icons.png);
   background-repeat: no-repeat;
   float: left; /* LTR */
@@ -24,31 +23,25 @@
   margin: 0 9px 0 0; /* LTR */
   width: 24px;
 }
-#forum td.forum .forum-status-new {
-  background-position: -24px 0;
+#forum .topic {
+  overflow: hidden;
 }
-
 #forum div.indent {
   margin-left: 20px;
 }
-#forum .icon div {
-  background-image: url(../../misc/forum-icons.png);
-  background-repeat: no-repeat;
-  width: 24px;
-  height: 24px;
-}
-#forum .icon .topic-status-new {
+
+#forum .topic-status-new {
   background-position: -24px 0;
 }
-#forum .icon .topic-status-hot {
+#forum .topic-status-hot {
   background-position: -48px 0;
 }
-#forum .icon .topic-status-hot-new {
+#forum .topic-status-hot-new {
   background-position: -72px 0;
 }
-#forum .icon .topic-status-sticky {
+#forum .topic-status-sticky {
   background-position: -96px 0;
 }
-#forum .icon .topic-status-closed {
+#forum .topic-status-closed {
   background-position: -120px 0;
 }
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index ca9bf7e..ad9e116 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -908,7 +908,6 @@ function forum_get_topics($tid, $sortby, $forum_per_page) {
   global $user, $forum_topic_list_header;
 
   $forum_topic_list_header = array(
-    NULL,
     array('data' => t('Topic'), 'field' => 'f.title'),
     array('data' => t('Replies'), 'field' => 'f.comment_count'),
     array('data' => t('Last reply'), 'field' => 'f.last_comment_timestamp'),