diff --git a/content.php b/content.php
index 5a68e4fd..1b60b5e3 100644
--- a/content.php
+++ b/content.php
@@ -37,7 +37,6 @@
 			<span class="cat-links">
 				<?php printf( __( 'Posted in %1$s', '_s' ), $categories_list ); ?>
 			</span>
-			<span class="sep"> | </span>
 			<?php endif; // End if categories ?>
 
 			<?php
@@ -45,18 +44,18 @@
 				$tags_list = get_the_tag_list( '', __( ', ', '_s' ) );
 				if ( $tags_list ) :
 			?>
+			<span class="sep"> | </span>
 			<span class="tag-links">
 				<?php printf( __( 'Tagged %1$s', '_s' ), $tags_list ); ?>
 			</span>
-			<span class="sep"> | </span>
 			<?php endif; // End if $tags_list ?>
 		<?php endif; // End if 'post' == get_post_type() ?>
 
 		<?php if ( comments_open() || ( '0' != get_comments_number() && ! comments_open() ) ) : ?>
-		<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', '_s' ), __( '1 Comment', '_s' ), __( '% Comments', '_s' ) ); ?></span>
 		<span class="sep"> | </span>
+		<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', '_s' ), __( '1 Comment', '_s' ), __( '% Comments', '_s' ) ); ?></span>
 		<?php endif; ?>
 
-		<?php edit_post_link( __( 'Edit', '_s' ), '<span class="edit-link">', '</span>' ); ?>
+		<?php edit_post_link( __( 'Edit', '_s' ), '<span class="sep"> | </span><span class="edit-link">', '</span>' ); ?>
 	</footer><!-- #entry-meta -->
 </article><!-- #post-<?php the_ID(); ?> -->
diff --git a/image.php b/image.php
index ed7901c6..6b2dbd86 100644
--- a/image.php
+++ b/image.php
@@ -31,7 +31,7 @@ get_header();
 									get_the_title( $post->post_parent )
 								);
 							?>
-							<?php edit_post_link( __( 'Edit', '_s' ), '<span class="sep">|</span> <span class="edit-link">', '</span>' ); ?>
+							<?php edit_post_link( __( 'Edit', '_s' ), '<span class="sep"> | </span> <span class="edit-link">', '</span>' ); ?>
 						</div><!-- .entry-meta -->
 
 						<nav id="image-navigation">