diff --git a/app/assets/javascripts/discourse/templates/post.js.handlebars b/app/assets/javascripts/discourse/templates/post.js.handlebars
index e22822e55..ed5a469ff 100644
--- a/app/assets/javascripts/discourse/templates/post.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/post.js.handlebars
@@ -25,12 +25,6 @@
           <i class="fa fa-trash-o deleted-user-avatar"></i>
         {{/unless}}
       </div>
-      {{#if wiki}}
-        <div {{action editPost this}} class="wiki" title="{{i18n post.wiki.about}}"><i class="fa fa-pencil-square-o fa-3x"></i></div>
-      {{/if}}
-      {{#if via_email}}
-        <div title="{{i18n post.via_email}}" class="via-email"><i class="fa fa-envelope-o fa-2x"></i></div>
-      {{/if}}
     </div>
 
     <div class='topic-body'>
@@ -54,6 +48,12 @@
             {{/if}}
           </div>
         {{/if}}
+        {{#if wiki}}
+          <div class="post-info wiki" title="{{i18n post.wiki.about}}" {{action editPost this}}><i class="fa fa-pencil-square-o"></i></div>
+        {{/if}}
+        {{#if via_email}}
+          <div class="post-info via-email" title="{{i18n post.via_email}}"><i class="fa fa-envelope-o"></i></div>
+        {{/if}}
         <div {{bind-attr class=":read-state read"}} title="{{i18n post.unread}}"><i class='fa fa-circle'></i></div>
       </div>
 
diff --git a/app/assets/javascripts/discourse/views/post_view.js b/app/assets/javascripts/discourse/views/post_view.js
index 3170537b4..6c6ac9a81 100644
--- a/app/assets/javascripts/discourse/views/post_view.js
+++ b/app/assets/javascripts/discourse/views/post_view.js
@@ -8,7 +8,8 @@ Discourse.PostView = Discourse.GroupedView.extend(Ember.Evented, {
                       'post.hidden:post-hidden',
                       'post.deleted',
                       'byTopicCreator:topic-creator',
-                      'groupNameClass'],
+                      'groupNameClass',
+                      'post.wiki:wiki'],
   postBinding: 'content',
 
   historyHeat: function() {
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index 47c5dcea1..ce763aa34 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -99,4 +99,24 @@ aside.quote {
     background-color: scale-color($primary, $lightness: 40%);
     cursor: pointer;
   }
-}
\ No newline at end of file
+}
+
+.wiki .topic-body {
+  background-color: rgba(64, 128, 64, .05);
+}
+
+.post-info {
+  &.wiki, &.via-email {
+    margin-right: 5px;
+    i.fa {
+      font-size: 14px;
+    }
+  }
+  &.wiki {
+    cursor: pointer;
+    color: rgb(64, 128, 64);
+  }
+  &.via-email {
+    color: scale-color($primary, $lightness: 70%);
+  }
+}
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 592b0eeaf..746c362d7 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -759,24 +759,12 @@ $topic-avatar-width: 45px;
   }
 }
 .topic-avatar {
- border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
- padding-top: 16px;
- width: $topic-avatar-width;
- float: left;
- position: relative;
- z-index: 2;
-
- .wiki {
-   margin-top: 14px;
-   color: scale-color($primary, $lightness: 80%);
-   margin-left: 5px;
-   cursor: pointer;
- }
-
- .via-email {
-   margin: 14px 0 0 8px;
-   color: scale-color($primary, $lightness: 80%);
- }
+  border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+  padding-top: 16px;
+  width: $topic-avatar-width;
+  float: left;
+  position: relative;
+  z-index: 2;
 }
 
 .gap {
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 0e04d1da2..113a7e533 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -373,19 +373,6 @@ iframe {
   position: relative;
 }
 
-.wiki {
-  float: left;
-  padding: 10px;
-  color: #408040;
-  i {
-    float: left;
-  }
-  h3 {
-    float: left;
-    margin-left: 10px;
-  }
-}
-
 .modal-body {
   input[type=text] {
     font-size: 16px;
@@ -394,7 +381,6 @@ iframe {
   }
 }
 
-
 #share-link {
   width: 290px;
 }