Index: wp-content/themes/twentyeleven/content-page.php
===================================================================
--- wp-content/themes/twentyeleven/content-page.php	(revision 18378)
+++ wp-content/themes/twentyeleven/content-page.php	(working copy)
@@ -16,6 +16,8 @@
 	<div class="entry-content">
 		<?php the_content(); ?>
 		<?php wp_link_pages( array( 'before' => '<div class="page-link"><span>' . __( 'Pages:', 'twentyeleven' ) . '</span>', 'after' => '</div>' ) ); ?>
+	</div><!-- .entry-content -->
+	<footer class="entry-meta">
 		<?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
-	</div><!-- .entry-content -->
+	</footer><!-- .entry-meta -->
 </article><!-- #post-<?php the_ID(); ?> -->
Index: wp-content/themes/twentyeleven/content-single.php
===================================================================
--- wp-content/themes/twentyeleven/content-single.php	(revision 18378)
+++ wp-content/themes/twentyeleven/content-single.php	(working copy)
@@ -27,16 +27,21 @@
 	<footer class="entry-meta">
 		<?php
 			/* translators: used between list items, there is a space after the comma */
+			$categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
+
+			/* translators: used between list items, there is a space after the comma */
 			$tag_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
 			if ( '' != $tag_list ) {
 				$utility_text = __( 'This entry was posted in %1$s and tagged %2$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
+			} elseif ( '' != $categories_list ) {
+				$utility_text = __( 'This entry was posted in %1$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
 			} else {
-				$utility_text = __( 'This entry was posted in %1$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
+				$utility_text = __( 'This entry was posted by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
 			}
+
 			printf(
 				$utility_text,
-				/* translators: used between list items, there is a space after the comma */
-				get_the_category_list( __( ', ', 'twentyeleven' ) ),
+				$categories_list,
 				$tag_list,
 				esc_url( get_permalink() ),
 				the_title_attribute( 'echo=0' ),
Index: wp-content/themes/twentyeleven/functions.php
===================================================================
--- wp-content/themes/twentyeleven/functions.php	(revision 18378)
+++ wp-content/themes/twentyeleven/functions.php	(working copy)
@@ -500,7 +500,7 @@
 		case 'trackback' :
 	?>
 	<li class="post pingback">
-		<p><?php _e( 'Pingback:', 'twentyeleven' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( '(Edit)', 'twentyeleven' ), ' ' ); ?></p>
+		<p><?php _e( 'Pingback:', 'twentyeleven' ); ?> <?php comment_author_link(); ?><?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?></p>
 	<?php
 			break;
 		default :
@@ -528,7 +528,7 @@
 						);
 					?>
 
-					<?php edit_comment_link( __( '[Edit]', 'twentyeleven' ), ' ' ); ?>
+					<?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
 				</div><!-- .comment-author .vcard -->
 
 				<?php if ( $comment->comment_approved == '0' ) : ?>
Index: wp-content/themes/twentyeleven/rtl.css
===================================================================
--- wp-content/themes/twentyeleven/rtl.css	(revision 18378)
+++ wp-content/themes/twentyeleven/rtl.css	(working copy)
@@ -446,8 +446,8 @@
 	float: left;
 }
 #respond input#submit {
-	left: auto;
-	right: 30px;
+	left: 0px;
+	right: auto;
 	padding: 5px 22px 5px 42px;
 }
 #respond #cancel-comment-reply-link {
Index: wp-content/themes/twentyeleven/style.css
===================================================================
--- wp-content/themes/twentyeleven/style.css	(revision 18378)
+++ wp-content/themes/twentyeleven/style.css	(working copy)
@@ -822,25 +822,32 @@
 .page-link span {
 	margin-right: 6px;
 }
-.entry-meta .edit-link a {
+.entry-meta .edit-link a,
+.commentlist .edit-link a {
 	background: #eee;
 	-moz-border-radius: 3px;
 	border-radius: 3px;
 	color: #666;
 	float: right;
 	font-size: 12px;
+	line-height: 1.5em;
 	font-weight: 300;
 	text-decoration: none;
 	padding: 0px 8px;
 }
-.entry-meta .edit-link a:hover {
+
+.entry-meta .edit-link a:hover,
+.commentlist .edit-link a:hover {
 	background: #888;
-	color: #fff;
+	color: #fff !important; /* for the Edit link on the Image post format */
 }
 .entry-content .edit-link {
 	clear: both;
 	display: block;
 }
+.commentlist .edit-link a {
+	float: none;
+}
 
 /* Images */
 .entry-content img,
@@ -1223,7 +1230,7 @@
 	margin-bottom: 0;
 }
 .indexed.format-image footer.entry-meta {
-	background: #e0e6e8;
+	background: #ddd;
 	margin-top: -7px;
 	padding: 20px 30px;
 	overflow: hidden;
@@ -2023,6 +2030,7 @@
 	border-radius: 3px;
 	margin: 0 auto 1.625em;
 	padding: 1.625em;
+	padding-bottom: 2.5em;
 	position: relative;
 	width: 68.9%;
 }
@@ -2103,10 +2111,10 @@
 	color: #eee;
 	cursor: pointer;
 	font-size: 15px;
-	left: 30px;
-	margin: 20px 0;
 	padding: 5px 42px 5px 22px;
-	position: relative;
+	position: absolute;
+	right: 0px;
+	bottom: 0px;
 	text-shadow: 0 -1px 0 rgba(0,0,0,0.3);
 }
 #respond input#submit:active {