diff --git a/lib/favorform.php b/lib/favorform.php
index 977f191838..37e13fb1c5 100644
--- a/lib/favorform.php
+++ b/lib/favorform.php
@@ -111,7 +111,7 @@ class FavorForm extends Form
      */
     function formLegend()
     {
-        $this->out->element('legend', null, _('Delete this notice'));
+        $this->out->element('legend', null, _('Favor this notice'));
     }
 
 
@@ -137,7 +137,7 @@ class FavorForm extends Form
     function formActions()
     {
         $this->out->submit('favor-submit-' . $this->notice->id,
-                           _('Favorite'));
+                           _('Favor'), 'submit', null, _('Favor this notice'));
     }
     
     /**
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 71f17604ba..1e164933ce 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -313,13 +313,14 @@ class HTMLOutputter extends XMLOutputter
      * @todo add a $name parameter
      */
 
-    function submit($id, $label, $cls='submit', $name=null)
+    function submit($id, $label, $cls='submit', $name=null, $title=null)
     {
         $this->element('input', array('type' => 'submit',
                                       'id' => $id,
                                       'name' => ($name) ? $name : $id,
                                       'class' => $cls,
-                                      'value' => $label));
+                                      'value' => $label,
+                                      'title' => $title));
     }
 
     /**
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 1283e43e4a..9c433f81a0 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -442,7 +442,7 @@ class NoticeListItem extends Widget
         $this->out->element('dt', null, _('Reply to this notice'));
         $this->out->elementStart('dd');
         $this->out->element('a', array('href' => $reply_url,
-                                       'title' => _('reply')), _('Reply'));
+                                       'title' => _('Reply to this notice')), _('Reply'));
         $this->out->elementEnd('dd');
         $this->out->elementEnd('dl');
     }
@@ -463,7 +463,7 @@ class NoticeListItem extends Widget
             $this->out->element('dt', null, _('Delete this notice'));
             $this->out->elementStart('dd');
             $this->out->element('a', array('href' => $deleteurl,
-                                           'title' => _('delete')), _('Delete'));
+                                           'title' => _('Delete this notice')), _('Delete'));
             $this->out->elementEnd('dd');
             $this->out->elementEnd('dl');
         }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index b0a41cede8..15377a7b58 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -784,6 +784,12 @@ margin-right:11px;
 .notice-options .notice_reply dt {
 display:none;
 }
+
+.notice-options input,
+.notice-options a {
+text-indent:-9999px;
+}
+
 .notice-options .notice_reply a,
 .notice-options form input.submit {
 display:block;