diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
index 47671fc3c..f4f6db254 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/client/Entities/Status.java
@@ -513,8 +513,7 @@ public class Status implements Parcelable{
         status.getAccount().makeEmojisAccount(context, null);
         String displayName;
         if( status.getReblog() != null){
-            displayName = Helper.shortnameToUnicode(status.getReblog().getAccount().getDisplay_name(), true);
-            displayName = String.format("%s @%s",displayName,status.getReblog().getAccount().getAcct());
+            displayName = String.format("@%s",status.getReblog().getAccount().getAcct());
         }else {
             displayName = String.format("@%s",status.getAccount().getAcct());
         }
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index 42c3e99f6..d004ea6d9 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -238,7 +238,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
         TextView status_content_translated;
         LinearLayout status_content_translated_container;
         TextView status_account_username;
-        TextView status_account_displayname;
+        TextView status_account_displayname, status_account_displayname_owner;
         ImageView status_account_profile;
         ImageView status_account_profile_boost;
         ImageView status_account_profile_boost_by;
@@ -307,6 +307,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             status_content_translated = itemView.findViewById(R.id.status_content_translated);
             status_account_username = itemView.findViewById(R.id.status_account_username);
             status_account_displayname = itemView.findViewById(R.id.status_account_displayname);
+            status_account_displayname_owner = itemView.findViewById(R.id.status_account_displayname_owner);
             status_account_profile = itemView.findViewById(R.id.status_account_profile);
             status_account_profile_boost = itemView.findViewById(R.id.status_account_profile_boost);
             status_account_profile_boost_by = itemView.findViewById(R.id.status_account_profile_boost_by);
@@ -688,8 +689,15 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             if( status.getReblog() != null){
                 ppurl = status.getReblog().getAccount().getAvatar();
                 holder.status_account_displayname.setText(context.getResources().getString(R.string.reblog_by, status.getAccount().getUsername()));
+                if( status.getReblog().getAccount().getDisplay_name().length() > 0)
+                    holder.status_account_displayname_owner.setText( status.getReblog().getAccount().getDisplay_name());
+                else
+                    holder.status_account_displayname_owner.setText( status.getReblog().getAccount().getAcct().replace("@",""));
+                holder.status_account_displayname_owner.setVisibility(View.VISIBLE);
+
             }else {
                 ppurl = status.getAccount().getAvatar();
+                holder.status_account_displayname_owner.setVisibility(View.GONE);
                 if( status.getAccount().getdisplayNameSpan() == null || status.getAccount().getdisplayNameSpan().toString().trim().length() == 0)
                     holder.status_account_displayname.setText(status.getAccount().getUsername().replace("@",""), TextView.BufferType.SPANNABLE);
                 else
@@ -699,12 +707,12 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
 
             //Change the color in gray for accounts in DARK Theme only
             Spannable wordtoSpan = status.getDisplayNameSpan();
-
             Pattern hashAcct;
-            if( status.getReblog() != null)
-                hashAcct = Pattern.compile("\\s(@"+status.getReblog().getAccount().getAcct()+")");
-            else
+            if( status.getReblog() != null) {
+                hashAcct = Pattern.compile("(@" + status.getReblog().getAccount().getAcct() + ")");
+            }else
                 hashAcct = Pattern.compile("(@"+status.getAccount().getAcct()+")");
+
             if( wordtoSpan != null && hashAcct != null){
                 Matcher matcherAcct = hashAcct.matcher(wordtoSpan);
                 while (matcherAcct.find()){
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 3773dd11e..1294c20ce 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -110,8 +110,8 @@
 
                 </LinearLayout>
                 <ImageView
-                    android:layout_width="45dp"
-                    android:layout_height="45dp"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
                     android:layout_alignParentStart="true"
                     android:layout_alignParentLeft="true"
                     android:layout_centerHorizontal="true"
@@ -124,7 +124,7 @@
                     android:layout_width="30dp"
                     android:layout_alignParentEnd="true"
                     android:layout_alignParentRight="true"
-                    android:layout_marginTop="20dp"
+                    android:layout_marginTop="25dp"
                     style="?attr/shapeBorder"
                     android:visibility="gone"
                     tools:ignore="ContentDescription" />
@@ -173,6 +173,13 @@
                 android:drawablePadding="2dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
+            <TextView
+                android:id="@+id/status_account_displayname_owner"
+                android:visibility="gone"
+                android:maxLines="1"
+                android:drawablePadding="2dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
             <LinearLayout
                 android:orientation="horizontal"
                 android:layout_marginBottom="10dp"
diff --git a/app/src/main/res/layout/drawer_status_compact.xml b/app/src/main/res/layout/drawer_status_compact.xml
index 6f87dc762..e415cb71c 100644
--- a/app/src/main/res/layout/drawer_status_compact.xml
+++ b/app/src/main/res/layout/drawer_status_compact.xml
@@ -33,6 +33,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
+        android:layout_marginBottom="10dp"
         android:baselineAligned="false">
         <LinearLayout
             android:layout_height="wrap_content"
@@ -108,8 +109,8 @@
 
                 </LinearLayout>
                 <ImageView
-                    android:layout_width="45dp"
-                    android:layout_height="45dp"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
                     android:layout_alignParentStart="true"
                     android:layout_alignParentLeft="true"
                     android:layout_centerHorizontal="true"
@@ -122,7 +123,7 @@
                     android:layout_width="30dp"
                     android:layout_alignParentEnd="true"
                     android:layout_alignParentRight="true"
-                    android:layout_marginTop="20dp"
+                    android:layout_marginTop="25dp"
                     style="?attr/shapeBorder"
                     android:visibility="gone"
                     tools:ignore="ContentDescription" />
@@ -133,20 +134,32 @@
             android:layout_marginLeft="10dp"
             android:layout_width="0dp"
             android:layout_weight="1"
-            android:layout_gravity="center_vertical"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-
+            <TextView
+                android:id="@+id/status_account_displayname"
+                android:maxLines="1"
+                android:drawablePadding="2dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
+            <TextView
+                android:id="@+id/status_account_displayname_owner"
+                android:visibility="gone"
+                android:maxLines="1"
+                android:drawablePadding="2dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
             <LinearLayout
                 android:orientation="horizontal"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <TextView
-                    android:id="@+id/status_account_displayname"
+                    android:textSize="12sp"
                     android:maxLines="1"
-                    android:drawablePadding="2dp"
+                    android:ellipsize="end"
                     android:layout_width="0dp"
                     android:layout_weight="1"
+                    android:id="@+id/status_account_username"
                     android:layout_height="wrap_content" />
                 <TextView
                     android:layout_marginStart="2dp"
@@ -160,13 +173,7 @@
                     android:gravity="end"
                     android:layout_height="wrap_content" />
             </LinearLayout>
-            <TextView
-                android:textSize="12sp"
-                android:maxLines="1"
-                android:ellipsize="end"
-                android:layout_width="wrap_content"
-                android:id="@+id/status_account_username"
-                android:layout_height="wrap_content" />
+
         </LinearLayout>
     </LinearLayout>
     <LinearLayout
@@ -627,6 +634,17 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="10dp"
         android:orientation="horizontal">
+        <ImageView
+            android:layout_gravity="center_horizontal"
+            android:gravity="center_vertical"
+            android:layout_marginRight="15dp"
+            android:layout_marginEnd="15dp"
+            android:id="@+id/new_element"
+            android:visibility="gone"
+            android:src="@drawable/ic_fiber_new"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:ignore="ContentDescription" />
         <TextView
             android:drawablePadding="2dp"
             android:layout_gravity="center_vertical"
@@ -634,17 +652,6 @@
             android:id="@+id/status_reply"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
-        <ImageView
-            android:layout_gravity="center_horizontal"
-            android:gravity="center_vertical"
-            android:layout_marginLeft="15dp"
-            android:layout_marginStart="15dp"
-            android:id="@+id/new_element"
-            android:visibility="gone"
-            android:src="@drawable/ic_fiber_new"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:ignore="ContentDescription" />
         <TextView
             android:layout_marginLeft="15dp"
             android:layout_marginStart="15dp"
diff --git a/app/src/main/res/layout/drawer_status_focused.xml b/app/src/main/res/layout/drawer_status_focused.xml
index f147f1c00..edea5eaa4 100644
--- a/app/src/main/res/layout/drawer_status_focused.xml
+++ b/app/src/main/res/layout/drawer_status_focused.xml
@@ -94,6 +94,13 @@
                 android:drawablePadding="2dp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
+            <TextView
+                android:id="@+id/status_account_displayname_owner"
+                android:visibility="gone"
+                android:maxLines="1"
+                android:drawablePadding="2dp"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content" />
             <TextView
                 android:textSize="12sp"
                 android:maxLines="1"