diff --git a/core/modules/filter/filter.pages.inc b/core/modules/filter/filter.pages.inc
index dec59c3..d6513e1 100644
--- a/core/modules/filter/filter.pages.inc
+++ b/core/modules/filter/filter.pages.inc
@@ -67,11 +67,17 @@ function theme_filter_tips($variables) {
       }
 
       if (count($tiplist) > 0) {
-        $output .= '<ul class="tips">';
+        $items = array();
         foreach ($tiplist as $tip) {
-          $output .= '<li' . ($long ? ' class="filter-' . str_replace("/", "-", $tip['id']) . '">' : '>') . $tip['tip'] . '</li>';
+          $item = array();
+          $item['data'] = $tip['tip'];
+          $item['class'] = array(drupal_html_class('filter-' . $tip['id']));
+          $items[] = $item;
         }
-        $output .= '</ul>';
+        $output .= theme('item_list', array(
+          'items' => $items,
+          'attributes' => array('class' => array('tips'))
+        ));
       }
 
       if ($multiple) {