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 d2bbbf1ea..cbb803355 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
@@ -2316,11 +2316,19 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                             holder.status_prev1_play_h.setVisibility(View.GONE);
                         else
                             holder.status_prev1_play.setVisibility(View.GONE);
-                    else
-                        if( fullAttachement)
+                    else {
+                        if( attachment.getType().toLowerCase().equals("video")) {
+                            holder.status_prev1_play_h.setImageResource(R.drawable.ic_video_preview);
+                            holder.status_prev1_play.setImageResource(R.drawable.ic_video_preview);
+                        }else if( attachment.getType().toLowerCase().equals("gifv")) {
+                            holder.status_prev1_play.setImageResource(R.drawable.ic_gif_preview);
+                            holder.status_prev1_play_h.setImageResource(R.drawable.ic_gif_preview);
+                        }
+                        if (fullAttachement)
                             holder.status_prev1_play_h.setVisibility(View.VISIBLE);
                         else
                             holder.status_prev1_play.setVisibility(View.VISIBLE);
+                    }
                 }else if( i == 1) {
                     imageView = fullAttachement?holder.status_prev2_h:holder.status_prev2;
                     if( attachment.getType().toLowerCase().equals("image") || attachment.getType().toLowerCase().equals("unknown"))
@@ -2328,11 +2336,19 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                             holder.status_prev2_play_h.setVisibility(View.GONE);
                         else
                             holder.status_prev2_play.setVisibility(View.GONE);
-                    else
-                        if( fullAttachement)
+                    else {
+                        if( attachment.getType().toLowerCase().equals("video")) {
+                            holder.status_prev2_play_h.setImageResource(R.drawable.ic_video_preview);
+                            holder.status_prev2_play.setImageResource(R.drawable.ic_video_preview);
+                        }else if( attachment.getType().toLowerCase().equals("gifv")) {
+                            holder.status_prev2_play_h.setImageResource(R.drawable.ic_gif_preview);
+                            holder.status_prev2_play.setImageResource(R.drawable.ic_gif_preview);
+                        }
+                        if (fullAttachement)
                             holder.status_prev2_play_h.setVisibility(View.VISIBLE);
                         else
                             holder.status_prev2_play.setVisibility(View.VISIBLE);
+                    }
                 }else if(i == 2) {
                     imageView = fullAttachement?holder.status_prev3_h:holder.status_prev3;
                     if( attachment.getType().toLowerCase().equals("image") || attachment.getType().toLowerCase().equals("unknown"))
@@ -2340,11 +2356,19 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                             holder.status_prev3_play_h.setVisibility(View.GONE);
                         else
                             holder.status_prev3_play.setVisibility(View.GONE);
-                    else
-                        if( fullAttachement)
+                    else {
+                        if( attachment.getType().toLowerCase().equals("video")) {
+                            holder.status_prev3_play_h.setImageResource(R.drawable.ic_video_preview);
+                            holder.status_prev3_play.setImageResource(R.drawable.ic_video_preview);
+                        }else if( attachment.getType().toLowerCase().equals("gifv")) {
+                            holder.status_prev3_play_h.setImageResource(R.drawable.ic_gif_preview);
+                            holder.status_prev3_play.setImageResource(R.drawable.ic_gif_preview);
+                        }
+                        if (fullAttachement)
                             holder.status_prev3_play_h.setVisibility(View.VISIBLE);
                         else
                             holder.status_prev3_play.setVisibility(View.VISIBLE);
+                    }
                 }else {
                     imageView = fullAttachement?holder.status_prev4_h:holder.status_prev4;
                     if( attachment.getType().toLowerCase().equals("image") || attachment.getType().toLowerCase().equals("unknown"))
@@ -2352,11 +2376,19 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
                             holder.status_prev4_play_h.setVisibility(View.GONE);
                         else
                             holder.status_prev4_play.setVisibility(View.GONE);
-                    else
-                        if( fullAttachement)
+                    else {
+                        if( attachment.getType().toLowerCase().equals("video")) {
+                            holder.status_prev4_play_h.setImageResource(R.drawable.ic_video_preview);
+                            holder.status_prev4_play.setImageResource(R.drawable.ic_video_preview);
+                        }else if( attachment.getType().toLowerCase().equals("gifv")) {
+                            holder.status_prev4_play_h.setImageResource(R.drawable.ic_gif_preview);
+                            holder.status_prev4_play.setImageResource(R.drawable.ic_gif_preview);
+                        }
+                        if (fullAttachement)
                             holder.status_prev4_play_h.setVisibility(View.VISIBLE);
                         else
                             holder.status_prev4_play.setVisibility(View.VISIBLE);
+                    }
                 }
                 String url = attachment.getPreview_url();
 
