diff --git a/app/src/main/res/drawable/ic_done_black.xml b/app/src/main/res/drawable/ic_done_black.xml
index 899cbb684..2d3858a70 100644
--- a/app/src/main/res/drawable/ic_done_black.xml
+++ b/app/src/main/res/drawable/ic_done_black.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="24"
     android:tint="?attr/colorControlNormal">
   <path
-      android:fillColor="@android:color/white"
+      android:fillColor="@android:color/black"
       android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
 </vector>
diff --git a/app/src/main/res/layout/activity_custom_selector.xml b/app/src/main/res/layout/activity_custom_selector.xml
index 1b6d22e00..f90ca51e2 100644
--- a/app/src/main/res/layout/activity_custom_selector.xml
+++ b/app/src/main/res/layout/activity_custom_selector.xml
@@ -1,7 +1,24 @@
 <?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 xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+      android:id="@+id/toolbar_layout"
+      android:layout_width="match_parent"
+      android:layout_height="?attr/actionBarSize"
+      app:layout_constraintTop_toTopOf="parent">
+        <include
+            layout="@layout/custom_selector_toolbar"
+            android:id="@+id/toolbar"
+            app:layout_constraintTop_toTopOf="parent"/>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <include
+      layout="@layout/fragment_custom_selector"
+      app:layout_constraintTop_toBottomOf="@+id/toolbar_layout"
+      app:layout_constraintBottom_toBottomOf="parent"
+      />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/custom_selector_toolbar.xml b/app/src/main/res/layout/custom_selector_toolbar.xml
index 28f5b725c..45ebdc923 100644
--- a/app/src/main/res/layout/custom_selector_toolbar.xml
+++ b/app/src/main/res/layout/custom_selector_toolbar.xml
@@ -1,6 +1,44 @@
 <?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">
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  >
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+  <ImageView
+    android:id="@+id/back"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    android:layout_centerVertical="true"
+    android:background="?attr/selectableItemBackgroundBorderless"
+    android:padding="@dimen/standard_gap"
+    app:srcCompat="?attr/custom_selector_back" />
+
+
+  <TextView
+    android:id="@+id/title"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    app:layout_constraintStart_toEndOf="@id/back"
+    app:layout_constraintTop_toTopOf="parent"
+    app:layout_constraintBottom_toBottomOf="parent"
+    android:layout_marginHorizontal="@dimen/standard_gap"
+    android:ellipsize="end"
+    android:maxLines="1"
+    android:text="@string/custom_selector_title"
+    style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title" />
+
+  <ImageView
+    android:id="@+id/done"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintTop_toTopOf="parent"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:layout_centerVertical="true"
+    android:clickable="true"
+    android:focusable="true"
+    android:padding="@dimen/standard_gap"
+    app:srcCompat="?attr/custom_selector_done"/>
+
+</merge>
\ 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
index 45a174bff..8a41cb6dd 100644
--- a/app/src/main/res/layout/fragment_custom_selector.xml
+++ b/app/src/main/res/layout/fragment_custom_selector.xml
@@ -6,20 +6,19 @@
   xmlns:app="http://schemas.android.com/apk/res-auto">
 
   <androidx.recyclerview.widget.RecyclerView
-    android:id="@+id/custom_selector_recycler_view"
+    android:id="@+id/selector_rv"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:visibility="gone"
-    tools:visibility="visible" />
+    />
 
   <TextView
+    android:id="@+id/empty_text"
     android:layout_height="wrap_content"
     android:layout_width="wrap_content"
     android:textSize="@dimen/normal_text"
-    android:padding="10dp"
-    android:text="No Images"
+    android:padding="@dimen/standard_gap"
+    android:text="@string/custom_selector_empty_text"
     android:visibility="gone"
-    tools:visibility="visible"
     app:layout_constraintTop_toTopOf="parent"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
@@ -31,8 +30,7 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_gravity="center"
-    android:visibility="gone"
-    tools:visibility="visible"
+    android:visibility="visible"
     app:layout_constraintTop_toTopOf="parent"
     app:layout_constraintBottom_toBottomOf="parent"
     app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_custom_selector_folder.xml b/app/src/main/res/layout/item_custom_selector_folder.xml
index 3592255dd..c13838e92 100644
--- a/app/src/main/res/layout/item_custom_selector_folder.xml
+++ b/app/src/main/res/layout/item_custom_selector_folder.xml
@@ -8,8 +8,8 @@
   <androidx.cardview.widget.CardView
     android:layout_width="match_parent"
     android:layout_height="0dp"
