diff --git a/app/build.gradle b/app/build.gradle
index c6f34cc68..68405acce 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -204,7 +204,7 @@ android {
             }
         }
         debug {
-            minifyEnabled true
+            minifyEnabled false
             testCoverageEnabled project.hasProperty('coverage')
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
             testProguardFile 'test-proguard-rules.txt'
diff --git a/app/src/main/res/drawable-ldpi/circle_shape.xml b/app/src/main/res/drawable-ldpi/circle_shape.xml
new file mode 100644
index 000000000..d581bfb9f
--- /dev/null
+++ b/app/src/main/res/drawable-ldpi/circle_shape.xml
@@ -0,0 +1,4 @@
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval" >
+    <solid android:color="@color/white" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-ldpi/commons.xml b/app/src/main/res/drawable-ldpi/commons.xml
new file mode 100644
index 000000000..4c2e6cabf
--- /dev/null
+++ b/app/src/main/res/drawable-ldpi/commons.xml
@@ -0,0 +1,62 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="1639.375"
+        android:viewportHeight="1640">
+    <group android:translateX="514.6875"
+            android:translateY="410">
+      <path
+          android:pathData="M305,516m-100,0a100,100 0,1 1,200 0a100,100 0,1 1,-200 0"
+          android:fillColor="#900"/>
+      <path
+          android:pathData="m294,696v118h22v-118"
+          android:fillColor="#069"/>
+      <path
+          android:pathData="m262,701l43,-75 43,75"
+          android:fillColor="#069"/>
+      <path
+          android:pathData="m169.943,635.501l-83.439,83.439l15.556,15.556l83.439,-83.439"
+          android:fillColor="#069"/>
+      <path
+          android:pathData="m143.78,616.409l83.439,-22.627 -22.627,83.439"
+          android:fillColor="#069"/>
+      <path
+          android:pathData="m125,505l-118,0l-0,22l118,0"
+          android:fillColor="#069"/>
+      <path
+          android:pathData="m120,473l75,43 -75,43"
+          android:fillColor="#069"/>
+      <path
+          android:pathData="m185.499,380.943l-83.439,-83.439l-15.556,15.556l83.439,83.439"
+          android:fillColor="#069"/>
+      <path
+          android:pathData="m204.591,354.78l22.627,83.439 -83.439,-22.627"
+          android:fillColor="#069"/>
+      <path
+          android:pathData="m424.501,651.057l83.439,83.439l15.556,-15.556l-83.439,-83.439"
+          android:fillColor="#069"/>
+      <path
+          android:pathData="m405.409,677.22l-22.627,-83.439 83.439,22.627"
+          android:fillColor="#069"/>
+      <path
+          android:pathData="m485,527l118,-0l0,-22l-118,-0"
+          android:fillColor="#069"/>
+      <path
+          android:pathData="m490,559l-75,-43 75,-43"
+          android:fillColor="#069"/>
+      <path
+          android:pathData="m440.057,396.499l83.439,-83.439l-15.556,-15.556l-83.439,83.439"
+          android:fillColor="#069"/>
+      <path
+          android:pathData="m466.22,415.591l-83.439,22.627 22.627,-83.439"
+          android:fillColor="#069"/>
+      <path
+          android:pathData="M123.981,334.981A256,256 0,1 0,486.019 334.981C415.309,264.27 308.536,300.332 287.322,144.769"
+          android:strokeWidth="84"
+          android:fillColor="#00000000"
+          android:strokeColor="#069"/>
+      <path
+          android:pathData="m282,1s-36,135 -80,185 116,-62 170,-5 -90,-180 -90,-180z"
+          android:fillColor="#069"/>
+    </group>
+</vector>
diff --git a/app/src/main/res/layout/activity_custom_selector.xml b/app/src/main/res/layout/activity_custom_selector.xml
new file mode 100644
index 000000000..1b6d22e00
--- /dev/null
+++ b/app/src/main/res/layout/activity_custom_selector.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent"
+  android:layout_height="match_parent">
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_custom_selector.xml b/app/src/main/res/layout/fragment_custom_selector.xml
new file mode 100644
index 000000000..45a174bff
--- /dev/null
+++ b/app/src/main/res/layout/fragment_custom_selector.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  xmlns:app="http://schemas.android.com/apk/res-auto">
+
+  <androidx.recyclerview.widget.RecyclerView
+    android:id="@+id/custom_selector_recycler_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:visibility="gone"
+    tools:visibility="visible" />
+
+  <TextView
+    android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
+    android:textSize="@dimen/normal_text"
+    android:padding="10dp"
+    android:text="No Images"
+    android:visibility="gone"
+    tools:visibility="visible"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"/>
+
+
+  <ProgressBar
+    android:id="@+id/loader"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:visibility="gone"
+    tools:visibility="visible"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_custom_selector_folder.xml b/app/src/main/res/layout/item_custom_selector_folder.xml
new file mode 100644
index 000000000..3592255dd
--- /dev/null
+++ b/app/src/main/res/layout/item_custom_selector_folder.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content">
+
+  <androidx.cardview.widget.CardView
+    android:layout_width="match_parent"
+    android:layout_height="0dp"
+    app:cardCornerRadius="5dp"
+    app:cardElevation="2dp"
+    android:id="@+id/view"
+    app:cardUseCompatPadding="true"
+    app:layout_constraintDimensionRatio="H,1:1"
+    app:layout_constraintTop_toTopOf="parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+      android:layout_width="match_parent"
+      android:background="@color/white"
+      android:layout_height="match_parent">
+
+      <ImageView
+        android:id="@+id/folder_thumbnail"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"/>
+
+      <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/album_overlay"
+        android:alpha="0.05"
+        android:background=""/>
+
+      <LinearLayout
+        android:id="@+id/folder_details"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        >
+
+        <TextView
+          android:id="@+id/album_name"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          app:layout_constraintLeft_toLeftOf="parent"
+          app:layout_constraintBottom_toBottomOf="parent"
+          android:layout_margin="5dp"
+          android:padding="5dp"
+          android:textColor="@color/white"
+          android:textStyle="bold"
+          android:layout_weight="1"
+          android:textSize="16sp"
+          android:singleLine="true"
+          android:ellipsize="end"/>
+
+        <TextView
+          android:id="@+id/album_count"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          app:layout_constraintRight_toRightOf="parent"
+          app:layout_constraintBottom_toBottomOf="parent"
+          android:layout_margin="5dp"
+          android:padding="5dp"
+          android:textColor="@color/white"
+          android:textStyle="bold"
+          android:textSize="16sp"
+          />
+
+      </LinearLayout>
+
+      <androidx.constraintlayout.widget.Group
+        android:id="@+id/v_album"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="visible"
+        app:constraint_referenced_ids="folder_details,album_overlay"/>
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+  </androidx.cardview.widget.CardView>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_custom_selector_image.xml b/app/src/main/res/layout/item_custom_selector_image.xml
new file mode 100644
index 000000000..7252f543f
--- /dev/null
+++ b/app/src/main/res/layout/item_custom_selector_image.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content">
+
+  <androidx.cardview.widget.CardView
+    android:layout_width="match_parent"
+    android:layout_height="0dp"
+    app:cardCornerRadius="5dp"
+    app:cardElevation="2dp"
+    android:id="@+id/view"
+    app:cardUseCompatPadding="true"
+    app:layout_constraintDimensionRatio="H,1:1"
+    app:layout_constraintTop_toTopOf="parent">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+      android:layout_width="match_parent"
+      android:layout_height="match_parent">
+
+      <ImageView
+        android:id="@+id/image_thumbnail"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"/>
+
+      <View
+        android:id="@+id/selected_overlay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:alpha="0.4"
+        android:background="@color/divider_grey"
+        />
+
+      <TextView
+        android:id="@+id/selected_count"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        app:layout_constraintDimensionRatio="H,1:1"
+        android:layout_margin="4dp"
+        android:textSize="11sp"
+        android:gravity="center|center_vertical"
+        android:includeFontPadding="false"
+        android:textStyle="bold"
+        android:textColor="@color/black"
+        android:background="@drawable/circle_shape"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+
+
+      <androidx.constraintlayout.widget.Group
+        android:id="@+id/selected_view"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="visible"
+        app:constraint_referenced_ids="selected_overlay,selected_count"/>
+
+
+      <View
+        android:id="@+id/uploaded_overlay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:alpha="0.15"
+        android:background="@color/black"/>
+
+
+      <ImageView
+        android:id="@+id/uploaded_overlay_icon"
+        android:layout_width="80dp"
+        android:layout_height="80dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:srcCompat="@drawable/commons"
+        />
+
+      <androidx.constraintlayout.widget.Group
+        android:id="@+id/uploaded"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="visible"
+        app:constraint_referenced_ids="uploaded_overlay,uploaded_overlay_icon"/>
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+  </androidx.cardview.widget.CardView>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file