diff --git a/app/src/main/res/drawable/ic_gif_preview.xml b/app/src/main/res/drawable/ic_gif_preview.xml
new file mode 100644
index 000000000..1fa039ce1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_gif_preview.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M4.4153,6.6759C2.1501,6.6759 0.3137,8.6996 0.3137,11.1971l0,10.5573C0.3137,24.2514 2.1361,26.2756 4.4153,26.2756L27.5864,26.2756C29.8517,26.2756 31.688,24.2519 31.688,21.7544L31.688,11.1971C31.688,8.7001 29.8656,6.6759 27.5864,6.6759ZM11.2265,17.2296l0,3.0153L8.498,20.2449C7.7395,20.2449 7.1342,19.57 7.1342,18.7375L7.1342,14.2139C7.1342,13.3755 7.7448,12.7066 8.498,12.7066L12.5906,12.7066L12.5906,11.1989L8.505,11.1989C6.9945,11.1989 5.7701,12.5355 5.7701,14.2232l0,4.5051C5.7701,20.3986 6.9895,21.7526 8.505,21.7526L12.5906,21.7526l0,-1.1307 0,0L12.5906,17.2296 12.5906,15.7219l-4.0923,0l0,1.5077zM15.3188,12.7066l0,7.5383l-1.3641,0l0,1.5077l4.0923,0l0,-1.5077l-1.3641,0l0,-7.5383l1.3641,0l0,-1.5077l-4.0923,0l0,1.5077zM20.7752,15.7219l0,-3.0153l5.4564,0l0,-1.5077l-6.8205,0l0,10.5537l1.3641,0l0,-4.523l4.0923,0l0,-1.5077z"
+      android:strokeWidth="1"
+      android:fillColor="#157efb"
+      android:strokeColor="#00000000"
+      android:fillType="evenOdd"/>
+
+</vector>
diff --git a/app/src/main/res/drawable/ic_video_preview.xml b/app/src/main/res/drawable/ic_video_preview.xml
new file mode 100644
index 000000000..bb38810de
--- /dev/null
+++ b/app/src/main/res/drawable/ic_video_preview.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:viewportHeight="847"
+    android:viewportWidth="847" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#3B77F7" android:pathData="M423,423m-398,0a398,398 0,1 1,796 0a398,398 0,1 1,-796 0"/>
+    <path android:fillColor="#FFFFFFFF" android:pathData="M642,423l-175,-101l-175,-101l0,202l0,202l175,-101z"/>
+</vector>
diff --git a/app/src/main/res/layout/drawer_status.xml b/app/src/main/res/layout/drawer_status.xml
index a2925d9dd..9bb1ee611 100644
--- a/app/src/main/res/layout/drawer_status.xml
+++ b/app/src/main/res/layout/drawer_status.xml
@@ -439,9 +439,9 @@
                                     android:id="@+id/status_prev1_play_h"
                                     android:visibility="gone"
                                     android:layout_centerInParent="true"
-                                    android:layout_width="20dp"
+                                    android:layout_width="30dp"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:layout_height="20dp"
+                                    android:layout_height="30dp"
                                     android:contentDescription="@string/play_video" />
                             </RelativeLayout>
                             <RelativeLayout
@@ -463,9 +463,9 @@
                                     android:id="@+id/status_prev2_play_h"
                                     android:visibility="gone"
                                     android:layout_centerInParent="true"
-                                    android:layout_width="20dp"
+                                    android:layout_width="30dp"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:layout_height="20dp"
+                                    android:layout_height="30dp"
                                     android:contentDescription="@string/play_video" />
                             </RelativeLayout>
                         </LinearLayout>
@@ -493,9 +493,9 @@
                                     android:id="@+id/status_prev3_play_h"
                                     android:visibility="gone"
                                     android:layout_centerInParent="true"
-                                    android:layout_width="20dp"
+                                    android:layout_width="30dp"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:layout_height="20dp"
+                                    android:layout_height="30dp"
                                     android:contentDescription="@string/play_video" />
                             </RelativeLayout>
                             <RelativeLayout
@@ -516,9 +516,9 @@
                                     android:id="@+id/status_prev4_play_h"
                                     android:visibility="gone"
                                     android:layout_centerInParent="true"
-                                    android:layout_width="20dp"
+                                    android:layout_width="30dp"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:layout_height="20dp"
+                                    android:layout_height="30dp"
                                     android:contentDescription="@string/play_video" />
                             </RelativeLayout>
                         </LinearLayout>
@@ -557,9 +557,9 @@
                             android:id="@+id/status_prev1_play"
                             android:visibility="gone"
                             android:layout_centerInParent="true"
-                            android:layout_width="20dp"
+                            android:layout_width="30dp"
                             android:src="@drawable/ic_play_arrow"
-                            android:layout_height="20dp" />
+                            android:layout_height="30dp" />
                         <ImageView
                             android:id="@+id/hide_preview"
                             android:layout_alignParentStart="true"
