diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 36c0bb9c5..b88951813 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -691,13 +691,6 @@ section.details {
     .avatar-wrapper {
       background-color: #f4f4f4;
     }
-
-    .avatar-flair.demo {
-      top: 25px;
-      &.rounded {
-        top: 23px;
-      }
-    }
   }
   .form-horizontal {
     .flair_inputs {
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index eff86a318..ecc352cd7 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -153,6 +153,10 @@ aside.quote {
   }
 }
 
+.topic-avatar {
+  position: relative;
+}
+
 .topic-avatar .avatar-flair, .avatar-flair-preview .avatar-flair {
   display: block;
   background-size: 20px 20px;
@@ -161,14 +165,14 @@ aside.quote {
   width: 20px;
   height: 20px;
   position: absolute;
-  top: 40px;
+  bottom: 0;
   right: -6px;
   &.rounded {
     background-size: 18px 18px;
     border-radius: 12px;
     width: 24px;
     height: 24px;
-    top: 38px;
+    bottom: -2px;
     right: -8px;
   }
 }
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index b6d8cc5d5..5014af1a8 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -636,7 +636,6 @@ $topic-avatar-width: 45px;
   padding-top: 15px;
   width: $topic-avatar-width;
   float: left;
-  position: relative;
   z-index: 3;
 }