diff --git a/app/assets/stylesheets/single-post-view.css.scss b/app/assets/stylesheets/single-post-view.css.scss
index da421b1ce..afb061e2d 100644
--- a/app/assets/stylesheets/single-post-view.css.scss
+++ b/app/assets/stylesheets/single-post-view.css.scss
@@ -4,32 +4,44 @@
 
 #single-post-content {
   #head {
-    color: #aaaaaa;
-    font-size: 12px;
-    #author {
-      .img {
-        max-width: 25%;
+    padding-bottom: 5px;
+    border-bottom: 1px solid $border-grey;
+    #post-info {
+      .info {
+        color: $text-grey;
+        font-size: 12px;
+        .post-time { color: $grey; }
+        i { margin-right: 5px; }
+        .status-message-location { 
+          padding-top: 2px; 
+          line-height: 14px;
+        }
+      }
+      .avatar.medium {
+        max-width: 75px;
       }
-      .avatar {}
       .bd {
         padding-left: 10px;
-        .retweet {
-          i {
-            margin: 0 3px;
-          }
+      }
+      .retweet {
+        color: $grey;
+        line-height: 14px;
+        padding-top: 2px; 
+        i { 
+          font-size: 28px;
+          line-height: 28px;
+        }
+        .post-time { display: block; }
+        .avatar { 
+          height: 28px;
+          width: 28px;
         }
       }
     }
     #single-post-actions {
-      .buttons {
-        position: relative;
-        top: 6px;
-        clear: right;
-      }
-      .public-info > i {
-        float: left;
-        margin: 2px 4px 0 0;
-      }
+      color: $text-grey;
+      font-size: 12px;
+      i { line-height: 50px; }
       i.comment:hover {
         color: #424242;
       }
diff --git a/app/assets/templates/single-post-viewer/single-post-actions_tpl.jst.hbs b/app/assets/templates/single-post-viewer/single-post-actions_tpl.jst.hbs
index 5f9f5f751..66a5101aa 100644
--- a/app/assets/templates/single-post-viewer/single-post-actions_tpl.jst.hbs
+++ b/app/assets/templates/single-post-viewer/single-post-actions_tpl.jst.hbs
@@ -1,15 +1,4 @@
 <div class='pull-right'>
-  <span class='public-info'>
-    {{#if public}}
-      <i class="entypo globe small"> </i>
-    {{else}}
-      <i class="entypo lock small"> </i>
-    {{/if}}
-  </span>
-  <span class="post-time">
-    <time datetime="{{created_at}}" title="{{localTime created_at}}" />
-  </span>
-  <div class="buttons pull-right">
     <a href="#" rel="auth-required" class="like" title="{{#if userLike}} {{t "viewer.unlike"}} {{else}} {{t "viewer.like"}} {{/if}}">
         {{#if userLike}}
             <i class="entypo heart red large"></i>
diff --git a/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs b/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs
index 3435cc17d..1e4407a59 100644
--- a/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs
+++ b/app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs
@@ -1,30 +1,71 @@
 <div id='head' class='row-fluid'>
-  <div id='author' class='span8'>
+  <div id='post-info' class='span8'>
     <div class="img pull-left">
-      {{{personImage author 'medium'}}}
+      {{#if root}}
+        {{{personImage root.author 'medium'}}}
+      {{else}}
+        {{{personImage author 'medium'}}}
+      {{/if}}
     </div>
 
     <div class="bd">
-      {{#linkToPerson author}}
-          {{name}}
-      {{/linkToPerson}}
-
-      {{#if root}}
-      <span class="retweet">
-        <i class="icon-retweet"></i>
+      <span class='author'>
+        {{#if root}}
           {{#linkToPerson root.author}}
             {{name}}
           {{/linkToPerson}}
+        {{else}}
+          {{#linkToPerson author}}
+            {{name}}
+          {{/linkToPerson}}
+        {{/if}}
       </span>
-      {{/if}}
-
-      <div class='status-message-location' />
+          
+      <div class='info'>
+        <span class='post_scope'>
+          {{#if public}}
+            <i class="entypo globe small" data-original-title="{{t "stream.public"}}"></i>
+          {{else}}
+            <i class="entypo lock small" data-original-title="{{t "stream.limited"}}"></i>
+          {{/if}}
+        </span>
+        <span class="post-time">
+          {{#if root}}
+            <time datetime="{{root.created_at}}" title="{{localTime root.created_at}}" />
+          {{else}}
+            <time datetime="{{created_at}}" title="{{localTime created_at}}" />
+          {{/if}}
+        </span>
+        {{#if root}}
+          {{#if root.provider_display_name}}
+            via {{root.provider_display_name}}
+          {{/if}}
+        {{else}}
+          {{#if provider_display_name}}
+            via {{provider_display_name}}
+          {{/if}}
+        {{/if}}
+        <div class='status-message-location' />
+        {{#if root}}
+          <div class='retweet'>
+            <i class='entypo retweet small pull-left'></i>
+            <div class="img pull-left">
+              {{{personImage author 'small'}}}
+            </div>
+            {{#linkToPerson author}}
+              {{name}}
+            {{/linkToPerson}}
+            <span class="post-time">
+              <time datetime="{{created_at}}" title="{{localTime created_at}}" />
+            </span>
+          </div>
+        {{/if}}
+      </div>
     </div>
   </div>
   <div id='single-post-actions' class='span4'>
   </div>
 </div>
-<hr />
 <div id='body' class='row-fluid'>
   <div id='real-post-content' class='span12'>
   </div>