@@ -593,9 +593,9 @@
                                 android:visibility="gone"
                                 android:id="@+id/status_prev2_play"
                                 android:layout_centerInParent="true"
-                                android:layout_width="20dp"
+                                android:layout_width="30dp"
                                 android:src="@drawable/ic_play_arrow"
-                                android:layout_height="20dp"
+                                android:layout_height="30dp"
                                 android:contentDescription="@string/play_video"/>
                         </RelativeLayout>
 
@@ -620,10 +620,10 @@
                                 <ImageView
                                     android:id="@+id/status_prev3_play"
                                     android:layout_centerInParent="true"
-                                    android:layout_width="20dp"
+                                    android:layout_width="30dp"
                                     android:src="@drawable/ic_play_arrow"
                                     android:visibility="gone"
-                                    android:layout_height="20dp"
+                                    android:layout_height="30dp"
                                     android:contentDescription="@string/play_video"/>
                             </RelativeLayout>
                             <RelativeLayout
@@ -643,9 +643,9 @@
                                     android:id="@+id/status_prev4_play"
                                     android:layout_centerInParent="true"
                                     android:visibility="gone"
-                                    android:layout_width="20dp"
+                                    android:layout_width="30dp"
                                     android:src="@drawable/ic_play_arrow"
-                                    android:layout_height="20dp"
+                                    android:layout_height="30dp"
                                     android:contentDescription="@string/play_video" />
                             </RelativeLayout>
 
diff --git a/app/src/main/res/layout/drawer_status_compact.xml b/app/src/main/res/layout/drawer_status_compact.xml
index aa38f84d9..be2771de0 100644
--- a/app/src/main/res/layout/drawer_status_compact.xml
+++ b/app/src/main/res/layout/drawer_status_compact.xml
@@ -415,9 +415,9 @@
                             android:id="@+id/status_prev1_play_h"
                             android:visibility="gone"
                             android:layout_centerInParent="true"
-                            android:layout_width="20dp"
+                            android:layout_width="30dp"
                             android:src="@drawable/ic_play_arrow"
-                            android:layout_height="20dp"
+                            android:layout_height="30dp"
                             android:contentDescription="@string/play_video" />
                     </RelativeLayout>
                     <RelativeLayout
@@ -439,9 +439,9 @@
                             android:id="@+id/status_prev2_play_h"
                             android:visibility="gone"
                             android:layout_centerInParent="true"
-                            android:layout_width="20dp"
+                            android:layout_width="30dp"
                             android:src="@drawable/ic_play_arrow"
-                            android:layout_height="20dp"
+                            android:layout_height="30dp"
                             android:contentDescription="@string/play_video" />
                     </RelativeLayout>
                 </LinearLayout>
@@ -471,9 +471,9 @@
                             android:id="@+id/status_prev3_play_h"
                             android:visibility="gone"
                             android:layout_centerInParent="true"
-                            android:layout_width="20dp"
+                            android:layout_width="30dp"
                             android:src="@drawable/ic_play_arrow"
-                            android:layout_height="20dp"
+                            android:layout_height="30dp"
                             android:contentDescription="@string/play_video" />
                     </RelativeLayout>
                     <RelativeLayout
@@ -494,9 +494,9 @@
                             android:id="@+id/status_prev4_play_h"
                             android:visibility="gone"
                             android:layout_centerInParent="true"
-                            android:layout_width="20dp"
+                            android:layout_width="30dp"
                             android:src="@drawable/ic_play_arrow"
-                            android:layout_height="20dp"
+                            android:layout_height="30dp"
                             android:contentDescription="@string/play_video" />
                     </RelativeLayout>
                 </LinearLayout>
@@ -534,9 +534,9 @@
                     android:id="@+id/status_prev1_play"
                     android:visibility="gone"
                     android:layout_centerInParent="true"
-                    android:layout_width="20dp"
+                    android:layout_width="30dp"
                     android:src="@drawable/ic_play_arrow"
-                    android:layout_height="20dp"
+                    android:layout_height="30dp"
                     android:contentDescription="@string/play_video" />
                 <ImageView
                     android:id="@+id/hide_preview"
@@ -571,9 +571,9 @@
                         android:visibility="gone"
                         android:id="@+id/status_prev2_play"
                         android:layout_centerInParent="true"
-                        android:layout_width="20dp"
+                        android:layout_width="30dp"
                         android:src="@drawable/ic_play_arrow"
-                        android:layout_height="20dp"
+                        android:layout_height="30dp"
                         android:contentDescription="@string/play_video"/>
                 </RelativeLayout>
 
@@ -598,10 +598,10 @@
                         <ImageView
                             android:id="@+id/status_prev3_play"
                             android:layout_centerInParent="true"