-    app:cardCornerRadius="5dp"
-    app:cardElevation="2dp"
+    app:cardCornerRadius="@dimen/dimen_6"
+    app:cardElevation="@dimen/dimen_2"
     android:id="@+id/view"
     app:cardUseCompatPadding="true"
     app:layout_constraintDimensionRatio="H,1:1"
@@ -43,14 +43,13 @@
 
         <TextView
           android:id="@+id/album_name"
-          android:layout_width="wrap_content"
+          android:layout_width="0dp"
           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_margin="@dimen/dimen_6"
+          android:padding="@dimen/dimen_6"
+          style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
           android:layout_weight="1"
           android:textSize="16sp"
           android:singleLine="true"
diff --git a/app/src/main/res/layout/item_custom_selector_image.xml b/app/src/main/res/layout/item_custom_selector_image.xml
index 7252f543f..e3240e90e 100644
--- a/app/src/main/res/layout/item_custom_selector_image.xml
+++ b/app/src/main/res/layout/item_custom_selector_image.xml
@@ -8,8 +8,8 @@
   <androidx.cardview.widget.CardView
     android:layout_width="match_parent"
     android:layout_height="0dp"
-    app:cardCornerRadius="5dp"
-    app:cardElevation="2dp"
+    app:cardCornerRadius="@dimen/dimen_6"
+    app:cardElevation="@dimen/dimen_2"
     android:id="@+id/view"
     app:cardUseCompatPadding="true"
     app:layout_constraintDimensionRatio="H,1:1"
@@ -35,11 +35,10 @@
 
       <TextView
         android:id="@+id/selected_count"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
+        android:layout_width="@dimen/dimen_20"
+        android:layout_height="@dimen/dimen_20"
         app:layout_constraintDimensionRatio="H,1:1"
-        android:layout_margin="4dp"
-        android:textSize="11sp"
+        android:layout_margin="@dimen/dimen_10"
         android:gravity="center|center_vertical"
         android:includeFontPadding="false"
         android:textStyle="bold"
@@ -67,8 +66,8 @@
 
       <ImageView
         android:id="@+id/uploaded_overlay_icon"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
+        android:layout_width="@dimen/dimen_140"
+        android:layout_height="@dimen/dimen_140"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:srcCompat="@drawable/commons"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 5387ca117..f43772fb5 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -49,6 +49,8 @@
     <attr name="menu_item_tint" format="reference"/>
     <attr name="search_icon" format="reference"/>
     <attr name="caption_description_text_color" format="reference" />
+    <attr name="custom_selector_done" format="reference"/>
+    <attr name="custom_selector_back" format="reference"/>
 
     <declare-styleable name="Badge">
         <attr name="boundary" format="color"/>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index ac5d31cf7..b3fb6d1a4 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -58,6 +58,7 @@
 
     <!-- Commonly used dimensions -->
     <dimen name="dimen_0">0dp</dimen>
+    <dimen name="dimen_2">2dp</dimen>
     <dimen name="dimen_6">6dp</dimen>
     <dimen name="dimen_10">10dp</dimen>
     <dimen name="dimen_20">20dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e0cf7d790..4e3c8fb04 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -646,5 +646,7 @@ Upload your first media by tapping on the add button.</string>
   <string name="learn_more">LEARN MORE</string>
   <string name="wlm_campaign_title">Wiki Loves Monuments</string>
   <string name="wlm_campaign_description">Wiki Loves Monuments is an international photo contest for monuments organised by Wikimedia</string>
+  <string name="custom_selector_title">Custom Selector</string>
+  <string name="custom_selector_empty_text">No Images</string>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 308291dea..1ae9e0a7c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -55,6 +55,8 @@
         <item name="contributionsListTextSecondary">@color/white</item>
         <item name="menu_item_tint">@color/white</item>
         <item name="search_icon">@drawable/ic_search_white_24dp</item>
+        <item name="custom_selector_done">@drawable/ic_done_white</item>
+        <item name="custom_selector_back">@drawable/ic_arrow_back_white</item>
         <item name="android:windowEnableSplitTouch">false</item>
         <item name="android:splitMotionEvents">false</item>
     </style>
@@ -113,6 +115,8 @@
         <item name="contributionsListTextSecondary">@color/disabled_button_text_color_dark</item>
         <item name="menu_item_tint">@color/primaryDarkColor</item>
         <item name="search_icon">@drawable/ic_search_blue_24dp</item>
+        <item name="custom_selector_done">@drawable/ic_done_black</item>
+        <item name="custom_selector_back">@drawable/ic_arrow_back_black</item>
         <item name="android:windowEnableSplitTouch">false</item>
         <item name="android:splitMotionEvents">false</item>
     </style>