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 6d802267f..5ade54fd6 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
@@ -297,6 +297,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
         TextView status_toot_app;
         RelativeLayout webview_preview;
         ImageView webview_preview_card;
+        LinearLayout left_buttons;
+
         public View getView(){
             return itemView;
         }
@@ -375,6 +377,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             conversation_pp_2_container = itemView.findViewById(R.id.conversation_pp_2_container);
             conversation_pp_3_container = itemView.findViewById(R.id.conversation_pp_3_container);
             vertical_content = itemView.findViewById(R.id.vertical_content);
+            left_buttons =  itemView.findViewById(R.id.left_buttons);
         }
     }
 
@@ -608,14 +611,22 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                 holder.status_account_displayname.setCompoundDrawables( null, null, null, null);
             }
             LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+            LinearLayout.LayoutParams paramsB = new LinearLayout.LayoutParams((int)Helper.convertDpToPixel(60, context), LinearLayout.LayoutParams.WRAP_CONTENT);
             if( status.getReblog() == null && !isCompactMode && getItemViewType(position) != FOCUSED_STATUS){
-                params.setMargins((int)Helper.convertDpToPixel(60, context),-(int)Helper.convertDpToPixel(10, context),0,0);
+                params.setMargins(0,-(int)Helper.convertDpToPixel(10, context),0,0);
+                if (status.getSpoiler_text() != null && status.getSpoiler_text().trim().length() > 0 )
+                    paramsB.setMargins(0,0,0,0);
+                else
+                    paramsB.setMargins(0,(int)Helper.convertDpToPixel(10, context),0,0);
             }else if( !isCompactMode && getItemViewType(position) != FOCUSED_STATUS){
-                params.setMargins((int)Helper.convertDpToPixel(60, context),0,0,0);
+                params.setMargins(0,0,0,0);
+                paramsB.setMargins(0,0,0,0);
             }
 
-            holder.vertical_content.setLayoutParams(params);
 
+
+            holder.vertical_content.setLayoutParams(params);
+            holder.left_buttons.setLayoutParams(paramsB);
             if( !status.isClickable())
                 status.makeClickable(context);
             if( !status.isEmojiFound())
@@ -893,7 +904,11 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
             }
             holder.status_action_container.setVisibility(View.VISIBLE);
             if( ( getItemViewType(position) != COMPACT_STATUS ) && (trans_forced || (translator != Helper.TRANS_NONE && currentLocale != null && status.getLanguage() != null && !status.getLanguage().trim().equals(currentLocale)))){
-                holder.status_translate.setVisibility(View.VISIBLE);
+                if( status.isSpoilerShown() || getItemViewType(position) == FOCUSED_STATUS){
+                    holder.status_translate.setVisibility(View.VISIBLE);
+                }else {
+                    holder.status_translate.setVisibility(View.GONE);
+                }
             }else {
                 holder.status_translate.setVisibility(View.GONE);
             }
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index 90ddb93ae..4c97b03a7 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -182,13 +182,14 @@
         </LinearLayout>
     </LinearLayout>
     <LinearLayout
-        android:layout_marginStart="60dp"
-        android:layout_marginLeft="60dp"
+
         android:id="@+id/vertical_content"
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
         <LinearLayout
+            android:layout_marginStart="60dp"
+            android:layout_marginLeft="60dp"
             android:id="@+id/status_spoiler_container"
             android:layout_width="match_parent"
             android:orientation="vertical"
@@ -219,13 +220,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
-            <RelativeLayout
-                android:layout_marginLeft="-60dp"
-                android:layout_marginStart="-60dp"
+            <LinearLayout
+                android:id="@+id/left_buttons"
+                android:orientation="vertical"
                 android:layout_width="60dp"
                 android:layout_height="wrap_content">
                 <ImageView
-                    android:layout_centerHorizontal="true"
                     android:layout_gravity="center_horizontal"
                     android:id="@+id/new_element"
                     android:visibility="gone"
@@ -234,7 +234,7 @@
                     android:layout_height="wrap_content"
                     tools:ignore="ContentDescription" />
                 <ImageButton
-                    android:layout_centerHorizontal="true"
+
                     android:id="@+id/status_translate"
                     android:gravity="center"
                     style="?attr/borderless"
@@ -244,7 +244,7 @@
                     android:layout_gravity="center_horizontal"
                     />
                 <ImageButton
-                    android:layout_centerHorizontal="true"
+
                     android:id="@+id/status_bookmark"
                     android:gravity="center"
                     android:visibility="gone"
@@ -256,7 +256,7 @@
                     android:layout_marginTop="5dp"
                     android:layout_gravity="center_horizontal"
                     />
-            </RelativeLayout>
+            </LinearLayout>
             <LinearLayout
                 android:id="@+id/status_content_container"
                 android:visibility="gone"
@@ -654,6 +654,8 @@
             </LinearLayout>
         </LinearLayout>
         <LinearLayout
+            android:layout_marginStart="60dp"
+            android:layout_marginLeft="60dp"
             android:id="@+id/status_spoiler_mention_container"
             android:layout_width="match_parent"
             android:orientation="vertical"
@@ -666,6 +668,8 @@
                 android:layout_height="wrap_content" />
         </LinearLayout>
         <LinearLayout
+            android:layout_marginStart="60dp"
+            android:layout_marginLeft="60dp"
             android:id="@+id/status_action_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/drawer_status_compact.xml b/app/src/main/res/layout/drawer_status_compact.xml
index 32a4a3a8d..738c54a9f 100644
--- a/app/src/main/res/layout/drawer_status_compact.xml
+++ b/app/src/main/res/layout/drawer_status_compact.xml
@@ -135,6 +135,12 @@
             android:orientation="vertical"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
+        <LinearLayout
+            android:id="@+id/left_buttons"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"/>
         <LinearLayout
             android:layout_marginStart="10dp"
             android:layout_marginLeft="10dp"
diff --git a/app/src/main/res/layout/drawer_status_focused.xml b/app/src/main/res/layout/drawer_status_focused.xml
index 8ba9efc55..8ac4df8bf 100644
--- a/app/src/main/res/layout/drawer_status_focused.xml
+++ b/app/src/main/res/layout/drawer_status_focused.xml
@@ -87,6 +87,12 @@
             android:orientation="vertical"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"/>
+        <LinearLayout
+            android:id="@+id/left_buttons"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"/>
         <LinearLayout
             android:layout_marginStart="10dp"
             android:layout_marginLeft="10dp"