-                            android:layout_width="20dp"
+                            android:layout_width="30dp"
                             android:src="@drawable/ic_play_arrow"
                             android:visibility="gone"
-                            android:layout_height="20dp"
+                            android:layout_height="30dp"
                             android:contentDescription="@string/play_video"/>
                     </RelativeLayout>
                     <RelativeLayout
@@ -621,9 +621,9 @@
                             android:id="@+id/status_prev4_play"
                             android:layout_centerInParent="true"
                             android:visibility="gone"
-                            android:layout_width="20dp"
+                            android:layout_width="30dp"
                             android:src="@drawable/ic_play_arrow"
-                            android:layout_height="20dp"
+                            android:layout_height="30dp"
                             android:contentDescription="@string/play_video"/>
                     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/drawer_status_focused.xml b/app/src/main/res/layout/drawer_status_focused.xml
index 65f354c04..535ef1ca0 100644
--- a/app/src/main/res/layout/drawer_status_focused.xml
+++ b/app/src/main/res/layout/drawer_status_focused.xml
@@ -343,9 +343,9 @@
                             android:id="@+id/status_prev1_play_h"
                             android:visibility="gone"
                             android:layout_centerInParent="true"
-                            android:layout_width="20dp"
+                            android:layout_width="30dp"
                             android:src="@drawable/ic_play_arrow"
-                            android:layout_height="20dp"
+                            android:layout_height="30dp"
                             android:contentDescription="@string/play_video"  />
                     </RelativeLayout>
                     <RelativeLayout
@@ -367,9 +367,9 @@
                             android:id="@+id/status_prev2_play_h"
                             android:visibility="gone"
                             android:layout_centerInParent="true"
-                            android:layout_width="20dp"
+                            android:layout_width="30dp"
                             android:src="@drawable/ic_play_arrow"
-                            android:layout_height="20dp"
+                            android:layout_height="30dp"
                             android:contentDescription="@string/play_video" />
                     </RelativeLayout>
                 </LinearLayout>
@@ -397,9 +397,9 @@
                             android:id="@+id/status_prev3_play_h"
                             android:visibility="gone"
                             android:layout_centerInParent="true"
-                            android:layout_width="20dp"
+                            android:layout_width="30dp"
                             android:src="@drawable/ic_play_arrow"
-                            android:layout_height="20dp"
+                            android:layout_height="30dp"
                             android:contentDescription="@string/play_video" />
                     </RelativeLayout>
                     <RelativeLayout
@@ -420,9 +420,9 @@
                             android:id="@+id/status_prev4_play_h"
                             android:visibility="gone"
                             android:layout_centerInParent="true"
-                            android:layout_width="20dp"
+                            android:layout_width="30dp"
                             android:src="@drawable/ic_play_arrow"
-                            android:layout_height="20dp"
+                            android:layout_height="30dp"
                             android:contentDescription="@string/play_video" />
                     </RelativeLayout>
                 </LinearLayout>
@@ -460,9 +460,9 @@
                     android:id="@+id/status_prev1_play"
                     android:visibility="gone"
                     android:layout_centerInParent="true"
-                    android:layout_width="20dp"
+                    android:layout_width="30dp"
                     android:src="@drawable/ic_play_arrow"
-                    android:layout_height="20dp"
+                    android:layout_height="30dp"
                     android:contentDescription="@string/play_video" />
                 <ImageView
                     android:id="@+id/hide_preview"
@@ -497,9 +497,9 @@
                         android:visibility="gone"
                         android:id="@+id/status_prev2_play"
                         android:layout_centerInParent="true"
-                        android:layout_width="20dp"
+                        android:layout_width="30dp"
                         android:src="@drawable/ic_play_arrow"
-                        android:layout_height="20dp"
+                        android:layout_height="30dp"
                         android:contentDescription="@string/play_video" />
                 </RelativeLayout>
 
@@ -524,10 +524,10 @@
                         <ImageView
                             android:id="@+id/status_prev3_play"
                             android:layout_centerInParent="true"
-                            android:layout_width="20dp"
+                            android:layout_width="30dp"
                             android:src="@drawable/ic_play_arrow"
                             android:visibility="gone"
-                            android:layout_height="20dp"
+                            android:layout_height="30dp"
                             android:contentDescription="@string/play_video"/>
                     </RelativeLayout>
                     <RelativeLayout
@@ -547,9 +547,9 @@
                             android:id="@+id/status_prev4_play"
                             android:layout_centerInParent="true"
                             android:visibility="gone"
-                            android:layout_width="20dp"
+                            android:layout_width="30dp"
                             android:src="@drawable/ic_play_arrow"
-                            android:layout_height="20dp"
+                            android:layout_height="30dp"
                             android:contentDescription="@string/play_video"/>
                     </RelativeLayout>