diff --git a/res/drawable-hdpi/ic_select_on.png b/res/drawable-hdpi/ic_select_on.png
index e50fcbdea..a1357ccc9 100644
Binary files a/res/drawable-hdpi/ic_select_on.png and b/res/drawable-hdpi/ic_select_on.png differ
diff --git a/res/drawable-mdpi/ic_select_on.png b/res/drawable-mdpi/ic_select_on.png
index 464f1fcf6..b46179a7e 100644
Binary files a/res/drawable-mdpi/ic_select_on.png and b/res/drawable-mdpi/ic_select_on.png differ
diff --git a/res/drawable-xhdpi/ic_select_on.png b/res/drawable-xhdpi/ic_select_on.png
index 9a83575ae..cb9c64141 100644
Binary files a/res/drawable-xhdpi/ic_select_on.png and b/res/drawable-xhdpi/ic_select_on.png differ
diff --git a/res/drawable-xxhdpi/ic_select_on.png b/res/drawable-xxhdpi/ic_select_on.png
index 51326566f..d8161d0a2 100644
Binary files a/res/drawable-xxhdpi/ic_select_on.png and b/res/drawable-xxhdpi/ic_select_on.png differ
diff --git a/res/drawable-xxxhdpi/ic_select_on.png b/res/drawable-xxxhdpi/ic_select_on.png
index 177ce2507..4d8d48fbe 100644
Binary files a/res/drawable-xxxhdpi/ic_select_on.png and b/res/drawable-xxxhdpi/ic_select_on.png differ
diff --git a/res/layout/mediapicker_media_item.xml b/res/layout/mediapicker_media_item.xml
index e5aa0150a..74bb160d0 100644
--- a/res/layout/mediapicker_media_item.xml
+++ b/res/layout/mediapicker_media_item.xml
@@ -49,15 +49,31 @@
         android:layout_height="match_parent"
         android:background="@color/transparent_black_90" />
 
-    <ImageView
+    <FrameLayout
         android:id="@+id/mediapicker_select_on"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="top|right|end"
         android:padding="6dp"
-        android:src="@drawable/ic_select_on"
         android:visibility="gone"
-        tools:visibility="visible" />
+        tools:visibility="visible">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/ic_select_on" />
+
+        <TextView
+            android:id="@+id/mediapicker_select_order"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:textColor="@color/core_white"
+            android:textSize="14dp"
+            android:gravity="center"
+            tools:text="3"/>
+
+    </FrameLayout>
 
     <ImageView
         android:id="@+id/mediapicker_select_off"
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java
index c7217b897..d718f99bb 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java
@@ -6,6 +6,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.TextView;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
@@ -18,6 +19,7 @@ import org.thoughtcrime.securesms.util.StableIdGenerator;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
@@ -27,7 +29,7 @@ public class MediaPickerItemAdapter extends RecyclerView.Adapter<MediaPickerItem
   private final GlideRequests            glideRequests;
   private final EventListener            eventListener;
   private final List<Media>              media;
-  private final Set<Media>               selected;
+  private final List<Media>              selected;
   private final int                      maxSelection;
   private final StableIdGenerator<Media> stableIdGenerator;
 
@@ -39,7 +41,7 @@ public class MediaPickerItemAdapter extends RecyclerView.Adapter<MediaPickerItem
     this.media             = new ArrayList<>();
     this.maxSelection      = maxSelection;
     this.stableIdGenerator = new StableIdGenerator<>();
-    this.selected          = new LinkedHashSet<>();
+    this.selected          = new LinkedList<>();
 
     setHasStableIds(true);
   }
@@ -81,7 +83,7 @@ public class MediaPickerItemAdapter extends RecyclerView.Adapter<MediaPickerItem
     notifyDataSetChanged();
   }
 
-  Set<Media> getSelected() {
+  List<Media> getSelected() {
     return selected;
   }
 
@@ -97,6 +99,7 @@ public class MediaPickerItemAdapter extends RecyclerView.Adapter<MediaPickerItem
     private final View      selectOn;
     private final View      selectOff;
     private final View      selectOverlay;
+    private final TextView  selectOrder;
 
     ItemViewHolder(@NonNull View itemView) {
       super(itemView);
@@ -105,9 +108,10 @@ public class MediaPickerItemAdapter extends RecyclerView.Adapter<MediaPickerItem
       selectOn      = itemView.findViewById(R.id.mediapicker_select_on);
       selectOff     = itemView.findViewById(R.id.mediapicker_select_off);
       selectOverlay = itemView.findViewById(R.id.mediapicker_select_overlay);
+      selectOrder   = itemView.findViewById(R.id.mediapicker_select_order);
     }
 
-    void bind(@NonNull Media media, boolean multiSelect, Set<Media> selected, int maxSelection, @NonNull GlideRequests glideRequests, @NonNull EventListener eventListener) {
+    void bind(@NonNull Media media, boolean multiSelect, List<Media> selected, int maxSelection, @NonNull GlideRequests glideRequests, @NonNull EventListener eventListener) {
       glideRequests.load(media.getUri())
                    .diskCacheStrategy(DiskCacheStrategy.NONE)
                    .transition(DrawableTransitionOptions.withCrossFade())
@@ -132,6 +136,7 @@ public class MediaPickerItemAdapter extends RecyclerView.Adapter<MediaPickerItem
         selectOff.setVisibility(View.VISIBLE);
         selectOn.setVisibility(View.VISIBLE);
         selectOverlay.setVisibility(View.VISIBLE);
+        selectOrder.setText(String.valueOf(selected.indexOf(media) + 1));
         itemView.setOnClickListener(v -> {
           selected.remove(media);
           eventListener.onMediaSelectionChanged(new ArrayList<>(selected));
@@ -154,6 +159,8 @@ public class MediaPickerItemAdapter extends RecyclerView.Adapter<MediaPickerItem
     void recycle() {
       itemView.setOnClickListener(null);
     }
+
+
   }
 
   interface EventListener {