diff --git a/modules/forum/forum-list.tpl.php b/modules/forum/forum-list.tpl.php
index bc0935f..ccd88a1 100644
--- a/modules/forum/forum-list.tpl.php
+++ b/modules/forum/forum-list.tpl.php
@@ -48,6 +48,7 @@
                * left-margin for indenting.
                */ ?>
         <?php print str_repeat('<div class="indent">', $forum->depth); ?>
+          <div class="icon"></div>
           <div class="name"><a href="<?php print $forum->link; ?>"><?php print $forum->name; ?></a></div>
           <?php if ($forum->description): ?>
             <div class="description"><?php print $forum->description; ?></div>
diff --git a/modules/forum/forum-rtl.css b/modules/forum/forum-rtl.css
index d31c9e7..81dd4d3 100644
--- a/modules/forum/forum-rtl.css
+++ b/modules/forum/forum-rtl.css
@@ -1,8 +1,7 @@
 
-#forum tr td.forum {
-  padding-left: 0.5em;
-  padding-right: 25px;
-  background-position: 98% 2px;
+#forum td.forum .icon {
+  float: right;
+  margin: 0 0 0 9px;
 }
 .forum-topic-navigation {
   padding: 1em 3em 0 0;
diff --git a/modules/forum/forum.css b/modules/forum/forum.css
index 3f3ed98..64da081 100644
--- a/modules/forum/forum.css
+++ b/modules/forum/forum.css
@@ -11,11 +11,14 @@
 #forum td.pager {
   white-space: nowrap;
 }
-#forum tr td.forum {
-  padding-left: 25px; /* LTR */
-  background-position: 2px 2px; /* LTR */
-  background-image: url(../../misc/forum-default.png);
+#forum td.forum .icon {
+  float: left; /* LTR */
+  background-position: 0 0;
+  background-image: url(../../misc/forum-icons.png);
   background-repeat: no-repeat;
+  height: 24px;
+  width: 24px;
+  margin: 0 9px 0 0; /* LTR */
 }
 #forum tr.new-topics td.forum {
   background-image: url(../../misc/forum-new.png);
diff --git a/themes/bartik/css/style.css b/themes/bartik/css/style.css
index d3cca07..18ff096 100644
--- a/themes/bartik/css/style.css
+++ b/themes/bartik/css/style.css
@@ -1435,9 +1435,6 @@ div.password-suggestions {
 div.vertical-tabs .vertical-tabs-panes fieldset.vertical-tabs-pane {
   padding: 1em;
 }
-#forum tr td.forum {
-  padding-left: 35px;
-}
 #forum .name {
   font-size: 1.083em;
 }