diff --git a/js/util.js b/js/util.js
index 9171c1e675..0987c6cc03 100644
--- a/js/util.js
+++ b/js/util.js
@@ -345,6 +345,7 @@ var SN = { // StatusNet
 
                 var submit = form.find('.submit').clone();
                 submit.addClass('submit_dialogbox');
+                submit.removeClass('submit');
                 form.append(submit);
 
                 $(this).hide();
diff --git a/lib/repeatform.php b/lib/repeatform.php
index 50e5d6dbe0..4f1c8aa320 100644
--- a/lib/repeatform.php
+++ b/lib/repeatform.php
@@ -104,7 +104,7 @@ class RepeatForm extends Form
      */
     function formLegend()
     {
-        $this->out->element('legend', null, _('Repeat this notice'));
+        $this->out->element('legend', null, _('Repeat this notice?'));
     }
 
     /**
@@ -129,7 +129,7 @@ class RepeatForm extends Form
     function formActions()
     {
         $this->out->submit('repeat-submit-' . $this->notice->id,
-                           _('Repeat'), 'submit', null, _('Repeat this notice'));
+                           _('Yes'), 'submit', null, _('Repeat this notice'));
     }
 
     /**
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 9cbee32c8d..810b3aa806 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1027,15 +1027,17 @@ display:block !important;
 margin-right:18px;
 }
 
-.form_repeat.dialogbox legend:after {
-content:'?';
-}
-.dialogbox button {
+.dialogbox button.close {
 position:absolute;
 right:3px;
 top:3px;
 }
 
+.dialogbox .submit_dialogbox {
+text-indent:0;
+font-weight:bold;
+}
+
 .notice-options {
 position:relative;
 font-size:0.95em;
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 009a726f1a..e86ee2437f 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -88,6 +88,7 @@ color:#FFFFFF;
 border-color:transparent;
 text-shadow:none;
 }
+.dialogbox .submit_dialogbox,
 input.submit,
 .form_notice input.submit {
 background:#AAAAAA url(../../base/images/illustrations/illu_pattern-01.png) 0 0 repeat-x;
@@ -97,9 +98,11 @@ border-color:#AAAAAA;
 border-top-color:#CCCCCC;
 border-left-color:#CCCCCC;
 }
+.dialogbox .submit_dialogbox:hover,
 input.submit:hover {
 background-position:0 -5px;
 }
+.dialogbox .submit_dialogbox:focus,
 input.submit:focus {
 background-position:0 -15px;
 box-shadow:3px 3px 3px rgba(194, 194, 194, 0.1);