diff --git a/wp-content/themes/twentytwelve/content-aside.php b/wp-content/themes/twentytwelve/content-aside.php
index 44cf9fbfab..57a6e4cf12 100644
--- a/wp-content/themes/twentytwelve/content-aside.php
+++ b/wp-content/themes/twentytwelve/content-aside.php
@@ -17,7 +17,7 @@
 	</div><!-- .aside -->
 
 	<footer class="entry-meta">
-		<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<div class="edit-link">', '</div>' ); ?>
 		<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a>
+		<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
 	</footer><!-- .entry-meta -->
 </article><!-- #post -->
diff --git a/wp-content/themes/twentytwelve/content-image.php b/wp-content/themes/twentytwelve/content-image.php
index fbc429324f..e660ef6b80 100644
--- a/wp-content/themes/twentytwelve/content-image.php
+++ b/wp-content/themes/twentytwelve/content-image.php
@@ -17,6 +17,7 @@
 			<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark">
 				<h1><?php the_title(); ?></h1>
 				<h2><time class="entry-date" datetime="<?php echo esc_attr( get_the_date( 'c' ) ); ?>" pubdate><?php echo get_the_date(); ?></time></h2>
+				<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
 			</a>
 		</footer><!-- .entry-meta -->
 	</article><!-- #post -->
diff --git a/wp-content/themes/twentytwelve/content-link.php b/wp-content/themes/twentytwelve/content-link.php
index b755a4da6e..bd3b095714 100644
--- a/wp-content/themes/twentytwelve/content-link.php
+++ b/wp-content/themes/twentytwelve/content-link.php
@@ -15,7 +15,7 @@
 		</div><!-- .entry-content -->
 
 		<footer class="entry-meta">
-			<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<div class="edit-link">', '</div>' ); ?>
 			<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a>
+			<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
 		</footer><!-- .entry-meta -->
 	</article><!-- #post -->
diff --git a/wp-content/themes/twentytwelve/content-quote.php b/wp-content/themes/twentytwelve/content-quote.php
index 7ab8510d2b..3d551de244 100644
--- a/wp-content/themes/twentytwelve/content-quote.php
+++ b/wp-content/themes/twentytwelve/content-quote.php
@@ -14,7 +14,7 @@
 	</div><!-- .entry-content -->
 
 	<footer class="entry-meta">
-		<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<div class="edit-link">', '</div>' ); ?>
 		<a href="<?php the_permalink(); ?>" title="<?php echo esc_attr( sprintf( __( 'Permalink to %s', 'twentytwelve' ), the_title_attribute( 'echo=0' ) ) ); ?>" rel="bookmark"><?php echo get_the_date(); ?></a>
+		<?php edit_post_link( __( 'Edit', 'twentytwelve' ), '<span class="edit-link">', '</span>' ); ?>
 	</footer><!-- .entry-meta -->
 </article><!-- #post -->
diff --git a/wp-content/themes/twentytwelve/style.css b/wp-content/themes/twentytwelve/style.css
index 4804792b90..a9ade6c8f7 100644
--- a/wp-content/themes/twentytwelve/style.css
+++ b/wp-content/themes/twentytwelve/style.css
@@ -876,10 +876,6 @@ footer.entry-meta {
 	line-height: 1.846153846;
 	color: #777;
 }
-footer .edit-link {
-	margin: 24px 0;
-	margin: 1.714285714rem 0;
-}
 
 
 /* =Archives