diff --git a/app/assets/stylesheets/entypo.css.scss b/app/assets/stylesheets/entypo.css.scss
index efb3b361c..bd1fc515e 100644
--- a/app/assets/stylesheets/entypo.css.scss
+++ b/app/assets/stylesheets/entypo.css.scss
@@ -33,6 +33,6 @@
   }
 
   &.large {
-    font-size: 25px;
+    font-size: 2.5em;
   }
 }
diff --git a/app/assets/stylesheets/single-post-view.css.sass b/app/assets/stylesheets/single-post-view.css.sass
index 816ba7c72..071288ca4 100644
--- a/app/assets/stylesheets/single-post-view.css.sass
+++ b/app/assets/stylesheets/single-post-view.css.sass
@@ -12,9 +12,25 @@
       .avatar
       .bd
         padding-left: 10px
+        .retweet
+          i
+            margin: 0 3px
     #single-post-actions
-      a:hover
-        text-decoration: none
+      .buttons
+        position: relative
+        top: 6px
+        clear: right
+      .public-info > i
+        float: left
+        margin: 2px 4px 0 0
+      time
+        float: right
+        margin-left: 3px
+      a
+        margin: 0 0 0 6px
+
+        &:hover
+          text-decoration: none
 
   border-right: solid 1px #ccc
   padding-right: 10px
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 cad10b5ec..6e1afc7ee 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,8 +1,13 @@
 <div class='pull-right'>
-  <div class="post-time">
+  <span class='public-info'>
+    {{#unless public}}
+      <i class="icon-lock icon-grey"> </i>
+    {{/unless}}
+  </span>
+  <span class="post-time">
     <time datetime="{{created_at}}" />
-  </div>
-  <div class='pull-right'>
+  </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>
@@ -11,6 +16,10 @@
         {{/if}}
     </a>
 
+    <a href="#" rel="auth-required" class="focus-comment" title="{{t "viewer.comment"}}">
+      <i class="entypo comment gray large"></i>
+    </a>
+
     {{#if userCanReshare}}
         <a href="#" rel="auth-required" class="reshare" title="{{#if userReshare}} {{t "viewer.reshared"}} {{else}} {{t "viewer.reshare"}} {{/if}}">
             {{#if userReshare}}
@@ -20,9 +29,5 @@
             {{/if}}
         </a>
     {{/if}}
-
-    <a href="#" rel="auth-required" class="focus-comment" title="{{t "viewer.comment"}}">
-      <i class="entypo comment gray large"></i>
-    </a>
   </div>
 </div>
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 37faa3ba3..3435cc17d 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
@@ -10,20 +10,14 @@
       {{/linkToPerson}}
 
       {{#if root}}
-      <div>
+      <span class="retweet">
         <i class="icon-retweet"></i>
           {{#linkToPerson root.author}}
             {{name}}
           {{/linkToPerson}}
-      </div>
+      </span>
       {{/if}}
 
-      <div class='public-info'>
-        {{#unless public}}
-          <i class="icon-lock icon-grey"> </i>
-        {{/unless}}
-      </div>
-
       <div class='status-message-location' />
     </div>
   </div>