Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.525
diff -u -p -r1.525 comment.module
--- modules/comment/comment.module	15 Feb 2007 11:40:18 -0000	1.525
+++ modules/comment/comment.module	19 Feb 2007 22:12:51 -0000
@@ -1561,6 +1561,8 @@ function comment_form($edit, $title = NU
     $form['submit'] = array('#type' => 'submit', '#value' => t('Post comment'), '#weight' => 20);
   }
 
+  $form['cancel'] = array('#type' => 'markup', '#value' => l(t('Cancel'), 'node/' . $edit['nid'], array('class' => 'form-button')), '#weight' => 21);
+
   if ($op == t('Preview comment')) {
     $form['#after_build'] = array('comment_form_add_preview');
   }
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.783
diff -u -p -r1.783 node.module
--- modules/node/node.module	15 Feb 2007 11:40:18 -0000	1.783
+++ modules/node/node.module	19 Feb 2007 22:12:53 -0000
@@ -2037,6 +2037,7 @@ function node_form($node, $form_values =
   if (!empty($node->nid) && node_access('delete', $node)) {
     $form['delete'] = array('#type' => 'button', '#value' => t('Delete'), '#weight' => 50);
   }
+  $form['cancel'] = array('#type' => 'markup', '#value' => l(t('Cancel'), 'node/' . $node->nid, array('class' => 'form-button')), '#weight' => 51);
   $form['#after_build'] = array('node_form_add_preview');
   $form['#base'] = 'node_form';
   return $form;
@@ -2088,6 +2089,7 @@ function theme_node_form($form) {
   $buttons = drupal_render($form['preview']);
   $buttons .= drupal_render($form['submit']);
   $buttons .= isset($form['delete']) ? drupal_render($form['delete']) : '';
+  $buttons .= drupal_render($form['cancel']);
 
   // Everything else gets rendered here, and is displayed before the admin form
   // field and the submit buttons.
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.451
diff -u -p -r1.451 system.module
--- modules/system/system.module	15 Feb 2007 11:40:18 -0000	1.451
+++ modules/system/system.module	19 Feb 2007 22:12:55 -0000
@@ -2150,7 +2150,7 @@ function confirm_form($form, $question, 
     $fragment = isset($path['fragment']) ? $path['fragment'] : NULL;
     $path = isset($path['path']) ? $path['path'] : NULL;
   }
-  $cancel = l($no ? $no : t('Cancel'), $path, array('query' => $query, 'fragment' => $fragment));
+  $cancel = l($no ? $no : t('Cancel'), $path, array('query' => $query, 'fragment' => $fragment, 'class' => 'form-button'));
 
   drupal_set_title($question);
   $form['#attributes'] = array('class' => 'confirmation');
Index: themes/garland/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/style.css,v
retrieving revision 1.16
diff -u -p -r1.16 style.css
--- themes/garland/style.css	6 Feb 2007 08:35:13 -0000	1.16
+++ themes/garland/style.css	19 Feb 2007 22:12:55 -0000
@@ -249,16 +249,19 @@ span.submitted, .description {
 
 .form-button, .form-submit {
   margin: 2em 0.5em 1em 0;
+  display: block;
+  float: left;
 }
 
 #watchdog-form-overview .form-submit,
-.confirmation .form-submit,
 .search-form .form-submit,
 .poll .form-submit,
 fieldset .form-button, fieldset .form-submit,
 .sidebar .form-button, .sidebar .form-submit,
 table .form-button, table .form-submit {
   margin: 0;
+  display: inline;
+  float: none;
 }
 
 .box {