diff --git a/app/assets/javascripts/discourse/templates/embedded-post.hbs b/app/assets/javascripts/discourse/templates/embedded-post.hbs
index 66366ee5aac..03bfc30a266 100644
--- a/app/assets/javascripts/discourse/templates/embedded-post.hbs
+++ b/app/assets/javascripts/discourse/templates/embedded-post.hbs
@@ -1,10 +1,6 @@
 <div class='row'>
   <div class='topic-avatar'>
-    <div class='contents'>
-      <div>
-        {{raw "post/poster-avatar" post=this classNames="main-avatar"}}
-      </div>
-    </div>
+    {{raw "post/poster-avatar" post=this classNames="main-avatar"}}
   </div>
   <div class='topic-body'>
     <div class="topic-meta-data">
diff --git a/app/assets/javascripts/discourse/templates/post.hbs b/app/assets/javascripts/discourse/templates/post.hbs
index c4f9c17bcbc..f40dc068ca9 100644
--- a/app/assets/javascripts/discourse/templates/post.hbs
+++ b/app/assets/javascripts/discourse/templates/post.hbs
@@ -11,15 +11,13 @@
 <article class="boxed {{if via_email 'via-email'}}" id={{view.postElementId}} data-post-id={{id}} data-user-id={{user_id}}>
   <div class='row'>
 
-    <div class='topic-avatar'>
-      <div class="contents">
+    <div class="topic-avatar">
         {{#if userDeleted}}
           <i class="fa fa-trash-o deleted-user-avatar"></i>
         {{else}}
           {{raw "post/poster-avatar" post=this classNames="main-avatar"}}
         {{/if}}
         {{plugin-outlet "poster-avatar-bottom"}}
-      </div>
     </div>
 
     <div class='topic-body'>
diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss
index 3343663b30b..0fc61f2977d 100644
--- a/app/assets/stylesheets/mobile/topic-post.scss
+++ b/app/assets/stylesheets/mobile/topic-post.scss
@@ -456,7 +456,7 @@ span.highlighted {
 
 .topic-avatar {
   float: left;
-  position: relative;
+  padding-top: 5px;
   z-index:999; /* must render on top of topic-body + topic-meta-data, otherwise not tappable */
 }
 
@@ -468,7 +468,7 @@ span.highlighted {
   .names {
     margin: 5px 0 0 5px;
     line-height: 17px;
-    padding-left: 60px;
+    padding-left: 50px;
     span {
       display: block;
     }