diff --git a/opentech/apply/activity/templates/activity/include/listing_base.html b/opentech/apply/activity/templates/activity/include/listing_base.html
index f830163c13fb7c72c8b2e1aa5fdae842f74849ed..2d2e7bdaf3959e0476c0f430a3eaaae416296e9d 100644
--- a/opentech/apply/activity/templates/activity/include/listing_base.html
+++ b/opentech/apply/activity/templates/activity/include/listing_base.html
@@ -7,14 +7,15 @@
         <div class="feed__meta js-feed-meta">
             <p class="feed__label feed__label--{{ activity.type }} feed__label--mobile">{{ activity.type|capfirst }}</p>
             <p class="feed__meta-item"><span>{{ activity|display_author:request.user }}</span> – {{ activity.timestamp|date:"Y-m-d H:i" }}</p>
-            <p class="feed__meta-item">
+            <p class="feed__meta-item feed__meta-item--edit-button">
                 <a class="link link--edit-submission is-active js-edit-comment" href="#">
                     Edit
                     <svg class="icon icon--pen"><use xlink:href="#pen"></use></svg>
                 </a>
             </p>
-            <!-- TODO: only show if has been previously edited -->
-            <p class="feed__meta-item">Last edited: <span class="js-last-edited">{{ activity.edited }}</span></p>
+            {% if activity.edited %}
+                <p class="feed__meta-item feed__meta-item--last-edited">(Last edited: <span class="js-last-edited">{{ activity.edited }}</span>)</p>
+            {% endif %}
             {% if activity.private %}
                 <p class="feed__meta-item feed__meta-item--right">
                     <svg class="icon icon--eye"><use xlink:href="#eye"></use></svg>
diff --git a/opentech/static_src/src/sass/apply/components/_feed.scss b/opentech/static_src/src/sass/apply/components/_feed.scss
index 2ab489a4bf4b1029ce4e6df43d4de6063046599f..d3afc66ee7327436224057045a9fcf735e18661c 100644
--- a/opentech/static_src/src/sass/apply/components/_feed.scss
+++ b/opentech/static_src/src/sass/apply/components/_feed.scss
@@ -101,6 +101,20 @@
             margin: 0 15px 0 0;
         }
 
+        &--edit-button {
+            border-left: 2px solid $color--mid-grey;
+            padding-left: 15px;
+        }
+
+        &--last-edited {
+            margin-right: 5px;
+            color: $color--mid-dark-grey;
+
+            span {
+                font-weight: $weight--normal;
+            }
+        }
+
         &--right {
             margin-left: auto;
         }